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

bin/json/game_battlescore.json

@@ -5,7 +5,7 @@
       "key": "guild_guild_boss_score_name_1",
       "text": "e-"
     },
-    "rank_low": 1,
+    "rank_low": 0,
     "rank_up": 19999,
     "grade": "gh_img_e0",
     "score": 1

bin/json/game_gamesummary.json

@@ -8,7 +8,7 @@
     "tabId": 2,
     "mapPos": {
       "x": 3665,
-      "y": 1922
+      "y": 1882
     },
     "type": 1,
     "params": "",
@@ -40,8 +40,8 @@
     },
     "tabId": 10,
     "mapPos": {
-      "x": 4513,
+      "x": 4473,
-      "y": 1528
+      "y": 1448
     },
     "type": 3,
     "params": "",
@@ -68,8 +68,8 @@
     },
     "tabId": 4,
     "mapPos": {
-      "x": 2871,
+      "x": 2711,
-      "y": 2511
+      "y": 2111
     },
     "type": 2,
     "params": "1",
@@ -106,8 +106,8 @@
     },
     "tabId": 4,
     "mapPos": {
-      "x": 2220,
+      "x": 2030,
-      "y": 1490
+      "y": 980
     },
     "type": 2,
     "params": "2",
@@ -144,8 +144,8 @@
     },
     "tabId": 4,
     "mapPos": {
-      "x": 4062,
+      "x": 3902,
-      "y": 912
+      "y": 470
     },
     "type": 2,
     "params": "3",
@@ -182,8 +182,8 @@
     },
     "tabId": 4,
     "mapPos": {
-      "x": 5211,
+      "x": 5071,
-      "y": 1680
+      "y": 1270
     },
     "type": 2,
     "params": "4",
@@ -220,7 +220,7 @@
     },
     "tabId": 3,
     "mapPos": {
-      "x": 2051,
+      "x": 2035,
       "y": 676
     },
     "type": 4,
@@ -264,7 +264,7 @@
     "tabId": 3,
     "mapPos": {
       "x": 2412,
-      "y": 453
+      "y": 413
     },
     "type": 4,
     "params": "",
@@ -306,8 +306,8 @@
     },
     "tabId": 3,
     "mapPos": {
-      "x": 2740,
+      "x": 2720,
-      "y": 624
+      "y": 574
     },
     "type": 4,
     "params": "",
@@ -349,8 +349,8 @@
     },
     "tabId": 5,
     "mapPos": {
-      "x": 2212,
+      "x": 2202,
-      "y": 165
+      "y": 105
     },
     "type": 4,
     "params": "",
@@ -387,8 +387,8 @@
     },
     "tabId": 6,
     "mapPos": {
-      "x": 5080,
+      "x": 5040,
-      "y": 1252
+      "y": 1202
     },
     "type": 4,
     "params": "",
@@ -425,8 +425,8 @@
     },
     "tabId": 6,
     "mapPos": {
-      "x": 5827,
+      "x": 5789,
-      "y": 1560
+      "y": 1500
     },
     "type": 4,
     "params": "",
@@ -458,8 +458,8 @@
     },
     "tabId": 6,
     "mapPos": {
-      "x": 6048,
+      "x": 6008,
-      "y": 1855
+      "y": 1805
     },
     "type": 4,
     "params": "",

bin/json/game_gamesummarytab.json

@@ -46,10 +46,10 @@
       "text": "狩猎挑战"
     },
     "mapPos": {
-      "x": -629,
+      "x": -603,
-      "y": 237
+      "y": 142
     },
-    "scale": 0.34
+    "scale": 0.32
   },
   {
     "tabId": 5,

bin/json/game_guildboss.json

@@ -45,7 +45,7 @@
     "score": 1,
     "buff": 14,
     "boss_des": {
-      "key": "guild_guild_boss_boss_name_1",
+      "key": "guild_guild_boss_des_name_1",
       "text": "大家集中火力，优先攻打冰霜杰克"
     }
   },
@@ -95,7 +95,7 @@
     "score": 1,
     "buff": 14,
     "boss_des": {
-      "key": "guild_guild_boss_boss_name_2",
+      "key": "guild_guild_boss_des_name_2",
       "text": "大家集中火力，优先攻打冰霜杰克"
     }
   },
@@ -145,7 +145,7 @@
     "score": 1,
     "buff": 14,
     "boss_des": {
-      "key": "guild_guild_boss_boss_name_3",
+      "key": "guild_guild_boss_des_name_3",
       "text": "大家集中火力，优先攻打冰霜杰克"
     }
   },
@@ -195,7 +195,7 @@
     "score": 1,
     "buff": 14,
     "boss_des": {
-      "key": "guild_guild_boss_boss_name_4",
+      "key": "guild_guild_boss_des_name_4",
       "text": "大家集中火力，优先攻打冰霜杰克"
     }
   },
@@ -245,7 +245,7 @@
     "score": 1,
     "buff": 14,
     "boss_des": {
-      "key": "guild_guild_boss_boss_name_5",
+      "key": "guild_guild_boss_des_name_5",
       "text": "大家集中火力，优先攻打冰霜杰克"
     }
   },
@@ -295,7 +295,7 @@
     "score": 1,
     "buff": 14,
     "boss_des": {
-      "key": "guild_guild_boss_boss_name_6",
+      "key": "guild_guild_boss_des_name_6",
       "text": "大家集中火力，优先攻打坦克"
     }
   },
@@ -345,7 +345,7 @@
     "score": 1,
     "buff": 14,
     "boss_des": {
-      "key": "guild_guild_boss_boss_name_7",
+      "key": "guild_guild_boss_des_name_7",
       "text": "大家集中火力，优先攻打坦克"
     }
   },
