Commit 5040cb22 authored by zhangjinzhou's avatar zhangjinzhou

暂存

parent b52620cf
...@@ -267,7 +267,7 @@ Page({ ...@@ -267,7 +267,7 @@ Page({
if (havechao) {//已经有超过的了,可操作 if (havechao) {//已经有超过的了,可操作
let math1 = Math.random(); let math1 = Math.random();
// console.log("已经有超过得了,可选使用", math1); // console.log("已经有超过得了,可选使用", math1);
if (math1 < 0.8&&type!="tool") { if (math1 < 0.8 && type != "tool") {
idoact = false; idoact = false;
} }
} else {//必操作 } else {//必操作
...@@ -277,7 +277,7 @@ Page({ ...@@ -277,7 +277,7 @@ Page({
if (idoact) { if (idoact) {
if (type == "tool") { if (type == "tool") {
// if (chawd + toolwarm > 0) { // if (chawd + toolwarm > 0) {
bido.push(["tool", 1]); bido.push(["tool", 1]);
// } // }
} }
if (type == "task") { if (type == "task") {
...@@ -474,7 +474,7 @@ Page({ ...@@ -474,7 +474,7 @@ Page({
}, },
onShow() { onShow() {
let ngametime = this.data.gametime; let ngametime = this.data.gametime;
if ((this.data.isnew > 0 && this.data.isnew < 7) || this.data.show_v != 2||ngametime<=0) { if ((this.data.isnew > 0 && this.data.isnew < 7) || this.data.show_v != 2 || ngametime <= 0) {
return; return;
} }
this.updateActInfo(); this.updateActInfo();
...@@ -669,11 +669,14 @@ Page({ ...@@ -669,11 +669,14 @@ Page({
}, },
//升温 //升温
updateRolewd(ridx, rwd) { updateRolewd(ridx, rwd) {
let mv = paples[ridx - 1] for (let i = 0; i < paples.length; i++) {
if (mv && rwd) { let mv = paples[i]
mv.gotoAndPlay(1); if (mv && rwd) {
mv.gotoAndPlay(1);
}
} }
this.data.roomdata[ridx - 1]["wd"] = rwd; this.data.roomdata[ridx - 1]["wd"] = rwd;
let ndata = this.data.roomdata; let ndata = this.data.roomdata;
this.setData({ this.setData({
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment