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

assets/bundles/first/config/Level.json

@@ -7,8 +7,8 @@
         "startnumber": 100,
         "diffcult": 1,
         "expdrop": "1101,10|1201,10|1301,10|1401,10|2101,5",
-        "reward": "",
-        "loserreward": "",
+        "reward": "1|20",
+        "loserreward": "1|5",
         "monster": "1,1001,10,1.6|2,1001,10,1.6|3,1001,10,1.6|4,1001,10,1.6|5,1002,15,1.6|6,1002,15,1.6|7,1002,15,1.6|8,1002,15,1.6|9,1002,15,1.6|10,1003,20,1.6|11,1003,20,1.6|12,1003,20,1.6|13,1003,20,1.6|14,1003,20,1.6|15,1003,25,1.6|16,1003,25,1.6|17,1003,25,1.6|18,1003,25,1.6|19,1003,25,1.6|20,1003,30,1.6|21,1003,30,1.6|22,1003,30,1.6|23,1003,30,1.6|24,1003,30,1.6|25,1003,40,1.6",
         "boss": "5|1101,10|1101,15|1101,20|1101,25|1101",
         "bosspro": 1200,
@@ -44,8 +44,8 @@
         "startnumber": 100,
         "diffcult": 1,
         "expdrop": "1101,10|1201,10|1301,10|1401,10|3101,5",
-        "reward": "",
-        "loserreward": "",
+        "reward": "1|20",
+        "loserreward": "1|5",
         "monster": "1,2001,10,1.6|2,2001,10,1.6|3,2001,10,1.6|4,2001,10,1.6|5,2002,15,1.6|6,2002,15,1.6|7,2002,15,1.6|8,2002,15,1.6|9,2002,15,1.6|10,2003,20,1.6|11,2003,20,1.6|12,2003,20,1.6|13,2003,20,1.6|14,2003,20,1.6|15,2003,25,1.6|16,2003,25,1.6|17,2003,25,1.6|18,2003,25,1.6|19,2003,25,1.6|20,2003,30,1.6|21,2003,30,1.6|22,2003,30,1.6|23,2003,30,1.6|24,2003,30,1.6|25,2003,40,1.6",
         "boss": "5|2101,10|2101,15|2101,20|2101,25|2101",
         "bosspro": 1200,
@@ -81,8 +81,8 @@
         "startnumber": 100,
         "diffcult": 1,
         "expdrop": "1101,10|1201,10|1301,10|1401,10|4101,5",
-        "reward": "",
-        "loserreward": "",
+        "reward": "1|20",
+        "loserreward": "1|5",
         "monster": "1,3001,10,1.6|2,3001,10,1.6|3,3001,10,1.6|4,3001,10,1.6|5,3002,15,1.6|6,3002,15,1.6|7,3002,15,1.6|8,3002,15,1.6|9,3002,15,1.6|10,3003,20,1.6|11,3003,20,1.6|12,3003,20,1.6|13,3003,20,1.6|14,3003,20,1.6|15,3003,25,1.6|16,3003,25,1.6|17,3003,25,1.6|18,3003,25,1.6|19,3003,25,1.6|20,3003,30,1.6|21,3003,30,1.6|22,3003,30,1.6|23,3003,30,1.6|24,3003,30,1.6|25,3003,40,1.6",
         "boss": "5|3101,10|3101,15|3101,20|3101,25|3101",
         "bosspro": 1200,
@@ -118,8 +118,8 @@
         "startnumber": 100,
         "diffcult": 1,
         "expdrop": "1101,10|1201,10|1301,10|1401,10|5101,5",
-        "reward": "",
-        "loserreward": "",
+        "reward": "1|20",
+        "loserreward": "1|5",
         "monster": "1,4001,10,1.6|2,4001,10,1.6|3,4001,10,1.6|4,4001,10,1.6|5,4002,15,1.6|6,4002,15,1.6|7,4002,15,1.6|8,4002,15,1.6|9,4002,15,1.6|10,4003,20,1.6|11,4003,20,1.6|12,4003,20,1.6|13,4003,20,1.6|14,4003,20,1.6|15,4003,25,1.6|16,4003,25,1.6|17,4003,25,1.6|18,4003,25,1.6|19,4003,25,1.6|20,4003,30,1.6|21,4003,30,1.6|22,4003,30,1.6|23,4003,30,1.6|24,4003,30,1.6|25,4003,40,1.6",
         "boss": "5|4101,10|4101,15|4101,20|4101,25|4101",
         "bosspro": 1200,