@@ -395,7 +395,7 @@
     "score": 1,
     "buff": 14,
     "boss_des": {
-      "key": "guild_guild_boss_boss_name_8",
+      "key": "guild_guild_boss_des_name_8",
       "text": "大家集中火力，优先攻打坦克"
     }
   },
@@ -445,7 +445,7 @@
     "score": 1,
     "buff": 14,
     "boss_des": {
-      "key": "guild_guild_boss_boss_name_9",
+      "key": "guild_guild_boss_des_name_9",
       "text": "大家集中火力，优先攻打坦克"
     }
   },
@@ -495,7 +495,7 @@
     "score": 1,
     "buff": 14,
     "boss_des": {
-      "key": "guild_guild_boss_boss_name_10",
+      "key": "guild_guild_boss_des_name_10",
       "text": "大家集中火力，优先攻打坦克"
     }
   },
@@ -545,7 +545,7 @@
     "score": 1,
     "buff": 14,
     "boss_des": {
-      "key": "guild_guild_boss_boss_name_11",
+      "key": "guild_guild_boss_des_name_11",
       "text": "大家集中火力，优先攻打埃雷特"
     }
   },
@@ -595,7 +595,7 @@
     "score": 1,
     "buff": 14,
     "boss_des": {
-      "key": "guild_guild_boss_boss_name_12",
+      "key": "guild_guild_boss_des_name_12",
       "text": "大家集中火力，优先攻打埃雷特"
     }
   },
@@ -645,7 +645,7 @@
     "score": 1,
     "buff": 14,
     "boss_des": {
-      "key": "guild_guild_boss_boss_name_13",
+      "key": "guild_guild_boss_des_name_13",
       "text": "大家集中火力，优先攻打埃雷特"
     }
   },
@@ -695,7 +695,7 @@
     "score": 1,
     "buff": 14,
     "boss_des": {
-      "key": "guild_guild_boss_boss_name_14",
+      "key": "guild_guild_boss_des_name_14",
       "text": "大家集中火力，优先攻打埃雷特"
     }
   },
@@ -745,7 +745,7 @@
     "score": 1,
     "buff": 14,
     "boss_des": {
-      "key": "guild_guild_boss_boss_name_15",
+      "key": "guild_guild_boss_des_name_15",
       "text": "大家集中火力，优先攻打埃雷特"
     }
   },
@@ -795,7 +795,7 @@
     "score": 1,
     "buff": 14,
     "boss_des": {
-      "key": "guild_guild_boss_boss_name_16",
+      "key": "guild_guild_boss_des_name_16",
       "text": "大家集中火力，优先攻打菲奥娜"
     }
   },
@@ -845,7 +845,7 @@
     "score": 1,
     "buff": 14,
     "boss_des": {
-      "key": "guild_guild_boss_boss_name_17",
+      "key": "guild_guild_boss_des_name_17",
       "text": "大家集中火力，优先攻打菲奥娜"
     }
   },
@@ -895,7 +895,7 @@
     "score": 1,
     "buff": 14,
     "boss_des": {
-      "key": "guild_guild_boss_boss_name_18",
+      "key": "guild_guild_boss_des_name_18",
       "text": "大家集中火力，优先攻打菲奥娜"
     }
   },
@@ -945,7 +945,7 @@
     "score": 1,
     "buff": 14,
     "boss_des": {
-      "key": "guild_guild_boss_boss_name_19",
+      "key": "guild_guild_boss_des_name_19",
       "text": "大家集中火力，优先攻打菲奥娜"
     }
   },
@@ -995,7 +995,7 @@
     "score": 1,
     "buff": 14,
     "boss_des": {
-      "key": "guild_guild_boss_boss_name_20",
+      "key": "guild_guild_boss_des_name_20",
       "text": "大家集中火力，优先攻打菲奥娜"
     }
   },
@@ -1045,7 +1045,7 @@
     "score": 1,
     "buff": 14,
     "boss_des": {
-      "key": "guild_guild_boss_boss_name_21",
+      "key": "guild_guild_boss_des_name_21",
       "text": "大家集中火力，优先攻打船长"
     }
   },
@@ -1095,7 +1095,7 @@
     "score": 1,
     "buff": 14,
     "boss_des": {
-      "key": "guild_guild_boss_boss_name_22",
+      "key": "guild_guild_boss_des_name_22",
       "text": "大家集中火力，优先攻打船长"
     }
   },
@@ -1145,7 +1145,7 @@
     "score": 1,
     "buff": 14,
     "boss_des": {
-      "key": "guild_guild_boss_boss_name_23",
+      "key": "guild_guild_boss_des_name_23",
       "text": "大家集中火力，优先攻打船长"
     }
   },
@@ -1195,7 +1195,7 @@
     "score": 1,
     "buff": 14,
     "boss_des": {
-      "key": "guild_guild_boss_boss_name_24",
+      "key": "guild_guild_boss_des_name_24",
       "text": "大家集中火力，优先攻打船长"
     }
   },
@@ -1245,7 +1245,7 @@
     "score": 1,
     "buff": 14,
     "boss_des": {
-      "key": "guild_guild_boss_boss_name_25",
+      "key": "guild_guild_boss_des_name_25",
       "text": "大家集中火力，优先攻打船长"
     }
   },
@@ -1295,7 +1295,7 @@
     "score": 1,
     "buff": 14,
     "boss_des": {
-      "key": "guild_guild_boss_boss_name_26",
+      "key": "guild_guild_boss_des_name_26",
       "text": "大家集中火力，优先攻打希沙窦斯"
     }
   },
@@ -1345,7 +1345,7 @@
     "score": 1,
     "buff": 14,
     "boss_des": {
-      "key": "guild_guild_boss_boss_name_27",
+      "key": "guild_guild_boss_des_name_27",
       "text": "大家集中火力，优先攻打希沙窦斯"
     }
   },
