修复bug

tower_sanguo/assets/resources/module/main/main.prefab

@@ -1527,7 +1527,7 @@
     "asset": {
       "__uuid__": "12e4eb4b-bc7d-4f5e-8a52-dbe046a0531a"
     },
-    "fileId": "1ax3riMWlJj4jicP9tjnSX",
+    "fileId": "bcYJgWLkBEU6jZzl6cQNzj",
     "sync": false
   },
   {
@@ -1657,7 +1657,7 @@
     "asset": {
       "__uuid__": "12e4eb4b-bc7d-4f5e-8a52-dbe046a0531a"
     },
-    "fileId": "eb1KJrOz5PeqlCHEh4Q4rg",
+    "fileId": "74hwpnvWVA6aQhlx0R6ZXb",
     "sync": false
   },
   {

tower_sanguo/assets/scripts/data/GameData.ts

@@ -63,16 +63,16 @@ export default class GameData {
             this.db_data = await GameController.resM.loadRemoteJson('https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/h5game/tower_sanguo/data/db_data.json?v=' + new Date().getTime());
             this.server_data = await GameController.resM.loadRemoteJson('https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/h5game/tower_sanguo/data/serverConfig_data.json?v=' + new Date().getTime());
 
-            this.db_data = cc.loader.getRes("data/db_data", cc.JsonAsset).json;
-            this.server_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.star_data = cc.loader.getRes("data/star_data", cc.JsonAsset).json;
+            // this.db_data = cc.loader.getRes("data/db_data", cc.JsonAsset).json;
+            // this.server_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.star_data = cc.loader.getRes("data/star_data", cc.JsonAsset).json;
 
             if (GameController.servertest) {
                 GameController.servertest.init();

tower_sanguo/assets/scripts/module/fight/FightUI.ts

@@ -1000,11 +1000,11 @@ export default class FightUI extends BaseUI {
                 }
                 this.resetMonster(m);
                 if (realdead) {
-                    this.monster_arr.splice(i, 1);
                     if (reward) {
                         let arr = m.vo.award.split(":");
                         this.roundYB += parseInt(arr[1]);
                     }
+                    this.monster_arr.splice(i, 1);
                 }
                 break;
             }

tower_sanguo/assets/scripts/vo/GeneralVO.ts

@@ -23,6 +23,9 @@ export default class GeneralVO {
     attSpeed: number;
     atk_res: number;
     hit_res: number;
+    /** 兵营开放抽卡等级 */
+    
+
     private _skillID: number;
     set skillID(v: number) {
         this._skillID = v;
@@ -114,7 +117,7 @@ export default class GeneralVO {
     exp: number;
     /** 状态 */
     status: GENERALSTATUS;
-    /** 碎片数量 */
+    /** 当前拥有碎片数量 */
     fragment: number;
     /** 合成武将需要的碎片 */
     fragment_compose: number;