@@ -155,8 +155,8 @@
         "startnumber": 100,
         "diffcult": 1,
         "expdrop": "1101,10|1201,10|1301,10|1401,10|6101,5",
-        "reward": "",
-        "loserreward": "",
+        "reward": "1|20",
+        "loserreward": "1|5",
         "monster": "1,5001,10,1.6|2,5001,10,1.6|3,5001,10,1.6|4,5001,10,1.6|5,5002,15,1.6|6,5002,15,1.6|7,5002,15,1.6|8,5002,15,1.6|9,5002,15,1.6|10,5003,20,1.6|11,5003,20,1.6|12,5003,20,1.6|13,5003,20,1.6|14,5003,20,1.6|15,5003,25,1.6|16,5003,25,1.6|17,5003,25,1.6|18,5003,25,1.6|19,5003,25,1.6|20,5003,30,1.6|21,5003,30,1.6|22,5003,30,1.6|23,5003,30,1.6|24,5003,30,1.6|25,5003,40,1.6",
         "boss": "5|5101,10|5101,15|5101,20|5101,25|5101",
         "bosspro": 1200,

assets/bundles/first/config/Monster.json

@@ -13,7 +13,7 @@
         "size": 1,
         "hp": 1,
         "exp": 1,
-        "peach": 10,
+        "peach": 7,
         "weapondrop": 50,
         "skill": 0
     },
@@ -31,7 +31,7 @@
         "size": 1,
         "hp": 1,
         "exp": 1,
-        "peach": 7,
+        "peach": 4,
         "weapondrop": 50,
         "skill": 0
     },
@@ -49,7 +49,7 @@
         "size": 1,
         "hp": 1,
         "exp": 1,
-        "peach": 5,
+        "peach": 3,
         "weapondrop": 50,
         "skill": 0
     },
@@ -57,9 +57,9 @@
         "id": 1101,
         "name": "金boss",
         "desc": "",
-        "icon": "Boss金",
+        "icon": "BOSS金",
         "res": [
-            "Boss金"
+            "BOSS金"
         ],
         "type": 2,
         "speed": 25,
@@ -67,7 +67,7 @@
         "size": 1,
         "hp": 15,
         "exp": 1,
-        "peach": 10,
+        "peach": 7,
         "weapondrop": 50,
         "skill": 11101
     },
@@ -85,7 +85,7 @@
         "size": 1,
         "hp": 1,
         "exp": 1,
-        "peach": 10,
+        "peach": 7,
         "weapondrop": 50,
         "skill": 0
     },
@@ -103,7 +103,7 @@
         "size": 1,
         "hp": 1,
         "exp": 1,
-        "peach": 7,
+        "peach": 4,
         "weapondrop": 50,
         "skill": 0
     },
@@ -121,7 +121,7 @@
         "size": 1,
         "hp": 1,
         "exp": 1,
-        "peach": 5,
+        "peach": 3,
         "weapondrop": 50,
         "skill": 0
     },
@@ -129,9 +129,9 @@
         "id": 2101,
         "name": "木boss",
         "desc": "",
-        "icon": "Boss木",
+        "icon": "BOSS木",
         "res": [
-            "Boss木"
+            "BOSS木"
         ],
         "type": 2,
         "speed": 25,
@@ -139,7 +139,7 @@
         "size": 1,
         "hp": 15,
         "exp": 1,
-        "peach": 10,
+        "peach": 7,
         "weapondrop": 50,
         "skill": 21101
     },
@@ -157,7 +157,7 @@
         "size": 1,
         "hp": 1,
         "exp": 1,
-        "peach": 10,
+        "peach": 7,
         "weapondrop": 50,
         "skill": 0
     },
@@ -175,7 +175,7 @@
         "size": 1,
         "hp": 1,
         "exp": 1,
-        "peach": 7,
+        "peach": 4,
         "weapondrop": 50,
         "skill": 0
     },
@@ -193,7 +193,7 @@
         "size": 1,
         "hp": 1,
         "exp": 1,
-        "peach": 5,
+        "peach": 3,
         "weapondrop": 50,
         "skill": 0
     },
@@ -201,9 +201,9 @@
         "id": 3101,
         "name": "水boss",
         "desc": "",