@@ -1395,7 +1395,7 @@
     "score": 1,
     "buff": 14,
     "boss_des": {
-      "key": "guild_guild_boss_boss_name_28",
+      "key": "guild_guild_boss_des_name_28",
       "text": "大家集中火力，优先攻打希沙窦斯"
     }
   },
@@ -1445,7 +1445,7 @@
     "score": 1,
     "buff": 14,
     "boss_des": {
-      "key": "guild_guild_boss_boss_name_29",
+      "key": "guild_guild_boss_des_name_29",
       "text": "大家集中火力，优先攻打希沙窦斯"
     }
   },
@@ -1495,7 +1495,7 @@
     "score": 1,
     "buff": 14,
     "boss_des": {
-      "key": "guild_guild_boss_boss_name_30",
+      "key": "guild_guild_boss_des_name_30",
       "text": "大家集中火力，优先攻打希沙窦斯"
     }
   },
@@ -1545,7 +1545,7 @@
     "score": 1,
     "buff": 14,
     "boss_des": {
-      "key": "guild_guild_boss_boss_name_31",
+      "key": "guild_guild_boss_des_name_31",
       "text": "大家集中火力，优先攻打幸运·普雷斯科特"
     }
   },
@@ -1595,7 +1595,7 @@
     "score": 1,
     "buff": 14,
     "boss_des": {
-      "key": "guild_guild_boss_boss_name_32",
+      "key": "guild_guild_boss_des_name_32",
       "text": "大家集中火力，优先攻打幸运·普雷斯科特"
     }
   },
@@ -1645,7 +1645,7 @@
     "score": 1,
     "buff": 14,
     "boss_des": {
-      "key": "guild_guild_boss_boss_name_33",
+      "key": "guild_guild_boss_des_name_33",
       "text": "大家集中火力，优先攻打幸运·普雷斯科特"
     }
   },
@@ -1695,7 +1695,7 @@
     "score": 1,
     "buff": 14,
     "boss_des": {
-      "key": "guild_guild_boss_boss_name_34",
+      "key": "guild_guild_boss_des_name_34",
       "text": "大家集中火力，优先攻打幸运·普雷斯科特"
     }
   },
@@ -1745,7 +1745,7 @@
     "score": 1,
     "buff": 14,
     "boss_des": {
-      "key": "guild_guild_boss_boss_name_35",
+      "key": "guild_guild_boss_des_name_35",
       "text": "大家集中火力，优先攻打幸运·普雷斯科特"
     }
   },
@@ -1795,7 +1795,7 @@
     "score": 1,
     "buff": 14,
     "boss_des": {
-      "key": "guild_guild_boss_boss_name_36",
+      "key": "guild_guild_boss_des_name_36",
       "text": "大家集中火力，优先攻打小欧"
     }
   },
@@ -1845,7 +1845,7 @@
     "score": 1,
     "buff": 14,
     "boss_des": {
-      "key": "guild_guild_boss_boss_name_37",
+      "key": "guild_guild_boss_des_name_37",
       "text": "大家集中火力，优先攻打小欧"
     }
   },
@@ -1895,7 +1895,7 @@
     "score": 1,
     "buff": 14,
     "boss_des": {
-      "key": "guild_guild_boss_boss_name_38",
+      "key": "guild_guild_boss_des_name_38",
       "text": "大家集中火力，优先攻打小欧"
     }
   },
@@ -1945,7 +1945,7 @@
     "score": 1,
     "buff": 14,
     "boss_des": {
-      "key": "guild_guild_boss_boss_name_39",
+      "key": "guild_guild_boss_des_name_39",
       "text": "大家集中火力，优先攻打小欧"
     }
   },
@@ -1995,7 +1995,7 @@
     "score": 1,
     "buff": 14,
     "boss_des": {
-      "key": "guild_guild_boss_boss_name_40",
+      "key": "guild_guild_boss_des_name_40",
       "text": "大家集中火力，优先攻打小欧"
     }
   },
@@ -2045,7 +2045,7 @@
     "score": 1,
     "buff": 14,
     "boss_des": {
-      "key": "guild_guild_boss_boss_name_41",
+      "key": "guild_guild_boss_des_name_41",
       "text": "大家集中火力，优先攻打大大"
     }
   },
@@ -2095,7 +2095,7 @@
     "score": 1,
     "buff": 14,
     "boss_des": {
-      "key": "guild_guild_boss_boss_name_42",
+      "key": "guild_guild_boss_des_name_42",
       "text": "大家集中火力，优先攻打大大"
     }
   },
@@ -2145,7 +2145,7 @@
     "score": 1,
     "buff": 14,
     "boss_des": {
-      "key": "guild_guild_boss_boss_name_43",
+      "key": "guild_guild_boss_des_name_43",
       "text": "大家集中火力，优先攻打大大"
     }
   },
@@ -2195,7 +2195,7 @@
     "score": 1,
     "buff": 14,
     "boss_des": {
-      "key": "guild_guild_boss_boss_name_44",
+      "key": "guild_guild_boss_des_name_44",
       "text": "大家集中火力，优先攻打大大"
     }
   },
@@ -2245,7 +2245,7 @@
     "score": 1,
     "buff": 14,
     "boss_des": {
-      "key": "guild_guild_boss_boss_name_45",
+      "key": "guild_guild_boss_des_name_45",
       "text": "大家集中火力，优先攻打大大"
     }
   },
@@ -2295,7 +2295,7 @@
     "score": 1,
     "buff": 14,
     "boss_des": {
-      "key": "guild_guild_boss_boss_name_46",
+      "key": "guild_guild_boss_des_name_46",
       "text": "大家集中火力，优先攻打蒂姆·邓普顿"
     }
   },
@@ -2345,7 +2345,7 @@
     "score": 1,
     "buff": 14,
     "boss_des": {
-      "key": "guild_guild_boss_boss_name_47",
+      "key": "guild_guild_boss_des_name_47",
       "text": "大家集中火力，优先攻打蒂姆·邓普顿"
     }
   },
