123

taobao_jn/client/app.js

 import cloud from '@tbmp/mp-cloud-sdk';
 import tbcc from './tbcc-sdk';
 
-const env = 'online' // 云函数环境 test 测试环境 online 线上环境
+const env = 'online' // 云函数环境 test 测试环境 online 线上环境 pre 预发环境
 cloud.init({
   env: env
 });
@@ -35,7 +35,8 @@ App({
     // this.activityId = activityId || '5f8550a3964f97be3647a635';
     // this.activityId = activityId || '5f8831e67389891bfd6bb35f'; //赵然1
     // this.activityId = activityId || '5f895d0f0cb733e071b4082b'; //开发者测试
-    this.activityId = activityId || '5f8d0026114fbb9493d3f0cb'; //线上id
+    // this.activityId = activityId || '5f8d0026114fbb9493d3f0cb'; //线上id
+    this.activityId = activityId || '5f8da60c0cb7336de5166845'; //pre
     
     
   }

taobao_jn/client/pages/pagegamemain/pagegamemain.acss

@@ -410,6 +410,18 @@ letter-spacing: 3rpx;
   position: absolute;
   transform-origin: 0rpx 0rpx 0rpx;
 }
+
+.gamemain .gamembot .gamembotNoTimes {
+  width: 222rpx;
+  height: 42rpx;
+  opacity: 1;
+  display: block;
+  left: 486rpx;
+  top: 40rpx;
+  position: absolute;
+  transform-origin: 0rpx 0rpx 0rpx;
+}
+
 .gamemain .gamembot .gamemtool {
   width: 146rpx;
   height: 144rpx;

taobao_jn/client/pages/pagegamemain/pagegamemain.axml

@@ -47,12 +47,14 @@
   </view>
   <view class="gamembot" a:if="{{show_v!=1}}">
     <image class="gamembotimg" src={{resList['f3909518-193e-49eb-a1cd-357c4f83d796'].url}} />
-    <view class="gamemtool{{tooltime>0?' blackWhiteFilter':''}}" onTap="usetool">
+
+    <view class="gamemtool{{isCanUseTool=='true'?' ':' blackWhiteFilter'}}" onTap="usetool">
       <image class="gamemtoobg1" src={{resList['6f5cdb3c-0c5b-42a0-9472-982761684dc4'].url}} />
       <image class="gamemtoobg2" src={{resList['9d6f3caf-a088-4f6d-9e0b-87967a79656c'].url}} />
       <image class="gamemtoolimg" src={{resList['e31f093d-6f42-4818-99cd-dfd3de98ef08'].url}} />
-      <label class="gamemtooltime" a:if="{{tooltime>0}}">下次使用：{{'\n'+showtooltime}}</label>
+      <!-- <label class="gamemtooltime" a:if="{{tooltime>0}}">下次使用：{{'\n'+showtooltime}}</label> -->
     </view>
+    <image class="gamembotNoTimes " a:if="{{noTimesV}}" src={{resList['b73dc175-9ca6-43ab-aab5-b938a575edbd'].url}} />
     <view class="gamemsharegro">
       <image class="gamemhrole" onTap="invitefriends" data-sidx=0 src={{invitedata[0]?resList['7b03a2af-445c-4ce6-b57b-a900e1eedfed'].url:resList['b33526ac-42e8-4f93-b8e8-dc5d44dce6aa'].url}} />
       <image class="gamenrole1" onTap="invitefriends" data-sidx=1 src={{invitedata[1]?resList['7b03a2af-445c-4ce6-b57b-a900e1eedfed'].url:resList['b33526ac-42e8-4f93-b8e8-dc5d44dce6aa'].url}} />

taobao_jn/client/pages/pagegamemain/pagegamemain.js

@@ -117,6 +117,8 @@ Page({
     overequest: false,
     laststat: "",
     firstin: true,
+    isCanUseTool:false,
+    noTimesV:false
   },
   onLoad(query) {
     console.log("onLoad========>", query);
@@ -144,7 +146,7 @@ Page({
     let isnew = false;
     let tooltime = 0;
     console.log("initGame", query, gamestat);
-    let { end, gl, start, step, toolcd } = query;
+    let { end, gl, start, step, toolcd ,canUseTool} = query;
     gameatime = Math.floor((Number(end) - Number(start)) / 1000);
     if (gamestat == "normal") {
       let isnewdata = my.getStorageSync({
@@ -248,6 +250,7 @@ Page({
       tooltime: tooltime,
       startime: Number(start),
       endtime: Number(end),
+      isCanUseTool:canUseTool
     });
 
     my.__updateWarms = () => {
@@ -846,7 +849,9 @@ Page({
   //使用道具
   async usetool() {
     let tooltime = this.data.tooltime;
-    if (tooltime <= 0) {//可使用
+    let canUseTool = this.data.isCanUseTool
+    console.log("能否使用道具",canUseTool)
+    if (canUseTool=='true') {//可使用
       // console.log("使用道具");
       this.opentool();
       // return;
@@ -862,7 +867,18 @@ Page({
       //   this.updateActInfo();
       // }
     } else {//倒计时中
-
+        if(this.data.noTimesV) return;
+        this.setData({
+            noTimesV:true
+        })
+        setTimeout(()=>{
+            if(this){
+                this.setData({
+                    noTimesV:false
+                })
+            }
+        },3000)
+        // commonToast("今日次数已用完")
     }
   },
   async usetool1() {
@@ -880,7 +896,8 @@ Page({
       if (success) {
         this.updateActInfo();
         this.setData({
-          tooltime: gtoolcd
+          tooltime: gtoolcd,
+          isCanUseTool: false
         });
       }
     } else {//倒计时中
@@ -1427,13 +1444,14 @@ Page({
       });
     })
     if (lgamedata) {
-      let { step, start, end, gl, toolcd, tooless } = query;
+      let { step, start, end, gl, toolcd, tooless ,canUseTool} = query;
       lgamedata["step"] = step;
       lgamedata["startime"] = start;
       lgamedata["endtime"] = end;
       lgamedata["gl"] = gl;
       lgamedata["toolcd"] = toolcd;
       lgamedata["tooltime"] = tooless;
+      lgamedata["canUseTool"] = canUseTool;
       my.removeStorage({
         key: key
       });
@@ -1455,8 +1473,9 @@ Page({
   async lastgameover(lgamedata, nowTime) {
     console.log("直接结束========》");
     let {
-      roomdata, roomnums, tooltime, canwin, step, startime, endtime, avatar2, avatar3, avatar4, othername, overequest, hidetime, linvite, ltool, lfollow, lsign, lcollect, lbrowseGoods
+        canUseTool,roomdata, roomnums, tooltime, canwin, step, startime, endtime, avatar2, avatar3, avatar4, othername, overequest, hidetime, linvite, ltool, lfollow, lsign, lcollect, lbrowseGoods
     } = lgamedata;
+    
     this.setData({
       avatar1: app.avatar,
       avatar2: avatar2,
@@ -1477,7 +1496,8 @@ Page({
       lfollow: lfollow,
       lsign: lsign,
       lcollect: lcollect,
-      lbrowseGoods: lbrowseGoods
+      lbrowseGoods: lbrowseGoods,
+      isCanUseTool:canUseTool
     });
     this.updateActInfo("last");
     this.updateAiInfo();
@@ -1487,11 +1507,12 @@ Page({
   //恢复上局游戏
   async lastgamereset(lgamedata, nowTime) {
     let {
-      roomdata, roomnums, tooltime, canwin, step, startime, endtime, avatar2, avatar3, avatar4, othername, toolcd, overequest, hidetime, linvite, ltool, lfollow, lsign, lcollect, lbrowseGoods
+        canUseTool,roomdata, roomnums, tooltime, canwin, step, startime, endtime, avatar2, avatar3, avatar4, othername, toolcd, overequest, hidetime, linvite, ltool, lfollow, lsign, lcollect, lbrowseGoods
     } = lgamedata;
 
     let gameatime = Math.floor((Number(endtime) - Number(nowTime)) / 1000);
     gtoolcd = Number(toolcd);
+    console.log("上一次使用过道具",canUseTool)
     this.setData({
       avatar1: app.avatar,
       avatar2: avatar2,
@@ -1515,7 +1536,8 @@ Page({
       lfollow: lfollow,
       lsign: lsign,
       lcollect: lcollect,
-      lbrowseGoods: lbrowseGoods
+      lbrowseGoods: lbrowseGoods,
+      isCanUseTool: canUseTool
     });
 
     this.updateActInfo("last");

taobao_jn/client/pages/pagepageindex/pagepageindex.js

@@ -425,7 +425,7 @@ Page({
             my.redirectTo({
                 url: '/pages/pagegamemain/pagegamemain?' +
                     "step=" + this.data.curGameStep + "&start=" + data.joinGameStartTime +
-                    "&end=" + data.joinGameEndTime + "&gl=" + winRate + "&toolcd=" + propsCD
+                    "&end=" + data.joinGameEndTime + "&gl=" + winRate + "&toolcd=" + propsCD + "&canUseTool=" + !data.usedTool
             })
             my.hideLoading();
         } else {
@@ -468,10 +468,10 @@ Page({
         const {
             item
         } = e.target.dataset;
-        if (!this.start && item == 'pagepagerank') {
-            commonToast("活动已结束")
-            return;
-        }
+        // if (!this.start && item == 'pagepagerank') {
+        //     commonToast("活动已结束")
+        //     return;
+        // }
 
         my.navigateTo({
             url: `/pages/${item}/${item}`
@@ -586,7 +586,8 @@ Page({
             toolEndTime,
             winRate,
             propsCD,
-            step
+            step,
+            usedTool
         } = data;
         if (joinGameStartTime && joinGameEndTime) {
             let nowTime = await getServerTime().catch(() => {});
@@ -600,7 +601,7 @@ Page({
                 tooless = 0;
             }
             let querystr = "step=" + step + "&start=" + joinGameStartTime +
-                "&end=" + joinGameEndTime + "&gl=" + winRate + "&toolcd=" + toolcd + "&tooless=" + tooless;
+                "&end=" + joinGameEndTime + "&gl=" + winRate + "&toolcd=" + toolcd + "&tooless=" + tooless + "&canUseTool=" + !usedTool;
 
             if (nowTime && joinGameEndTime > nowTime) { //上局未结束，继续游戏
                 querystr += "&laststat=go";

taobao_jn/client/resconfig/resList.js

@@ -752,5 +752,17 @@ const resList = {
         url: '//yun.duiba.com.cn/spark/assets/rankPageFinal.f6c5990ccbcc0ebca410570153441448d439ff31.png',
         uuid: 'b4d591f8-3459-49c9-9ddc-3d80afb7babd'
       },
+      'c29511d4-46ef-4562-a432-4d25946750f4': {
+        name: 'noTimes',
+        ext: '.png',
+        url: '//yun.duiba.com.cn/spark/assets/noTimes.29101840afac22f3fea6182c27c2799b88b06395.png',
+        uuid: 'c29511d4-46ef-4562-a432-4d25946750f4'
+      },
+      'b73dc175-9ca6-43ab-aab5-b938a575edbd': {
+        name: 'noTimesFinal',
+        ext: '.png',
+        url: '//yun.duiba.com.cn/spark/assets/noTimesFinal.ccf64248e89b0d81092851d5356486e67d5d5546.png',
+        uuid: 'b73dc175-9ca6-43ab-aab5-b938a575edbd'
+      }
 };
 export default resList;
\ No newline at end of file