Merge branch 'master' of http://git.mokasz.com/zouyong/tower_sanguo

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

@@ -156,16 +156,6 @@ export default class FightUI extends BaseUI {
                 res.push("spine/person/" + vo.resource);
             }
         }
-        //怪物如果是武将，也需要加入列表
-        this.missionVO = GameController.gameData.getMissionByID(GameController.gameData.player.current_mission);
-        let arr = this.missionVO.rounds;
-        for (let i = 0; i < arr.length; i++) {
-            let vo: MonsterVO = GameController.gameData.getMonsterByID(arr[i].monster_Id);
-            if (typeof vo.resource == 'number') {
-                let g: GeneralVO = GameController.gameData.getGeneralByID(vo.resource);
-                res.push("spine/person/" + g.resource);
-            }
-        }
 
         cc.loader.loadResArray(res, sp.SkeletonData, this.initMissionData.bind(this));
     }
@@ -647,6 +637,17 @@ export default class FightUI extends BaseUI {
             }
         }
 
+        //怪物如果是武将，也需要加入列表
+        this.missionVO = GameController.gameData.getMissionByID(GameController.gameData.player.current_mission);
+        let arr = this.missionVO.rounds;
+        for (let i = 0; i < arr.length; i++) {
+            let vo: MonsterVO = GameController.gameData.getMonsterByID(arr[i].monster_Id);
+            if (typeof vo.resource == 'number') {
+                let g: GeneralVO = GameController.gameData.getGeneralByID(vo.resource);
+                res.push("spine/person/" + g.resource);
+            }
+        }
+
         this.loadMonsterRes(res);
     }
 

tower_sanguo/assets/scripts/module/main/Main_BuffItem.ts

@@ -0,0 +1,18 @@
+const { ccclass,property } = cc._decorator;
+
+@ccclass
+export default class Main_BuffItem extends cc.Component {
+
+    @property(cc.Sprite)
+    lbl_bg:cc.Sprite = null;
+    @property(cc.Sprite)
+    lbl_icon:cc.Sprite = null;
+    @property(cc.Label)
+    lbl_name:cc.Label = null;
+    @property(cc.RichText)
+    lbl_des:cc.RichText = null;
+
+    onLoad () {
+		
+    }
+}

tower_sanguo/assets/scripts/module/main/Main_BuffItem.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "f776ea6f-1595-48e0-a7c3-df70332f0cba",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}