bug修复：升星；任务条过滤与跳转；登陆时的appid与version；

tower_sanguo/assets/resources/data/openfun_data.json

@@ -5,7 +5,7 @@
 		"openmission": 5,
 		"btn_src": "btn_marshalstage",
 		"uiID": 1,
-		"ui_src": "marshalStageUI"
+		"ui_src": "MarshalStageUI"
 	},
 	"2": {
 		"id": 2,
@@ -34,29 +34,57 @@
 	"5": {
 		"id": 5,
 		"name": "点将台",
-		"openmission": 0,
+		"openmission": 4,
 		"btn_src": "btn_getgeneral",
 		"uiID": 5,
-		"ui_src": "GetGeneralUI"
+		"ui_src": "DrawRecruitUI"
 	},
 	"6": {
 		"id": 6,
 		"name": "转盘",
-		"openmission": 1
+		"openmission": 1,
+		"btn_src": "btn_turntable",
+		"uiID": 6,
+		"ui_src": "turntableUI"
 	},
 	"7": {
 		"id": 7,
 		"name": "投资",
-		"openmission": 1
+		"openmission": 1,
+		"uiID": 7
 	},
 	"8": {
 		"id": 8,
 		"name": "存钱罐",
-		"openmission": 1
+		"openmission": 1,
+		"btn_src": "btn_piggyback",
+		"uiID": 8,
+		"ui_src": "PiggyBankUI"
 	},
 	"9": {
 		"id": 9,
 		"name": "通关红包",
-		"openmission": 1
+		"openmission": 1,
+		"btn_src": "btn_chPo_RedBag",
+		"uiID": 9
+	},
+	"10": {
+		"id": 10,
+		"name": "训练",
+		"openmission": 1,
+		"btn_src": "btn3",
+		"uiID": 10
+	},
+	"11": {
+		"id": 11,
+		"name": "观看视频广告",
+		"openmission": 1,
+		"uiID": 11
+	},
+	"12": {
+		"id": 12,
+		"name": "使用统帅技能",
+		"openmission": 41,
+		"uiID": 12
 	}
 }

tower_sanguo/assets/resources/data/task_data.json

@@ -6,7 +6,7 @@
 		"activevalue1": 5,
 		"count2": 20,
 		"activevalue2": 15,
-		"gotoui": 0
+		"gotoui": 10
 	},
 	"2": {
 		"id": 2,
@@ -42,7 +42,7 @@
 		"activevalue1": 5,
 		"count2": 3,
 		"activevalue2": 15,
-		"gotoui": 1
+		"gotoui": 12
 	},
 	"6": {
 		"id": 6,
@@ -51,6 +51,6 @@
 		"activevalue1": 5,
 		"count2": 30,
 		"activevalue2": 20,
-		"gotoui": -1
+		"gotoui": 11
 	}
 }

tower_sanguo/assets/scripts/data/GameData.ts

@@ -75,7 +75,7 @@ export default class GameData {
         'star', 'help', 'turntable', 'taskActive', 'task', 'commanderskill', 'openfun'];
 
     /** 是否使用本地资源，不使用oss资源 */
