代码冲突合并

tower_sanguo/assets/scripts/data/GameData.ts

@@ -10,6 +10,7 @@ import PlayerUpdateResponse from "../net/msg/PlayerUpdateResponse";
 import { Dictionary } from "../utils/Dictionary";
 import BarrackVO from "../vo/BarrackVO";
 import BuffVO from "../vo/BuffVO";
+import CommanderSkillVO from "../vo/CommanderSkillVO";
 import FetterVO from "../vo/FetterVO";
 import GeneralVO from "../vo/GeneralVO";
 import MissionVO from "../vo/MissionVO";
@@ -83,21 +84,21 @@ export default class GameData {
             this.task_data = await GameController.resM.loadRemoteJson('https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/h5game/tower_sanguo/data/task_data.json?v=' + new Date().getTime());
             this.turntable_data = await GameController.resM.loadRemoteJson('https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/h5game/tower_sanguo/data/turntable_data.json?v=' + new Date().getTime());
 
-            // this.db_data = cc.loader.getRes("data/db_data", cc.JsonAsset).json;
-            // this.serverConfig_data = cc.loader.getRes("data/serverConfig_data", cc.JsonAsset).json;
-            // this.fetter_data = cc.loader.getRes("data/fetter_data", cc.JsonAsset).json;
-            // this.buff_data = cc.loader.getRes("data/buff_data", cc.JsonAsset).json;
-            // this.skill_data = cc.loader.getRes("data/skill_data", cc.JsonAsset).json;
-            // this.general_data = cc.loader.getRes("data/general_data", cc.JsonAsset).json;
-            // this.monster_data = cc.loader.getRes("data/monster_data", cc.JsonAsset).json;
-            // this.mission_data = cc.loader.getRes("data/mission_data", cc.JsonAsset).json;
-            // this.item_data = cc.loader.getRes("data/item_data", cc.JsonAsset).json;
-            // this.barrack_data = cc.loader.getRes("data/barrack_data", cc.JsonAsset).json;
-            // this.star_data = cc.loader.getRes("data/star_data", cc.JsonAsset).json;
-            // this.help_data = cc.loader.getRes("data/help_data", cc.JsonAsset).json;
-            // this.turntable_data = cc.loader.getRes("data/turntable_data", cc.JsonAsset).json;
-            // this.task_data = cc.loader.getRes("data/task_data", cc.JsonAsset).json;
-            // this.commanderskill_data = cc.loader.getRes("data/commanderskill_data", cc.JsonAsset).json;
+             this.db_data = cc.loader.getRes("data/db_data", cc.JsonAsset).json;
+             this.serverConfig_data = cc.loader.getRes("data/serverConfig_data", cc.JsonAsset).json;
+             this.fetter_data = cc.loader.getRes("data/fetter_data", cc.JsonAsset).json;
+             this.buff_data = cc.loader.getRes("data/buff_data", cc.JsonAsset).json;
+             this.skill_data = cc.loader.getRes("data/skill_data", cc.JsonAsset).json;
+             this.general_data = cc.loader.getRes("data/general_data", cc.JsonAsset).json;
+             this.monster_data = cc.loader.getRes("data/monster_data", cc.JsonAsset).json;
+             this.mission_data = cc.loader.getRes("data/mission_data", cc.JsonAsset).json;
+             this.item_data = cc.loader.getRes("data/item_data", cc.JsonAsset).json;
+             this.barrack_data = cc.loader.getRes("data/barrack_data", cc.JsonAsset).json;
+             this.star_data = cc.loader.getRes("data/star_data", cc.JsonAsset).json;
+             this.help_data = cc.loader.getRes("data/help_data", cc.JsonAsset).json;
+             this.turntable_data = cc.loader.getRes("data/turntable_data", cc.JsonAsset).json;
+             this.task_data = cc.loader.getRes("data/task_data", cc.JsonAsset).json;
+             this.commanderskill_data = cc.loader.getRes("data/commanderskill_data", cc.JsonAsset).json;
 
             this.initJsonData();
         }
@@ -304,8 +305,8 @@ export default class GameData {
             console.log("index: " + i + " d: ", o);
         }
 
-        console.log("commanderskill_data: ", this.commanderskill_data);
-        console.log("skill_data: ", this.skill_data);
+        //console.log("commanderskill_data: ", this.commanderskill_data);
+        //console.log("skill_data: ", this.skill_data);
 
 
         turntableModel.Instance.turntable_data = this.turntable_data;
@@ -643,6 +644,19 @@ export default class GameData {
         }
     }
 
+    private initScheduler() {
+        let self = this;
+        let count = 0;
+        let a = cc.director.getScheduler().schedule(() => {
+            count++;
+            if (count % 5 == 0) {
+                count = 1;
+                let vo: MissionVO = self.getMissionByID(self.player.current_mission);
+                self.updateProp(PLAYERPROP.FOOD, Math.floor(vo.foodRecover * 5), true);
+            }
+        }, this, 1);
+    }
+
     /**
      * 兵营等级更新后，更新开放武将及下个开放武将
      * @param barrackLv