Merge branch 'master' of http://120.92.132.192:23541/TDGame/TDGameClient3D

assets/resources/configs/Levels.json

@@ -27,7 +27,7 @@
                 "hp": 10,
                 "damage": 5,
                 "anger": 5,
-                "createTime": 4000,
+                "createTime": 2000,
                 "startPosType": 1,
                 "startPos": 1
             },
@@ -40,7 +40,7 @@
                 "hp": 10,
                 "damage": 5,
                 "anger": 5,
-                "createTime": 7000,
+                "createTime": 3000,
                 "startPosType": 1,
                 "startPos": 2
             },
@@ -53,7 +53,7 @@
                 "hp": 10,
                 "damage": 5,
                 "anger": 5,
-                "createTime": 10000,
+                "createTime": 4000,
                 "startPosType": 1,
                 "startPos": 0
             },
@@ -66,7 +66,7 @@
                 "hp": 10,
                 "damage": 5,
                 "anger": 5,
-                "createTime": 13000,
+                "createTime": 5000,
                 "startPosType": 1,
                 "startPos": 1
             },
@@ -79,7 +79,7 @@
                 "hp": 10,
                 "damage": 5,
                 "anger": 5,
-                "createTime": 16000,
+                "createTime": 6000,
                 "startPosType": 1,
                 "startPos": 2
             },
@@ -92,7 +92,7 @@
                 "hp": 10,
                 "damage": 5,
                 "anger": 5,
-                "createTime": 19000,
+                "createTime": 7000,
                 "startPosType": 1,
                 "startPos": 0
             },
@@ -105,7 +105,7 @@
                 "hp": 10,
                 "damage": 5,
                 "anger": 5,
-                "createTime": 22000,
+                "createTime": 8000,
                 "startPosType": 1,
                 "startPos": 1
             },
@@ -118,7 +118,7 @@
                 "hp": 10,
                 "damage": 5,
                 "anger": 5,
-                "createTime": 25000,
+                "createTime": 9000,
                 "startPosType": 1,
                 "startPos": 2
             },
@@ -131,7 +131,7 @@
                 "hp": 10,
                 "damage": 5,
                 "anger": 5,
-                "createTime": 28000,
+                "createTime": 10000,
                 "startPosType": 1,
                 "startPos": 0
             },
@@ -144,7 +144,7 @@
                 "hp": 10,
                 "damage": 5,
                 "anger": 5,
-                "createTime": 31000,
+                "createTime": 11000,
                 "startPosType": 1,
                 "startPos": 1
             },
@@ -157,7 +157,7 @@
                 "hp": 10,
                 "damage": 5,
                 "anger": 5,
-                "createTime": 34000,
+                "createTime": 12000,
                 "startPosType": 1,
                 "startPos": 2
             },
@@ -170,7 +170,7 @@
                 "hp": 10,
                 "damage": 5,
                 "anger": 5,
-                "createTime": 37000,
+                "createTime": 13000,
                 "startPosType": 1,
                 "startPos": 0
             },
@@ -183,7 +183,7 @@
                 "hp": 10,
                 "damage": 5,
                 "anger": 5,
-                "createTime": 40000,
+                "createTime": 14000,
                 "startPosType": 1,
                 "startPos": 1
             },
@@ -196,7 +196,7 @@
                 "hp": 10,
                 "damage": 5,
                 "anger": 5,
-                "createTime": 43000,
+                "createTime": 15000,
                 "startPosType": 1,
                 "startPos": 2
             },
@@ -209,7 +209,7 @@
                 "hp": 10,
                 "damage": 5,
                 "anger": 5,
-                "createTime": 46000,
+                "createTime": 16000,
                 "startPosType": 1,
                 "startPos": 0
             },
@@ -222,7 +222,7 @@
                 "hp": 10,
                 "damage": 5,
                 "anger": 5,
-                "createTime": 49000,
+                "createTime": 17000,
                 "startPosType": 1,
                 "startPos": 1
             },
@@ -235,7 +235,7 @@
                 "hp": 10,
                 "damage": 5,
                 "anger": 5,
