Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

bin/json/game_dispatch_task.json

@@ -8,7 +8,7 @@
     },
     "icon": "xmwg_rw_pt1",
     "taskcd": 200,
-    "tasktime": 134,
+    "tasktime": 93,
     "tasktxt": {
       "key": "Entrustment details of Po",
       "text": "这是属于阿宝的专属委托"
@@ -56,7 +56,7 @@
     },
     "icon": "xmwg_rw_pt2",
     "taskcd": 200,
-    "tasktime": 127,
+    "tasktime": 174,
     "tasktxt": {
       "key": "Entrustment details of Bobi",
       "text": "这是属于波比的专属委托"
@@ -104,7 +104,7 @@
     },
     "icon": "xmwg_rw_pt3",
     "taskcd": 200,
-    "tasktime": 144,
+    "tasktime": 60,
     "tasktxt": {
       "key": "Entrustment details of Tiger",
       "text": "这是属于悍娇虎的专属委托"
@@ -152,7 +152,7 @@
     },
     "icon": "xmwg_rw_pt4",
     "taskcd": 200,
-    "tasktime": 97,
+    "tasktime": 96,
     "tasktxt": {
       "key": "Entrustment details of Shifu",
       "text": "这是属于师父的专属委托"
@@ -200,7 +200,7 @@
     },
     "icon": "xmwg_rw_pt5",
     "taskcd": 200,
-    "tasktime": 136,
+    "tasktime": 90,
     "tasktxt": {
       "key": "Entrustment details of Po",
       "text": "这是属于阿宝的专属委托"
@@ -248,7 +248,7 @@
     },
     "icon": "xmwg_rw_pt6",
     "taskcd": 200,
-    "tasktime": 117,
+    "tasktime": 83,
     "tasktxt": {
       "key": "Entrustment details of Bobi",
       "text": "这是属于波比的专属委托"
@@ -296,7 +296,7 @@
     },
     "icon": "xmwg_rw_pt7",
     "taskcd": 200,
-    "tasktime": 174,
+    "tasktime": 128,
     "tasktxt": {
       "key": "Entrustment details of Tiger",
       "text": "这是属于悍娇虎的专属委托"
@@ -344,7 +344,7 @@
     },
     "icon": "xmwg_rw_pt1",
     "taskcd": 200,
-    "tasktime": 124,
+    "tasktime": 68,
     "tasktxt": {
       "key": "Entrustment details of Shifu",
       "text": "这是属于师父的专属委托"
@@ -392,7 +392,7 @@
     },
     "icon": "xmwg_rw_pt2",
     "taskcd": 200,
-    "tasktime": 61,
+    "tasktime": 155,
     "tasktxt": {
       "key": "Entrustment details of Po",
       "text": "这是属于阿宝的专属委托"
@@ -440,7 +440,7 @@
     },
     "icon": "xmwg_rw_pt3",
     "taskcd": 200,
-    "tasktime": 102,
+    "tasktime": 100,
     "tasktxt": {
       "key": "Entrustment details of Bobi",
       "text": "这是属于波比的专属委托"
@@ -488,7 +488,7 @@
     },
     "icon": "xmwg_rw_pt4",
     "taskcd": 200,
-    "tasktime": 71,
+    "tasktime": 77,
     "tasktxt": {
       "key": "Entrustment details of Tiger",
       "text": "这是属于悍娇虎的专属委托"
@@ -536,7 +536,7 @@
     },
     "icon": "xmwg_rw_pt5",
     "taskcd": 200,
-    "tasktime": 74,
+    "tasktime": 158,
     "tasktxt": {
       "key": "Entrustment details of Shifu",
       "text": "这是属于师父的专属委托"
@@ -584,7 +584,7 @@
     },
     "icon": "xmwg_rw_pt6",
     "taskcd": 200,
-    "tasktime": 60,
+    "tasktime": 130,
     "tasktxt": {
       "key": "Entrustment details of Po",
       "text": "这是属于阿宝的专属委托"
@@ -632,7 +632,7 @@
     },
     "icon": "xmwg_rw_pt7",
     "taskcd": 200,
-    "tasktime": 129,
+    "tasktime": 158,
     "tasktxt": {
       "key": "Entrustment details of Bobi",
       "text": "这是属于波比的专属委托"
@@ -680,7 +680,7 @@
     },
     "icon": "xmwg_rw_pt1",
     "taskcd": 200,
-    "tasktime": 64,
+    "tasktime": 173,
     "tasktxt": {
       "key": "Entrustment details of Tiger",
       "text": "这是属于悍娇虎的专属委托"
@@ -728,7 +728,7 @@
     },
     "icon": "xmwg_rw_pt2",
     "taskcd": 200,
-    "tasktime": 166,
+    "tasktime": 130,
     "tasktxt": {
       "key": "Entrustment details of Shifu",
       "text": "这是属于师父的专属委托"
@@ -776,7 +776,7 @@
     },
     "icon": "xmwg_rw_pt3",
     "taskcd": 200,
-    "tasktime": 175,
+    "tasktime": 156,
     "tasktxt": {
       "key": "Entrustment details of Po",
       "text": "这是属于阿宝的专属委托"
@@ -824,7 +824,7 @@
     },
     "icon": "xmwg_rw_pt4",
     "taskcd": 200,
-    "tasktime": 98,
+    "tasktime": 116,
     "tasktxt": {
       "key": "Entrustment details of Bobi",
       "text": "这是属于波比的专属委托"
@@ -872,7 +872,7 @@
     },
     "icon": "xmwg_rw_pt5",
     "taskcd": 200,
-    "tasktime": 137,
+    "tasktime": 100,
     "tasktxt": {
       "key": "Entrustment details of Tiger",
       "text": "这是属于悍娇虎的专属委托"
@@ -920,7 +920,7 @@
     },
     "icon": "xmwg_rw_pt6",
     "taskcd": 200,
-    "tasktime": 178,
+    "tasktime": 109,
     "tasktxt": {
       "key": "Entrustment details of Shifu",
       "text": "这是属于师父的专属委托"
@@ -968,7 +968,7 @@
     },
     "icon": "xmwg_rw_pt7",
     "taskcd": 200,
-    "tasktime": 63,
+    "tasktime": 101,
     "tasktxt": {
       "key": "Entrustment details of Po",
       "text": "这是属于阿宝的专属委托"
@@ -1016,7 +1016,7 @@
     },
     "icon": "xmwg_rw_pt1",
     "taskcd": 200,
-    "tasktime": 120,
+    "tasktime": 108,
     "tasktxt": {
       "key": "Entrustment details of Bobi",
       "text": "这是属于波比的专属委托"
@@ -1064,7 +1064,7 @@
     },
     "icon": "xmwg_rw_pt2",
     "taskcd": 200,
-    "tasktime": 77,
+    "tasktime": 85,
     "tasktxt": {
       "key": "Entrustment details of Tiger",
       "text": "这是属于悍娇虎的专属委托"
@@ -1112,7 +1112,7 @@
     },
     "icon": "xmwg_rw_pt3",
     "taskcd": 200,
-    "tasktime": 155,
+    "tasktime": 120,
     "tasktxt": {
       "key": "Entrustment details of Shifu",
       "text": "这是属于师父的专属委托"
@@ -1160,7 +1160,7 @@
     },
     "icon": "xmwg_rw_pt4",
     "taskcd": 200,
