소스 검색

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

greg 4 년 전
부모
커밋
d600c74985
2개의 변경된 파일247개의 추가작업 그리고 146개의 파일을 삭제
  1. 202 101
      assets/resources/configs/Levels.json
  2. 45 45
      assets/resources/configs/Weapons.json

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 202 - 101
assets/resources/configs/Levels.json


+ 45 - 45
assets/resources/configs/Weapons.json

@@ -109,7 +109,7 @@
         "fireSocketPath": "RootNode/qiang_0801/FireSocket",
         "gunFireAnimation": "RifleFire",
         "skill": 40001,
-        "damage": 35,
+        "damage": 53,
         "clip": 5,
         "attackRange": 2,
         "attackCount": 1,
@@ -141,7 +141,7 @@
         "fireSocketPath": "RootNode/qiang_0901/FireSocket",
         "gunFireAnimation": "RifleFire",
         "skill": 40001,
-        "damage": 53,
+        "damage": 34,
         "clip": 30,
         "attackRange": 1,
         "attackCount": 1,
@@ -269,7 +269,7 @@
         "fireSocketPath": "RootNode/qiang_0601/FireSocket",
         "gunFireAnimation": "RifleFire",
         "skill": 40001,
-        "damage": 270,
+        "damage": 405,
         "clip": 5,
         "attackRange": 2,
         "attackCount": 1,
@@ -301,7 +301,7 @@
         "fireSocketPath": "RootNode/qiang_0701/FireSocket",
         "gunFireAnimation": "RifleFire",
         "skill": 40001,
-        "damage": 405,
+        "damage": 608,
         "clip": 5,
         "attackRange": 2,
         "attackCount": 1,
@@ -333,7 +333,7 @@
         "fireSocketPath": "RootNode/qiang_1001/FireSocket",
         "gunFireAnimation": "RifleFire",
         "skill": 40001,
-        "damage": 608,
+        "damage": 395,
         "clip": 30,
         "attackRange": 1,
         "attackCount": 1,
@@ -365,7 +365,7 @@
         "fireSocketPath": "RootNode/qiang_1301/FireSocket",
         "gunFireAnimation": "RifleFire",
         "skill": 40001,
-        "damage": 912,
+        "damage": 1003,
         "clip": 20,
         "attackRange": 1,
         "attackCount": 1,
@@ -397,7 +397,7 @@
         "fireSocketPath": "RootNode/qiang_1401/FireSocket",
         "gunFireAnimation": "RifleFire",
         "skill": 40001,
-        "damage": 1368,
+        "damage": 1505,
         "clip": 20,
         "attackRange": 1,
         "attackCount": 1,
@@ -429,7 +429,7 @@
         "fireSocketPath": "RootNode/qiang_1501/FireSocket",
         "gunFireAnimation": "RifleFire",
         "skill": 40001,
-        "damage": 2052,
+        "damage": 2257,
         "clip": 20,
         "attackRange": 1,
         "attackCount": 1,
@@ -461,7 +461,7 @@
         "fireSocketPath": "RootNode/qiang_1701/FireSocket",
         "gunFireAnimation": "RifleFire",
         "skill": 40001,
-        "damage": 3078,
+        "damage": 6156,
         "clip": 8,
         "attackRange": 1,
         "attackCount": 2,
@@ -525,7 +525,7 @@
         "fireSocketPath": "RootNode/qiang_0601/FireSocket",
         "gunFireAnimation": "RifleFire",
         "skill": 40001,
-        "damage": 6926,
+        "damage": 10389,
         "clip": 6,
         "attackRange": 2,
         "attackCount": 1,
@@ -557,7 +557,7 @@
         "fireSocketPath": "RootNode/qiang_1201/FireSocket",
         "gunFireAnimation": "RifleFire",
         "skill": 40001,
-        "damage": 10389,
+        "damage": 11428,
         "clip": 20,
         "attackRange": 1,
         "attackCount": 1,
@@ -621,7 +621,7 @@
         "fireSocketPath": "RootNode/qiang_0701/FireSocket",
         "gunFireAnimation": "RifleFire",
         "skill": 40001,
-        "damage": 23376,
+        "damage": 35064,
         "clip": 6,
         "attackRange": 2,
         "attackCount": 1,
@@ -653,7 +653,7 @@
         "fireSocketPath": "RootNode/qiang_1101/FireSocket",
         "gunFireAnimation": "RifleFire",
         "skill": 40001,
-        "damage": 35064,
+        "damage": 22792,
         "clip": 30,
         "attackRange": 1,
         "attackCount": 1,
@@ -717,7 +717,7 @@
         "fireSocketPath": "RootNode/qiang_0601/FireSocket",
         "gunFireAnimation": "RifleFire",
         "skill": 40001,
-        "damage": 78894,
+        "damage": 118341,
         "clip": 7,
         "attackRange": 2,
         "attackCount": 1,
@@ -749,7 +749,7 @@
         "fireSocketPath": "RootNode/qiang_1601/FireSocket",
         "gunFireAnimation": "RifleFire",
         "skill": 40001,