-                "createTime": 52000,
+                "createTime": 18000,
                 "startPosType": 1,
                 "startPos": 2
             },
@@ -248,7 +248,7 @@
                 "hp": 10,
                 "damage": 5,
                 "anger": 5,
-                "createTime": 55000,
+                "createTime": 19000,
                 "startPosType": 1,
                 "startPos": 0
             },
@@ -261,7 +261,7 @@
                 "hp": 10,
                 "damage": 5,
                 "anger": 5,
-                "createTime": 58000,
+                "createTime": 20000,
                 "startPosType": 1,
                 "startPos": 1
             },
@@ -274,7 +274,7 @@
                 "hp": 10,
                 "damage": 5,
                 "anger": 5,
-                "createTime": 61000,
+                "createTime": 21000,
                 "startPosType": 1,
                 "startPos": 2
             },
@@ -287,7 +287,7 @@
                 "hp": 10,
                 "damage": 5,
                 "anger": 5,
-                "createTime": 64000,
+                "createTime": 22000,
                 "startPosType": 1,
                 "startPos": 0
             },
@@ -300,7 +300,7 @@
                 "hp": 10,
                 "damage": 5,
                 "anger": 5,
-                "createTime": 67000,
+                "createTime": 23000,
                 "startPosType": 1,
                 "startPos": 1
             },
@@ -313,7 +313,7 @@
                 "hp": 10,
                 "damage": 5,
                 "anger": 5,
-                "createTime": 70000,
+                "createTime": 24000,
                 "startPosType": 1,
                 "startPos": 2
             },
@@ -326,7 +326,7 @@
                 "hp": 10,
                 "damage": 5,
                 "anger": 5,
-                "createTime": 73000,
+                "createTime": 25000,
                 "startPosType": 1,
                 "startPos": 0
             },
@@ -339,7 +339,7 @@
                 "hp": 10,
                 "damage": 5,
                 "anger": 5,
-                "createTime": 76000,
+                "createTime": 26000,
                 "startPosType": 1,
                 "startPos": 1
             },
@@ -352,7 +352,7 @@
                 "hp": 10,
                 "damage": 5,
                 "anger": 5,
-                "createTime": 79000,
+                "createTime": 27000,
                 "startPosType": 1,
                 "startPos": 2
             },
@@ -365,7 +365,7 @@
                 "hp": 10,
                 "damage": 5,
                 "anger": 5,
-                "createTime": 82000,
+                "createTime": 28000,
                 "startPosType": 1,
                 "startPos": 0
             },
@@ -378,7 +378,7 @@
                 "hp": 10,
                 "damage": 5,
                 "anger": 5,
-                "createTime": 85000,
+                "createTime": 29000,
                 "startPosType": 1,
                 "startPos": 1
             },
@@ -391,7 +391,7 @@
                 "hp": 10,
                 "damage": 5,
                 "anger": 5,
-                "createTime": 88000,
+                "createTime": 30000,
                 "startPosType": 1,
                 "startPos": 2
             },
@@ -404,7 +404,7 @@
                 "hp": 10,
                 "damage": 5,
                 "anger": 5,
-                "createTime": 91000,
+                "createTime": 31000,
                 "startPosType": 1,
                 "startPos": 0
             },
@@ -417,7 +417,7 @@
                 "hp": 10,
                 "damage": 5,
                 "anger": 5,
-                "createTime": 94000,
+                "createTime": 32000,
                 "startPosType": 1,
                 "startPos": 1
             },
@@ -430,10 +430,135 @@
                 "hp": 10,
                 "damage": 5,
                 "anger": 5,
-                "createTime": 97000,
+                "createTime": 33000,
                 "startPosType": 1,
                 "startPos": 2
             }
         ]