-    "tasktime": 121,
+    "tasktime": 167,
     "tasktxt": {
       "key": "Entrustment details of Po",
       "text": "这是属于阿宝的专属委托"
@@ -1208,7 +1208,7 @@
     },
     "icon": "xmwg_rw_pt5",
     "taskcd": 200,
-    "tasktime": 156,
+    "tasktime": 96,
     "tasktxt": {
       "key": "Entrustment details of Bobi",
       "text": "这是属于波比的专属委托"
@@ -1256,7 +1256,7 @@
     },
     "icon": "xmwg_rw_pt6",
     "taskcd": 200,
-    "tasktime": 80,
+    "tasktime": 62,
     "tasktxt": {
       "key": "Entrustment details of Tiger",
       "text": "这是属于悍娇虎的专属委托"
@@ -1304,7 +1304,7 @@
     },
     "icon": "xmwg_rw_pt7",
     "taskcd": 200,
-    "tasktime": 179,
+    "tasktime": 90,
     "tasktxt": {
       "key": "Entrustment details of Shifu",
       "text": "这是属于师父的专属委托"
@@ -1352,7 +1352,7 @@
     },
     "icon": "xmwg_rw_pt1",
     "taskcd": 200,
-    "tasktime": 140,
+    "tasktime": 158,
     "tasktxt": {
       "key": "Entrustment details of Po",
       "text": "这是属于阿宝的专属委托"
@@ -1400,7 +1400,7 @@
     },
     "icon": "xmwg_rw_pt2",
     "taskcd": 200,
-    "tasktime": 88,
+    "tasktime": 67,
     "tasktxt": {
       "key": "Entrustment details of Bobi",
       "text": "这是属于波比的专属委托"
@@ -1448,7 +1448,7 @@
     },
     "icon": "xmwg_rw_pt3",
     "taskcd": 200,
-    "tasktime": 156,
+    "tasktime": 93,
     "tasktxt": {
       "key": "Entrustment details of Tiger",
       "text": "这是属于悍娇虎的专属委托"
@@ -1496,7 +1496,7 @@
     },
     "icon": "xmwg_rw_pt4",
     "taskcd": 200,
-    "tasktime": 144,
+    "tasktime": 87,
     "tasktxt": {
       "key": "Entrustment details of Shifu",
       "text": "这是属于师父的专属委托"
@@ -1544,7 +1544,7 @@
     },
     "icon": "xmwg_rw_pt5",
     "taskcd": 200,
-    "tasktime": 171,
+    "tasktime": 112,
     "tasktxt": {
       "key": "Entrustment details of Po",
       "text": "这是属于阿宝的专属委托"
@@ -1592,7 +1592,7 @@
     },
     "icon": "xmwg_rw_pt6",
     "taskcd": 200,
-    "tasktime": 73,
+    "tasktime": 89,
     "tasktxt": {
       "key": "Entrustment details of Bobi",
       "text": "这是属于波比的专属委托"
@@ -1640,7 +1640,7 @@
     },
     "icon": "xmwg_rw_pt7",
     "taskcd": 200,
-    "tasktime": 79,
+    "tasktime": 171,
     "tasktxt": {
       "key": "Entrustment details of Tiger",
       "text": "这是属于悍娇虎的专属委托"
@@ -1688,7 +1688,7 @@
     },
     "icon": "xmwg_rw_pt1",
     "taskcd": 200,
-    "tasktime": 147,
+    "tasktime": 126,
     "tasktxt": {
       "key": "Entrustment details of Shifu",
       "text": "这是属于师父的专属委托"
@@ -1736,7 +1736,7 @@
     },
     "icon": "xmwg_rw_pt2",
     "taskcd": 200,
-    "tasktime": 153,
+    "tasktime": 155,
     "tasktxt": {
       "key": "Entrustment details of Po",
       "text": "这是属于阿宝的专属委托"
@@ -1784,7 +1784,7 @@
     },
     "icon": "xmwg_rw_pt3",
     "taskcd": 200,
-    "tasktime": 162,
+    "tasktime": 148,
     "tasktxt": {
       "key": "Entrustment details of Bobi",
       "text": "这是属于波比的专属委托"
@@ -1832,7 +1832,7 @@
     },
     "icon": "xmwg_rw_pt4",
     "taskcd": 200,
-    "tasktime": 138,
+    "tasktime": 174,
     "tasktxt": {
       "key": "Entrustment details of Tiger",
       "text": "这是属于悍娇虎的专属委托"
@@ -1880,7 +1880,7 @@
     },
     "icon": "xmwg_rw_pt5",
     "taskcd": 200,
-    "tasktime": 131,
+    "tasktime": 97,
     "tasktxt": {
       "key": "Entrustment details of Shifu",
       "text": "这是属于师父的专属委托"
@@ -1928,7 +1928,7 @@
     },
     "icon": "xmwg_rw_pt6",
     "taskcd": 200,
-    "tasktime": 83,
+    "tasktime": 121,
     "tasktxt": {
       "key": "Entrustment details of Po",
       "text": "这是属于阿宝的专属委托"
@@ -1976,7 +1976,7 @@
     },
     "icon": "xmwg_rw_pt7",
     "taskcd": 200,
-    "tasktime": 60,
+    "tasktime": 103,
     "tasktxt": {
       "key": "Entrustment details of Bobi",
       "text": "这是属于波比的专属委托"
@@ -2024,7 +2024,7 @@
     },
     "icon": "xmwg_rw_pt1",
     "taskcd": 200,
-    "tasktime": 161,
+    "tasktime": 155,
     "tasktxt": {
       "key": "Entrustment details of Tiger",
       "text": "这是属于悍娇虎的专属委托"
@@ -2072,7 +2072,7 @@
     },
     "icon": "xmwg_rw_pt2",
     "taskcd": 200,
-    "tasktime": 63,
+    "tasktime": 73,
     "tasktxt": {
       "key": "Entrustment details of Shifu",
       "text": "这是属于师父的专属委托"
@@ -2120,7 +2120,7 @@
     },
     "icon": "xmwg_rw_pt3",
     "taskcd": 200,
-    "tasktime": 176,
+    "tasktime": 180,
     "tasktxt": {
       "key": "Entrustment details of Po",
       "text": "这是属于阿宝的专属委托"
@@ -2168,7 +2168,7 @@
     },
     "icon": "xmwg_rw_pt4",
     "taskcd": 200,
-    "tasktime": 69,
+    "tasktime": 168,
     "tasktxt": {
       "key": "Entrustment details of Bobi",
       "text": "这是属于波比的专属委托"
@@ -2216,7 +2216,7 @@
     },
     "icon": "xmwg_rw_pt5",
     "taskcd": 200,
-    "tasktime": 103,
+    "tasktime": 146,
     "tasktxt": {
       "key": "Entrustment details of Tiger",
       "text": "这是属于悍娇虎的专属委托"
@@ -2264,7 +2264,7 @@
     },
     "icon": "xmwg_rw_pt6",
     "taskcd": 200,
-    "tasktime": 97,
+    "tasktime": 86,
     "tasktxt": {
       "key": "Entrustment details of Shifu",
       "text": "这是属于师父的专属委托"
@@ -2312,7 +2312,7 @@
     },
     "icon": "xmwg_rw_pt7",
     "taskcd": 200,
-    "tasktime": 157,
+    "tasktime": 126,
     "tasktxt": {
       "key": "Entrustment details of Po",
       "text": "这是属于阿宝的专属委托"
@@ -2360,7 +2360,7 @@
     },
     "icon": "xmwg_rw_pt1",
     "taskcd": 200,