-        "damage": 118341,
+        "damage": 236682,
         "clip": 8,
         "attackRange": 1,
         "attackCount": 2,
@@ -781,7 +781,7 @@
         "fireSocketPath": "RootNode/qiang_1501/FireSocket",
         "gunFireAnimation": "RifleFire",
         "skill": 40001,
-        "damage": 177512,
+        "damage": 195263,
         "clip": 20,
         "attackRange": 1,
         "attackCount": 1,
@@ -845,7 +845,7 @@
         "fireSocketPath": "RootNode/qiang_0901/FireSocket",
         "gunFireAnimation": "RifleFire",
         "skill": 40001,
-        "damage": 399402,
+        "damage": 259611,
         "clip": 30,
         "attackRange": 1,
         "attackCount": 1,
@@ -877,7 +877,7 @@
         "fireSocketPath": "RootNode/qiang_0801/FireSocket",
         "gunFireAnimation": "RifleFire",
         "skill": 40001,
-        "damage": 599103,
+        "damage": 898655,
         "clip": 6,
         "attackRange": 2,
         "attackCount": 1,
@@ -941,7 +941,7 @@
         "fireSocketPath": "RootNode/qiang_0701/FireSocket",
         "gunFireAnimation": "RifleFire",
         "skill": 40001,
-        "damage": 1347983,
+        "damage": 2021975,
         "clip": 7,
         "attackRange": 2,
         "attackCount": 1,
@@ -973,7 +973,7 @@
         "fireSocketPath": "RootNode/qiang_1301/FireSocket",
         "gunFireAnimation": "RifleFire",
         "skill": 40001,
-        "damage": 2021975,
+        "damage": 2224173,
         "clip": 20,
         "attackRange": 1,
         "attackCount": 1,
@@ -1037,7 +1037,7 @@
         "fireSocketPath": "RootNode/qiang_1101/FireSocket",
         "gunFireAnimation": "RifleFire",
         "skill": 40001,
-        "damage": 4549445,
+        "damage": 2957139,
         "clip": 30,
         "attackRange": 1,
         "attackCount": 1,
@@ -1069,7 +1069,7 @@
         "fireSocketPath": "RootNode/qiang_1801/FireSocket",
         "gunFireAnimation": "RifleFire",
         "skill": 40001,
-        "damage": 6824168,
+        "damage": 13648336,
         "clip": 8,
         "attackRange": 1,
         "attackCount": 2,
@@ -1133,7 +1133,7 @@
         "fireSocketPath": "RootNode/qiang_1001/FireSocket",
         "gunFireAnimation": "RifleFire",
         "skill": 40001,
-        "damage": 15354378,
+        "damage": 9980346,
         "clip": 30,
         "attackRange": 1,
         "attackCount": 1,
@@ -1165,7 +1165,7 @@
         "fireSocketPath": "RootNode/qiang_0801/FireSocket",
         "gunFireAnimation": "RifleFire",
         "skill": 40001,
-        "damage": 23031567,
+        "damage": 34547351,
         "clip": 7,
         "attackRange": 2,
         "attackCount": 1,
@@ -1197,7 +1197,7 @@
         "fireSocketPath": "RootNode/qiang_1201/FireSocket",
         "gunFireAnimation": "RifleFire",
         "skill": 40001,
-        "damage": 34547351,
+        "damage": 38002086,
         "clip": 20,
         "attackRange": 1,
         "attackCount": 1,
@@ -1261,7 +1261,7 @@
         "fireSocketPath": "RootNode/qiang_1401/FireSocket",
         "gunFireAnimation": "RifleFire",
         "skill": 40001,
-        "damage": 77731541,
+        "damage": 85504695,
         "clip": 20,
         "attackRange": 1,
         "attackCount": 1,
@@ -1293,7 +1293,7 @@
         "fireSocketPath": "RootNode/qiang_1601/FireSocket",
         "gunFireAnimation": "RifleFire",
         "skill": 40001,
-        "damage": 116597312,
+        "damage": 233194624,
         "clip": 8,
         "attackRange": 1,
         "attackCount": 2,
@@ -1325,7 +1325,7 @@
         "fireSocketPath": "RootNode/qiang_1901/FireSocket",
         "gunFireAnimation": "RifleFire",
         "skill": 40001,
-        "damage": 174895968,
+        "damage": 122427178,
         "clip": 50,
         "attackRange": 1,
         "attackCount": 1,
@@ -1389,7 +1389,7 @@
         "fireSocketPath": "RootNode/qiang_1001/FireSocket",
         "gunFireAnimation": "RifleFire",
         "skill": 40001,
-        "damage": 393515928,
+        "damage": 255785353,
         "clip": 30,
         "attackRange": 1,
         "attackCount": 1,
@@ -1421,7 +1421,7 @@
         "fireSocketPath": "RootNode/qiang_1701/FireSocket",
         "gunFireAnimation": "RifleFire",
         "skill": 40001,
-        "damage": 590273892,
+        "damage": 1180547784,
         "clip": 8,
         "attackRange": 1,
         "attackCount": 2,