@@ -2395,7 +2395,7 @@
     "score": 1,
     "buff": 14,
     "boss_des": {
-      "key": "guild_guild_boss_boss_name_48",
+      "key": "guild_guild_boss_des_name_48",
       "text": "大家集中火力，优先攻打蒂姆·邓普顿"
     }
   },
@@ -2445,7 +2445,7 @@
     "score": 1,
     "buff": 14,
     "boss_des": {
-      "key": "guild_guild_boss_boss_name_49",
+      "key": "guild_guild_boss_des_name_49",
       "text": "大家集中火力，优先攻打蒂姆·邓普顿"
     }
   },
@@ -2495,7 +2495,7 @@
     "score": 1,
     "buff": 14,
     "boss_des": {
-      "key": "guild_guild_boss_boss_name_50",
+      "key": "guild_guild_boss_des_name_50",
       "text": "大家集中火力，优先攻打蒂姆·邓普顿"
     }
   }

bin/json/game_hero.json

@@ -10287,6 +10287,80 @@
     ],
     "expitemnum": 7
   },
+  {
+    "hid": "54017",
+    "name": {
+      "key": "hero_main_name_137",
+      "text": "蝙蝠·黛比"
+    },
+    "star": 3,
+    "color": 2,
+    "race": 4,
+    "job": 1,
+    "type": 2,
+    "ip": 1,
+    "sd": 1,
+    "handbook": -1,
+    "prefab": "54017",
+    "rotation": "0|0|0",
+    "revolve": 0,
+    "icon": "54017",
+    "vocal": "54017",
+    "tujing": [
+      107
+    ],
+    "detailwindow": "effect_chezhan",
+    "intr": {
+      "key": "",
+      "text": ""
+    },
+    "events": "hero_54005",
+    "cite": "",
+    "effectstay": [],
+    "hpspace": {
+      "x": 0,
+      "y": -0.69,
+      "z": 0
+    },
+    "capskillrule": 101,
+    "skill": 0,
+    "skill1": 0,
+    "skill2": 0,
+    "skill3": 0,
+    "txt": {
+      "key": "atlas_54017",
+      "text": ""
+    },
+    "enteranivalue": 0,
+    "camerainterval": 0,
+    "equiprcom": [
+      1,
+      2,
+      10
+    ],
+    "angle": 0,
+    "deviation": 0,
+    "show": 2,
+    "herofrag": [
+      {
+        "a": "item",
+        "t": "12025001",
+        "n": 1
+      }
+    ],
+    "herofragnum": 6,
+    "heroskillup": [
+      "10000004"
+    ],
+    "expitem": [
+      {
+        "a": "item",
+        "t": "10000011",
+        "n": 1
+      }
+    ],
+    "expitemnum": 7
+  },
   {
     "hid": "51050",
     "name": {
@@ -10583,6 +10657,154 @@
     ],
     "expitemnum": 7
   },
