Merge remote-tracking branch 'refs/remotes/origin/jiaoneiqunuan' into jiaoneiqunuan

taobao_jn/client/pages/pagegamemain/pagegamemain.js

@@ -22,10 +22,11 @@ const toolwarm = 1;//升温道具+温度值
 const taskwarm = 1;//任务+温度值
 const invitewarm = 1;//邀请+温度值
 const toolcd = 5;//
-const paple1 = "cloud://50A61CFE9CCC27602FFD480B36839784//paple1.svga";
-const paple2 = "cloud://48FEB56992D156E3C9C05DC07DFEAC5C//paple2.svga";
-const paple3 = "cloud://003C0A5953796DA010090F2745FA02B5//paple3.svga";
-const paple4 = "cloud://1FFE377B99BB73F6D837D258262405DF//paple4.svga";
+
+const paple1 = "cloud://1C47337C3D86F381913E3741232B26EB//paple1.svga";
+const paple2 = "cloud://6E5D893BA34F99343C702D9FAA543C21//paple2.svga";
+const paple3 = "cloud://F03F0071205084B1A58F9C560010C076//paple3.svga";
+const paple4 = "cloud://650F093A4384DAB23C0C551A7818EE1F//paple4.svga";
 Page({
   data: {
     resList: resList,
@@ -106,10 +107,17 @@ Page({
     avatar2: "",
     avatar3: "",
     avatar4: "",
+    canwin:false
   },
   onLoad(props) {
     console.log("onLoad========>", app, props);
     let step = 1;
+    let sucgl = 70;
+    let nranksuc = Math.random()*100;
+    let canwin = false;
+    if(nranksuc<sucgl){//能赢
+      canwin = true;
+    }
     let roomnums = [2, 3, 4][step - 1];
     if (roomnums == 2) {
 
@@ -133,14 +141,25 @@ Page({
       roomdata: roomdata,
       attionlist: [],
       showattionlist: [],
-
+      canwin:canwin,
     });
     let attiontxt1 = "游戏开始啦，共有" + roomnums + "名玩家加入游戏，快来升温队伍拿奖励吧。";
     this.addAttionTxt(attiontxt1);
     this.changePashow();
     this.updateAct();
     // this.updateActInfo();
-    this.doAiControl();
+    // this.doAiControl();
+    this.newAiControl();
+  },
+  //新ai逻辑
+  newAiControl(){
+    let canwin = this.data.canwin;
+    let roomnums = this.data.roomnums-1;
+    if(canwin){// 机器不用操作
+
+    }else{//机器使用道具
+      
+    }
   },
   //其余机器人升温逻辑
   doAiControl() {

taobao_jn/client/pages/pagepageindex/pagepageindex.js

@@ -144,7 +144,7 @@ Page({
 
                 },
                 (err) => {
-                    console.log(err);
+                    console.log("aa",err);
                 }
             )
             SvgaParser.loadSvga(
@@ -158,7 +158,7 @@ Page({
 
                 },
                 (err) => {
-                    console.log(err);
+                    console.log("bb",err);
                 }
             )