@@ -1453,7 +1453,7 @@
         "fireSocketPath": "RootNode/qiang_0901/FireSocket",
         "gunFireAnimation": "RifleFire",
         "skill": 40001,
-        "damage": 885410838,
+        "damage": 575517045,
         "clip": 30,
         "attackRange": 1,
         "attackCount": 1,
@@ -1485,7 +1485,7 @@
         "fireSocketPath": "RootNode/qiang_1201/FireSocket",
         "gunFireAnimation": "RifleFire",
         "skill": 40001,
-        "damage": 1328116257,
+        "damage": 1460927883,
         "clip": 20,
         "attackRange": 1,
         "attackCount": 1,
@@ -1517,7 +1517,7 @@
         "fireSocketPath": "RootNode/qiang_2001/FireSocket",
         "gunFireAnimation": "RifleFire",
         "skill": 40001,
-        "damage": 1992174386,
+        "damage": 1394522070,
         "clip": 70,
         "attackRange": 1,
         "attackCount": 1,
@@ -1549,7 +1549,7 @@
         "fireSocketPath": "RootNode/qiang_1301/FireSocket",
         "gunFireAnimation": "RifleFire",
         "skill": 40001,
-        "damage": 2988261579,
+        "damage": 3287087737,
         "clip": 20,
         "attackRange": 1,
         "attackCount": 1,
@@ -1581,7 +1581,7 @@
         "fireSocketPath": "RootNode/qiang_1101/FireSocket",
         "gunFireAnimation": "RifleFire",
         "skill": 40001,
-        "damage": 4482392369,
+        "damage": 2913555040,
         "clip": 30,
         "attackRange": 1,
         "attackCount": 1,
@@ -1613,7 +1613,7 @@
         "fireSocketPath": "RootNode/qiang_1401/FireSocket",
         "gunFireAnimation": "RifleFire",
         "skill": 40001,
-        "damage": 6723588554,
+        "damage": 7395947409,
         "clip": 20,
         "attackRange": 1,
         "attackCount": 1,
@@ -1645,7 +1645,7 @@
         "fireSocketPath": "RootNode/qiang_1501/FireSocket",
         "gunFireAnimation": "RifleFire",
         "skill": 40001,
-        "damage": 10085382831,
+        "damage": 11093921114,
         "clip": 20,
         "attackRange": 1,
         "attackCount": 1,
@@ -1677,7 +1677,7 @@
         "fireSocketPath": "RootNode/qiang_1601/FireSocket",
         "gunFireAnimation": "RifleFire",
         "skill": 40001,
-        "damage": 15128074247,
+        "damage": 30256148494,
         "clip": 8,
         "attackRange": 1,
         "attackCount": 3,
@@ -1709,7 +1709,7 @@
         "fireSocketPath": "RootNode/qiang_2001/FireSocket",
         "gunFireAnimation": "RifleFire",
         "skill": 40001,
-        "damage": 22692111371,
+        "damage": 15884477960,
         "clip": 70,
         "attackRange": 1,
         "attackCount": 1,
@@ -1741,7 +1741,7 @@
         "fireSocketPath": "RootNode/qiang_1701/FireSocket",
         "gunFireAnimation": "RifleFire",
         "skill": 40001,
-        "damage": 34038167057,
+        "damage": 68076334114,
         "clip": 8,
         "attackRange": 1,
         "attackCount": 3,
@@ -1773,7 +1773,7 @@
         "fireSocketPath": "RootNode/qiang_1901/FireSocket",
         "gunFireAnimation": "RifleFire",
         "skill": 40001,
-        "damage": 51057250586,
+        "damage": 35740075410,
         "clip": 50,
         "attackRange": 1,
         "attackCount": 1,
@@ -1805,7 +1805,7 @@
         "fireSocketPath": "RootNode/qiang_1801/FireSocket",
         "gunFireAnimation": "RifleFire",
         "skill": 40001,
-        "damage": 76585875879,
+        "damage": 153171751758,
         "clip": 8,
         "attackRange": 1,
         "attackCount": 2,
@@ -1837,7 +1837,7 @@
         "fireSocketPath": "RootNode/qiang_1901/FireSocket",
         "gunFireAnimation": "RifleFire",
         "skill": 40001,
-        "damage": 114878813819,
+        "damage": 80415169673,
         "clip": 50,
         "attackRange": 1,
         "attackCount": 1,
@@ -1869,7 +1869,7 @@
         "fireSocketPath": "RootNode/qiang_1801/FireSocket",
         "gunFireAnimation": "RifleFire",
         "skill": 40001,
-        "damage": 172318220729,
+        "damage": 344636441458,
         "clip": 8,
         "attackRange": 1,
         "attackCount": 3,
@@ -1901,7 +1901,7 @@
         "fireSocketPath": "RootNode/qiang_2001/FireSocket",
         "gunFireAnimation": "RifleFire",
         "skill": 40001,
-        "damage": 258477331094,
+        "damage": 180934131766,
         "clip": 70,
         "attackRange": 1,
         "attackCount": 1,

이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.