+  {
+    "hid": "51054",
+    "name": {
+      "key": "hero_main_name_137",
+      "text": "豚鼠灵"
+    },
+    "star": 3,
+    "color": 2,
+    "race": 4,
+    "job": 1,
+    "type": 2,
+    "ip": 1,
+    "sd": 1,
+    "handbook": -1,
+    "prefab": "51054",
+    "rotation": "0|0|0",
+    "revolve": 0,
+    "icon": "51054",
+    "vocal": "51054",
+    "tujing": [
+      107
+    ],
+    "detailwindow": "effect_chezhan",
+    "intr": {
+      "key": "",
+      "text": ""
+    },
+    "events": "hero_51054",
+    "cite": "",
+    "effectstay": [],
+    "hpspace": {
+      "x": 0,
+      "y": -0.69,
+      "z": 0
+    },
+    "capskillrule": 101,
+    "skill": 0,
+    "skill1": 151054111,
+    "skill2": 151054211,
+    "skill3": 0,
+    "txt": {
+      "key": "atlas_51054",
+      "text": ""
+    },
+    "enteranivalue": 0,
+    "camerainterval": 0,
+    "equiprcom": [
+      1,
+      2,
+      10
+    ],
+    "angle": 0,
+    "deviation": 0,
+    "show": 2,
+    "herofrag": [
+      {
+        "a": "item",
+        "t": "12025001",
+        "n": 1
+      }
+    ],
+    "herofragnum": 6,
+    "heroskillup": [
+      "10000004"
+    ],
+    "expitem": [
+      {
+        "a": "item",
+        "t": "10000011",
+        "n": 1
+      }
+    ],
+    "expitemnum": 7
+  },
+  {
+    "hid": "51055",
+    "name": {
+      "key": "hero_main_name_137",
+      "text": "卷轴灵"
+    },
+    "star": 3,
+    "color": 2,
+    "race": 4,
+    "job": 1,
+    "type": 2,
+    "ip": 1,
+    "sd": 1,
+    "handbook": -1,
+    "prefab": "51055",
+    "rotation": "0|0|0",
+    "revolve": 0,
+    "icon": "51055",
+    "vocal": "51055",
+    "tujing": [
+      107
+    ],
+    "detailwindow": "effect_chezhan",
+    "intr": {
+      "key": "",
+      "text": ""
+    },
+    "events": "hero_51055",
+    "cite": "",
+    "effectstay": [],
+    "hpspace": {
+      "x": 0,
+      "y": -0.69,
+      "z": 0
+    },
+    "capskillrule": 101,
+    "skill": 0,
+    "skill1": 151055111,
+    "skill2": 151055211,
+    "skill3": 0,
+    "txt": {
+      "key": "atlas_51055",
+      "text": ""
+    },
+    "enteranivalue": 0,
+    "camerainterval": 0,
+    "equiprcom": [
+      1,
+      2,
+      10
+    ],
+    "angle": 0,
+    "deviation": 0,
+    "show": 2,
+    "herofrag": [
+      {
+        "a": "item",
+        "t": "12025001",
+        "n": 1
+      }
+    ],
+    "herofragnum": 6,
+    "heroskillup": [
+      "10000004"
+    ],
+    "expitem": [
+      {
+        "a": "item",
+        "t": "10000011",
+        "n": 1
+      }
+    ],
+    "expitemnum": 7
+  },
   {
     "hid": "51100",
     "name": {

bin/json/game_herolevelgrow.json

@@ -2903,6 +2903,28 @@
     "defgrow": 1250,
     "speedgrow": 0
   },
+  {
+    "id": "54017",
+    "hp": 0,
+    "atk": 0,
+    "def": 0,
+    "speed": 183,
+    "cri": 100,
+    "cridam": 1500,
+    "effhit": 0,
+    "effre": 200,
+    "losthold": 0,
+    "understand": 0,
+    "damre": 0,
+    "causedam": 0,
+    "treadd": 0,
+    "betreadd": 0,
+    "suckblood": 0,
+    "hpgrow": 1000,
+    "atkgrow": 1300,
+    "defgrow": 1250,
+    "speedgrow": 0
+  },
   {
     "id": "51050",
     "hp": 0,
@@ -2991,6 +3013,50 @@
     "defgrow": 1250,
     "speedgrow": 0
   },
+  {
+    "id": "51054",
+    "hp": 0,
+    "atk": 0,
+    "def": 0,
+    "speed": 183,
+    "cri": 100,
+    "cridam": 1500,
+    "effhit": 0,
+    "effre": 200,
+    "losthold": 0,
+    "understand": 0,
+    "damre": 0,
+    "causedam": 0,
+    "treadd": 0,
+    "betreadd": 0,
+    "suckblood": 0,
+    "hpgrow": 1000,
+    "atkgrow": 1300,
+    "defgrow": 1250,
+    "speedgrow": 0
+  },
+  {
+    "id": "51055",
+    "hp": 0,
+    "atk": 0,
+    "def": 0,
+    "speed": 183,
+    "cri": 100,
+    "cridam": 1500,
+    "effhit": 0,
+    "effre": 200,
+    "losthold": 0,
+    "understand": 0,
+    "damre": 0,
+    "causedam": 0,
+    "treadd": 0,
+    "betreadd": 0,
+    "suckblood": 0,
+    "hpgrow": 1000,
+    "atkgrow": 1300,
+    "defgrow": 1250,
+    "speedgrow": 0
+  },
   {
     "id": "51100",
     "hp": 0,

bin/json/game_navigation.json

@@ -286,5 +286,23 @@
     ],
     "functionicon": "ty_qp_sj",
     "jumpId": 1003
+  },
+  {
+    "Id": 17,
+    "scene": "CommandScene",
+    "scenename": {
+      "key": "navigation_Sheet1_scenename_17",
+      "text": "指挥部"
+    },
+    "sceneicon": "ty_qp_zhb",
+    "functionname": {
+      "key": "navigation_Sheet1_functionname_17",
+      "text": "护符水晶"
+    },
+    "npcName": [
+      "功能入口——护符水晶"
+    ],
+    "functionicon": "ty_qp_zhb",
+    "jumpId": 10019
   }
 ]

bin/json/game_rdtasknpc.json

@@ -6829,8 +6829,8 @@
       "901"
     ],
     "event": [
-      2,
+      12,
-      12960
+      1001
     ],
     "goto": 0
   },
@@ -6871,8 +6871,8 @@
       "901"
     ],
     "event": [
-      2,
+      12,
-      12960
+      1001
     ],
     "goto": 0
   },
@@ -6913,8 +6913,8 @@
       "901"
     ],
     "event": [
-      2,
+      12,
-      12960
+      1002
     ],
     "goto": 0
   },
@@ -6955,8 +6955,8 @@
       "901"
     ],
     "event": [
-      2,
+      12,
-      12960
+      1002
     ],
     "goto": 0
   },
@@ -6997,8 +6997,8 @@
       "901"
     ],
     "event": [
-      2,
+      12,
-      12960
+      1002
     ],
     "goto": 0
   },

bin/json/game_skillatk.json

@@ -22025,7 +22025,7 @@
       "Id": [
         255007211,
         255007212,
-        25007213
+        255007213
       ]
     },
     "Desc": {

bin/json/game_skillbuff.json

@@ -324,7 +324,6 @@
     },
     "BuffType": 30,
     "EffectArgu": [
-      14,
       100
     ],
     "BufParNum": 1,
@@ -355,7 +354,6 @@
     },
     "BuffType": 30,
     "EffectArgu": [
-      14,
       150
     ],
     "BufParNum": 1,
@@ -2804,7 +2802,6 @@
     },
     "BuffType": 30,
     "EffectArgu": [
-      -1,
       500
     ],
     "BufParNum": 1,
@@ -2896,7 +2893,6 @@
     },
     "BuffType": 30,
     "EffectArgu": [
-      -1,
       1000
     ],
     "BufParNum": 1,
@@ -2927,7 +2923,6 @@
     },
     "BuffType": 30,
     "EffectArgu": [
-      -1,
       200
     ],
     "BufParNum": 1,
@@ -3256,7 +3251,6 @@
     },
     "BuffType": 30,
     "EffectArgu": [
-      -1,
       100
     ],
     "BufParNum": 1,
@@ -3952,7 +3946,6 @@
     },
     "BuffType": 30,
     "EffectArgu": [
-      -1,
       50
     ],
     "BufParNum": 1,
@@ -4592,7 +4585,7 @@
       "key": "skill_skill_buff_Desc_390001467",
       "text": "每拥有1个进攻符文，最终伤害提高5%（最多可叠加6次）。"
     },