-    "tasktime": 142,
+    "tasktime": 103,
     "tasktxt": {
       "key": "Entrustment details of Bobi",
       "text": "这是属于波比的专属委托"
@@ -2408,7 +2408,7 @@
     },
     "icon": "xmwg_rw_pt2",
     "taskcd": 200,
-    "tasktime": 167,
+    "tasktime": 73,
     "tasktxt": {
       "key": "Entrustment details of Tiger",
       "text": "这是属于悍娇虎的专属委托"
@@ -2456,7 +2456,7 @@
     },
     "icon": "xmwg_rw_pt3",
     "taskcd": 200,
-    "tasktime": 171,
+    "tasktime": 99,
     "tasktxt": {
       "key": "Entrustment details of Shifu",
       "text": "这是属于师父的专属委托"
@@ -2504,7 +2504,7 @@
     },
     "icon": "xmwg_rw_pt4",
     "taskcd": 200,
-    "tasktime": 157,
+    "tasktime": 121,
     "tasktxt": {
       "key": "Entrustment details of Po",
       "text": "这是属于阿宝的专属委托"
@@ -2552,7 +2552,7 @@
     },
     "icon": "xmwg_rw_pt5",
     "taskcd": 200,
-    "tasktime": 104,
+    "tasktime": 172,
     "tasktxt": {
       "key": "Entrustment details of Bobi",
       "text": "这是属于波比的专属委托"
@@ -2600,7 +2600,7 @@
     },
     "icon": "xmwg_rw_pt6",
     "taskcd": 200,
-    "tasktime": 83,
+    "tasktime": 146,
     "tasktxt": {
       "key": "Entrustment details of Tiger",
       "text": "这是属于悍娇虎的专属委托"
@@ -2648,7 +2648,7 @@
     },
     "icon": "xmwg_rw_pt7",
     "taskcd": 200,
-    "tasktime": 147,
+    "tasktime": 173,
     "tasktxt": {
       "key": "Entrustment details of Shifu",
       "text": "这是属于师父的专属委托"
@@ -2696,7 +2696,7 @@
     },
     "icon": "xmwg_rw_pt1",
     "taskcd": 200,
-    "tasktime": 85,
+    "tasktime": 173,
     "tasktxt": {
       "key": "Entrustment details of Po",
       "text": "这是属于阿宝的专属委托"
@@ -2744,7 +2744,7 @@
     },
     "icon": "xmwg_rw_pt2",
     "taskcd": 200,
-    "tasktime": 179,
+    "tasktime": 160,
     "tasktxt": {
       "key": "Entrustment details of Bobi",
       "text": "这是属于波比的专属委托"
@@ -2792,7 +2792,7 @@
     },
     "icon": "xmwg_rw_pt3",
     "taskcd": 200,
-    "tasktime": 107,
+    "tasktime": 99,
     "tasktxt": {
       "key": "Entrustment details of Tiger",
       "text": "这是属于悍娇虎的专属委托"
@@ -2840,7 +2840,7 @@
     },
     "icon": "xmwg_rw_pt4",
     "taskcd": 200,
-    "tasktime": 158,
+    "tasktime": 139,
     "tasktxt": {
       "key": "Entrustment details of Shifu",
       "text": "这是属于师父的专属委托"
@@ -2888,7 +2888,7 @@
     },
     "icon": "xmwg_rw_pt5",
     "taskcd": 200,
-    "tasktime": 169,
+    "tasktime": 81,
     "tasktxt": {
       "key": "Entrustment details of Po",
       "text": "这是属于阿宝的专属委托"
@@ -2936,7 +2936,7 @@
     },
     "icon": "xmwg_rw_pt6",
     "taskcd": 200,
-    "tasktime": 132,
+    "tasktime": 173,
     "tasktxt": {
       "key": "Entrustment details of Bobi",
       "text": "这是属于波比的专属委托"
@@ -2984,7 +2984,7 @@
     },
     "icon": "xmwg_rw_pt7",
     "taskcd": 200,
-    "tasktime": 64,
+    "tasktime": 135,
     "tasktxt": {
       "key": "Entrustment details of Tiger",
       "text": "这是属于悍娇虎的专属委托"
@@ -3080,7 +3080,7 @@
     },
     "icon": "xmwg_rw_pt2",
     "taskcd": 200,
-    "tasktime": 152,
+    "tasktime": 84,
     "tasktxt": {
       "key": "Entrustment details of Po",
       "text": "这是属于阿宝的专属委托"
@@ -3128,7 +3128,7 @@
     },
     "icon": "xmwg_rw_pt3",
     "taskcd": 200,
-    "tasktime": 112,
+    "tasktime": 94,
     "tasktxt": {
       "key": "Entrustment details of Bobi",
       "text": "这是属于波比的专属委托"
@@ -3176,7 +3176,7 @@
     },
     "icon": "xmwg_rw_pt4",
     "taskcd": 200,
-    "tasktime": 76,
+    "tasktime": 96,
     "tasktxt": {
       "key": "Entrustment details of Tiger",
       "text": "这是属于悍娇虎的专属委托"
@@ -3224,7 +3224,7 @@
     },
     "icon": "xmwg_rw_pt5",
     "taskcd": 200,
-    "tasktime": 127,
+    "tasktime": 68,
     "tasktxt": {
       "key": "Entrustment details of Shifu",
       "text": "这是属于师父的专属委托"
@@ -3272,7 +3272,7 @@
     },
     "icon": "xmwg_rw_pt6",
     "taskcd": 200,
-    "tasktime": 162,
+    "tasktime": 161,
     "tasktxt": {
       "key": "Entrustment details of Po",
       "text": "这是属于阿宝的专属委托"
@@ -3320,7 +3320,7 @@
     },
     "icon": "xmwg_rw_pt7",
     "taskcd": 200,
-    "tasktime": 157,
+    "tasktime": 151,
     "tasktxt": {
       "key": "Entrustment details of Bobi",
       "text": "这是属于波比的专属委托"
@@ -3368,7 +3368,7 @@
     },
     "icon": "xmwg_rw_pt1",
     "taskcd": 200,
-    "tasktime": 133,
+    "tasktime": 177,
     "tasktxt": {
       "key": "Entrustment details of Tiger",
       "text": "这是属于悍娇虎的专属委托"
@@ -3416,7 +3416,7 @@
     },
     "icon": "xmwg_rw_pt2",
     "taskcd": 200,
-    "tasktime": 142,
+    "tasktime": 169,
     "tasktxt": {
       "key": "Entrustment details of Shifu",
       "text": "这是属于师父的专属委托"
@@ -3464,7 +3464,7 @@
     },
     "icon": "xmwg_rw_pt3",
     "taskcd": 200,
-    "tasktime": 116,
+    "tasktime": 104,
     "tasktxt": {
       "key": "Entrustment details of Po",
       "text": "这是属于阿宝的专属委托"
@@ -3512,7 +3512,7 @@
     },
     "icon": "xmwg_rw_pt4",
     "taskcd": 200,
