Commit e040cab4 authored by zhangjinzhou's avatar zhangjinzhou

代码暂存

parent 157d8d61
...@@ -238,7 +238,7 @@ Page({ ...@@ -238,7 +238,7 @@ Page({
roomdata: roomdata, roomdata: roomdata,
attionlist: [], attionlist: [],
showattionlist: [], showattionlist: [],
canwin: canwin, canwin: false,//canwin,
isfirst: true, isfirst: true,
gametime: gameatime, gametime: gameatime,
tooltime: tooltime, tooltime: tooltime,
...@@ -271,9 +271,10 @@ Page({ ...@@ -271,9 +271,10 @@ Page({
let attiontxt1 = "游戏开始啦,共有" + this.data.roomnums + "名玩家加入游戏,快来升温队伍拿奖励吧。"; let attiontxt1 = "游戏开始啦,共有" + this.data.roomnums + "名玩家加入游戏,快来升温队伍拿奖励吧。";
this.addAttionTxt(attiontxt1); this.addAttionTxt(attiontxt1);
this.updateAct(); this.updateAct();
// setTimeout(() => { setTimeout(() => {
// this.newAiControl("invite", 1); this.newAiControl("task", 1,2);
// }, 4000); this.hideSetData();
}, 4000);
}, },
//新ai逻辑,tool==使用道具,task==任务,invite==邀请人 //新ai逻辑,tool==使用道具,task==任务,invite==邀请人
async newAiControl(type = "tool", ainum = 1, aiwarm = 0) { async newAiControl(type = "tool", ainum = 1, aiwarm = 0) {
...@@ -924,8 +925,9 @@ Page({ ...@@ -924,8 +925,9 @@ Page({
}) })
if (success) { if (success) {
const { total, invite, tool, follow, sign, collect, browseGoods } = data; const { total, invite, tool, follow, sign, collectGoods, browseGoods } = data;
let ridx = this.data.myidx; let ridx = this.data.myidx;
let collect = collectGoods;
let nwd = this.data.roomdata[ridx - 1]["wd"] || 0; let nwd = this.data.roomdata[ridx - 1]["wd"] || 0;
if (total > nwd) { if (total > nwd) {
this.updateRolewd(ridx, total); this.updateRolewd(ridx, total);
...@@ -1393,7 +1395,7 @@ Page({ ...@@ -1393,7 +1395,7 @@ Page({
step: step, step: step,
roomnums: roomnums, roomnums: roomnums,
roomdata: roomdata, roomdata: roomdata,
canwin: canwin, canwin: false,//canwin,
gametime: 0, gametime: 0,
gametimeshow: this.changeshowtime(0), gametimeshow: this.changeshowtime(0),
tooltime: tooltime, tooltime: tooltime,
...@@ -1422,7 +1424,7 @@ Page({ ...@@ -1422,7 +1424,7 @@ Page({
step: step, step: step,
roomnums: roomnums, roomnums: roomnums,
roomdata: roomdata, roomdata: roomdata,
canwin: canwin, canwin: false,//canwin,
gametime: gameatime, gametime: gameatime,
gametimeshow: this.changeshowtime(gameatime), gametimeshow: this.changeshowtime(gameatime),
tooltime: tooltime, tooltime: tooltime,
......
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