-    "BuffType": 30,
+    "BuffType": 1,
     "EffectArgu": [
       14,
       50
@@ -4623,7 +4616,7 @@
       "key": "skill_skill_buff_Desc_390001468",
       "text": "每拥有1个进攻符文，最终伤害提高7.5%（最多可叠加6次）。"
     },
-    "BuffType": 30,
+    "BuffType": 1,
     "EffectArgu": [
       14,
       75
@@ -4715,7 +4708,7 @@
       "key": "skill_skill_buff_Desc_390001474",
       "text": "当前生命低于50%时，造成伤害增加15%。"
     },
-    "BuffType": 30,
+    "BuffType": 1,
     "EffectArgu": [
       14,
       150

bin/json/game_skillpassive.json

@@ -593,7 +593,10 @@
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
     "MaxEmitTimesInRound": 1,
-    "Callback": []
+    "Callback": [
+      1,
+      750
+    ]
   },
   {
     "Id": 414007211,
@@ -1213,7 +1216,10 @@
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
     "MaxEmitTimesInRound": 1,
-    "Callback": []
+    "Callback": [
+      1,
+      750
+    ]
   },
   {
     "Id": 414005211,
@@ -2022,7 +2028,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 150,
-    "Type": "BeatBack",
+    "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
     "MaxEmitTimesInRound": 1,
@@ -2040,7 +2046,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 600,
-    "Type": "BeatBack",
+    "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
     "MaxEmitTimesInRound": 1,
@@ -2626,7 +2632,10 @@
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
     "MaxEmitTimesInRound": 1,
-    "Callback": []
+    "Callback": [
+      1,
+      750
+    ]
   },
   {
     "Id": 400001501,

bin/json/game_worldrd.json

@@ -21,8 +21,8 @@
     },
     "eventweight": 1000,
     "eventtype": 1,
-    "battleready": 0,
+    "battleready": 126,
-    "battleid": 0,
+    "battleid": 720001,
     "getitem": []
   },
   {
@@ -34,8 +34,8 @@
     },
     "eventweight": 1000,
     "eventtype": 1,
-    "battleready": 0,
+    "battleready": 126,
-    "battleid": 0,
+    "battleid": 720001,
     "getitem": []
   },
   {
@@ -47,8 +47,8 @@
     },
     "eventweight": 1000,
     "eventtype": 1,
-    "battleready": 0,
+    "battleready": 126,
-    "battleid": 0,
+    "battleid": 720001,
     "getitem": []
   },
   {
@@ -62,7 +62,13 @@
     "eventtype": 2,
     "battleready": 0,
     "battleid": 0,
-    "getitem": []
+    "getitem": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 10000
+      }
+    ]
   },
   {
     "id": 6,
@@ -75,7 +81,13 @@
     "eventtype": 2,
     "battleready": 0,
     "battleid": 0,
-    "getitem": []
+    "getitem": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 20000
+      }
+    ]
   },
   {
     "id": 7,
@@ -99,8 +111,8 @@
     },
     "eventweight": 1000,
     "eventtype": 1,
-    "battleready": 0,
+    "battleready": 126,
-    "battleid": 0,
+    "battleid": 720001,
     "getitem": []
   },
   {
@@ -112,8 +124,8 @@
     },
     "eventweight": 1000,
     "eventtype": 1,
-    "battleready": 0,
+    "battleready": 126,
-    "battleid": 0,
+    "battleid": 720001,
     "getitem": []
   },
   {
@@ -125,8 +137,8 @@
     },
     "eventweight": 1000,
     "eventtype": 1,
-    "battleready": 0,
+    "battleready": 126,
-    "battleid": 0,
+    "battleid": 720001,
     "getitem": []
   },
   {
@@ -140,7 +152,13 @@
     "eventtype": 2,
     "battleready": 0,
     "battleid": 0,
-    "getitem": []
+    "getitem": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 10000
+      }
+    ]
   },
   {
     "id": 12,
@@ -153,6 +171,12 @@
     "eventtype": 2,
     "battleready": 0,
     "battleid": 0,
-    "getitem": []
+    "getitem": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 20000
+      }
+    ]
   }
 ]

bin/json/game_worldtask.json