-    "tasktime": 155,
+    "tasktime": 123,
     "tasktxt": {
       "key": "Entrustment details of Bobi",
       "text": "这是属于波比的专属委托"

bin/json/game_drop.json

@@ -2386,7 +2386,7 @@
     "prize": [
       {
         "a": "item",
-        "t": "513001",
+        "t": "524004",
         "n": 100
       }
     ],
@@ -2400,7 +2400,7 @@
     "prize": [
       {
         "a": "item",
-        "t": "513002",
+        "t": "525001",
         "n": 100
       }
     ],
@@ -2414,7 +2414,7 @@
     "prize": [
       {
         "a": "item",
-        "t": "513003",
+        "t": "525004",
         "n": 100
       }
     ],
@@ -2428,7 +2428,7 @@
     "prize": [
       {
         "a": "item",
-        "t": "513004",
+        "t": "524008",
         "n": 100
       }
     ],
@@ -2442,7 +2442,7 @@
     "prize": [
       {
         "a": "item",
-        "t": "513005",
+        "t": "524003",
         "n": 100
       }
     ],
@@ -2456,7 +2456,7 @@
     "prize": [
       {
         "a": "item",
-        "t": "514001",
+        "t": "515005",
         "n": 100
       }
     ],
@@ -2470,7 +2470,7 @@
     "prize": [
       {
         "a": "item",
-        "t": "514002",
+        "t": "514001",
         "n": 100
       }
     ],
@@ -2498,7 +2498,7 @@
     "prize": [
       {
         "a": "item",
-        "t": "514004",
+        "t": "534006",
         "n": 100
       }
     ],
@@ -2512,7 +2512,7 @@
     "prize": [
       {
         "a": "item",
-        "t": "514005",
+        "t": "534002",
         "n": 100
       }
     ],
@@ -2526,7 +2526,7 @@
     "prize": [
       {
         "a": "item",
-        "t": "514006",
+        "t": "524002",
         "n": 100
       }
     ],
@@ -2540,7 +2540,7 @@
     "prize": [
       {
         "a": "item",
-        "t": "514007",
+        "t": "535001",
         "n": 100
       }
     ],
@@ -2554,7 +2554,7 @@
     "prize": [
       {
         "a": "item",
-        "t": "515001",
+        "t": "515004",
         "n": 100
       }
     ],
@@ -2568,7 +2568,7 @@
     "prize": [
       {
         "a": "item",
-        "t": "515002",
+        "t": "544005",
         "n": 100
       }
     ],
@@ -2579,706 +2579,6 @@
     "id": 185,
     "dropid": 1000001,
     "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "515003",
-        "n": 100
-      }
-    ],
-    "star": 1,
-    "p": 1000
-  },
-  {
-    "id": 186,
-    "dropid": 1000001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "515004",
-        "n": 100
-      }
-    ],
-    "star": 1,
-    "p": 1000
-  },
-  {
-    "id": 187,
-    "dropid": 1000001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "523001",
-        "n": 100
-      }
-    ],
-    "star": 1,
-    "p": 1000
-  },
-  {
-    "id": 188,
-    "dropid": 1000001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "523002",
-        "n": 100
-      }
-    ],
-    "star": 1,
-    "p": 1000
-  },
-  {
-    "id": 189,
-    "dropid": 1000001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "523003",
-        "n": 100
-      }
-    ],
-    "star": 1,
-    "p": 1000
-  },
-  {
-    "id": 190,
-    "dropid": 1000001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "523004",
-        "n": 100
-      }
-    ],
-    "star": 1,
-    "p": 1000
-  },
-  {
-    "id": 191,
-    "dropid": 1000001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "524001",
-        "n": 100
-      }
-    ],
-    "star": 1,
-    "p": 1000
-  },
-  {
-    "id": 192,
-    "dropid": 1000001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "524002",
-        "n": 100
-      }
-    ],
-    "star": 1,
-    "p": 1000
-  },
-  {
-    "id": 193,
-    "dropid": 1000001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "524003",
-        "n": 100
-      }
-    ],
-    "star": 1,
-    "p": 1000
-  },
-  {
-    "id": 194,
-    "dropid": 1000001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "524004",
-        "n": 100
-      }
-    ],
-    "star": 1,
-    "p": 1000
-  },
-  {
-    "id": 195,
-    "dropid": 1000001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "524005",
-        "n": 100
-      }
-    ],
-    "star": 1,
-    "p": 1000
-  },
-  {
-    "id": 196,
-    "dropid": 1000001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "524006",
-        "n": 100
-      }
-    ],
-    "star": 1,
-    "p": 1000
-  },
-  {
-    "id": 197,
-    "dropid": 1000001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "524007",
-        "n": 100
-      }
-    ],
-    "star": 1,
-    "p": 1000
-  },
-  {
-    "id": 198,
-    "dropid": 1000001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "524008",
-        "n": 100
-      }
-    ],
-    "star": 1,
-    "p": 1000
-  },
-  {
-    "id": 199,
-    "dropid": 1000001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "524009",
-        "n": 100
-      }
-    ],
-    "star": 1,
-    "p": 1000
-  },
-  {
-    "id": 200,
-    "dropid": 1000001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "525001",
-        "n": 100
-      }
-    ],
-    "star": 1,
-    "p": 1000
-  },
-  {
-    "id": 201,
-    "dropid": 1000001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "525002",
-        "n": 100
-      }
-    ],
-    "star": 1,
-    "p": 1000
-  },
-  {
-    "id": 202,
-    "dropid": 1000001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "525003",
-        "n": 100
-      }
-    ],
-    "star": 1,
-    "p": 1000
-  },
-  {
-    "id": 203,
-    "dropid": 1000001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "525004",
-        "n": 100
-      }
-    ],
-    "star": 1,
-    "p": 1000
-  },
-  {
-    "id": 204,
-    "dropid": 1000001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "533001",
-        "n": 100
-      }
-    ],
-    "star": 1,
-    "p": 1000
-  },
-  {
-    "id": 205,
-    "dropid": 1000001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "533002",
-        "n": 100
-      }
-    ],
-    "star": 1,
-    "p": 1000
-  },
-  {
-    "id": 206,
-    "dropid": 1000001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "533003",
-        "n": 100
-      }
-    ],
-    "star": 1,
-    "p": 1000
-  },
-  {
-    "id": 207,
-    "dropid": 1000001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "533004",
-        "n": 100
-      }
-    ],
-    "star": 1,
-    "p": 1000
-  },
-  {
-    "id": 208,
-    "dropid": 1000001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "533005",
-        "n": 100
-      }
-    ],
-    "star": 1,
-    "p": 1000
-  },
-  {
-    "id": 209,
-    "dropid": 1000001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "533006",
-        "n": 100
-      }
-    ],
-    "star": 1,
-    "p": 1000
-  },
-  {
-    "id": 210,
-    "dropid": 1000001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "534001",
-        "n": 100
-      }
-    ],
-    "star": 1,
-    "p": 1000
-  },
-  {
-    "id": 211,
-    "dropid": 1000001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "534002",
-        "n": 100
-      }
-    ],
-    "star": 1,
-    "p": 1000
-  },
-  {
-    "id": 212,
-    "dropid": 1000001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "534003",
-        "n": 100
-      }
-    ],
-    "star": 1,
-    "p": 1000
-  },
-  {
-    "id": 213,
-    "dropid": 1000001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "534004",
-        "n": 100
-      }
-    ],
-    "star": 1,
-    "p": 1000
-  },
-  {
-    "id": 214,
-    "dropid": 1000001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "534005",
-        "n": 100
-      }
-    ],
-    "star": 1,
-    "p": 1000
-  },
-  {
-    "id": 215,
-    "dropid": 1000001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "534006",
-        "n": 100
-      }
-    ],
-    "star": 1,
-    "p": 1000
-  },
-  {
-    "id": 216,
-    "dropid": 1000001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "534007",
-        "n": 100
-      }
-    ],
-    "star": 1,
-    "p": 1000
-  },
-  {
-    "id": 217,
-    "dropid": 1000001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "534008",
-        "n": 100
-      }
-    ],
-    "star": 1,
-    "p": 1000
-  },
-  {
-    "id": 218,
-    "dropid": 1000001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "535001",
-        "n": 100
-      }
-    ],
-    "star": 1,
-    "p": 1000
-  },
-  {
-    "id": 219,
-    "dropid": 1000001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "535002",
-        "n": 100
-      }
-    ],
-    "star": 1,
-    "p": 1000
-  },
-  {
-    "id": 220,
-    "dropid": 1000001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "535003",
-        "n": 100
-      }
-    ],
-    "star": 1,
-    "p": 1000
-  },
-  {
-    "id": 221,
-    "dropid": 1000001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "535004",
-        "n": 100
-      }
-    ],
-    "star": 1,
-    "p": 1000
-  },
-  {
-    "id": 222,
-    "dropid": 1000001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "535005",
-        "n": 100
-      }
-    ],
-    "star": 1,
-    "p": 1000
-  },
-  {
-    "id": 223,
-    "dropid": 1000001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "535006",
-        "n": 100
-      }
-    ],
-    "star": 1,
-    "p": 1000
-  },
-  {
-    "id": 224,
-    "dropid": 1000001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "543001",
-        "n": 100
-      }
-    ],
-    "star": 1,
-    "p": 1000
-  },
-  {
-    "id": 225,
-    "dropid": 1000001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "543002",
-        "n": 100
-      }
-    ],
-    "star": 1,
-    "p": 1000
-  },
-  {
-    "id": 226,
-    "dropid": 1000001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "543003",
-        "n": 100
-      }
-    ],
-    "star": 1,
-    "p": 1000
-  },
-  {
-    "id": 227,
-    "dropid": 1000001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "543004",
-        "n": 100
-      }
-    ],
-    "star": 1,
-    "p": 1000
-  },
-  {
-    "id": 228,
-    "dropid": 1000001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "543005",
-        "n": 100
-      }
-    ],
-    "star": 1,
-    "p": 1000
-  },
-  {
-    "id": 229,
-    "dropid": 1000001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "543006",
-        "n": 100
-      }
-    ],
-    "star": 1,
-    "p": 1000
-  },
-  {
-    "id": 230,
-    "dropid": 1000001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "543007",
-        "n": 100
-      }
-    ],
-    "star": 1,
-    "p": 1000
-  },
-  {
-    "id": 231,
-    "dropid": 1000001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "544001",
-        "n": 100
-      }
-    ],
-    "star": 1,
-    "p": 1000
-  },
-  {
-    "id": 232,
-    "dropid": 1000001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "544002",
-        "n": 100
-      }
-    ],
-    "star": 1,
-    "p": 1000
-  },
-  {
-    "id": 233,
-    "dropid": 1000001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "544003",
-        "n": 100
-      }
-    ],
-    "star": 1,
-    "p": 1000
-  },
-  {
-    "id": 234,
-    "dropid": 1000001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "544004",
-        "n": 100
-      }
-    ],
-    "star": 1,
-    "p": 1000
-  },
-  {
-    "id": 235,
-    "dropid": 1000001,
-    "condition": 0,
     "prize": [
       {
         "a": "item",
@@ -3288,89 +2588,5 @@
     ],
     "star": 1,
     "p": 1000
-  },
-  {
-    "id": 236,
-    "dropid": 1000001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "545001",
-        "n": 100
-      }
-    ],
-    "star": 1,
-    "p": 1000
-  },
-  {
-    "id": 237,
-    "dropid": 1000001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "545002",
-        "n": 100
-      }
-    ],
-    "star": 1,
-    "p": 1000
-  },
-  {
-    "id": 238,
-    "dropid": 1000001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "545003",
-        "n": 100
-      }
-    ],
-    "star": 1,
-    "p": 1000
-  },
-  {
-    "id": 239,
-    "dropid": 1000001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "545004",
-        "n": 100
-      }
-    ],
-    "star": 1,
-    "p": 1000
-  },
-  {
-    "id": 240,
-    "dropid": 1000001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "544005",
-        "n": 100
-      }
-    ],
-    "star": 1,
-    "p": 1000
-  },
-  {
-    "id": 241,
-    "dropid": 1000001,
-    "condition": 0,
-    "prize": [
-      {
-        "a": "item",
-        "t": "515005",
-        "n": 100
-      }
-    ],
-    "star": 1,
-    "p": 1000
   }
 ]

