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

assets/d3d/barriers/fences/Fence01.fbx.meta

@@ -64,7 +64,7 @@
         "wrapMode": 1,
         "sample": 30,
         "span": {
-          "from": 0.23333333333333334,
+          "from": 0.13333333333333333,
           "to": 0.7083333134651184
         },
         "events": []
@@ -127,7 +127,7 @@
           },
           {
             "name": "Die",
-            "from": 0.23333333333333334,
+            "from": 0.13333333333333333,
             "to": 0.7083333134651184,
             "wrapMode": 1
           },

assets/resources/configs/Levels.json

@@ -1,444 +1,7 @@
 [
     {
         "id": "level1",
-        "awards": 100,
-        "killAward": 10,
-        "maxAnger": 100,
-        "monsters": [
-            {
-                "mId": "M1",
-                "monsterId": 20101001,
-                "type": 0,
-                "count": 1,
-                "intervalTime": 1000,
-                "hp": 10,
-                "damage": 5,
-                "anger": 5,
-                "createTime": 1000,
-                "startPosType": 1,
-                "startPos": 0
-            },
-            {
-                "mId": "M2",
-                "monsterId": 20101002,
-                "type": 0,
-                "count": 1,
-                "intervalTime": 1000,
-                "hp": 10,
-                "damage": 5,
-                "anger": 5,
-                "createTime": 2000,
-                "startPosType": 1,
-                "startPos": 1
-            },
-            {
-                "mId": "M3",
-                "monsterId": 20101003,
-                "type": 0,
-                "count": 1,
-                "intervalTime": 1000,
-                "hp": 10,
-                "damage": 5,
-                "anger": 5,
-                "createTime": 3000,
-                "startPosType": 1,
-                "startPos": 2
-            },
-            {
-                "mId": "M4",
-                "monsterId": 20201001,
-                "type": 0,
-                "count": 1,
-                "intervalTime": 1000,
-                "hp": 10,
-                "damage": 5,
-                "anger": 5,
-                "createTime": 4000,
-                "startPosType": 1,
-                "startPos": 0
-            },
-            {
-                "mId": "M5",
-                "monsterId": 20201002,
-                "type": 0,
-                "count": 1,
-                "intervalTime": 1000,
-                "hp": 10,
-                "damage": 5,
-                "anger": 5,
-                "createTime": 5000,
-                "startPosType": 1,
-                "startPos": 1
-            },
-            {
-                "mId": "M6",
-                "monsterId": 20201003,
-                "type": 0,
-                "count": 1,
-                "intervalTime": 1000,
-                "hp": 10,
-                "damage": 5,
-                "anger": 5,
-                "createTime": 6000,
-                "startPosType": 1,
-                "startPos": 2
-            },
-            {
-                "mId": "M7",
-                "monsterId": 20301001,
-                "type": 0,
-                "count": 1,
-                "intervalTime": 1000,
-                "hp": 10,
-                "damage": 5,
-                "anger": 5,
-                "createTime": 7000,
-                "startPosType": 1,
-                "startPos": 0
-            },
-            {
-                "mId": "M8",
-                "monsterId": 20301002,
-                "type": 0,
-                "count": 1,
-                "intervalTime": 1000,
-                "hp": 10,
-                "damage": 5,
-                "anger": 5,
-                "createTime": 8000,
-                "startPosType": 1,
-                "startPos": 1
-            },
-            {
-                "mId": "M9",
-                "monsterId": 20301003,
-                "type": 0,
-                "count": 1,
-                "intervalTime": 1000,
-                "hp": 10,
-                "damage": 5,
-                "anger": 5,
-                "createTime": 9000,
-                "startPosType": 1,
-                "startPos": 2
-            },
-            {
-                "mId": "M10",
-                "monsterId": 20401001,
-                "type": 0,
-                "count": 1,
-                "intervalTime": 1000,
-                "hp": 10,
-                "damage": 5,
-                "anger": 5,
-                "createTime": 10000,
-                "startPosType": 1,
-                "startPos": 0
-            },
-            {
-                "mId": "M11",
-                "monsterId": 20401002,
-                "type": 0,
-                "count": 1,
-                "intervalTime": 1000,
-                "hp": 10,
-                "damage": 5,
-                "anger": 5,
-                "createTime": 11000,
-                "startPosType": 1,
-                "startPos": 1
-            },
-            {
-                "mId": "M12",
-                "monsterId": 20401003,
-                "type": 0,
-                "count": 1,
-                "intervalTime": 1000,
-                "hp": 10,
-                "damage": 5,
-                "anger": 5,
-                "createTime": 12000,
-                "startPosType": 1,
-                "startPos": 2
-            },
-            {
-                "mId": "M13",
-                "monsterId": 20501001,
-                "type": 0,
-                "count": 1,
-                "intervalTime": 1000,
-                "hp": 10,
-                "damage": 5,
-                "anger": 5,
-                "createTime": 13000,
-                "startPosType": 1,
-                "startPos": 0
-            },
-            {
-                "mId": "M14",
-                "monsterId": 20501002,
-                "type": 0,
-                "count": 1,
-                "intervalTime": 1000,
-                "hp": 10,
-                "damage": 5,
-                "anger": 5,
-                "createTime": 14000,
-                "startPosType": 1,
-                "startPos": 1
-            },
-            {
-                "mId": "M15",
-                "monsterId": 20501003,
-                "type": 0,
-                "count": 1,
-                "intervalTime": 1000,
-                "hp": 10,
-                "damage": 5,
-                "anger": 5,
-                "createTime": 15000,
-                "startPosType": 1,
-                "startPos": 2
-            },
-            {
-                "mId": "M16",
-                "monsterId": 20601001,
-                "type": 0,
-                "count": 1,
-                "intervalTime": 1000,
-                "hp": 10,
-                "damage": 5,
-                "anger": 5,
-                "createTime": 16000,
-                "startPosType": 1,
-                "startPos": 0
-            },
-            {
-                "mId": "M17",
-                "monsterId": 20601002,
-                "type": 0,
-                "count": 1,
-                "intervalTime": 1000,
-                "hp": 10,
-                "damage": 5,
-                "anger": 5,
-                "createTime": 17000,
-                "startPosType": 1,
-                "startPos": 1
-            },
-            {
-                "mId": "M18",
-                "monsterId": 20601003,
-                "type": 0,
-                "count": 1,
-                "intervalTime": 1000,
-                "hp": 10,
-                "damage": 5,
-                "anger": 5,
-                "createTime": 18000,
-                "startPosType": 1,
-                "startPos": 2
-            },
-            {
-                "mId": "M19",
-                "monsterId": 20901001,
-                "type": 0,
-                "count": 1,
-                "intervalTime": 1000,
-                "hp": 10,
-                "damage": 5,
-                "anger": 5,
-                "createTime": 19000,
-                "startPosType": 1,
-                "startPos": 0
-            },
-            {
-                "mId": "M20",
-                "monsterId": 20901002,
-                "type": 0,
-                "count": 1,
-                "intervalTime": 1000,
-                "hp": 10,
-                "damage": 5,
-                "anger": 5,
-                "createTime": 20000,
-                "startPosType": 1,
-                "startPos": 1
-            },
-            {
-                "mId": "M21",
-                "monsterId": 20901003,
-                "type": 0,
-                "count": 1,
-                "intervalTime": 1000,
-                "hp": 10,
-                "damage": 5,
-                "anger": 5,
-                "createTime": 21000,
-                "startPosType": 1,
-                "startPos": 2
-            },
-            {
-                "mId": "M22",
-                "monsterId": 21001001,
-                "type": 0,
-                "count": 1,
-                "intervalTime": 1000,
-                "hp": 10,
-                "damage": 5,
-                "anger": 5,
-                "createTime": 22000,
-                "startPosType": 1,
-                "startPos": 0
-            },
-            {
-                "mId": "M23",
-                "monsterId": 21001002,
-                "type": 0,
-                "count": 1,
-                "intervalTime": 1000,
-                "hp": 10,
-                "damage": 5,
-                "anger": 5,
-                "createTime": 23000,
-                "startPosType": 1,
-                "startPos": 1
-            },
-            {
-                "mId": "M24",
-                "monsterId": 21001003,
-                "type": 0,
-                "count": 1,
-                "intervalTime": 1000,
-                "hp": 10,
-                "damage": 5,
-                "anger": 5,
-                "createTime": 24000,
-                "startPosType": 1,
-                "startPos": 2
-            },
-            {
-                "mId": "M25",
-                "monsterId": 21101001,
-                "type": 0,
-                "count": 1,
-                "intervalTime": 1000,
-                "hp": 10,
-                "damage": 5,
-                "anger": 5,
-                "createTime": 25000,
-                "startPosType": 1,
-                "startPos": 0
-            },
-            {
-                "mId": "M26",
-                "monsterId": 21101002,
-                "type": 0,
-                "count": 1,
-                "intervalTime": 1000,
-                "hp": 10,
-                "damage": 5,
-                "anger": 5,
-                "createTime": 26000,
-                "startPosType": 1,
-                "startPos": 1
-            },
-            {
-                "mId": "M27",
-                "monsterId": 21101003,
-                "type": 0,
-                "count": 1,
-                "intervalTime": 1000,
-                "hp": 10,
-                "damage": 5,
-                "anger": 5,
-                "createTime": 27000,
-                "startPosType": 1,
-                "startPos": 2
-            },
-            {
-                "mId": "M28",
-                "monsterId": 21201001,
-                "type": 0,
-                "count": 1,
-                "intervalTime": 1000,
-                "hp": 10,
-                "damage": 5,
-                "anger": 5,
-                "createTime": 28000,
-                "startPosType": 1,
-                "startPos": 0
-            },
-            {
-                "mId": "M29",
-                "monsterId": 21201002,
-                "type": 0,
-                "count": 1,
-                "intervalTime": 1000,
-                "hp": 10,
-                "damage": 5,
-                "anger": 5,
-                "createTime": 29000,
-                "startPosType": 1,
-                "startPos": 1
-            },
-            {
-                "mId": "M30",
-                "monsterId": 21201003,
-                "type": 0,
-                "count": 1,
-                "intervalTime": 1000,
-                "hp": 10,
-                "damage": 5,
-                "anger": 5,
-                "createTime": 30000,
-                "startPosType": 1,
-                "startPos": 2
-            },
-            {
-                "mId": "M31",
-                "monsterId": 21401001,
-                "type": 0,
-                "count": 1,
-                "intervalTime": 1000,
-                "hp": 10,
-                "damage": 5,
-                "anger": 5,
-                "createTime": 31000,
-                "startPosType": 1,
-                "startPos": 0
-            },
-            {
-                "mId": "M32",
-                "monsterId": 21401002,
-                "type": 0,
-                "count": 1,
-                "intervalTime": 1000,
-                "hp": 10,
-                "damage": 5,
-                "anger": 5,
-                "createTime": 32000,
-                "startPosType": 1,
-                "startPos": 1
-            },
-            {
-                "mId": "M33",
-                "monsterId": 21401003,
-                "type": 0,
-                "count": 1,
-                "intervalTime": 1000,
-                "hp": 10,
-                "damage": 5,
-                "anger": 5,
-                "createTime": 33000,
-                "startPosType": 1,
-                "startPos": 2
-            }
-        ]
-    },
-    {
-        "id": "level2",
-        "awards": 100,
+        "awards": 10,
         "killAward": 10,
         "maxAnger": 100,
         "monsters": [
@@ -446,104 +9,104 @@
                 "mId": "M34",
                 "monsterId": 20101001,
                 "type": 1,
-                "count": 2,
-                "intervalTime": 0,
+                "count": 3,
+                "intervalTime": 1000,
                 "hp": 10,
                 "damage": 5,
-                "anger": 5,
+                "anger": 10,
                 "createTime": 0,
-                "startPosType": 0,
+                "startPosType": 1,
                 "startPos": 0
             },
             {
                 "mId": "M35",
                 "monsterId": 20101002,
                 "type": 1,
-                "count": 2,
-                "intervalTime": 3000,
+                "count": 1,
+                "intervalTime": 1000,
                 "hp": 10,
                 "damage": 5,
-                "anger": 5,
+                "anger": 10,
                 "createTime": 0,
-                "startPosType": 0,
+                "startPosType": 1,
                 "startPos": 1
             },
             {
                 "mId": "M36",
                 "monsterId": 20201001,
                 "type": 1,
-                "count": 2,
-                "intervalTime": 3000,
+                "count": 3,
+                "intervalTime": 1000,
                 "hp": 10,
                 "damage": 5,
-                "anger": 5,
+                "anger": 10,
                 "createTime": 0,
-                "startPosType": 0,
+                "startPosType": 1,
                 "startPos": 2
             },
             {
                 "mId": "M37",
                 "monsterId": 20201002,
                 "type": 1,
-                "count": 2,
-                "intervalTime": 3000,
+                "count": 1,
+                "intervalTime": 1000,
                 "hp": 10,
                 "damage": 5,
-                "anger": 5,
+                "anger": 10,
                 "createTime": 0,
-                "startPosType": 0,
+                "startPosType": 1,
                 "startPos": 1
             },
             {
                 "mId": "M38",
                 "monsterId": 20101001,
                 "type": 1,
-                "count": 2,
-                "intervalTime": 3000,
+                "count": 3,
+                "intervalTime": 1000,
                 "hp": 10,
                 "damage": 5,
-                "anger": 5,
+                "anger": 10,
                 "createTime": 0,
-                "startPosType": 0,
+                "startPosType": 1,
                 "startPos": 0
             },
             {
                 "mId": "M39",
                 "monsterId": 20101002,
                 "type": 1,
-                "count": 2,
-                "intervalTime": 3000,
+                "count": 1,
+                "intervalTime": 1000,
                 "hp": 10,
                 "damage": 5,
-                "anger": 5,
+                "anger": 10,
                 "createTime": 0,
-                "startPosType": 0,
+                "startPosType": 1,
                 "startPos": 1
             },
             {
                 "mId": "M40",
                 "monsterId": 20301001,
                 "type": 1,
-                "count": 2,
-                "intervalTime": 3000,
+                "count": 3,
+                "intervalTime": 1000,
                 "hp": 10,
                 "damage": 5,
-                "anger": 5,
+                "anger": 10,
                 "createTime": 0,
-                "startPosType": 0,
+                "startPosType": 1,
                 "startPos": 2
             },
             {
                 "mId": "M41",
                 "monsterId": 20301002,
                 "type": 1,
-                "count": 2,
-                "intervalTime": 3000,
+                "count": 1,
+                "intervalTime": 1000,
                 "hp": 10,
                 "damage": 5,
-                "anger": 5,
+                "anger": 10,
                 "createTime": 0,
-                "startPosType": 0,
+                "startPosType": 1,
                 "startPos": 1
             },
             {
@@ -551,14 +114,20 @@
                 "monsterId": 20401003,
                 "type": 0,
                 "count": 1,
-                "intervalTime": 6000,
+                "intervalTime": 0,
                 "hp": 10,
                 "damage": 5,
-                "anger": 5,
-                "createTime": 30000,
+                "anger": 10,
+                "createTime": 16500,
                 "startPosType": 1,
                 "startPos": 1
             }
         ]
+    },
+    {
+        "id": "level2",
+        "awards": 10,
+        "killAward": 10,
+        "maxAnger": 100
     }
 ]