@@ -16,7 +16,7 @@
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_1",
-      "text": "指挥部内有一处放着月光原石的反应堆，赶快去看看。"
+      "text": "指挥部内放着月光原石的反应堆，赶快去看看。"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_1",
@@ -58,7 +58,7 @@
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_2",
-      "text": "传承者面临身体半透明的困扰，骇客蛛发挥强大的黑客技术，帮忙寻找恢复实体化的方法。"
+      "text": "你面临身体半透明的困扰，骇客蛛发挥强大的黑客技术，帮忙寻找恢复实体化的方法。"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_2",
@@ -139,7 +139,7 @@
     "icon": "25001",
     "task_name": {
       "key": "worldtask_world_task_task_name_4",
-      "text": "突如起来的袭击"
+      "text": "突如其来的袭击"
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_4",
@@ -185,7 +185,7 @@
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_5",
-      "text": "幸运的找到了邦尼兔，但他非常不信任我，那么就向他展示一下自己的实力，获取信任吧。"
+      "text": "幸运的找到了邦尼兔，但他非常不信任你，那么就向他展示一下自己的实力，获取信任吧。"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_5",
@@ -227,7 +227,7 @@
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_6",
-      "text": "圣桃树的预言让邦尼兔非常焦虑，他担心反派势力随时会卷土重来，为了能和他们并肩作战，我必须获得邦尼兔的信任。"
+      "text": "圣桃树的预言让邦尼兔非常焦虑，他担心反派势力随时会卷土重来，为了能和他们并肩作战，你必须获得邦尼兔的信任。"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_6",
@@ -361,7 +361,7 @@
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_9",
-      "text": "跟着豺狼小怪消失的方向，我们一行人追踪到熊猫武馆。武馆是中轴城守护者提高战斗力、习武比试的地方。"
+      "text": "跟着豺狼小怪消失的方向，你们一行人追踪到熊猫武馆。武馆是中轴城守护者提高战斗力、习武比试的地方。"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_9",
@@ -403,7 +403,7 @@
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_10",
-      "text": "获得浣熊师傅的认同后，我们对熊猫武馆进行调查，试图找出刚才那团黑气。"
+      "text": "获得浣熊师傅的认同后，你们对熊猫武馆进行调查，试图找出刚才那团黑气。"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_10",
@@ -447,7 +447,7 @@
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_11",
-      "text": "骇客蛛发现月光原石的踪迹，让守护者速回指挥部。"
+      "text": "骇客蛛发现月光原石的踪迹，让你速回指挥部。"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_11",
@@ -559,7 +559,7 @@
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_13",
-      "text": "疯狂原始人世界环境恶劣，在骇客蛛指导，为自己的守护者穿到装备。"
+      "text": "疯狂原始人世界环境恶劣，在骇客蛛指导，为你的守护者穿戴装备。"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_13",
@@ -601,7 +601,7 @@
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_14",
-      "text": "再次进入疯狂原始人！在小伊的指引下，深入巨型猩猩怪的巢穴。可是……"
+      "text": "再次回到了疯狂原始人！在小伊的指引下，深入巨型猩猩怪的巢穴。可是……"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_14",
@@ -5491,7 +5491,7 @@
     "opencond": "",
     "lock": 1,
     "lockend": 999,
-    "ontxe": 0,
+    "ontxe": 20220,
     "id_after": 300020,
     "group": 301,
     "exgroup": 310,
@@ -5499,15 +5499,15 @@
     "icon": "25001",
     "task_name": {
       "key": "worldtask_world_task_task_name_127",
-      "text": "阿宝悍娇虎日常一"
+      "text": "悍娇虎逸闻一"
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_127",
-      "text": "阿宝悍娇虎日常一"
+      "text": "悍娇虎独自一人站在武馆，看上去似乎很生气。"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_127",
-      "text": "阿宝悍娇虎日常一"
+      "text": "和悍娇虎聊聊"
     },
     "get_item": [],
     "trigger": 0,
@@ -5539,17 +5539,23 @@
     "icon": "25001",
     "task_name": {
       "key": "worldtask_world_task_task_name_128",
-      "text": "阿宝悍娇虎日常二"
+      "text": "悍娇虎逸闻二"
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_128",
-      "text": "阿宝悍娇虎日常二"
+      "text": "找到阿宝，并把阿宝带回武馆吧。"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_128",
-      "text": "阿宝悍娇虎日常二"
+      "text": "找到阿宝"
     },
-    "get_item": [],
+    "get_item": [
+      {
+        "a": "item",
+        "t": "13000004",
+        "n": 3
+      }
+    ],
     "trigger": 0,
     "npc": 300020,
     "completetask": [
@@ -5573,7 +5579,7 @@
     "opencond": "",
     "lock": 1,
     "lockend": 999,
-    "ontxe": 0,
+    "ontxe": 20220,
     "id_after": 300040,
     "group": 302,
     "exgroup": 310,
@@ -5581,15 +5587,15 @@
     "icon": "25001",
     "task_name": {
       "key": "worldtask_world_task_task_name_129",
-      "text": "希卡普&亚丝翠&鼻涕粗日常一"
+      "text": "驯龙小队的一天一"
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_129",
-      "text": "希卡普&亚丝翠&鼻涕粗日常一"
+      "text": "希卡普约着他的伙伴们一起做龙鞍，快帮他们收集制作材料吧。"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_129",
-      "text": "希卡普&亚丝翠&鼻涕粗日常一"
+      "text": "和希卡普聊聊"
     },
     "get_item": [],
     "trigger": 0,
@@ -5623,15 +5629,15 @@
     "icon": "25001",
     "task_name": {
       "key": "worldtask_world_task_task_name_130",
-      "text": "希卡普&亚丝翠&鼻涕粗日常二"
+      "text": "驯龙小队的一天二"
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_130",
-      "text": "希卡普&亚丝翠&鼻涕粗日常二"
+      "text": "原本好好制作龙鞍的鼻涕粗突然和亚丝翠吵了起来，得上前阻止他们。"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_130",
-      "text": "希卡普&亚丝翠&鼻涕粗日常二"
+      "text": "阻止鼻涕粗"
     },
     "get_item": [],
     "trigger": 0,
@@ -5665,15 +5671,15 @@
     "icon": "25001",
     "task_name": {
       "key": "worldtask_world_task_task_name_131",
-      "text": "希卡普&亚丝翠&鼻涕粗日常三"
+      "text": "驯龙小队的一天三"
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_131",
-      "text": "希卡普&亚丝翠&鼻涕粗日常三"
+      "text": "亚丝翠情绪激动，你不能让他们互相伤害。"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_131",
-      "text": "希卡普&亚丝翠&鼻涕粗日常三"
+      "text": "阻止鼻亚丝翠"
     },
     "get_item": [],
     "trigger": 0,
@@ -5707,15 +5713,15 @@
     "icon": "25001",
     "task_name": {
       "key": "worldtask_world_task_task_name_132",
-      "text": "希卡普&亚丝翠&鼻涕粗日常四"
+      "text": "驯龙小队的一天四"
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_132",
-      "text": "希卡普&亚丝翠&鼻涕粗日常四"
+      "text": "希卡普看上去很生气。"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_132",
-      "text": "希卡普&亚丝翠&鼻涕粗日常四"
+      "text": "和希卡普聊聊"
     },
     "get_item": [],
     "trigger": 0,
@@ -5747,15 +5753,15 @@
     "icon": "25001",
     "task_name": {
       "key": "worldtask_world_task_task_name_133",
-      "text": "希卡普&亚丝翠&鼻涕粗日常四_1"
+      "text": "驯龙小队的一天五"
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_133",
-      "text": "希卡普&亚丝翠&鼻涕粗日常四_1"
+      "text": "和鼻涕粗沟通，让他知道问题出在哪。"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_133",
-      "text": "希卡普&亚丝翠&鼻涕粗日常四_1"
+      "text": "找到鼻涕粗"
     },
     "get_item": [],
     "trigger": 0,
@@ -5787,15 +5793,15 @@
     "icon": "25001",
     "task_name": {
       "key": "worldtask_world_task_task_name_134",
-      "text": "希卡普&亚丝翠&鼻涕粗日常四_2"
+      "text": "驯龙小队的一天终"
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_134",
-      "text": "希卡普&亚丝翠&鼻涕粗日常四_2"
+      "text": "为了让驯龙小队重归于好，你准备去找鼻涕粗聊聊。"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_134",
-      "text": "希卡普&亚丝翠&鼻涕粗日常四_2"
+      "text": "让他们和好如初"
     },
     "get_item": [],
     "trigger": 0,
@@ -5831,11 +5837,11 @@
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_135",
-      "text": "平先生的焦急"
+      "text": "平先生焦急的看向武馆的方向，看上去像是遇到了什么棘手的事。"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_135",
-      "text": "平先生的焦急"
+      "text": "找平先生聊聊"
     },
     "get_item": [],
     "trigger": 0,
@@ -5871,11 +5877,11 @@
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_136",
-      "text": "赛龙的故事"
+      "text": "暴芙那特和悍夫那特好像又在斗嘴了。"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_136",
-      "text": "赛龙的故事"
+      "text": "去找双胞胎"
     },
     "get_item": [],
     "trigger": 0,