bin/json/game_global.json

@@ -612,7 +612,7 @@
       }
     ],
     "dispatch_weektaskcheck": 7,
-    "pandamas_challenge_cd": 3600,
+    "pandamas_challenge_cd": 600,
     "pandamas_challenge_num": 3,
     "pandamas_fight_num": 3,
     "pandamas_RankAbove50": 50,

bin/json/game_hero.json

@@ -5251,7 +5251,7 @@
     "hid": "44006",
     "name": {
       "key": "hero_44006",
-      "text": "瓦希尔指挥官"
+      "text": "悍娇虎"
     },
     "star": 4,
     "color": 3,

bin/json/game_herolevelgrow.json

@@ -1479,9 +1479,9 @@
     "cridam": 1500,
     "effhit": 0,
     "effre": 200,
-    "hpgrow": 1000,
+    "hpgrow": 2000,
     "atkgrow": 1300,
-    "defgrow": 1250,
+    "defgrow": 2000,
     "speedgrow": 0
   },
   {
@@ -1494,9 +1494,9 @@
     "cridam": 1500,
     "effhit": 0,
     "effre": 200,
-    "hpgrow": 1000,
+    "hpgrow": 2000,
     "atkgrow": 1300,
-    "defgrow": 1250,
+    "defgrow": 1500,
     "speedgrow": 0
   },
   {
@@ -1509,9 +1509,9 @@
     "cridam": 1500,
     "effhit": 0,
     "effre": 200,
-    "hpgrow": 1100,
+    "hpgrow": 2250,
     "atkgrow": 1300,
-    "defgrow": 1150,
+    "defgrow": 1500,
     "speedgrow": 0
   },
   {
@@ -1524,9 +1524,9 @@
     "cridam": 1500,
     "effhit": 0,
     "effre": 200,
-    "hpgrow": 1150,
+    "hpgrow": 2000,
-    "atkgrow": 1100,
+    "atkgrow": 1300,
-    "defgrow": 1300,
+    "defgrow": 2000,
     "speedgrow": 0
   },
   {
@@ -1539,9 +1539,9 @@
     "cridam": 1500,
     "effhit": 0,
     "effre": 200,
-    "hpgrow": 1250,
+    "hpgrow": 2000,
-    "atkgrow": 1000,
+    "atkgrow": 1300,
-    "defgrow": 1250,
+    "defgrow": 1500,
     "speedgrow": 0
   },
   {
@@ -1554,9 +1554,9 @@
     "cridam": 1500,
     "effhit": 0,
     "effre": 200,
-    "hpgrow": 1000,
+    "hpgrow": 2250,
     "atkgrow": 1300,
-    "defgrow": 1250,
+    "defgrow": 1500,
     "speedgrow": 0
   },
   {

bin/json/game_herolevelup.json

@@ -418,5 +418,978 @@
     "hp": 13511.4,
     "atk": 1125,
     "def": 1228
+  },
+  {
+    "level": 61,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 62,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 63,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 64,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 65,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 66,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 67,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 68,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 69,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 70,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 71,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 72,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 73,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 74,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 75,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 76,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 77,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 78,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 79,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 80,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 81,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 82,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 83,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 84,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 85,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 86,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 87,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 88,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 89,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 90,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 91,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 92,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 93,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 94,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 95,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 96,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 97,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 98,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 99,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 100,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 101,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 102,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 103,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 104,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 105,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 106,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 107,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 108,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 109,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 110,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 111,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 112,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 113,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 114,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 115,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 116,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 117,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 118,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 119,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 120,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 121,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 122,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 123,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 124,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 125,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 126,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 127,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 128,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 129,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 130,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 131,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 132,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 133,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 134,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 135,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 136,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 137,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 138,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 139,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 140,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 141,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 142,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 143,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 144,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 145,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 146,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 147,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 148,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 149,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 150,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 151,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 152,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 153,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 154,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 155,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 156,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 157,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 158,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 159,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 160,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 161,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 162,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 163,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 164,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 165,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 166,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 167,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 168,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 169,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 170,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 171,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 172,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 173,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 174,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 175,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 176,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 177,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 178,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 179,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 180,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 181,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 182,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 183,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 184,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 185,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 186,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 187,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 188,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 189,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 190,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 191,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 192,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 193,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 194,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 195,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 196,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 197,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 198,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
+  },
+  {
+    "level": 199,
+    "heroexp": 0,
+    "hp": 13511.4,
+    "atk": 1125,
+    "def": 1228
   }
 ]

