kaka 4 лет назад
Родитель
Сommit
7a87aa5dac

+ 0 - 28
assets/resources/data/guide_data.json

@@ -14,34 +14,6 @@
 		"lagNext": "0"
 	},
 	{
-		"id": "1_2",
-		"trigger": "1",
-		"trNum": "0",
-		"trForm": "1",
-		"dialogPos": "300:::::",
-		"dialogPos1": "",
-		"dialogAlignment": "1",
-		"dialog": "<color=8A4312>“任务红包”开启\n完成任务可立即提现</color>",
-		"displayRect": "",
-		"clickRect": "主界面层/game/node_ui/顶部个人信息/任务",
-		"finger": "100:20",
-		"lagNext": "1"
-	},
-	{
-		"id": "2_1",
-		"trigger": "1",
-		"trNum": "0",
-		"trForm": "1",
-		"dialogPos": ":300::::",
-		"dialogPos1": "",
-		"dialogAlignment": "0",
-		"dialog": "<color=8A4312>完成任务必得现金,最\n高可以提现100元哦!</color>",
-		"displayRect": "0:200:500:300",
-		"clickRect": "all",
-		"finger": "100:-100",
-		"lagNext": "1"
-	},
-	{
 		"id": "3_1",
 		"trigger": "1",
 		"trNum": "0",

Разница между файлами не показана из-за своего большого размера
+ 431 - 296
assets/resources/game/prefab/game.prefab


+ 3 - 4
assets/script/game/data/AdData.ts

@@ -104,8 +104,7 @@ export class AdData {
     }
 
 
-    public async watchVideo(type: AdFun)
-    {
+    public async watchVideo(type: AdFun) {
         this.ad_subType = type;
         let data = {
             "imei": gData.appData.machineInfo.imei,
@@ -240,7 +239,7 @@ export class AdData {
                     ecpmlevel = parseInt(forceAd[i].value);
                 }
 
-                this.AutoRedMoneyMap.set(parseInt(forceAd[i].value), parseInt(forceAd[i].AutoRedMoney))
+                this.AutoRedMoneyMap.set(parseInt(forceAd[i].value), parseInt(forceAd[i].autoRedMoney))
             }
         }
 
@@ -312,7 +311,7 @@ export class AdData {
 
     /** 点击提现弹出全屏插屏 */
     checkPopCashFull() {
-        if (this.FullCsahAdArr.indexOf(this.ecpmLevel.toString()) == -1) { 
+        if (this.FullCsahAdArr.indexOf(this.ecpmLevel.toString()) == -1) {
             return;
         }
         mk.ad.showInterAd(1);

+ 3 - 0
assets/script/game/data/GameData.ts

@@ -521,6 +521,9 @@ export class GameData {
         }
 
         this.playerProp.userFarmTaskInfo = response.data.userFarmTaskInfo;
+        if (this.playerProp.userFarmTaskInfo.completeCount >= this.playerProp.userFarmTaskInfo.taskCount) {
+            mk.guide.open(5);
+        }
         //gData.gameData.init_task = true;
     }
 

+ 1 - 1
assets/script/game/module/redBagTask/RedBagTask.ts

@@ -133,7 +133,7 @@ export default class RedBagTask extends cc.Component {
                             this.node_value.scale = 0;
                             cc.tween(this.node_value).to(0.5, { scale: 1.3 }, cc.easeSineOut()).to(0.1, { scale: 1 }).call(() => {
                                 this.openBtn_ani.node.active = true;
-                                mk.guide.open(2);
+                                // mk.guide.open(2);
                                 this.initTaskProgressUI();
                                 this.showChangePart();
                             }).start();

BIN
build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/caches/build_file_checksums.ser


Некоторые файлы не были показаны из-за большого количества измененных файлов