Merge branch 'master' of http://101.33.225.95:3000/chenanghui/AdLike2048

assets/bundles/first/config/Skill.json

@@ -36,7 +36,7 @@
         "range": 0,
         "atk_type": "16",
         "fly": "",
-        "atk_para": "1,0.5,60,10000",
+        "atk_para": "1,0.5,150,10000",
         "atk_buff1": "",
         "atk_buff2": "",
         "skill": "",
@@ -52,13 +52,13 @@
         "level": 0,
         "cd": 0.8,
         "priority": 0,
-        "animation": "攻击1",
+        "animation": "攻击2",
         "showeffect": "",
         "target_stage": 1,
         "range": 0,
         "atk_type": "16",
         "fly": "",
-        "atk_para": "2,0.3,60,10000",
+        "atk_para": "2,0.3,150,10000",
         "atk_buff1": "",
         "atk_buff2": "",
         "skill": "",
@@ -74,13 +74,13 @@
         "level": 0,
         "cd": 0.8,
         "priority": 0,
-        "animation": "攻击1",
+        "animation": "攻击3",
         "showeffect": "",
         "target_stage": 1,
         "range": 0,
         "atk_type": "16",
         "fly": "",
-        "atk_para": "2,0.3,60,10000",
+        "atk_para": "2,0.3,150,10000",
         "atk_buff1": "2,3000,50",
         "atk_buff2": "",
         "skill": "",
@@ -96,13 +96,13 @@
         "level": 0,
         "cd": 0.8,
         "priority": 0,
-        "animation": "攻击1",
+        "animation": "攻击4",
         "showeffect": "",
         "target_stage": 1,
         "range": 0,
         "atk_type": "16",
         "fly": "",
-        "atk_para": "3,0.2,60,10000",
+        "atk_para": "3,0.2,150,10000",
         "atk_buff1": "2,3000,50",
         "atk_buff2": "",
         "skill": "",
@@ -1030,8 +1030,8 @@
         "atk_buff1": "",
         "atk_buff2": "",
         "skill": "",
-        "condition": "1,2000",
-        "result": "1,100,0.5,3000,3"
+        "condition": "1,1000",
+        "result": "1,83,0.5,3000,3"
     },
     {
         "id": 230101,
@@ -1096,8 +1096,8 @@
         "atk_buff1": "",
         "atk_buff2": "",
         "skill": "",
-        "condition": "1,2000",
-        "result": "1,120,0.5,3500,3"
+        "condition": "1,1000",
+        "result": "1,94,0.5,3500,3"
     },
     {
         "id": 240101,
@@ -1162,8 +1162,8 @@
         "atk_buff1": "",
         "atk_buff2": "",
         "skill": "",
-        "condition": "1,2000",
-        "result": "1,140,0.5,4000,3"
+        "condition": "1,1000",
+        "result": "1,105,0.5,4000,3"
     },
     {
         "id": 250101,
@@ -1228,8 +1228,8 @@
         "atk_buff1": "",
         "atk_buff2": "",
         "skill": "",
-        "condition": "1,2000",
-        "result": "1,160,0.5,5000,3"
+        "condition": "1,1000",
+        "result": "1,116,0.5,5000,3"
     },
     {
         "id": 310101,

assets/bundles/first/config/Text.json

@@ -27,97 +27,97 @@
         "id": 1005,
         "type": 2,
         "level": 1,
-        "weight": 80
+        "weight": 0
     },
     {
         "id": 1006,
         "type": 2,
         "level": 2,
-        "weight": 10
+        "weight": 0
     },
     {
         "id": 1007,
         "type": 2,
         "level": 3,
-        "weight": 5
+        "weight": 0
     },
     {
         "id": 1008,
         "type": 2,
         "level": 4,
-        "weight": 4
+        "weight": 0
     },
     {
         "id": 1009,
         "type": 3,
         "level": 1,
-        "weight": 80
+        "weight": 0
     },
     {
         "id": 1010,
         "type": 3,
         "level": 2,
-        "weight": 10
+        "weight": 0
     },
     {
         "id": 1011,
         "type": 3,
         "level": 3,
-        "weight": 5
+        "weight": 0
     },
     {
         "id": 1012,
         "type": 3,
         "level": 4,
-        "weight": 4
+        "weight": 0
     },
     {
         "id": 1013,
         "type": 4,
         "level": 1,
-        "weight": 80
+        "weight": 0
     },
     {
         "id": 1014,
         "type": 4,
         "level": 2,
-        "weight": 10
+        "weight": 0
     },
     {
         "id": 1015,
         "type": 4,
         "level": 3,
-        "weight": 5
+        "weight": 0
     },
     {
         "id": 1016,
         "type": 4,
         "level": 4,
-        "weight": 4
+        "weight": 0
     },
     {
         "id": 1017,
         "type": 5,
         "level": 1,
-        "weight": 80
+        "weight": 0
     },
     {
         "id": 1018,
         "type": 5,
         "level": 2,
-        "weight": 10
+        "weight": 0
     },
     {
         "id": 1019,
         "type": 5,
         "level": 3,
-        "weight": 5
+        "weight": 0
     },
     {
         "id": 1020,
         "type": 5,
         "level": 4,
-        "weight": 4
+        "weight": 0
     },
     {
         "id": 2001,
@@ -141,7 +141,7 @@
         "id": 3002,
         "type": 13,
         "level": 0,
-        "weight": 6
+        "weight": 0
     },
     {
         "id": 3003,