bin/json/game_initial.json

@@ -99,6 +99,16 @@
       }
     ]
   },
+  {
+    "index": "146",
+    "var": [
+      {
+        "a": "item",
+        "t": "100004",
+        "n": 10
+      }
+    ]
+  },
   {
     "index": "165",
     "var": [
@@ -1608,5 +1618,245 @@
         "n": 10
       }
     ]
+  },
+  {
+    "index": "328",
+    "var": [
+      {
+        "a": "item",
+        "t": "14010101",
+        "n": 10
+      }
+    ]
+  },
+  {
+    "index": "329",
+    "var": [
+      {
+        "a": "item",
+        "t": "14010102",
+        "n": 11
+      }
+    ]
+  },
+  {
+    "index": "330",
+    "var": [
+      {
+        "a": "item",
+        "t": "14010203",
+        "n": 12
+      }
+    ]
+  },
+  {
+    "index": "331",
+    "var": [
+      {
+        "a": "item",
+        "t": "14010204",
+        "n": 13
+      }
+    ]
+  },
+  {
+    "index": "332",
+    "var": [
+      {
+        "a": "item",
+        "t": "14010305",
+        "n": 14
+      }
+    ]
+  },
+  {
+    "index": "333",
+    "var": [
+      {
+        "a": "item",
+        "t": "14010306",
+        "n": 15
+      }
+    ]
+  },
+  {
+    "index": "334",
+    "var": [
+      {
+        "a": "item",
+        "t": "14010407",
+        "n": 16
+      }
+    ]
+  },
+  {
+    "index": "335",
+    "var": [
+      {
+        "a": "item",
+        "t": "14010408",
+        "n": 17
+      }
+    ]
+  },
+  {
+    "index": "336",
+    "var": [
+      {
+        "a": "item",
+        "t": "14020101",
+        "n": 18
+      }
+    ]
+  },
+  {
+    "index": "337",
+    "var": [
+      {
+        "a": "item",
+        "t": "14020102",
+        "n": 19
+      }
+    ]
+  },
+  {
+    "index": "338",
+    "var": [
+      {
+        "a": "item",
+        "t": "14020203",
+        "n": 20
+      }
+    ]
+  },
+  {
+    "index": "339",
+    "var": [
+      {
+        "a": "item",
+        "t": "14020204",
+        "n": 21
+      }
+    ]
+  },
+  {
+    "index": "340",
+    "var": [
+      {
+        "a": "item",
+        "t": "14020305",
+        "n": 22
+      }
+    ]
+  },
+  {
+    "index": "341",
+    "var": [
+      {
+        "a": "item",
+        "t": "14020306",
+        "n": 23
+      }
+    ]
+  },
+  {
+    "index": "342",
+    "var": [
+      {
+        "a": "item",
+        "t": "14020407",
+        "n": 24
+      }
+    ]
+  },
+  {
+    "index": "343",
+    "var": [
+      {
+        "a": "item",
+        "t": "14020408",
+        "n": 25
+      }
+    ]
+  },
+  {
+    "index": "344",
+    "var": [
+      {
+        "a": "item",
+        "t": "14030101",
+        "n": 26
+      }
+    ]
+  },
+  {
+    "index": "345",
+    "var": [
+      {
+        "a": "item",
+        "t": "14030102",
+        "n": 27
+      }
+    ]
+  },
+  {
+    "index": "346",
+    "var": [
+      {
+        "a": "item",
+        "t": "14030203",
+        "n": 28
+      }
+    ]
+  },
+  {
+    "index": "347",
+    "var": [
+      {
+        "a": "item",
+        "t": "14030204",
+        "n": 29
+      }
+    ]
+  },
+  {
+    "index": "348",
+    "var": [
+      {
+        "a": "item",
+        "t": "14030305",
+        "n": 30
+      }
+    ]
+  },
+  {
+    "index": "349",
+    "var": [
+      {
+        "a": "item",
+        "t": "14030306",
+        "n": 31
+      }
+    ]
+  },
+  {
+    "index": "350",
+    "var": [
+      {
+        "a": "item",
+        "t": "14030407",
+        "n": 32
+      }
+    ]
+  },
+  {
+    "index": "351",
+    "var": [
+      {
+        "a": "item",
+        "t": "14030408",
+        "n": 33
+      }
+    ]
   }
 ]

bin/json/game_item.json