-        "icon": "Boss水",
+        "icon": "BOSS水",
         "res": [
-            "Boss水"
+            "BOSS水"
         ],
         "type": 2,
         "speed": 25,
@@ -211,7 +211,7 @@
         "size": 1,
         "hp": 15,
         "exp": 1,
-        "peach": 10,
+        "peach": 7,
         "weapondrop": 50,
         "skill": 31101
     },
@@ -229,7 +229,7 @@
         "size": 1,
         "hp": 1,
         "exp": 1,
-        "peach": 10,
+        "peach": 7,
         "weapondrop": 50,
         "skill": 0
     },
@@ -247,7 +247,7 @@
         "size": 1,
         "hp": 1,
         "exp": 1,
-        "peach": 7,
+        "peach": 4,
         "weapondrop": 50,
         "skill": 0
     },
@@ -265,7 +265,7 @@
         "size": 1,
         "hp": 1,
         "exp": 1,
-        "peach": 5,
+        "peach": 3,
         "weapondrop": 50,
         "skill": 0
     },
@@ -273,9 +273,9 @@
         "id": 4101,
         "name": "火boss",
         "desc": "",
-        "icon": "Boss火",
+        "icon": "BOSS火",
         "res": [
-            "Boss火"
+            "BOSS火"
         ],
         "type": 2,
         "speed": 25,
@@ -283,7 +283,7 @@
         "size": 1,
         "hp": 15,
         "exp": 1,
-        "peach": 10,
+        "peach": 7,
         "weapondrop": 50,
         "skill": 41101
     },
@@ -301,7 +301,7 @@
         "size": 1,
         "hp": 1,
         "exp": 1,
-        "peach": 10,
+        "peach": 7,
         "weapondrop": 50,
         "skill": 0
     },
@@ -319,7 +319,7 @@
         "size": 1,
         "hp": 1,
         "exp": 1,
-        "peach": 7,
+        "peach": 4,
         "weapondrop": 50,
         "skill": 0
     },
@@ -337,7 +337,7 @@
         "size": 1,
         "hp": 1,
         "exp": 1,
-        "peach": 5,
+        "peach": 3,
         "weapondrop": 50,
         "skill": 0
     },
@@ -345,9 +345,9 @@
         "id": 5101,
         "name": "土boss",
         "desc": "",
-        "icon": "Boss土",
+        "icon": "BOSS土",
         "res": [
-            "Boss土"
+            "BOSS土"
         ],
         "type": 2,
         "speed": 25,
@@ -355,7 +355,7 @@
         "size": 1,
         "hp": 15,
         "exp": 1,
-        "peach": 10,
+        "peach": 7,
         "weapondrop": 50,
         "skill": 51101
     },
@@ -373,7 +373,7 @@
         "size": 1,
         "hp": 3,
         "exp": 1,
-        "peach": 1,
+        "peach": 3,
         "weapondrop": 0,
         "skill": 0
     }

assets/bundles/first/config/Skill.json

@@ -124,7 +124,7 @@
         "range": 0,
         "atk_type": "3",
         "fly": "",
-        "atk_para": "10000",
+        "atk_para": "6000",
         "atk_buff1": "",
         "atk_buff2": "",
         "skill": "",
@@ -146,7 +146,7 @@
         "range": 260,
         "atk_type": "14",
         "fly": "",
-        "atk_para": "2,0.4,10000",
+        "atk_para": "2,0.4,6000",
         "atk_buff1": "",
         "atk_buff2": "",
         "skill": "",
@@ -168,7 +168,7 @@
         "range": 260,
         "atk_type": "14",
         "fly": "",
-        "atk_para": "2,0.4,10000",
+        "atk_para": "2,0.4,6000",
         "atk_buff1": "1,5000,3",
         "atk_buff2": "",
         "skill": "",
@@ -190,7 +190,7 @@
         "range": 300,
         "atk_type": "14",
         "fly": "",
-        "atk_para": "2,0.4,10000",
+        "atk_para": "2,0.4,6000",
         "atk_buff1": "1,5000,3",
         "atk_buff2": "",
         "skill": "",
@@ -212,7 +212,7 @@
         "range": 300,
         "atk_type": "14",
         "fly": "",
-        "atk_para": "2,0.4,10000",
+        "atk_para": "2,0.4,6000",
         "atk_buff1": "1,5000,3",
         "atk_buff2": "",
         "skill": "10,30,12,0.075,200,3,10000",