-    private useLocal: boolean = true;
+    private useLocal: boolean = false;
 
     async initLocalConfigs() {
         console.log('initLocalConfigs');
@@ -271,6 +271,7 @@ export default class GameData {
             let vo = {
                 star: o.star,
                 nextReq: o.nextReq,
+                tansChip: o.tansChip,
             }
             this.star_data[i] = vo;
         }

tower_sanguo/assets/scripts/module/loading/LoadingUI.ts

@@ -41,6 +41,8 @@ export default class LoadingUI extends BaseUI {
     clickServer(){
         if(this.toogle.toggleItems[0].isChecked){
             this.lbl_server.string = 'https://tafang-test.duiweize.com/';
+            GameController.commonData.appid = 'wx17e502b5f230fd9a';
+            GameController.commonData.version = '1.0.0';
         }
         else{
             this.lbl_server.string = 'http://172.16.15.167:9092/';

tower_sanguo/assets/scripts/module/piggyBank/PiggyBankUI.ts

@@ -47,7 +47,8 @@ export default class PiggyBankUI extends BaseUI {
     /** 领取奖励 */
     private onClickReceive() {
         // 提现
-        if (PiggyBankModel.bank_cash_value > 0) {
+        let bank_cash_value = PiggyBankModel.bank_cash_value;
+        if (bank_cash_value > 0) {
             GameController.http.getPiggyBox();
         } else {
             this.close();

tower_sanguo/assets/scripts/module/task/TaskModel.ts

@@ -24,7 +24,7 @@ export type TASKITEM = {
     /** 当前阶段 任务进度*/
     cur_bar: number;
     /** 前往功能的id */
-    gotoui:number,
+    gotoui: number,
 }
 /** 活跃宝箱数据类型 */
 type ACTIVEITEM = {
@@ -126,7 +126,7 @@ export default class TaskModel {
                 count2: item_data.count2,
                 activevalue1: item_data.activevalue1,
                 activevalue2: item_data.activevalue2,
-                gotoui:item_data.gotoui
+                gotoui: item_data.gotoui
             }
             this.task_data.list_data[i] = list_data;
             i++;
@@ -145,7 +145,19 @@ export default class TaskModel {
         let list_data = GameController.gameData.player.getProp(PLAYERPROP.USER_DAILY_TASK_INFO);
         if (list_data) {
             let temp_str_list_data = JSON.parse(list_data)
-            if (temp_str_list_data) this.task_data.list_data = temp_str_list_data;
+            if (temp_str_list_data) {
+                this.task_data.list_data = temp_str_list_data;
+                // 应用最新的配置数据
+                const t_count = this.task_data.list_data.length;
+                for (let i = 0; i < t_count; i++) {
+                    const id = this.task_data.list_data[i].id;
+                    let c_task = GameController.gameData.getTaskById(id);
+                    c_task.state = this.task_data.list_data[i].state;
+                    c_task.task_stage = this.task_data.list_data[i].task_stage;
+                    c_task.cur_bar = this.task_data.list_data[i].cur_bar;
+                    this.task_data.list_data[i] = c_task;
+                }
+            }
         }
 
         // 活跃数据 - 需要服务端校验
@@ -313,9 +325,12 @@ export default class TaskModel {
         let data = [];
         for (let i = 0; i < this.task_data.list_data.length; i++) {
             let o = this.task_data.list_data[i];
-            if(GameController.gameData.checkUIOpenByUIID(o.gotoui)){
+            if (GameController.gameData.checkUIOpenByUIID(o.gotoui)) {
                 data.push(o);
+            } else {
+                cc.log('被过滤的功能：%o', o)
             }
+            // data.push(o);
         }
         return data;
     }

tower_sanguo/assets/scripts/module/task/TaskUI.ts

@@ -428,45 +428,36 @@ export default class TaskUI extends BaseUI {
         let item_data = _data.item_data as TaskVO;
 
         GameController.audioM.playEffect(AUDIO_TYPE.button);
+
+        // 部分任务特殊处理
         const id = item_data.id;
-        this.close();
-        GameController.uiM.openUIByUIID(item_data.gotoui);
-        return;
         switch (id) {
             case 1:
                 // 武将训练-主页
                 this.close();
                 XXEvent.emit("open-guide", id);
-                break;
+                return;
             case 2:
                 // 投资
-                TaskModel.addTaskItemBar(PLAYERPROP.INVEST_TIMES);// 加进度，测试用
-                break;
-            case 3:
-                // 抽取武将
-                TaskModel.addTaskItemBar(PLAYERPROP.GENERAL_LUCK_TIMES);// 加进度，测试用
-                break;
-            case 4:
-                // 转盘抽奖
-                GameController.uiM.openUI(turntableUI, () => {
-                    XXEvent.emit("open-guide", id);
-                }, ViewZorder.UI);
-                this.close();
-                // TaskModel.addTaskItemBar(PLAYERPROP.TURNTABLE_LUCK_TIMES);// 加进度，测试用
+                // TaskModel.addTaskItemBar(PLAYERPROP.INVEST_TIMES);// 加进度，测试用
                 break;
             case 5:
                 // 使用统帅技能-主页
                 XXEvent.emit("open-guide", id);
                 this.close();
-                break;
+                return;
             case 6:
                 // 观看广告
-                TaskModel.addTaskItemBar(PLAYERPROP.LOOK_VIDEO_TIMES);// 加进度，测试用
-                break;
+                // TaskModel.addTaskItemBar(PLAYERPROP.LOOK_VIDEO_TIMES);// 加进度，测试用
+                this.close();
+                return;
 
             default:
                 break;
         }
+        this.close();
+        GameController.uiM.openUIByUIID(item_data.gotoui);
+        return;
 
     }
     // 任务奖励回调