@@ -791,7 +791,7 @@
     "id": "90001",
     "name": {
       "key": "itemname_90001",
-      "text": "阿宝星辉"
+      "text": "阿宝星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -828,7 +828,7 @@
     "id": "90002",
     "name": {
       "key": "itemname_90002",
-      "text": "波比星辉"
+      "text": "波比星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -865,7 +865,7 @@
     "id": "90003",
     "name": {
       "key": "itemname_90003",
-      "text": "小伊星辉"
+      "text": "小伊星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -2330,7 +2330,7 @@
     "id": "513001",
     "name": {
       "key": "itemdesc_513001",
-      "text": "闪闪星辉"
+      "text": "闪闪星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -2367,7 +2367,7 @@
     "id": "513002",
     "name": {
       "key": "itemdesc_513002",
-      "text": "食人鱼先生星辉"
+      "text": "食人鱼先生星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -2404,7 +2404,7 @@
     "id": "513003",
     "name": {
       "key": "itemdesc_513003",
-      "text": "啊啊星辉"
+      "text": "啊啊星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -2441,7 +2441,7 @@
     "id": "513004",
     "name": {
       "key": "itemdesc_513004",
-      "text": "法夸德勋爵星辉"
+      "text": "法夸德勋爵星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -2478,7 +2478,7 @@
     "id": "513005",
     "name": {
       "key": "itemdesc_513005",
-      "text": "大大星辉"
+      "text": "大大星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -2515,7 +2515,7 @@
     "id": "514001",
     "name": {
       "key": "itemdesc_514001",
-      "text": "史图依克星辉"
+      "text": "史图依克星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -2552,7 +2552,7 @@
     "id": "514002",
     "name": {
       "key": "itemdesc_514002",
-      "text": "大龙星辉"
+      "text": "大龙星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -2589,7 +2589,7 @@
     "id": "514003",
     "name": {
       "key": "itemdesc_514003",
-      "text": "亚丝翠星辉"
+      "text": "亚丝翠星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -2626,7 +2626,7 @@
     "id": "514004",
     "name": {
       "key": "itemdesc_514004",
-      "text": "克莱尔·努涅斯星辉"
+      "text": "克莱尔·努涅斯星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -2663,7 +2663,7 @@
     "id": "514005",
     "name": {
       "key": "itemdesc_514005",
-      "text": "鹤大师星辉"
+      "text": "鹤大师星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -2700,7 +2700,7 @@
     "id": "514006",
     "name": {
       "key": "itemdesc_514006",
-      "text": "布兰奇星辉"
+      "text": "布兰奇星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -2737,7 +2737,7 @@
     "id": "514007",
     "name": {
       "key": "itemdesc_514007",
-      "text": "格里斯特王子星辉"
+      "text": "格里斯特王子星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -2774,7 +2774,7 @@
     "id": "515001",
     "name": {
       "key": "itemdesc_515001",
-      "text": "吉姆·莱克星辉"
+      "text": "吉姆·莱克星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -2811,7 +2811,7 @@
     "id": "515002",
     "name": {
       "key": "itemdesc_515002",
-      "text": "船长星辉"
+      "text": "船长星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -2848,7 +2848,7 @@
     "id": "515003",
     "name": {
       "key": "itemdesc_515003",
-      "text": "希沙窦斯星辉"
+      "text": "希沙窦斯星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -2885,7 +2885,7 @@
     "id": "515004",
     "name": {
       "key": "itemdesc_515004",
-      "text": "小欧星辉"
+      "text": "小欧星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -2922,7 +2922,7 @@
     "id": "523001",
     "name": {
       "key": "itemdesc_523001",
-      "text": "斯梅克船长星辉"
+      "text": "斯梅克船长星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -2959,7 +2959,7 @@
     "id": "523002",
     "name": {
       "key": "itemdesc_523002",
-      "text": "警卫队长星辉"
+      "text": "警卫队长星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -2996,7 +2996,7 @@
     "id": "523003",
     "name": {
       "key": "itemdesc_523003",
-      "text": "泰德·邓普顿星辉"
+      "text": "泰德·邓普顿星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -3033,7 +3033,7 @@
     "id": "523004",
     "name": {
       "key": "itemdesc_523004",
-      "text": "吉姆·普雷斯科特星辉"
+      "text": "吉姆·普雷斯科特星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -3070,7 +3070,7 @@
     "id": "524001",
     "name": {
       "key": "itemdesc_524001",
-      "text": "警长星辉"
+      "text": "警长星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -3107,7 +3107,7 @@
     "id": "524002",
     "name": {
       "key": "itemdesc_524002",
-      "text": "牙仙星辉"
+      "text": "牙仙星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -3144,7 +3144,7 @@
     "id": "524003",
     "name": {
       "key": "itemdesc_524003",
-      "text": "睡神沙人星辉"
+      "text": "睡神沙人星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -3181,7 +3181,7 @@
     "id": "524004",
     "name": {
       "key": "itemdesc_524004",
-      "text": "邦尼兔星辉"
+      "text": "邦尼兔星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -3218,7 +3218,7 @@
     "id": "524005",
     "name": {
       "key": "itemdesc_524005",
-      "text": "金猴星辉"
+      "text": "金猴星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -3255,7 +3255,7 @@
     "id": "524006",
     "name": {
       "key": "itemdesc_524006",
-      "text": "凯尔星辉"
+      "text": "凯尔星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -3292,7 +3292,7 @@
     "id": "524007",
     "name": {
       "key": "itemdesc_524007",
-      "text": "小钱星辉"
+      "text": "小钱星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -3329,7 +3329,7 @@
     "id": "524008",
     "name": {
       "key": "itemdesc_524008",
-      "text": "暴芙那特星辉"
+      "text": "暴芙那特星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -3366,7 +3366,7 @@
     "id": "524009",
     "name": {
       "key": "itemdesc_524009",
-      "text": "云朵先生星辉"
+      "text": "云朵先生星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -3403,7 +3403,7 @@
     "id": "525001",
     "name": {
       "key": "itemdesc_525001",
-      "text": "阿宝星辉"
+      "text": "阿宝星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -3440,7 +3440,7 @@
     "id": "525002",
     "name": {
       "key": "itemdesc_525002",
-      "text": "沃尔夫先生星辉"
+      "text": "沃尔夫先生星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -3477,7 +3477,7 @@
     "id": "525003",
     "name": {
       "key": "itemdesc_525003",
-      "text": "羊仙姑星辉"
+      "text": "羊仙姑星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -3514,7 +3514,7 @@
     "id": "525004",
     "name": {
       "key": "itemdesc_525004",
-      "text": "波比星辉"
+      "text": "波比星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -3551,7 +3551,7 @@
     "id": "533001",
     "name": {
       "key": "itemdesc_533001",
-      "text": "巫嘎星辉"
+      "text": "巫嘎星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -3588,7 +3588,7 @@
     "id": "533002",
     "name": {
       "key": "itemdesc_533002",
-      "text": "坦克星辉"
+      "text": "坦克星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -3625,7 +3625,7 @@
     "id": "533003",
     "name": {
       "key": "itemdesc_533003",
-      "text": "胡德先生星辉"
+      "text": "胡德先生星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -3662,7 +3662,7 @@
     "id": "533004",
     "name": {
       "key": "itemdesc_533004",
-      "text": "普鲁格兰杰星辉"
+      "text": "普鲁格兰杰星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -3699,7 +3699,7 @@
     "id": "533005",
     "name": {
       "key": "itemdesc_533005",
-      "text": "鼻涕粗星辉"
+      "text": "鼻涕粗星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -3736,7 +3736,7 @@
     "id": "533006",
     "name": {
       "key": "itemdesc_533006",
-      "text": "珍妮丝·邓普顿星辉"
+      "text": "珍妮丝·邓普顿星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -3773,7 +3773,7 @@
     "id": "534001",
     "name": {
       "key": "itemdesc_534001",
-      "text": "贫嘴驴星辉"
+      "text": "贫嘴驴星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -3810,7 +3810,7 @@
     "id": "534002",
     "name": {
       "key": "itemdesc_534002",
-      "text": "蒂姆·邓普顿星辉"
+      "text": "蒂姆·邓普顿星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -3847,7 +3847,7 @@
     "id": "534003",
     "name": {
       "key": "itemdesc_534003",
-      "text": "圣诞老人星辉"
+      "text": "圣诞老人星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -3884,7 +3884,7 @@
     "id": "534004",
     "name": {
       "key": "itemdesc_534004",
-      "text": "瓜哥星辉"
+      "text": "瓜哥星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -3921,7 +3921,7 @@
     "id": "534005",
     "name": {
       "key": "itemdesc_534005",
-      "text": "沃尔特·史翠克勒星辉"
+      "text": "沃尔特·史翠克勒星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -3958,7 +3958,7 @@
     "id": "534006",
     "name": {
       "key": "itemdesc_534006",
-      "text": "冰霜杰克星辉"
+      "text": "冰霜杰克星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -3995,7 +3995,7 @@
     "id": "534007",
     "name": {
       "key": "itemdesc_534007",
-      "text": "菲奥娜星辉"
+      "text": "菲奥娜星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -4032,7 +4032,7 @@
     "id": "534008",
     "name": {
       "key": "itemdesc_534008",
-      "text": "悍夫那特星辉"
+      "text": "悍夫那特星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -4069,7 +4069,7 @@
     "id": "535001",
     "name": {
       "key": "itemdesc_535001",
-      "text": "师父星辉"
+      "text": "师父星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -4106,7 +4106,7 @@
     "id": "535002",
     "name": {
       "key": "itemdesc_535002",
-      "text": "希卡普星辉"
+      "text": "希卡普星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -4143,7 +4143,7 @@
     "id": "535003",
     "name": {
       "key": "itemdesc_535003",
-      "text": "漆黑星辉"
+      "text": "漆黑星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -4180,7 +4180,7 @@
     "id": "535004",
     "name": {
       "key": "itemdesc_535004",
-      "text": "黛安·福克斯顿星辉"
+      "text": "黛安·福克斯顿星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -4217,7 +4217,7 @@
     "id": "535005",
     "name": {
       "key": "itemdesc_535005",
-      "text": "幸运·普雷斯科特星辉"
+      "text": "幸运·普雷斯科特星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -4254,7 +4254,7 @@
     "id": "535006",
     "name": {
       "key": "itemdesc_535006",
-      "text": "平先生星辉"
+      "text": "平先生星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -4291,7 +4291,7 @@
     "id": "543001",
     "name": {
       "key": "itemdesc_543001",
-      "text": "阿比盖尔·斯通星辉"
+      "text": "阿比盖尔·斯通星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -4328,7 +4328,7 @@
     "id": "543002",
     "name": {
       "key": "itemdesc_543002",
-      "text": "果酱教授星辉"
+      "text": "果酱教授星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -4365,7 +4365,7 @@
     "id": "543003",
     "name": {
       "key": "itemdesc_543003",
-      "text": "史蒂夫·帕丘克星辉"
+      "text": "史蒂夫·帕丘克星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -4402,7 +4402,7 @@
     "id": "543004",
     "name": {
       "key": "itemdesc_543004",
-      "text": "姜饼人星辉"
+      "text": "姜饼人星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -4439,7 +4439,7 @@
     "id": "543005",
     "name": {
       "key": "itemdesc_543005",
-      "text": "瓦希尔指挥官星辉"
+      "text": "瓦希尔指挥官星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -4476,7 +4476,7 @@
     "id": "543006",
     "name": {
       "key": "itemdesc_543006",
-      "text": "布里奇特星辉"
+      "text": "布里奇特星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -4513,7 +4513,7 @@
     "id": "543007",
     "name": {
       "key": "itemdesc_543007",
-      "text": "戈伯星辉"
+      "text": "戈伯星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -4550,7 +4550,7 @@
     "id": "544001",
     "name": {
       "key": "itemdesc_544001",
-      "text": "美肚鲨星辉"
+      "text": "美肚鲨星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -4587,7 +4587,7 @@
     "id": "544002",
     "name": {
       "key": "itemdesc_544002",
-      "text": "蛇先生星辉"
+      "text": "蛇先生星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -4624,7 +4624,7 @@
     "id": "544003",
     "name": {
       "key": "itemdesc_544003",
-      "text": "匹诺曹星辉"
+      "text": "匹诺曹星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -4661,7 +4661,7 @@
     "id": "544004",
     "name": {
       "key": "itemdesc_544004",
-      "text": "骇客蛛星辉"
+      "text": "骇客蛛星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -4698,7 +4698,7 @@
     "id": "544006",
     "name": {
       "key": "itemdesc_544006",
-      "text": "悍娇虎星辉"
+      "text": "悍娇虎星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -4735,7 +4735,7 @@
     "id": "545001",
     "name": {
       "key": "itemdesc_545001",
-      "text": "乌龟大师星辉"
+      "text": "乌龟大师星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -4772,7 +4772,7 @@
     "id": "545002",
     "name": {
       "key": "itemdesc_545002",
-      "text": "梅林星辉"
+      "text": "梅林星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -4809,7 +4809,7 @@
     "id": "545003",
     "name": {
       "key": "itemdesc_545003",
-      "text": "盖星辉"
+      "text": "盖星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -4846,7 +4846,7 @@
     "id": "545004",
     "name": {
       "key": "itemdesc_545004",
-      "text": "穿靴子的猫星辉"
+      "text": "穿靴子的猫星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -4883,7 +4883,7 @@
     "id": "544005",
     "name": {
       "key": "itemdesc_544005",
-      "text": "小伊星辉"
+      "text": "小伊星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -4920,7 +4920,7 @@
     "id": "515005",
     "name": {
       "key": "itemdesc_515005",
-      "text": "亚力克斯星辉"
+      "text": "亚力克斯星象点"
     },
     "usetype": 3,
     "color": 4,
@@ -4994,7 +4994,7 @@
     "id": "1000001",
     "name": {
       "key": "itemname_1000001",
-      "text": "星辉宝箱"
+      "text": "星象点宝箱"
     },
     "usetype": 6,
     "color": 5,

bin/json/game_monsterformat.json

@@ -566,7 +566,7 @@
     "bossHpCnt": 4,
     "monster": 550025,
     "lv": 26,
-    "hppro": 0.6,
+    "hppro": 3,
     "atkpro": 1,
     "defpro": 0.4,
     "modelsize": 1

bin/json/game_pandamasmryl.json

@@ -13,7 +13,7 @@
     "ticks": 3,
     "time": 10,
     "ani": "fitness_action1",
-    "energy": "",
+    "energy": "20大卡",
     "p": 500,
     "before_training": 25003,
     "after_training": 25004,
@@ -33,7 +33,7 @@
     "ticks": 3,
     "time": 10,
     "ani": "fitness_action2",
-    "energy": "",
+    "energy": "20大卡",
     "p": 500,
     "before_training": 25003,
     "after_training": 25004,

bin/json/game_skillafteratk.json

@@ -22412,7 +22412,7 @@
     "Argu": [
       1,
       4,
-      1500
+      4000
     ],
     "FollowSK": [
       255002112
@@ -22556,7 +22556,7 @@
     "Argu": [
       1,
       4,
-      2000
+      8000
     ],
     "FollowSK": [],
     "SucFollowSK": [],

modules/arena/api_challengereward.go

@@ -85,6 +85,7 @@ func (this *apiComp) ChallengeReward(session comm.IUserSession, req *pb.ArenaCha
 		Integral: info.Integral + info.Prededuction,
 		Defend:   info.Defend,
 		Isai:     false,
+		Lv:       info.Lv,
 	}
 
 	if len(info.Record) > 10 {
@@ -103,6 +104,7 @@ func (this *apiComp) ChallengeReward(session comm.IUserSession, req *pb.ArenaCha
 			Integral: rival.Integral,
 			Defend:   rival.Defend,
 			Isai:     false,
+			Lv:       rival.Lv,
 		}
 		if len(rival.Record) > 10 {
 			rival.Record = rival.Record[1:]