@@ -234,7 +234,7 @@
         "range": 0,
         "atk_type": "13",
         "fly": "",
-        "atk_para": "1,0,10000",
+        "atk_para": "1,0,8000",
         "atk_buff1": "",
         "atk_buff2": "",
         "skill": "",
@@ -256,7 +256,7 @@
         "range": 0,
         "atk_type": "13",
         "fly": "",
-        "atk_para": "2,0.5,10000",
+        "atk_para": "2,0.5,8000",
         "atk_buff1": "",
         "atk_buff2": "",
         "skill": "",
@@ -278,7 +278,7 @@
         "range": 0,
         "atk_type": "13",
         "fly": "",
-        "atk_para": "3,0.3,10000",
+        "atk_para": "3,0.3,8000",
         "atk_buff1": "",
         "atk_buff2": "",
         "skill": "",
@@ -300,7 +300,7 @@
         "range": 0,
         "atk_type": "13",
         "fly": "",
-        "atk_para": "4,0.2,10000",
+        "atk_para": "4,0.2,8000",
         "atk_buff1": "",
         "atk_buff2": "",
         "skill": "",
@@ -322,7 +322,7 @@
         "range": 0,
         "atk_type": "13",
         "fly": "",
-        "atk_para": "5,0.16,10000",
+        "atk_para": "5,0.16,8000",
         "atk_buff1": "",
         "atk_buff2": "",
         "skill": "",
@@ -344,7 +344,7 @@
         "range": 0,
         "atk_type": "4",
         "fly": "",
-        "atk_para": "10000",
+        "atk_para": "7000",
         "atk_buff1": "",
         "atk_buff2": "",
         "skill": "",
@@ -366,7 +366,7 @@
         "range": 0,
         "atk_type": "17",
         "fly": "",
-        "atk_para": "2,12,10000",
+        "atk_para": "2,12,7000",
         "atk_buff1": "",
         "atk_buff2": "",
         "skill": "",
@@ -388,7 +388,7 @@
         "range": 0,
         "atk_type": "17",
         "fly": "",
-        "atk_para": "3,12,10000",
+        "atk_para": "3,12,7000",
         "atk_buff1": "",
         "atk_buff2": "",
         "skill": "",
@@ -410,7 +410,7 @@
         "range": 0,
         "atk_type": "12",
         "fly": "",
-        "atk_para": "3,12,10000",
+        "atk_para": "3,12,7000",
         "atk_buff1": "",
         "atk_buff2": "",
         "skill": "",
@@ -432,7 +432,7 @@
         "range": 0,
         "atk_type": "12",
         "fly": "",
-        "atk_para": "5,12,10000",
+        "atk_para": "5,12,7000",
         "atk_buff1": "",
         "atk_buff2": "",
         "skill": "",
@@ -454,7 +454,7 @@
         "range": 0,
         "atk_type": "5",
         "fly": "",
-        "atk_para": "40,0.5,1,10000",
+        "atk_para": "40,0.5,1,7500",
         "atk_buff1": "",
         "atk_buff2": "",
         "skill": "",
@@ -476,7 +476,7 @@
         "range": 0,
         "atk_type": "5",
         "fly": "",
-        "atk_para": "40,0.4,2,10000",
+        "atk_para": "40,0.4,2,7500",
         "atk_buff1": "",
         "atk_buff2": "",
         "skill": "",
@@ -498,7 +498,7 @@
         "range": 0,
         "atk_type": "5",
         "fly": "",
-        "atk_para": "40,0.3,3,10000",
+        "atk_para": "40,0.3,3,7500",
         "atk_buff1": "",
         "atk_buff2": "",
         "skill": "",
@@ -520,7 +520,7 @@
         "range": 0,
         "atk_type": "5",
         "fly": "",
-        "atk_para": "40,0.22,3,10000",
+        "atk_para": "40,0.22,3,7500",
         "atk_buff1": "1,5000,3",
         "atk_buff2": "",
         "skill": "",
@@ -542,7 +542,7 @@
         "range": 0,
         "atk_type": "5",
         "fly": "",
-        "atk_para": "40,0.2,3,10000",
+        "atk_para": "40,0.2,3,7500",
         "atk_buff1": "1,5000,3",
         "atk_buff2": "",
         "skill": "11,0.2,10000,2,10000,50",