modules/academy/api_challenge.go

@@ -50,7 +50,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.AcademyChallen
 		Redflist:   record.Redflist,
 		BlueCompId: record.BlueCompId,
 		Buleflist:  record.Buleflist,
-		Tasks:      level.Task,
+		Tasks:      record.Tasks,
 	}})
 	return
 }

modules/academy/api_teaching.go

@@ -53,7 +53,7 @@ func (this *apiComp) Teaching(session comm.IUserSession, req *pb.AcademyTeaching
 			Redflist:   record.Redflist,
 			BlueCompId: record.BlueCompId,
 			Buleflist:  record.Buleflist,
-			Tasks:      level.Task,
+			Tasks:      record.Tasks,
 		}})
 	return
 }

modules/combat/api_challenge.go

@@ -49,7 +49,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.CombatChalleng
 		Redflist:   record.Redflist,
 		BlueCompId: record.BlueCompId,
 		Buleflist:  record.Buleflist,
-		Tasks:      nil,
+		Tasks:      record.Tasks,
 	}})
 	return
 }

modules/pagoda/api_racechallenge.go

@@ -134,7 +134,7 @@ func (this *apiComp) ChallengeRace(session comm.IUserSession, req *pb.PagodaChal
 			Redflist:   record.Redflist,
 			BlueCompId: record.BlueCompId,
 			Buleflist:  record.Buleflist,
-			Tasks:      conf.Fightevents,
+			Tasks:      record.Tasks,
 		},
 		Cid: req.Cid,
 	})

modules/worldtask/api_battlestart.go

@@ -74,7 +74,7 @@ func (this *apiComp) Battlestart(session comm.IUserSession, req *pb.WorldtaskBat
 					Redflist:   record.Redflist,
 					BlueCompId: record.BlueCompId,
 					Buleflist:  record.Buleflist,
-					Tasks:      battleConf.EventList,
+					Tasks:      record.Tasks,
 				},
 			}
 		} else {

modules/wtask/api_battleevent.go

@@ -50,7 +50,7 @@ func (this *apiComp) BattleEvent(session comm.IUserSession, req *pb.WTaskBattleE
 	}); err != nil {
 		return
 	}
-	session.SendMsg(string(this.module.GetType()), "battlestart", &pb.WTaskBattleEventResp{
+	session.SendMsg(string(this.module.GetType()), "battleevent", &pb.WTaskBattleEventResp{
 		Group: req.Group,
 		Event: req.Event,
 		Info: &pb.BattleInfo{
@@ -62,7 +62,7 @@ func (this *apiComp) BattleEvent(session comm.IUserSession, req *pb.WTaskBattleE
 			Redflist:   record.Redflist,
 			BlueCompId: record.BlueCompId,
 			Buleflist:  record.Buleflist,
-			Tasks:      []int32{conf.Battleid},
+			Tasks:      record.Tasks,
 		},
 	})
 	return

modules/wtask/api_battlestart.go

@@ -59,7 +59,7 @@ func (this *apiComp) BattleStart(session comm.IUserSession, req *pb.WTaskBattleS
 			Redflist:   record.Redflist,
 			BlueCompId: record.BlueCompId,
 			Buleflist:  record.Buleflist,
-			Tasks:      battleConf.EventList,
+			Tasks:      record.Tasks,
 		},
 	})
 	return

modules/wtask/api_eventcomplete.go

@@ -94,6 +94,6 @@ func (this *apiComp) EventComplete(session comm.IUserSession, req *pb.WTaskEvent
 		return
 	}
 
-	session.SendMsg(string(this.module.GetType()), "eventtarget", &pb.WTaskEventCompleteResp{Group: req.Group, Event: event, Award: award})
+	session.SendMsg(string(this.module.GetType()), "eventcomplete", &pb.WTaskEventCompleteResp{Group: req.Group, Event: event, Award: award})
 	return
 }