+    },
+    {
+        "id": "level2",
+        "awards": 100,
+        "killAward": 10,
+        "maxAnger": 100,
+        "monsters": [
+            {
+                "mId": "M34",
+                "monsterId": 20101001,
+                "type": 1,
+                "count": 2,
+                "intervalTime": 0,
+                "hp": 10,
+                "damage": 5,
+                "anger": 5,
+                "createTime": 0,
+                "startPosType": 0,
+                "startPos": 0
+            },
+            {
+                "mId": "M35",
+                "monsterId": 20101002,
+                "type": 1,
+                "count": 2,
+                "intervalTime": 3000,
+                "hp": 10,
+                "damage": 5,
+                "anger": 5,
+                "createTime": 0,
+                "startPosType": 0,
+                "startPos": 1
+            },
+            {
+                "mId": "M36",
+                "monsterId": 20201001,
+                "type": 1,
+                "count": 2,
+                "intervalTime": 3000,
+                "hp": 10,
+                "damage": 5,
+                "anger": 5,
+                "createTime": 0,
+                "startPosType": 0,
+                "startPos": 2
+            },
+            {
+                "mId": "M37",
+                "monsterId": 20201002,
+                "type": 1,
+                "count": 2,
+                "intervalTime": 3000,
+                "hp": 10,
+                "damage": 5,
+                "anger": 5,
+                "createTime": 0,
+                "startPosType": 0,
+                "startPos": 1
+            },
+            {
+                "mId": "M38",
+                "monsterId": 20101001,
+                "type": 1,
+                "count": 2,
+                "intervalTime": 3000,
+                "hp": 10,
+                "damage": 5,
+                "anger": 5,
+                "createTime": 0,
+                "startPosType": 0,
+                "startPos": 0
+            },
+            {
+                "mId": "M39",
+                "monsterId": 20101002,
+                "type": 1,
+                "count": 2,
+                "intervalTime": 3000,
+                "hp": 10,
+                "damage": 5,
+                "anger": 5,
+                "createTime": 0,
+                "startPosType": 0,
+                "startPos": 1
+            },
+            {
+                "mId": "M40",
+                "monsterId": 20301001,
+                "type": 1,
+                "count": 2,
+                "intervalTime": 3000,
+                "hp": 10,
+                "damage": 5,
+                "anger": 5,
+                "createTime": 0,
+                "startPosType": 0,
+                "startPos": 2
+            },
+            {
+                "mId": "M41",
+                "monsterId": 20301002,
+                "type": 1,
+                "count": 2,
+                "intervalTime": 3000,
+                "hp": 10,
+                "damage": 5,
+                "anger": 5,
+                "createTime": 0,
+                "startPosType": 0,
+                "startPos": 1
+            },
+            {
+                "mId": "M42",
+                "monsterId": 20401003,
+                "type": 0,
+                "count": 1,
+                "intervalTime": 6000,
+                "hp": 10,
+                "damage": 5,
+                "anger": 5,
+                "createTime": 30000,
+                "startPosType": 1,
+                "startPos": 1
+            }
+        ]
     }
 ]

assets/scripts/games/ui/fightings/monsters/MonsterBase.ts

@@ -88,6 +88,7 @@ export class MonsterBase extends Component {
         scale.x*=this.monsterConfig.scale.x;
         scale.y*=this.monsterConfig.scale.y;
         scale.z*=this.monsterConfig.scale.z;
+        this.node.setScale(scale);
     }
     
     update (deltaTime: number) {
@@ -234,7 +235,7 @@ export class MonsterBase extends Component {
      * 血条显示位置
      */
     get hpSocket():Node{
-        let socket:Node=find("RootNode/HpSocket",this.node);
+        let socket:Node=find("RootNode/Root/HpSocket",this.node);
         return socket?socket:this.node;
     }
 }

assets/scripts/games/ui/shops/ShopMediator.ts

@@ -108,14 +108,14 @@ export class ShopMediator extends GUIMediator {
                 id:element.id,
                 index:element.index
             }
+            //buyType 购买方式 0金币购买  1宝石购买
             if(config.diamondPurchaseId==undefined||config.diamondPurchaseId.indexOf(element.id)<0){
                 itemData.buyType=0;
             }else{
                 itemData.buyType=1;
             }
-            if(unlockLevel<0){
-                itemData.state=1;
-            }else if(weaponConfig.level>=unlockLevel){
+            //state 0 未解锁  1 已解锁
+            if(unlockLevel<0||weaponConfig.level>=unlockLevel){
                 itemData.state=1;
             }else{
                 itemData.state=0;