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

tower_sanguo/assets/resources/module/gm/gm.prefab

@@ -8050,7 +8050,7 @@
         "__id__": 281
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [],
     "_prefab": {
       "__id__": 296
@@ -10774,8 +10774,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 448.3,
-      "height": 91.28
+      "width": 0,
+      "height": 35.28
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

tower_sanguo/assets/scripts/module/gm/GmUI.ts

@@ -133,7 +133,7 @@ export default class GmUI extends BaseUI {
         }
         this.lbl_crood.string = str;
     }
-    private createMonster(id, x, y) {
+    private createMonster(id = null, x = null, y = null) {
         let node = GameController.pool.getPrefabByClassName("Monster");
         if (!node) {
             return;