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

bin/json/game_coin.json

@@ -15,6 +15,10 @@
     "intr": {
       "key": "item_coin_intr_1",
       "text": "可以用来购买各种道具的基础货币。"
+    },
+    "intr2": {
+      "key": "item_coin_intr2_1",
+      "text": ""
     }
   },
   {
@@ -32,7 +36,11 @@
     "img": "attr_diamond",
     "intr": {
       "key": "item_coin_intr_2",
-      "text": "珍惜的高级货币，可以用来购买各种稀有道具。"
+      "text": "珍贵的高级货币，可以用来购买各种稀有道具。"
+    },
+    "intr2": {
+      "key": "item_coin_intr2_2",
+      "text": ""
     }
   },
   {
@@ -40,7 +48,7 @@
     "keyint": 3,
     "name": {
       "key": "item_coin_name_3",
-      "text": "角色经验"
+      "text": "传承者经验值"
     },
     "color": 3,
     "effects": "",
@@ -50,7 +58,11 @@
     "img": "attr_exp",
     "intr": {
       "key": "item_coin_intr_3",
-      "text": "可用于提升角色等级。"
+      "text": "历代月中人传承者的经验值，可用于提升自己的等级。"
+    },
+    "intr2": {
+      "key": "item_coin_intr2_3",
+      "text": "”不提示自己，怎么能与其他守护者并肩战斗呢？“"
     }
   },
   {
@@ -58,7 +70,7 @@
     "keyint": 4,
     "name": {
       "key": "item_coin_name_4",
-      "text": "友情点"
+      "text": "友情背包"
     },
     "color": 1,
     "effects": "",
@@ -68,7 +80,11 @@
     "img": "attr_friendPoint",
     "intr": {
       "key": "item_coin_intr_4",
-      "text": "好友赠送的友情点，可以用于有情商店兑换各种道具。"
+      "text": "好友赠送的背包，朋友怎么会忍心让你风餐露宿呢？带上这个承载着友情的背包，找友情商店兑换心仪的物品吧。"
+    },
+    "intr2": {
+      "key": "item_coin_intr2_4",
+      "text": "”朋友的背包，背到现在还没烂。它早已成为我生命的另一半。看在它这么贵重的份上，老板，多给我一点吧。“"
     }
   },
   {
@@ -76,7 +92,7 @@
     "keyint": 5,
     "name": {
       "key": "item_coin_name_5",
-      "text": "废弃角色经验"
+      "text": "遗留的经验值"
     },
     "color": 3,
     "effects": "",
@@ -86,7 +102,11 @@
     "img": "attr_palyexp",
     "intr": {
       "key": "item_coin_intr_5",
-      "text": "可用于提升角色等级。"
+      "text": "去往其他地方的守护者遗留的经验值，可用于提升守护者的等级。"
+    },
+    "intr2": {
+      "key": "item_coin_intr2_5",
+      "text": "”有些人来过又离开了，但他们总会留下点什么。“"
     }
   },
   {
@@ -94,7 +114,7 @@
     "keyint": 6,
     "name": {
       "key": "item_coin_name_6",
-      "text": "公会经验"
+      "text": "俱乐部经验值"
     },
     "color": 1,
     "effects": "",
@@ -104,7 +124,11 @@
     "img": "attr_guildexp",
     "intr": {
       "key": "item_coin_intr_6",
-      "text": "可以用于提升公会等级。"
+      "text": "俱乐部专属的经验值，可以用于提升俱乐部等级。"
+    },
+    "intr2": {
+      "key": "item_coin_intr2_6",
+      "text": "”俱乐部会员可以任意翻阅这些日记，上面记载了许多冒险的故事，以及我们是怎么把产业做大做强的。“沃尔夫说道。"
     }
   },
   {
@@ -112,7 +136,7 @@
     "keyint": 7,
     "name": {
       "key": "item_coin_name_7",
-      "text": "公会活跃度"
+      "text": "活跃印章"
     },
     "color": 1,
     "effects": "",
@@ -122,7 +146,11 @@
     "img": "attr_guildactive",
     "intr": {
       "key": "item_coin_intr_7",
-      "text": "通过公会任务获取，达到一定活跃度公会成员都可以在公会任务界面领取奖励。"
+      "text": "通过俱乐部任务获取，代表活跃度。印章达到一定数量，俱乐部成员可以领取对应的奖励。"
+    },
+    "intr2": {
+      "key": "item_coin_intr2_7",
+      "text": "”这里活跃的人太多，以至于有时候印章都不够用了。“戴安狐说道。"
     }
   },
   {
@@ -130,7 +158,7 @@
     "keyint": 8,
     "name": {
       "key": "item_coin_name_8",
-      "text": "公会币"
+      "text": "俱乐部卡"
     },
     "color": 3,
     "effects": "",
@@ -140,7 +168,11 @@
     "img": "attr_guildcoin",
     "intr": {
       "key": "item_coin_intr_8",
-      "text": "可以用于在公会商店兑换各种道具。"
+      "text": "俱乐部会员专属的卡，可以用来在俱乐部商店兑换各种道具。"
+    },
+    "intr2": {
+      "key": "item_coin_intr2_8",
+      "text": "“这是一张尊贵的卡，象征着身份，象征着不凡。”"
     }
   },
   {
@@ -148,7 +180,7 @@
     "keyint": 9,
     "name": {
       "key": "item_coin_name_9",
-      "text": "星图币"
+      "text": "星图灯"
     },
     "color": 3,
     "effects": "",
@@ -161,6 +193,10 @@
     "intr": {
       "key": "item_coin_intr_9",
       "text": "点亮星图的必要道具，可以通过升级获得。"
+    },
+    "intr2": {
+      "key": "item_coin_intr2_9",
+      "text": "“给黑夜带去黎明，只是小小的一盏灯。”"
     }
   },
   {
@@ -168,7 +204,7 @@
     "keyint": 10,
     "name": {
       "key": "item_coin_name_10",
-      "text": "商会经验"
+      "text": "商会徽章"
     },
     "color": 3,
     "effects": "",
@@ -178,7 +214,11 @@
     "img": "attr_vipexp",
     "intr": {
       "key": "item_coin_intr_10",
-      "text": "商会地位的象征，积累一定声望可以提升商会等级。"
+      "text": "商会地位的象征，积累一定数量可以提升商会等级。"
+    },
+    "intr2": {
+      "key": "item_coin_intr2_10",
+      "text": "“商会的艰辛与不易都浓缩在这小小的徽章之中。“"
     }
   },
   {
@@ -196,7 +236,11 @@
     "img": "attr_arenacoin",
     "intr": {
       "key": "item_coin_intr_11",
-      "text": "向竞技比赛强者发放的兑换币，可以在竞技商店兑换多种奖励。"
+      "text": "竞技比赛强者才能获得的钱币，可以在竞技商店兑换多种奖励。"
+    },
+    "intr2": {
+      "key": "item_coin_intr2_11",
+      "text": "“强者的证明！实力的象征！胜利的嘉奖！好了好了，快去把它花掉吧。”"
     }
   },
   {
@@ -214,7 +258,11 @@
     "img": "attr_ps",
     "intr": {
       "key": "item_coin_intr_12",
-      "text": "挑战关卡必备。"
+      "text": "挑战关卡必备。没有体力做不成任何事。"
+    },
+    "intr2": {
+      "key": "item_coin_intr2_12",
+      "text": ""
     }
   },
   {
@@ -222,7 +270,7 @@
     "keyint": 13,
     "name": {
       "key": "item_coin_name_13",
-      "text": "守护者经验"
+      "text": "守护者经验值"
     },
     "color": 3,
     "effects": "",
@@ -230,7 +278,11 @@
     "img": "attr_heroexp",
     "intr": {
       "key": "item_coin_intr_13",
-      "text": "累积到一定值会提升守护者等级。"
+      "text": "历代守护者的战斗经验值，可用于提升守护者的等级。"
+    },
+    "intr2": {
+      "key": "item_coin_intr2_13",
+      "text": "“先辈们的宝贵经验！可以学到很多东西，还可以读到很多小故事。”"
     }
   },
   {
@@ -238,7 +290,7 @@
     "keyint": 14,
     "name": {
       "key": "item_coin_name_14",
-      "text": "荣耀值"
+      "text": "幸运星"
     },
     "color": 5,
     "effects": "",
@@ -248,7 +300,11 @@
     "img": "attr_moongold",
     "intr": {
       "key": "item_coin_intr_14",
-      "text": "可用于守护者商店，通过重复抽取同一个守护者7次以上获得。"
+      "text": "重复抽取同一个守护者7次以上才能获得的宝贝，可用于守护者商店。"
+    },
+    "intr2": {
+      "key": "item_coin_intr2_14",
+      "text": "“你的运气实在非凡，这个宝贝送给你。”"
     }
   },
   {
@@ -256,7 +312,7 @@
     "keyint": 15,
     "name": {
       "key": "item_coin_name_15",
-      "text": "虚拟币"
+      "text": "瓶盖"
     },
     "color": 5,
     "effects": "",
@@ -266,7 +322,11 @@
     "img": "attr_merchantmoney",
     "intr": {
       "key": "item_coin_intr_15",
-      "text": "用于在巨怪商队内进行消费的货币。"
+      "text": "用于在巨怪商队内进行消费的货币。巨怪们并不会使用常规意义的黄金宝石之类的货币，反倒是小型又量产的人类工艺品更受他们青睐。"
+    },
+    "intr2": {
+      "key": "item_coin_intr2_15",
+      "text": "“多么精致的东西啊！人类居然把这么美丽的东西扔进垃圾桶里。“一位不愿透露姓名的巨怪说道。"
     }
   }
 ]

bin/json/game_gamesummary.json

@@ -2,7 +2,7 @@
   {
     "id": 1,
     "name": {
-      "key": "冒险关卡",
+      "key": "gamesummary_node_name_1",
       "text": "冒险关卡"
     },
     "tabId": 2,
@@ -14,7 +14,7 @@
     "params": "",
     "jumpId": 166,
     "introduce": {
-      "key": "冒险关卡",
+      "key": "gamesummary_node_introdunce_1",
       "text": "冒险关卡"
     },
     "bg": "hkz_wftj_zxgk",
@@ -30,7 +30,7 @@
   {
     "id": 2,
     "name": {
-      "key": "竞技场",
+      "key": "gamesummary_node_name_2",
       "text": "竞技场"
     },
     "tabId": 10,
@@ -42,7 +42,7 @@
     "params": "",
     "jumpId": 10015,
     "introduce": {
-      "key": "竞技场",
+      "key": "gamesummary_node_introdunce_2",
       "text": "竞技场"
     },
     "bg": "hkz_wftj_jjc",
@@ -58,7 +58,7 @@
   {
     "id": 3,
     "name": {
-      "key": "狩猎-巨型猩猩",
+      "key": "gamesummary_node_name_3",
       "text": "狩猎-巨型猩猩"
     },
     "tabId": 4,
@@ -70,7 +70,7 @@
     "params": "1",
     "jumpId": 10026,
     "introduce": {
-      "key": "狩猎-巨型猩猩",
+      "key": "gamesummary_node_introdunce_3",
       "text": "狩猎-巨型猩猩"
     },
     "bg": "hkz_wftj_sl02",
@@ -96,7 +96,7 @@
   {
     "id": 4,
     "name": {
-      "key": "狩猎-大厨",
+      "key": "gamesummary_node_name_4",
       "text": "狩猎-大厨"
     },
     "tabId": 4,
@@ -108,7 +108,7 @@
     "params": "2",
     "jumpId": 10025,
     "introduce": {
-      "key": "狩猎-大厨",
+      "key": "gamesummary_node_introdunce_4",
       "text": "狩猎-大厨"
     },
     "bg": "hkz_wftj_sl01",
@@ -134,7 +134,7 @@
   {
     "id": 5,
     "name": {
-      "key": "狩猎-太空海星",
+      "key": "gamesummary_node_name_5",
       "text": "狩猎-太空海星"
     },
     "tabId": 4,
@@ -146,7 +146,7 @@
     "params": "3",
     "jumpId": 168,
     "introduce": {
-      "key": "狩猎-太空海星",
+      "key": "gamesummary_node_introdunce_5",
       "text": "狩猎-太空海星"
     },
     "bg": "hkz_wftj_sl03",
@@ -172,7 +172,7 @@
   {
     "id": 6,
     "name": {
-      "key": "狩猎-火龙",
+      "key": "gamesummary_node_name_6",
       "text": "狩猎-火龙"
     },
     "tabId": 4,
@@ -184,7 +184,7 @@
     "params": "4",
     "jumpId": 10024,
     "introduce": {
-      "key": "狩猎-火龙",
+      "key": "gamesummary_node_introdunce_6",
       "text": "狩猎-火龙"
     },
     "bg": "hkz_wftj_sl04",
@@ -210,7 +210,7 @@
   {
     "id": 7,
     "name": {
-      "key": "维京远征-火焰泰坦",
+      "key": "gamesummary_node_name_7",
       "text": "维京远征-火焰泰坦"
     },
     "tabId": 3,
@@ -222,7 +222,7 @@
     "params": "",
     "jumpId": 10022,
     "introduce": {
-      "key": "维京远征-火焰泰坦",
+      "key": "gamesummary_node_introdunce_7",
       "text": "维京远征-火焰泰坦"
     },
     "bg": "hkz_wftj_wjyz03",
@@ -253,7 +253,7 @@
   {
     "id": 8,
     "name": {
-      "key": "维京远征-冰霜泰坦",
+      "key": "gamesummary_node_name_8",
       "text": "维京远征-冰霜泰坦"
     },
     "tabId": 3,
@@ -265,7 +265,7 @@
     "params": "",
     "jumpId": 10020,
     "introduce": {
-      "key": "维京远征-冰霜泰坦",
+      "key": "gamesummary_node_introdunce_8",
       "text": "维京远征-冰霜泰坦"
     },
     "bg": "hkz_wftj_wjyz02",
@@ -296,7 +296,7 @@
   {
     "id": 9,
     "name": {
-      "key": "维京远征-森林泰坦",
+      "key": "gamesummary_node_name_9",
       "text": "维京远征-森林泰坦"
     },
     "tabId": 3,
@@ -308,7 +308,7 @@
     "params": "",
     "jumpId": 10021,
     "introduce": {
-      "key": "维京远征-森林泰坦",
+      "key": "gamesummary_node_introdunce_9",
       "text": "维京远征-森林泰坦"
     },
     "bg": "hkz_wftj_wjyz01",
@@ -339,7 +339,7 @@
   {
     "id": 10,
     "name": {
-      "key": "经验副本",
+      "key": "gamesummary_node_name_10",
       "text": "经验副本"
     },
     "tabId": 5,
@@ -351,7 +351,7 @@
     "params": "",
     "jumpId": 10013,
     "introduce": {
-      "key": "经验副本",
+      "key": "gamesummary_node_introdunce_10",
       "text": "经验副本"
     },
     "bg": "hkz_wftj_jyfb",
@@ -377,7 +377,7 @@
   {
     "id": 11,
     "name": {
-      "key": "功夫大师挑战塔",
+      "key": "gamesummary_node_name_11",
       "text": "功夫大师挑战塔"
     },
     "tabId": 7,
@@ -389,7 +389,7 @@
     "params": "",
     "jumpId": 10004,
     "introduce": {
-      "key": "功夫大师挑战塔",
+      "key": "gamesummary_node_introdunce_11",
       "text": "功夫大师挑战塔"
     },
     "bg": "hkz_wftj_wjyz01",
@@ -405,7 +405,7 @@
   {
     "id": 12,
     "name": {
-      "key": "循环塔",
+      "key": "gamesummary_node_name_12",
       "text": "循环塔"
     },
     "tabId": 8,
@@ -417,7 +417,7 @@
     "params": "",
     "jumpId": 10017,
     "introduce": {
-      "key": "循环塔",
+      "key": "gamesummary_node_introdunce_12",
       "text": "循环塔"
     },
     "bg": "hkz_wftj_wjyz01",
@@ -433,7 +433,7 @@
   {
     "id": 13,
     "name": {
-      "key": "阵营塔",
+      "key": "gamesummary_node_name_13",
       "text": "阵营塔"
     },
     "tabId": 9,
@@ -445,7 +445,7 @@
     "params": "",
     "jumpId": 10018,
     "introduce": {
-      "key": "阵营塔",
+      "key": "gamesummary_node_introdunce_13",
       "text": "阵营塔"
     },
     "bg": "hkz_wftj_wjyz01",
@@ -461,7 +461,7 @@
   {
     "id": 14,
     "name": {
-      "key": "巨怪商队",
+      "key": "gamesummary_node_name_14",
       "text": "巨怪商队"
     },
     "tabId": 12,
@@ -473,7 +473,7 @@
     "params": "",
     "jumpId": 11001,
     "introduce": {
-      "key": "巨怪商队",
+      "key": "gamesummary_node_introdunce_14",
       "text": "巨怪商队"
     },
     "bg": "hkz_wftj_jsg",
@@ -489,7 +489,7 @@
   {
     "id": 15,
     "name": {
-      "key": "旧时光",
+      "key": "gamesummary_node_name_15",
       "text": "旧时光"
     },
     "tabId": 13,
@@ -501,7 +501,7 @@
     "params": "",
     "jumpId": 10019,
     "introduce": {
-      "key": "旧时光",
+      "key": "gamesummary_node_introdunce_15",
       "text": "旧时光"
     },
     "bg": "hkz_wftj_jsg",
@@ -517,7 +517,7 @@
   {
     "id": 16,
     "name": {
-      "key": "迷宫玩法",
+      "key": "gamesummary_node_name_16",
       "text": "迷宫玩法"
     },
     "tabId": 11,
@@ -529,7 +529,7 @@
     "params": "",
     "jumpId": 10019,
     "introduce": {
-      "key": "迷宫玩法",
+      "key": "gamesummary_node_introdunce_16",
       "text": "迷宫玩法"
     },
     "bg": "hkz_wftj_jsg",

bin/json/game_gamesummarytab.json

@@ -3,7 +3,7 @@
     "tabId": 1,
     "layer": 0,
     "name": {
-      "key": "探险旅程",
+      "key": "gamesummary_fathernode_name_1",
       "text": "探险旅程"
     },
     "mapPos": {
@@ -16,7 +16,7 @@
     "tabId": 2,
     "layer": 1,
     "name": {
-      "key": "主线探险",
+      "key": "gamesummary_fathernode_name_2",
       "text": "主线探险"
     },
     "mapPos": {
@@ -29,7 +29,7 @@
     "tabId": 3,
     "layer": 1,
     "name": {
-      "key": "维京远征",
+      "key": "gamesummary_fathernode_name_3",
       "text": "维京远征"
     },
     "mapPos": {
@@ -42,7 +42,7 @@
     "tabId": 4,
     "layer": 1,
     "name": {
-      "key": "狩猎副本",
+      "key": "gamesummary_fathernode_name_4",
       "text": "狩猎副本"
     },
     "mapPos": {
@@ -55,7 +55,7 @@
     "tabId": 5,
     "layer": 1,
     "name": {
-      "key": "经验副本",
+      "key": "gamesummary_fathernode_name_5",
       "text": "经验副本"
     },
     "mapPos": {
@@ -68,7 +68,7 @@
     "tabId": 6,
     "layer": 0,
     "name": {
-      "key": "功夫训练",
+      "key": "gamesummary_fathernode_name_6",
       "text": "功夫训练"
     },
     "mapPos": {
@@ -81,7 +81,7 @@
     "tabId": 7,
     "layer": 1,
     "name": {
-      "key": "功夫大师挑战塔",
+      "key": "gamesummary_fathernode_name_7",
       "text": "功夫大师挑战塔"
     },
     "mapPos": {
@@ -94,7 +94,7 @@
     "tabId": 8,
     "layer": 1,
     "name": {
-      "key": "循环塔",
+      "key": "gamesummary_fathernode_name_8",
       "text": "循环塔"
     },
     "mapPos": {
@@ -107,7 +107,7 @@
     "tabId": 9,
     "layer": 1,
     "name": {
-      "key": "阵营塔",
+      "key": "gamesummary_fathernode_name_9",
       "text": "阵营塔"
     },
     "mapPos": {
@@ -120,7 +120,7 @@
     "tabId": 10,
     "layer": 0,
     "name": {
-      "key": "竞技挑战",
+      "key": "gamesummary_fathernode_name_10",
       "text": "竞技挑战"
     },
     "mapPos": {
@@ -133,7 +133,7 @@
     "tabId": 11,
     "layer": 0,
     "name": {
-      "key": "迷宫玩法",
+      "key": "gamesummary_fathernode_name_11",
       "text": "迷宫玩法"
     },
     "mapPos": {
@@ -146,7 +146,7 @@
     "tabId": 12,
     "layer": 0,
     "name": {
-      "key": "巨怪商队",
+      "key": "gamesummary_fathernode_name_12",
       "text": "巨怪商队"
     },
     "mapPos": {
@@ -159,7 +159,7 @@
     "tabId": 13,
     "layer": 0,
     "name": {
-      "key": "旧时光",
+      "key": "gamesummary_fathernode_name_13",
       "text": "旧时光"
     },
     "mapPos": {

bin/json/game_opencond.json

@@ -858,8 +858,8 @@
     },
     "main": [
       {
-        "key": 2,
+        "key": 1,
-        "param": 1100304
+        "param": 1
       }
     ],
     "wkqbx": 0,
@@ -1823,14 +1823,9 @@
     "id": "puzzle",
     "name": {
       "key": "opencond_opencond_name_79",
-      "text": "拼图"
+      "text": "拼图签到"
     },
-    "main": [
+    "main": [],
-      {
-        "key": 2,
-        "param": 1100604
-      }
-    ],
     "wkqbx": 0,
     "kqbx": 0,
     "img": "",

bin/json/game_stroneevent.json

@@ -6,10 +6,11 @@
       "text": "预留用"
     },
     "EventType": 16,
-    "Value1": "item,10000001,2",
+    "EventResource": "",
-    "Value2": "0",
+    "Value1": 10001001,
-    "Value3": "0",
+    "Value2": 0,
-    "Value4": "0",
+    "Value3": 0,
+    "Value4": 0,
     "PostEvent": 11000002,
     "probability": 500
   },
@@ -20,10 +21,11 @@
       "text": "预留用"
     },
     "EventType": 16,
-    "Value1": "item,10000001,3",
+    "EventResource": "",
-    "Value2": "0",
+    "Value1": 10001001,
-    "Value3": "0",
+    "Value2": 0,
-    "Value4": "0",
+    "Value3": 0,
+    "Value4": 0,
     "PostEvent": 0,
     "probability": 0
   },
@@ -34,10 +36,11 @@
       "text": "预留用"
     },
     "EventType": 16,
-    "Value1": "item,10000001,4",
+    "EventResource": "",
-    "Value2": "0",
+    "Value1": 10001001,
-    "Value3": "0",
+    "Value2": 0,
-    "Value4": "0",
+    "Value3": 0,
+    "Value4": 0,
     "PostEvent": 0,
     "probability": 0
   },
@@ -48,10 +51,11 @@
       "text": "预留用"
     },
     "EventType": 16,
-    "Value1": "item,10000001,5",
+    "EventResource": "",
-    "Value2": "0",
+    "Value1": 10001001,
-    "Value3": "0",
+    "Value2": 0,
-    "Value4": "0",
+    "Value3": 0,
+    "Value4": 0,
     "PostEvent": 0,
     "probability": 0
   },
@@ -62,10 +66,11 @@
       "text": "预留用"
     },
     "EventType": 16,
-    "Value1": "item,10000001,6",
+    "EventResource": "",
-    "Value2": "0",
+    "Value1": 10001001,
-    "Value3": "0",
+    "Value2": 0,
-    "Value4": "0",
+    "Value3": 0,
+    "Value4": 0,
     "PostEvent": 0,
     "probability": 0
   },
@@ -76,10 +81,11 @@
       "text": "预留用"
     },
     "EventType": 16,
-    "Value1": "item,10000001,7",
+    "EventResource": "",
-    "Value2": "0",
+    "Value1": 10001001,
-    "Value3": "0",
+    "Value2": 0,
-    "Value4": "0",
+    "Value3": 0,
+    "Value4": 0,
     "PostEvent": 0,
     "probability": 0
   }

bin/json/game_stroneroom.json

@@ -12,6 +12,7 @@
     "EventStoryNpcGroup": 0,
     "EventTreasureGroup": 0,
     "EventStoreGroup": 0,
+    "BossEvent": 0,
     "Condition": 0
   },
   {
@@ -27,6 +28,7 @@
     "EventStoryNpcGroup": 0,
     "EventTreasureGroup": 0,
     "EventStoreGroup": 0,
+    "BossEvent": 0,
     "Condition": 0
   },
   {
@@ -42,6 +44,7 @@
     "EventStoryNpcGroup": 0,
     "EventTreasureGroup": 0,
     "EventStoreGroup": 0,
+    "BossEvent": 0,
     "Condition": 0
   },
   {
@@ -57,6 +60,7 @@
     "EventStoryNpcGroup": 0,
     "EventTreasureGroup": 0,
     "EventStoreGroup": 0,
+    "BossEvent": 0,
     "Condition": 0
   },
   {
@@ -72,6 +76,7 @@
     "EventStoryNpcGroup": 0,
     "EventTreasureGroup": 0,
     "EventStoreGroup": 0,
+    "BossEvent": 0,
     "Condition": 0
   },
   {
@@ -87,6 +92,7 @@
     "EventStoryNpcGroup": 0,
     "EventTreasureGroup": 0,
     "EventStoreGroup": 0,
+    "BossEvent": 0,
     "Condition": 0
   }
 ]

bin/json/game_stronestage.json

@@ -55,7 +55,7 @@
     },
     "RoomId": 4,
     "RoomGroup": 0,
-    "PortalGroup": 100002,
+    "PortalGroup": 100003,
     "rewardpreview": [
       {
         "a": "attr",

sys/configure/structs/Game.MainStageData.go

@@ -13,13 +13,14 @@ import "errors"
 type GameMainStageData struct {
     Id int32
     Chapterid int32
-    Taskid int32
+    GroupId int32
-    Unlockid int32
+    PreviousGroupId []int32
     Previoustage int32
     Episodetype int32
     Openlevel int32
     EditorStage int32
     Venturemodel string
+    Venturetype int32
     Ventureavatar []string
     Heroimg string
     Bubbletext string
@@ -55,13 +56,27 @@ func (*GameMainStageData) GetTypeId() int32 {
 func (_v *GameMainStageData)Deserialize(_buf map[string]interface{}) (err error) {
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["chapterid"].(float64); !_ok_ { err = errors.New("chapterid error"); return }; _v.Chapterid = int32(_tempNum_) }
-    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["taskid"].(float64); !_ok_ { err = errors.New("taskid error"); return }; _v.Taskid = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["group_id"].(float64); !_ok_ { err = errors.New("group_id error"); return }; _v.GroupId = int32(_tempNum_) }
-    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["unlockid"].(float64); !_ok_ { err = errors.New("unlockid error"); return }; _v.Unlockid = int32(_tempNum_) }
+     {
+                var _arr_ []interface{}
+                var _ok_ bool
+                if _arr_, _ok_ = _buf["previous_group_id"].([]interface{}); !_ok_ { err = errors.New("previous_group_id error"); return }
+
+                _v.PreviousGroupId = make([]int32, 0, len(_arr_))
+                
+                for _, _e_ := range _arr_ {
+                    var _list_v_ int32
+                    { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
+                    _v.PreviousGroupId = append(_v.PreviousGroupId, _list_v_)
+                }
+            }
+
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["previoustage"].(float64); !_ok_ { err = errors.New("previoustage error"); return }; _v.Previoustage = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Episodetype"].(float64); !_ok_ { err = errors.New("Episodetype error"); return }; _v.Episodetype = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["openlevel"].(float64); !_ok_ { err = errors.New("openlevel error"); return }; _v.Openlevel = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["EditorStage"].(float64); !_ok_ { err = errors.New("EditorStage error"); return }; _v.EditorStage = int32(_tempNum_) }
     { var _ok_ bool; if _v.Venturemodel, _ok_ = _buf["venturemodel"].(string); !_ok_ { err = errors.New("venturemodel error"); return } }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["venturetype"].(float64); !_ok_ { err = errors.New("venturetype error"); return }; _v.Venturetype = int32(_tempNum_) }
      {
                 var _arr_ []interface{}
                 var _ok_ bool

sys/configure/structs/Game.StroneEventData.go

@@ -14,10 +14,11 @@ type GameStroneEventData struct {
     EventId int32
     EventTitle string
     EventType int32
-    Value1 string
+    EventResource string
-    Value2 string
+    Value1 int32
-    Value3 string
+    Value2 int32
-    Value4 string
+    Value3 int32
+    Value4 int32
     PostEvent int32
     Probability int32
 }
@@ -32,10 +33,11 @@ func (_v *GameStroneEventData)Deserialize(_buf map[string]interface{}) (err erro
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["EventId"].(float64); !_ok_ { err = errors.New("EventId error"); return }; _v.EventId = int32(_tempNum_) }
     {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["EventTitle"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.EventTitle error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.EventTitle, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["EventType"].(float64); !_ok_ { err = errors.New("EventType error"); return }; _v.EventType = int32(_tempNum_) }
-    { var _ok_ bool; if _v.Value1, _ok_ = _buf["Value1"].(string); !_ok_ { err = errors.New("Value1 error"); return } }
+    { var _ok_ bool; if _v.EventResource, _ok_ = _buf["EventResource"].(string); !_ok_ { err = errors.New("EventResource error"); return } }
-    { var _ok_ bool; if _v.Value2, _ok_ = _buf["Value2"].(string); !_ok_ { err = errors.New("Value2 error"); return } }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Value1"].(float64); !_ok_ { err = errors.New("Value1 error"); return }; _v.Value1 = int32(_tempNum_) }
-    { var _ok_ bool; if _v.Value3, _ok_ = _buf["Value3"].(string); !_ok_ { err = errors.New("Value3 error"); return } }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Value2"].(float64); !_ok_ { err = errors.New("Value2 error"); return }; _v.Value2 = int32(_tempNum_) }
-    { var _ok_ bool; if _v.Value4, _ok_ = _buf["Value4"].(string); !_ok_ { err = errors.New("Value4 error"); return } }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Value3"].(float64); !_ok_ { err = errors.New("Value3 error"); return }; _v.Value3 = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Value4"].(float64); !_ok_ { err = errors.New("Value4 error"); return }; _v.Value4 = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["PostEvent"].(float64); !_ok_ { err = errors.New("PostEvent error"); return }; _v.PostEvent = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["probability"].(float64); !_ok_ { err = errors.New("probability error"); return }; _v.Probability = int32(_tempNum_) }
     return

sys/configure/structs/Game.StroneRoomData.go

@@ -20,6 +20,7 @@ type GameStroneRoomData struct {
     EventStoryNpcGroup int32
     EventTreasureGroup int32
     EventStoreGroup int32
+    BossEvent int32
     Condition int32
 }
 
@@ -39,6 +40,7 @@ func (_v *GameStroneRoomData)Deserialize(_buf map[string]interface{}) (err error
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["EventStoryNpcGroup"].(float64); !_ok_ { err = errors.New("EventStoryNpcGroup error"); return }; _v.EventStoryNpcGroup = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["EventTreasureGroup"].(float64); !_ok_ { err = errors.New("EventTreasureGroup error"); return }; _v.EventTreasureGroup = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["EventStoreGroup"].(float64); !_ok_ { err = errors.New("EventStoreGroup error"); return }; _v.EventStoreGroup = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["BossEvent"].(float64); !_ok_ { err = errors.New("BossEvent error"); return }; _v.BossEvent = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Condition"].(float64); !_ok_ { err = errors.New("Condition error"); return }; _v.Condition = int32(_tempNum_) }
     return
 }

sys/configure/structs/game.coinData.go

@@ -19,6 +19,7 @@ type GameCoinData struct {
     Access []int32
     Img string
     Intr string
+    Intr2 string
 }
 
 const TypeId_GameCoinData = 1416227927
@@ -49,6 +50,7 @@ func (_v *GameCoinData)Deserialize(_buf map[string]interface{}) (err error) {
 
     { var _ok_ bool; if _v.Img, _ok_ = _buf["img"].(string); !_ok_ { err = errors.New("img error"); return } }
     {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["intr"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Intr error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Intr, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+    {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["intr2"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Intr2 error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Intr2, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
     return
 }