diff --git a/bin/json/game_battlescore.json b/bin/json/game_battlescore.json index 6c2a50f51..5cb06c605 100644 --- a/bin/json/game_battlescore.json +++ b/bin/json/game_battlescore.json @@ -866,7 +866,7 @@ }, "PassUnlock": 0, "rank_low": 0, - "rank_up": 300000, + "rank_up": 30000, "icon": "gh_img_f", "grade": 101 }, @@ -878,8 +878,8 @@ "text": "C" }, "PassUnlock": 0, - "rank_low": 300001, - "rank_up": 600000, + "rank_low": 30001, + "rank_up": 60000, "icon": "gh_img_c", "grade": 102 }, @@ -891,8 +891,8 @@ "text": "B" }, "PassUnlock": 0, - "rank_low": 600001, - "rank_up": 700000, + "rank_low": 60001, + "rank_up": 70000, "icon": "gh_img_b", "grade": 103 }, @@ -904,8 +904,8 @@ "text": "A" }, "PassUnlock": 0, - "rank_low": 700001, - "rank_up": 800000, + "rank_low": 70001, + "rank_up": 80000, "icon": "gh_img_a", "grade": 104 }, @@ -917,8 +917,8 @@ "text": "A+" }, "PassUnlock": 0, - "rank_low": 800001, - "rank_up": 1000000, + "rank_low": 80001, + "rank_up": 100000, "icon": "gh_img_a1", "grade": 105 }, @@ -930,8 +930,8 @@ "text": "S" }, "PassUnlock": 1, - "rank_low": 1000001, - "rank_up": 2000000, + "rank_low": 100001, + "rank_up": 200000, "icon": "gh_img_s", "grade": 106 }, @@ -943,8 +943,8 @@ "text": "SS" }, "PassUnlock": 1, - "rank_low": 2000001, - "rank_up": 3000000, + "rank_low": 200001, + "rank_up": 300000, "icon": "gh_img_ss", "grade": 107 }, @@ -956,8 +956,8 @@ "text": "SSS" }, "PassUnlock": 1, - "rank_low": 3000001, - "rank_up": 4000000, + "rank_low": 300001, + "rank_up": 400000, "icon": "gh_img_sss", "grade": 108 }, @@ -969,8 +969,8 @@ "text": "EX" }, "PassUnlock": 1, - "rank_low": 4000001, - "rank_up": 5000000, + "rank_low": 400001, + "rank_up": 500000, "icon": "gh_img_ex3", "grade": 109 }, @@ -982,8 +982,8 @@ "text": "EX+" }, "PassUnlock": 1, - "rank_low": 5000001, - "rank_up": 6666666, + "rank_low": 500001, + "rank_up": 666666, "icon": "gh_img_ex2", "grade": 110 }, @@ -995,7 +995,7 @@ "text": "EX++" }, "PassUnlock": 1, - "rank_low": 6666667, + "rank_low": 666667, "rank_up": -1, "icon": "gh_img_ex1", "grade": 111 @@ -1009,7 +1009,7 @@ }, "PassUnlock": 0, "rank_low": 0, - "rank_up": 300000, + "rank_up": 30000, "icon": "gh_img_f", "grade": 201 }, @@ -1021,8 +1021,8 @@ "text": "C" }, "PassUnlock": 0, - "rank_low": 300001, - "rank_up": 600000, + "rank_low": 30001, + "rank_up": 60000, "icon": "gh_img_c", "grade": 202 }, @@ -1034,8 +1034,8 @@ "text": "B" }, "PassUnlock": 0, - "rank_low": 600001, - "rank_up": 700000, + "rank_low": 60001, + "rank_up": 70000, "icon": "gh_img_b", "grade": 203 }, @@ -1047,8 +1047,8 @@ "text": "A" }, "PassUnlock": 0, - "rank_low": 700001, - "rank_up": 800000, + "rank_low": 70001, + "rank_up": 80000, "icon": "gh_img_a", "grade": 204 }, @@ -1060,8 +1060,8 @@ "text": "A+" }, "PassUnlock": 0, - "rank_low": 800001, - "rank_up": 1000000, + "rank_low": 80001, + "rank_up": 100000, "icon": "gh_img_a1", "grade": 205 }, @@ -1073,8 +1073,8 @@ "text": "S" }, "PassUnlock": 1, - "rank_low": 1000001, - "rank_up": 2000000, + "rank_low": 100001, + "rank_up": 200000, "icon": "gh_img_s", "grade": 206 }, @@ -1086,8 +1086,8 @@ "text": "SS" }, "PassUnlock": 1, - "rank_low": 2000001, - "rank_up": 3000000, + "rank_low": 200001, + "rank_up": 300000, "icon": "gh_img_ss", "grade": 207 }, @@ -1099,8 +1099,8 @@ "text": "SSS" }, "PassUnlock": 1, - "rank_low": 3000001, - "rank_up": 4000000, + "rank_low": 300001, + "rank_up": 400000, "icon": "gh_img_sss", "grade": 208 }, @@ -1112,8 +1112,8 @@ "text": "EX" }, "PassUnlock": 1, - "rank_low": 4000001, - "rank_up": 5000000, + "rank_low": 400001, + "rank_up": 500000, "icon": "gh_img_ex3", "grade": 209 }, @@ -1125,8 +1125,8 @@ "text": "EX+" }, "PassUnlock": 1, - "rank_low": 5000001, - "rank_up": 6666666, + "rank_low": 500001, + "rank_up": 666666, "icon": "gh_img_ex2", "grade": 210 }, @@ -1138,7 +1138,7 @@ "text": "EX++" }, "PassUnlock": 1, - "rank_low": 6666667, + "rank_low": 666667, "rank_up": -1, "icon": "gh_img_ex1", "grade": 211 @@ -1152,7 +1152,7 @@ }, "PassUnlock": 0, "rank_low": 0, - "rank_up": 300000, + "rank_up": 30000, "icon": "gh_img_f", "grade": 301 }, @@ -1164,8 +1164,8 @@ "text": "C" }, "PassUnlock": 0, - "rank_low": 300001, - "rank_up": 600000, + "rank_low": 30001, + "rank_up": 60000, "icon": "gh_img_c", "grade": 302 }, @@ -1177,8 +1177,8 @@ "text": "B" }, "PassUnlock": 0, - "rank_low": 600001, - "rank_up": 700000, + "rank_low": 60001, + "rank_up": 70000, "icon": "gh_img_b", "grade": 303 }, @@ -1190,8 +1190,8 @@ "text": "A" }, "PassUnlock": 0, - "rank_low": 700001, - "rank_up": 800000, + "rank_low": 70001, + "rank_up": 80000, "icon": "gh_img_a", "grade": 304 }, @@ -1203,8 +1203,8 @@ "text": "A+" }, "PassUnlock": 0, - "rank_low": 800001, - "rank_up": 1000000, + "rank_low": 80001, + "rank_up": 100000, "icon": "gh_img_a1", "grade": 305 }, @@ -1216,8 +1216,8 @@ "text": "S" }, "PassUnlock": 1, - "rank_low": 1000001, - "rank_up": 2000000, + "rank_low": 100001, + "rank_up": 200000, "icon": "gh_img_s", "grade": 306 }, @@ -1229,8 +1229,8 @@ "text": "SS" }, "PassUnlock": 1, - "rank_low": 2000001, - "rank_up": 3000000, + "rank_low": 200001, + "rank_up": 300000, "icon": "gh_img_ss", "grade": 307 }, @@ -1242,8 +1242,8 @@ "text": "SSS" }, "PassUnlock": 1, - "rank_low": 3000001, - "rank_up": 4000000, + "rank_low": 300001, + "rank_up": 400000, "icon": "gh_img_sss", "grade": 308 }, @@ -1255,8 +1255,8 @@ "text": "EX" }, "PassUnlock": 1, - "rank_low": 4000001, - "rank_up": 5000000, + "rank_low": 400001, + "rank_up": 500000, "icon": "gh_img_ex3", "grade": 309 }, @@ -1268,8 +1268,8 @@ "text": "EX+" }, "PassUnlock": 1, - "rank_low": 5000001, - "rank_up": 6666666, + "rank_low": 500001, + "rank_up": 666666, "icon": "gh_img_ex2", "grade": 310 }, @@ -1281,7 +1281,7 @@ "text": "EX++" }, "PassUnlock": 1, - "rank_low": 6666667, + "rank_low": 666667, "rank_up": -1, "icon": "gh_img_ex1", "grade": 311 diff --git a/bin/json/game_block.json b/bin/json/game_block.json index 3c1308603..5234d25b1 100644 --- a/bin/json/game_block.json +++ b/bin/json/game_block.json @@ -9,7 +9,7 @@ "icon": "sx_fk_dhs", "icon2": "sx_fk_ls", "weight": 1500, - "effect": "effect_sx_xiaochu_dhs", + "effect": "", "choseeffect": "effect_sx_trail_dhs", "pointeffect": "effect_sx_liuguang_dhs", "score": 1, @@ -26,7 +26,7 @@ "icon": "sx_fk_ls", "icon2": "sx_fk_dhs", "weight": 1500, - "effect": "effect_sx_xiaochu_ls", + "effect": "", "choseeffect": "effect_sx_trail_fhs", "pointeffect": "effect_sx_liuguang_ls", "score": 1, @@ -43,7 +43,7 @@ "icon": "sx_fk_lvs", "icon2": "sx_fk_lvs", "weight": 1500, - "effect": "effect_sx_xiaochu_lvs", + "effect": "", "choseeffect": "effect_sx_trail_hs", "pointeffect": "effect_sx_liuguang_lvs", "score": 1, @@ -60,7 +60,7 @@ "icon": "sx_fk_zs", "icon2": "sx_fk_zs", "weight": 1500, - "effect": "effect_sx_xiaochu_zs", + "effect": "", "choseeffect": "effect_sx_trail_ls", "pointeffect": "effect_sx_liuguang_zs", "score": 1, @@ -77,7 +77,7 @@ "icon": "sx_fk_hs", "icon2": "sx_fk_hs", "weight": 1500, - "effect": "effect_sx_xiaochu_hs", + "effect": "", "choseeffect": "effect_sx_trail_lvs", "pointeffect": "effect_sx_liuguang_hs", "score": 1, @@ -94,7 +94,7 @@ "icon": "sx_fk_fhs", "icon2": "sx_fk_fhs", "weight": 1500, - "effect": "effect_sx_xiaochu_fhs", + "effect": "", "choseeffect": "effect_sx_trail_zs", "pointeffect": "effect_sx_liuguang_fhs", "score": 1, diff --git a/bin/json/game_enchantboss.json b/bin/json/game_enchantboss.json index 052a13638..a19505dee 100644 --- a/bin/json/game_enchantboss.json +++ b/bin/json/game_enchantboss.json @@ -24,7 +24,7 @@ }, "strategy_text": { "key": "enchantboss_boss_strategy_text_01", - "text": "BOSS攻略描述" + "text": "火焰泰坦拥有无限血量,玩家必须战斗至足够的回合数之后,才能获得最终胜利。【火岩熔心】会优先攻击队长目标,队长目标防御越弱伤害越高,因此队长需要放置防御值高的守护者,将有利于减少伤害。【熔岩迸发】会给全体目标附加【炽热岩浆】效果。当火焰泰坦释放【熔岩爆裂】时会引爆所有【炙热岩浆】效果,对敌人造成巨大伤害。【炙热岩浆】只能通过增益效果和净化消除,在释放【熔岩爆裂】前尽可能多的消除【炙热岩浆】效果,积攒更多花瓣,可使得火焰泰坦进入破防状态,且得分数倍率也将获得提高。因此使用能多上增益效果和拥有净化能力的守护者,是取得高分的关键。战斗结束时,成功存在的队伍方可获得S级及以上评级。" }, "boss": [ 1430001 @@ -44,7 +44,7 @@ } ], "BattleReadyID": 4101, - "heroexp": 0, + "heroexp": 10, "spine": "bossShow_huolong", "icon": "hkz_wftj_wjyz03", "back_png": "wjyz_img003", @@ -75,7 +75,7 @@ }, "strategy_text": { "key": "enchantboss_boss_strategy_text_02", - "text": "BOSS攻略描述" + "text": "冰霜泰坦拥有无限血量,玩家必须战斗至足够的回合数之后,才能获得最终胜利。【冰寒彻骨】会优先攻击队长目标,队长目标当前血量越低伤害越高,因此队长需要放置血量高的守护者,将有利于减少伤害。【寒风凛冽】会给全体目标附加【寒骨冰棱】效果。当冰霜泰坦释放【冰霜呼啸】时会引爆所有【寒骨冰棱】效果,对敌人造成巨大伤害。【寒骨冰棱】只能通过减益效果和治疗消除,在释放【冰霜呼啸】前尽可能多的消除【寒骨冰棱】效果,积攒更多花瓣,可使得冰霜泰坦进入破防状态,且得分数倍率也将获得提高。因此使用能多上减益效果和拥有治疗能力的守护者,是取得高分的关键。战斗结束时,成功存在的队伍方可获得S级及以上评级。" }, "boss": [ 1430002 @@ -95,7 +95,7 @@ } ], "BattleReadyID": 4201, - "heroexp": 0, + "heroexp": 10, "spine": "bossShow_huolong", "icon": "hkz_wftj_wjyz02", "back_png": "wjyz_img001", @@ -136,7 +136,7 @@ }, "strategy_text": { "key": "enchantboss_boss_strategy_text_03", - "text": "BOSS攻略描述" + "text": "森林泰坦拥有无限血量,玩家必须战斗至足够的回合数之后,才能获得最终胜利。【荆棘窒息】会优先攻击队长目标,队长目标速度越低伤害越高,因此队长需要放置速度高的守护者,将有利于减少伤害。【盘根错节】会给全体目标附加【疯缠树枝】效果。当森林泰坦释放【藤蔓狂舞】时会引爆所有【疯缠树枝】效果,对敌人造成巨大伤害。【疯缠树枝】只能通过行动回合消除,在释放【藤蔓狂舞】前尽可能多的消除【疯缠树枝】效果,积攒更多花瓣,可使得森林泰坦进入破防状态,且得分数倍率也将获得提高。因此使用可以改变行动值,或者拥有额外回合,以及速度提升能力的守护者,是取得高分的关键。战斗结束时,成功存在的队伍方可获得S级及以上评级。" }, "boss": [ 1430003 @@ -156,7 +156,7 @@ } ], "BattleReadyID": 4301, - "heroexp": 0, + "heroexp": 10, "spine": "bossShow_huolong", "icon": "hkz_wftj_wjyz01", "back_png": "wjyz_img002", diff --git a/bin/json/game_enchantbossreward.json b/bin/json/game_enchantbossreward.json index b17cc262a..9a15c1ff1 100644 --- a/bin/json/game_enchantbossreward.json +++ b/bin/json/game_enchantbossreward.json @@ -4,43 +4,33 @@ "type": 1, "dropshow1": [ { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010003", "n": 1 }, { - "a": "attr", - "t": "diamond", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010004", "n": 1 } ], "probability": [ - 1000, - 900, - 78 + 81, + 19 ], "reward1_drop": [ - 10001 + 19001001, + 19002001 ], "reward2": [ { "a": "attr", - "t": "diamond", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", + "t": "gold", "n": 1 } ], "reward2_drop": [ - 10001 + 19003001 ] }, { @@ -48,43 +38,39 @@ "type": 1, "dropshow1": [ { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010002", "n": 1 }, { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010003", "n": 1 }, { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010004", "n": 1 } ], "probability": [ - 1000, - 900, - 78 + 15, + 69, + 16 ], "reward1_drop": [ - 10001 + 19001002, + 19002002 ], "reward2": [ { "a": "attr", - "t": "diamond", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", + "t": "gold", "n": 1 } ], "reward2_drop": [ - 10001 + 19003002 ] }, { @@ -92,43 +78,39 @@ "type": 1, "dropshow1": [ { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010002", "n": 1 }, { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010003", "n": 1 }, { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010004", "n": 1 } ], "probability": [ - 1000, - 900, - 78 + 25, + 62, + 13 ], "reward1_drop": [ - 10001 + 19001003, + 19002003 ], "reward2": [ { "a": "attr", - "t": "diamond", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", + "t": "gold", "n": 1 } ], "reward2_drop": [ - 10001 + 19003003 ] }, { @@ -136,43 +118,39 @@ "type": 1, "dropshow1": [ { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010002", "n": 1 }, { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010003", "n": 1 }, { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010004", "n": 1 } ], "probability": [ - 1000, - 900, - 78 + 35, + 55, + 10 ], "reward1_drop": [ - 10001 + 19001004, + 19002004 ], "reward2": [ { "a": "attr", - "t": "diamond", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", + "t": "gold", "n": 1 } ], "reward2_drop": [ - 10001 + 19003004 ] }, { @@ -180,43 +158,39 @@ "type": 1, "dropshow1": [ { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010002", "n": 1 }, { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010003", "n": 1 }, { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010004", "n": 1 } ], "probability": [ - 1000, - 900, - 78 + 55, + 38, + 7 ], "reward1_drop": [ - 10001 + 19001005, + 19002005 ], "reward2": [ { "a": "attr", - "t": "diamond", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", + "t": "gold", "n": 1 } ], "reward2_drop": [ - 10001 + 19003005 ] }, { @@ -224,43 +198,39 @@ "type": 1, "dropshow1": [ { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010002", "n": 1 }, { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010003", "n": 1 }, { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010004", "n": 1 } ], "probability": [ - 1000, - 900, - 78 + 70, + 26, + 4 ], "reward1_drop": [ - 10001 + 19001006, + 19002006 ], "reward2": [ { "a": "attr", - "t": "diamond", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", + "t": "gold", "n": 1 } ], "reward2_drop": [ - 10001 + 19003006 ] }, { @@ -268,43 +238,33 @@ "type": 1, "dropshow1": [ { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010002", "n": 1 }, { - "a": "attr", - "t": "diamond", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010003", "n": 1 } ], "probability": [ - 1000, - 900, - 78 + 80, + 20 ], "reward1_drop": [ - 10001 + 19001007, + 19002007 ], "reward2": [ { "a": "attr", - "t": "diamond", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", + "t": "gold", "n": 1 } ], "reward2_drop": [ - 10001 + 19003007 ] }, { @@ -312,43 +272,39 @@ "type": 1, "dropshow1": [ { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010001", "n": 1 }, { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010002", "n": 1 }, { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010003", "n": 1 } ], "probability": [ - 1000, - 900, - 78 + 30, + 60, + 10 ], "reward1_drop": [ - 10001 + 19001008, + 19002008 ], "reward2": [ { "a": "attr", - "t": "diamond", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", + "t": "gold", "n": 1 } ], "reward2_drop": [ - 10001 + 19003008 ] }, { @@ -356,43 +312,33 @@ "type": 1, "dropshow1": [ { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010001", "n": 1 }, { - "a": "attr", - "t": "diamond", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010002", "n": 1 } ], "probability": [ - 1000, - 900, - 78 + 50, + 50 ], "reward1_drop": [ - 10001 + 19001009, + 19002009 ], "reward2": [ { "a": "attr", - "t": "diamond", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", + "t": "gold", "n": 1 } ], "reward2_drop": [ - 10001 + 19003009 ] }, { @@ -400,87 +346,27 @@ "type": 1, "dropshow1": [ { - "a": "attr", - "t": "diamond", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010001", "n": 1 } ], "probability": [ - 1000, - 900, - 78 + 100 ], "reward1_drop": [ - 10001 + 19001010, + 19002010 ], "reward2": [ { "a": "attr", - "t": "diamond", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", + "t": "gold", "n": 1 } ], "reward2_drop": [ - 10001 - ] - }, - { - "score": 101, - "type": 1, - "dropshow1": [ - { - "a": "attr", - "t": "diamond", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", - "n": 1 - } - ], - "probability": [ - 1000, - 900, - 78 - ], - "reward1_drop": [ - 10001 - ], - "reward2": [ - { - "a": "attr", - "t": "diamond", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", - "n": 1 - } - ], - "reward2_drop": [ - 10001 + 19003010 ] }, { @@ -488,43 +374,33 @@ "type": 2, "dropshow1": [ { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010003", "n": 1 }, { - "a": "attr", - "t": "diamond", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010004", "n": 1 } ], "probability": [ - 1000, - 900, - 78 + 81, + 19 ], "reward1_drop": [ - 10001 + 19101001, + 19002001 ], "reward2": [ { "a": "attr", - "t": "diamond", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", + "t": "gold", "n": 1 } ], "reward2_drop": [ - 10001 + 19003001 ] }, { @@ -532,43 +408,39 @@ "type": 2, "dropshow1": [ { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010002", "n": 1 }, { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010003", "n": 1 }, { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010004", "n": 1 } ], "probability": [ - 1000, - 900, - 78 + 15, + 69, + 16 ], "reward1_drop": [ - 10001 + 19101002, + 19002002 ], "reward2": [ { "a": "attr", - "t": "diamond", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", + "t": "gold", "n": 1 } ], "reward2_drop": [ - 10001 + 19003002 ] }, { @@ -576,43 +448,39 @@ "type": 2, "dropshow1": [ { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010002", "n": 1 }, { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010003", "n": 1 }, { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010004", "n": 1 } ], "probability": [ - 1000, - 900, - 78 + 25, + 62, + 13 ], "reward1_drop": [ - 10001 + 19101003, + 19002003 ], "reward2": [ { "a": "attr", - "t": "diamond", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", + "t": "gold", "n": 1 } ], "reward2_drop": [ - 10001 + 19003003 ] }, { @@ -620,43 +488,39 @@ "type": 2, "dropshow1": [ { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010002", "n": 1 }, { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010003", "n": 1 }, { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010004", "n": 1 } ], "probability": [ - 1000, - 900, - 78 + 35, + 55, + 10 ], "reward1_drop": [ - 10001 + 19101004, + 19002004 ], "reward2": [ { "a": "attr", - "t": "diamond", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", + "t": "gold", "n": 1 } ], "reward2_drop": [ - 10001 + 19003004 ] }, { @@ -664,43 +528,39 @@ "type": 2, "dropshow1": [ { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010002", "n": 1 }, { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010003", "n": 1 }, { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010004", "n": 1 } ], "probability": [ - 1000, - 900, - 78 + 55, + 38, + 7 ], "reward1_drop": [ - 10001 + 19101005, + 19002005 ], "reward2": [ { "a": "attr", - "t": "diamond", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", + "t": "gold", "n": 1 } ], "reward2_drop": [ - 10001 + 19003005 ] }, { @@ -708,43 +568,39 @@ "type": 2, "dropshow1": [ { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010002", "n": 1 }, { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010003", "n": 1 }, { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010004", "n": 1 } ], "probability": [ - 1000, - 900, - 78 + 70, + 26, + 4 ], "reward1_drop": [ - 10001 + 19101006, + 19002006 ], "reward2": [ { "a": "attr", - "t": "diamond", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", + "t": "gold", "n": 1 } ], "reward2_drop": [ - 10001 + 19003006 ] }, { @@ -752,43 +608,33 @@ "type": 2, "dropshow1": [ { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010002", "n": 1 }, { - "a": "attr", - "t": "diamond", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010003", "n": 1 } ], "probability": [ - 1000, - 900, - 78 + 80, + 20 ], "reward1_drop": [ - 10001 + 19101007, + 19002007 ], "reward2": [ { "a": "attr", - "t": "diamond", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", + "t": "gold", "n": 1 } ], "reward2_drop": [ - 10001 + 19003007 ] }, { @@ -796,43 +642,39 @@ "type": 2, "dropshow1": [ { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010001", "n": 1 }, { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010002", "n": 1 }, { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010003", "n": 1 } ], "probability": [ - 1000, - 900, - 78 + 30, + 60, + 10 ], "reward1_drop": [ - 10001 + 19101008, + 19002008 ], "reward2": [ { "a": "attr", - "t": "diamond", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", + "t": "gold", "n": 1 } ], "reward2_drop": [ - 10001 + 19003008 ] }, { @@ -840,43 +682,33 @@ "type": 2, "dropshow1": [ { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010001", "n": 1 }, { - "a": "attr", - "t": "diamond", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010002", "n": 1 } ], "probability": [ - 1000, - 900, - 78 + 50, + 50 ], "reward1_drop": [ - 10001 + 19101009, + 19002009 ], "reward2": [ { "a": "attr", - "t": "diamond", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", + "t": "gold", "n": 1 } ], "reward2_drop": [ - 10001 + 19003009 ] }, { @@ -884,87 +716,27 @@ "type": 2, "dropshow1": [ { - "a": "attr", - "t": "diamond", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010001", "n": 1 } ], "probability": [ - 1000, - 900, - 78 + 100 ], "reward1_drop": [ - 10001 + 19101010, + 19002010 ], "reward2": [ { "a": "attr", - "t": "diamond", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", + "t": "gold", "n": 1 } ], "reward2_drop": [ - 10001 - ] - }, - { - "score": 201, - "type": 2, - "dropshow1": [ - { - "a": "attr", - "t": "diamond", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", - "n": 1 - } - ], - "probability": [ - 1000, - 900, - 78 - ], - "reward1_drop": [ - 10001 - ], - "reward2": [ - { - "a": "attr", - "t": "diamond", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", - "n": 1 - } - ], - "reward2_drop": [ - 10001 + 19003010 ] }, { @@ -972,43 +744,33 @@ "type": 3, "dropshow1": [ { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010003", "n": 1 }, { - "a": "attr", - "t": "diamond", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010004", "n": 1 } ], "probability": [ - 1000, - 900, - 78 + 81, + 19 ], "reward1_drop": [ - 10001 + 19201001, + 19002001 ], "reward2": [ { "a": "attr", - "t": "diamond", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", + "t": "gold", "n": 1 } ], "reward2_drop": [ - 10001 + 19003001 ] }, { @@ -1016,43 +778,39 @@ "type": 3, "dropshow1": [ { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010002", "n": 1 }, { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010003", "n": 1 }, { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010004", "n": 1 } ], "probability": [ - 1000, - 900, - 78 + 15, + 69, + 16 ], "reward1_drop": [ - 10001 + 19201002, + 19002002 ], "reward2": [ { "a": "attr", - "t": "diamond", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", + "t": "gold", "n": 1 } ], "reward2_drop": [ - 10001 + 19003002 ] }, { @@ -1060,43 +818,39 @@ "type": 3, "dropshow1": [ { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010002", "n": 1 }, { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010003", "n": 1 }, { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010004", "n": 1 } ], "probability": [ - 1000, - 900, - 78 + 25, + 62, + 13 ], "reward1_drop": [ - 10001 + 19201003, + 19002003 ], "reward2": [ { "a": "attr", - "t": "diamond", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", + "t": "gold", "n": 1 } ], "reward2_drop": [ - 10001 + 19003003 ] }, { @@ -1104,43 +858,39 @@ "type": 3, "dropshow1": [ { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010002", "n": 1 }, { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010003", "n": 1 }, { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010004", "n": 1 } ], "probability": [ - 1000, - 900, - 78 + 35, + 55, + 10 ], "reward1_drop": [ - 10001 + 19201004, + 19002004 ], "reward2": [ { "a": "attr", - "t": "diamond", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", + "t": "gold", "n": 1 } ], "reward2_drop": [ - 10001 + 19003004 ] }, { @@ -1148,43 +898,39 @@ "type": 3, "dropshow1": [ { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010002", "n": 1 }, { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010003", "n": 1 }, { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010004", "n": 1 } ], "probability": [ - 1000, - 900, - 78 + 55, + 38, + 7 ], "reward1_drop": [ - 10001 + 19201005, + 19002005 ], "reward2": [ { "a": "attr", - "t": "diamond", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", + "t": "gold", "n": 1 } ], "reward2_drop": [ - 10001 + 19003005 ] }, { @@ -1192,43 +938,39 @@ "type": 3, "dropshow1": [ { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010002", "n": 1 }, { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010003", "n": 1 }, { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010004", "n": 1 } ], "probability": [ - 1000, - 900, - 78 + 70, + 26, + 4 ], "reward1_drop": [ - 10001 + 19201006, + 19002006 ], "reward2": [ { "a": "attr", - "t": "diamond", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", + "t": "gold", "n": 1 } ], "reward2_drop": [ - 10001 + 19003006 ] }, { @@ -1236,43 +978,33 @@ "type": 3, "dropshow1": [ { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010002", "n": 1 }, { - "a": "attr", - "t": "diamond", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010003", "n": 1 } ], "probability": [ - 1000, - 900, - 78 + 80, + 20 ], "reward1_drop": [ - 10001 + 19201007, + 19002007 ], "reward2": [ { "a": "attr", - "t": "diamond", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", + "t": "gold", "n": 1 } ], "reward2_drop": [ - 10001 + 19003007 ] }, { @@ -1280,43 +1012,39 @@ "type": 3, "dropshow1": [ { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010001", "n": 1 }, { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010002", "n": 1 }, { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010003", "n": 1 } ], "probability": [ - 1000, - 900, - 78 + 30, + 60, + 10 ], "reward1_drop": [ - 10001 + 19201008, + 19002008 ], "reward2": [ { "a": "attr", - "t": "diamond", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", + "t": "gold", "n": 1 } ], "reward2_drop": [ - 10001 + 19003008 ] }, { @@ -1324,43 +1052,33 @@ "type": 3, "dropshow1": [ { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010001", "n": 1 }, { - "a": "attr", - "t": "diamond", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010002", "n": 1 } ], "probability": [ - 1000, - 900, - 78 + 50, + 50 ], "reward1_drop": [ - 10001 + 19201009, + 19002009 ], "reward2": [ { "a": "attr", - "t": "diamond", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", + "t": "gold", "n": 1 } ], "reward2_drop": [ - 10001 + 19003009 ] }, { @@ -1368,87 +1086,27 @@ "type": 3, "dropshow1": [ { - "a": "attr", - "t": "diamond", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", + "a": "item", + "t": "19010001", "n": 1 } ], "probability": [ - 1000, - 900, - 78 + 100 ], "reward1_drop": [ - 10001 + 19201010, + 19002010 ], "reward2": [ { "a": "attr", - "t": "diamond", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", + "t": "gold", "n": 1 } ], "reward2_drop": [ - 10001 - ] - }, - { - "score": 301, - "type": 3, - "dropshow1": [ - { - "a": "attr", - "t": "diamond", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", - "n": 1 - } - ], - "probability": [ - 1000, - 900, - 78 - ], - "reward1_drop": [ - 10001 - ], - "reward2": [ - { - "a": "attr", - "t": "diamond", - "n": 1 - }, - { - "a": "attr", - "t": "diamond", - "n": 1 - } - ], - "reward2_drop": [ - 10001 + 19003010 ] } ] \ No newline at end of file diff --git a/bin/json/game_gamesummary.json b/bin/json/game_gamesummary.json index cdc32cd0b..d2f7c0887 100644 --- a/bin/json/game_gamesummary.json +++ b/bin/json/game_gamesummary.json @@ -181,7 +181,7 @@ "text": "猫鼠游戏" }, "tabId": 11003, - "type": 5, + "type": 9, "jumpId": 10064, "icon": "ty_icon_tzlq", "mapPos": { @@ -219,7 +219,7 @@ "text": "扑克对决" }, "tabId": 11003, - "type": 0, + "type": 7, "jumpId": 10071, "icon": "ty_icon_zpjl", "mapPos": { @@ -241,7 +241,7 @@ "text": "与驴同行" }, "tabId": 11004, - "type": 0, + "type": 5, "jumpId": 10070, "icon": "zx_icon_yltx", "mapPos": { @@ -263,7 +263,7 @@ "text": "胜者为王" }, "tabId": 11004, - "type": 0, + "type": 8, "jumpId": 10073, "icon": "ty_icon_szww", "mapPos": { diff --git a/bin/json/game_global.json b/bin/json/game_global.json index 12fc7d199..1ceb09b50 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -797,6 +797,7 @@ "plunder_pvp_college_time": 7, "pvp_endtime": 3, "pvp_maintenancetime": 2, - "pvp_integraltool": "pvpintegral" + "pvp_integraltool": "pvpintegral", + "sx_returnspeed": 0.5 } ] \ No newline at end of file diff --git a/bin/json/game_guide.json b/bin/json/game_guide.json index 1f487fc49..e4c8ceec5 100644 --- a/bin/json/game_guide.json +++ b/bin/json/game_guide.json @@ -1073,11 +1073,11 @@ "followguide": 0, "finger": [ "flymain", - "btn_left$" + "rightBtn$" ], "offset": { - "x": 0, - "y": 0 + "x": -50, + "y": -50 }, "fingerTime": 0, "objSize": { @@ -1115,7 +1115,7 @@ "followguide": 0, "finger": [ "flymain", - "speed$" + "speed_up$" ], "offset": { "x": 0, @@ -1187,6 +1187,48 @@ "skipgroup": false, "reward": [] }, + { + "id": 1000404, + "group": 4, + "type": 1, + "startPar": "StopTime", + "parameter": "ResiveTime", + "interface": "", + "condition": "flytrigger_Guide4", + "followtj": "", + "followguide": 0, + "finger": [ + "3d", + "Root/程序/scenes_dragons_01_场景组件/track_story(Clone)/point2" + ], + "offset": { + "x": 0, + "y": 0 + }, + "fingerTime": 0, + "objSize": { + "x": 400, + "y": 400 + }, + "objOffset": { + "x": -200, + "y": -200 + }, + "txt": "1000154", + "txtoffset": { + "x": 0, + "y": 0 + }, + "speakerface": 0, + "sound": "", + "mask": false, + "lock": false, + "uishow": false, + "skiptime": 10000, + "skip": 0, + "skipgroup": false, + "reward": [] + }, { "id": 1000501, "group": 5, diff --git a/bin/json/game_hero.json b/bin/json/game_hero.json index f504c37c7..f7d56314b 100644 --- a/bin/json/game_hero.json +++ b/bin/json/game_hero.json @@ -18677,7 +18677,7 @@ "ip": 1, "sd": 1, "handbook": false, - "prefab": "55005", + "prefab": "85001", "rotation": "0|0|0", "revolve": 0, "scale": [ @@ -18763,7 +18763,7 @@ "ip": 1, "sd": 1, "handbook": false, - "prefab": "55006", + "prefab": "85002", "rotation": "0|0|0", "revolve": 0, "scale": [ @@ -18849,7 +18849,7 @@ "ip": 1, "sd": 1, "handbook": false, - "prefab": "55007", + "prefab": "85003", "rotation": "0|0|0", "revolve": 0, "scale": [ diff --git a/bin/json/game_integralbuff.json b/bin/json/game_integralbuff.json index 960378881..5da2ff766 100644 --- a/bin/json/game_integralbuff.json +++ b/bin/json/game_integralbuff.json @@ -1,11 +1,12 @@ [ { - "skillid": 310001001, + "skillid": 823011421, + "showGroup": 1, "type": 1, "val": 1, "show": 1, "incompatibility": [ - 310001002 + 823011422 ], "name": { "key": "IntegralBoss_Integralbuff_name_01", @@ -18,12 +19,13 @@ } }, { - "skillid": 310001002, + "skillid": 823011422, + "showGroup": 1, "type": 1, "val": 2, "show": 1, "incompatibility": [ - 310001001 + 823011421 ], "name": { "key": "IntegralBoss_Integralbuff_name_02", @@ -36,12 +38,13 @@ } }, { - "skillid": 310001003, + "skillid": 823011423, + "showGroup": 1, "type": 1, "val": 3, "show": 1, "incompatibility": [ - 310001001 + 823011421 ], "name": { "key": "IntegralBoss_Integralbuff_name_03", @@ -54,12 +57,13 @@ } }, { - "skillid": 310001004, + "skillid": 923011431, + "showGroup": 2, "type": 2, "val": 1, "show": 1, "incompatibility": [ - 310001001 + 823011421 ], "name": { "key": "IntegralBoss_Integralbuff_name_04", @@ -72,12 +76,13 @@ } }, { - "skillid": 310001005, + "skillid": 923011432, + "showGroup": 2, "type": 2, "val": 2, "show": 1, "incompatibility": [ - 310001001 + 823011421 ], "name": { "key": "IntegralBoss_Integralbuff_name_05", @@ -90,12 +95,13 @@ } }, { - "skillid": 310001006, + "skillid": 923011433, + "showGroup": 2, "type": 2, "val": 3, "show": 1, "incompatibility": [ - 310001001 + 823011421 ], "name": { "key": "IntegralBoss_Integralbuff_name_06", @@ -108,12 +114,13 @@ } }, { - "skillid": 310001007, + "skillid": 835003421, + "showGroup": 2, "type": 2, "val": 1, "show": 2, "incompatibility": [ - 310001001 + 823011421 ], "name": { "key": "IntegralBoss_Integralbuff_name_07", @@ -126,12 +133,13 @@ } }, { - "skillid": 310001008, + "skillid": 835003422, + "showGroup": 2, "type": 2, "val": 2, "show": 2, "incompatibility": [ - 310001001 + 823011421 ], "name": { "key": "IntegralBoss_Integralbuff_name_08", @@ -144,12 +152,13 @@ } }, { - "skillid": 310001009, + "skillid": 835003423, + "showGroup": 2, "type": 2, "val": 3, "show": 2, "incompatibility": [ - 310001001 + 823011421 ], "name": { "key": "IntegralBoss_Integralbuff_name_09", @@ -162,12 +171,13 @@ } }, { - "skillid": 310001010, + "skillid": 935003431, + "showGroup": 2, "type": 2, "val": 1, "show": 3, "incompatibility": [ - 310001001 + 823011421 ], "name": { "key": "IntegralBoss_Integralbuff_name_10", @@ -180,12 +190,13 @@ } }, { - "skillid": 310001011, + "skillid": 935003432, + "showGroup": 2, "type": 2, "val": 2, "show": 3, "incompatibility": [ - 310001001 + 823011421 ], "name": { "key": "IntegralBoss_Integralbuff_name_11", @@ -198,12 +209,13 @@ } }, { - "skillid": 310001012, + "skillid": 935003433, + "showGroup": 2, "type": 2, "val": 3, "show": 3, "incompatibility": [ - 310001001 + 823011421 ], "name": { "key": "IntegralBoss_Integralbuff_name_12", @@ -216,12 +228,13 @@ } }, { - "skillid": 310001013, + "skillid": 833005421, + "showGroup": 2, "type": 2, "val": 1, "show": 4, "incompatibility": [ - 310001001 + 823011421 ], "name": { "key": "IntegralBoss_Integralbuff_name_13", @@ -234,12 +247,13 @@ } }, { - "skillid": 310001014, + "skillid": 833005422, + "showGroup": 2, "type": 2, "val": 1, "show": 5, "incompatibility": [ - 310001001 + 823011421 ], "name": { "key": "IntegralBoss_Integralbuff_name_14", @@ -252,12 +266,13 @@ } }, { - "skillid": 310001015, + "skillid": 833005413, + "showGroup": 2, "type": 2, "val": 2, "show": 5, "incompatibility": [ - 310001001 + 823011421 ], "name": { "key": "IntegralBoss_Integralbuff_name_15", @@ -270,12 +285,13 @@ } }, { - "skillid": 310001016, + "skillid": 933005431, + "showGroup": 2, "type": 2, "val": 3, "show": 5, "incompatibility": [ - 310001001 + 823011421 ], "name": { "key": "IntegralBoss_Integralbuff_name_16", @@ -288,12 +304,13 @@ } }, { - "skillid": 310001017, + "skillid": 933005432, + "showGroup": 2, "type": 2, "val": 1, "show": 6, "incompatibility": [ - 310001001 + 823011421 ], "name": { "key": "IntegralBoss_Integralbuff_name_17", @@ -306,12 +323,13 @@ } }, { - "skillid": 310001018, + "skillid": 933005433, + "showGroup": 2, "type": 2, "val": 2, "show": 6, "incompatibility": [ - 310001001 + 823011421 ], "name": { "key": "IntegralBoss_Integralbuff_name_18", @@ -324,12 +342,13 @@ } }, { - "skillid": 310001019, + "skillid": 843004421, + "showGroup": 2, "type": 2, "val": 3, "show": 6, "incompatibility": [ - 310001001 + 823011421 ], "name": { "key": "IntegralBoss_Integralbuff_name_19", @@ -342,12 +361,13 @@ } }, { - "skillid": 310001020, + "skillid": 843004422, + "showGroup": 2, "type": 2, "val": 1, "show": 7, "incompatibility": [ - 310001001 + 823011421 ], "name": { "key": "IntegralBoss_Integralbuff_name_20", @@ -360,12 +380,13 @@ } }, { - "skillid": 310001021, + "skillid": 843004423, + "showGroup": 2, "type": 2, "val": 1, "show": 8, "incompatibility": [ - 310001001 + 823011421 ], "name": { "key": "IntegralBoss_Integralbuff_name_21", @@ -378,12 +399,13 @@ } }, { - "skillid": 310001022, + "skillid": 943004431, + "showGroup": 2, "type": 2, "val": 2, "show": 8, "incompatibility": [ - 310001001 + 823011421 ], "name": { "key": "IntegralBoss_Integralbuff_name_22", diff --git a/bin/json/game_integralcondition.json b/bin/json/game_integralcondition.json index e0c4c6e93..1009cff4b 100644 --- a/bin/json/game_integralcondition.json +++ b/bin/json/game_integralcondition.json @@ -9,7 +9,8 @@ "iType": 1, "jumpto": 150, "skillid": [ - 310001001 + 933005433, + 823011423 ], "des": { "key": "IntegralBoss_Integralcondition_des_01", @@ -26,7 +27,8 @@ "iType": 1, "jumpto": 150, "skillid": [ - 310001002 + 843004421, + 923011432 ], "des": { "key": "IntegralBoss_Integralcondition_des_02", @@ -43,7 +45,8 @@ "iType": 1, "jumpto": 150, "skillid": [ - 310001003 + 843004422, + 923011433 ], "des": { "key": "IntegralBoss_Integralcondition_des_03", @@ -60,7 +63,8 @@ "iType": 1, "jumpto": 150, "skillid": [ - 310001004 + 943004431, + 835003422 ], "des": { "key": "IntegralBoss_Integralcondition_des_04", @@ -77,7 +81,7 @@ "iType": 1, "jumpto": 150, "skillid": [ - 310001005 + 835003423 ], "des": { "key": "IntegralBoss_Integralcondition_des_05", @@ -94,7 +98,7 @@ "iType": 1, "jumpto": 150, "skillid": [ - 310001006 + 935003432 ], "des": { "key": "IntegralBoss_Integralcondition_des_06", @@ -111,7 +115,7 @@ "iType": 1, "jumpto": 150, "skillid": [ - 310001007 + 935003433 ], "des": { "key": "IntegralBoss_Integralcondition_des_07", @@ -128,7 +132,7 @@ "iType": 1, "jumpto": 150, "skillid": [ - 310001008 + 833005413 ], "des": { "key": "IntegralBoss_Integralcondition_des_08", @@ -145,7 +149,7 @@ "iType": 1, "jumpto": 150, "skillid": [ - 310001009 + 933005431 ], "des": { "key": "IntegralBoss_Integralcondition_des_09", @@ -162,7 +166,7 @@ "iType": 1, "jumpto": 150, "skillid": [ - 310001010 + 933005432 ], "des": { "key": "IntegralBoss_Integralcondition_des_10", diff --git a/bin/json/game_loading.json b/bin/json/game_loading.json index 66f2133a2..bd496146b 100644 --- a/bin/json/game_loading.json +++ b/bin/json/game_loading.json @@ -149,7 +149,7 @@ "text": "「冰岛龙穴」" }, "prompt": { - "key": "loading_Sheet1_prompt_10", + "key": "loading_Sheet1_prompt_11", "text": "冰岛内部隐藏的溶洞区域,听说这里里面好像有些……宝藏?" } }, @@ -163,7 +163,7 @@ "text": "「冰岛龙穴」" }, "prompt": { - "key": "loading_Sheet1_prompt_39", + "key": "loading_Sheet1_prompt_12", "text": "冰岛内部隐藏的溶洞区域,听说这里里面好像有些……宝藏?" } }, @@ -177,7 +177,7 @@ "text": "「卡梅洛特城堡」" }, "prompt": { - "key": "loading_Sheet1_prompt_40", + "key": "loading_Sheet1_prompt_13", "text": "由阿瓦隆之心驱动着的浮游城堡,守护联盟的「智囊研究所」隐秘于此,在那里布兰奇等研究员进行着各种秘密研究。" } }, @@ -191,7 +191,7 @@ "text": "「疯狂原始人」" }, "prompt": { - "key": "loading_Sheet1_prompt_12", + "key": "loading_Sheet1_prompt_14", "text": "疯狂原始人 力气大是原始人的特点之一。" } }, @@ -205,7 +205,7 @@ "text": "「功夫熊猫」" }, "prompt": { - "key": "loading_Sheet1_prompt_13", + "key": "loading_Sheet1_prompt_15", "text": "相信自己是特别的,是习得绝世神功的秘钥。" } }, @@ -219,7 +219,7 @@ "text": "「坏蛋联盟」" }, "prompt": { - "key": "loading_Sheet1_prompt_14", + "key": "loading_Sheet1_prompt_16", "text": "坏蛋联盟心中有一朵善良之花,花开时,全身蔓延着愉快的刺激感。" } }, @@ -233,7 +233,7 @@ "text": "「巨型猩猩BOSS战」" }, "prompt": { - "key": "loading_Sheet1_prompt_15", + "key": "loading_Sheet1_prompt_17", "text": "困兽在狂风中嘶吼,罪恶的灵魂浑然不知末日即将来临。" } }, @@ -247,7 +247,7 @@ "text": "「森林泰坦BOSS战」" }, "prompt": { - "key": "loading_Sheet1_prompt_16", + "key": "loading_Sheet1_prompt_18", "text": "漫长的远征到了尽头,巨大的阴影笼罩在众人的心头上。" } }, @@ -261,7 +261,7 @@ "text": "「普通战斗」" }, "prompt": { - "key": "loading_Sheet1_prompt_17", + "key": "loading_Sheet1_prompt_19", "text": "伟大守护者的第一次成就,往往是一场看似平平无奇的战斗。" } }, @@ -275,7 +275,7 @@ "text": "「神龙大侠」" }, "prompt": { - "key": "loading_Sheet1_prompt_19", + "key": "loading_Sheet1_prompt_20", "text": "在翡翠宫接受传承,获得神龙卷轴,就会成为神龙大侠。
嗯……没人规定神龙大侠不能是熊猫吧?" } }, @@ -289,7 +289,7 @@ "text": "「极北龙岛群」" }, "prompt": { - "key": "loading_Sheet1_prompt_31", + "key": "loading_Sheet1_prompt_21", "text": "伟大守护者的第一次成就,往往是一场看似平平无奇的战斗。" } }, @@ -303,7 +303,7 @@ "text": "「恐惧灵」" }, "prompt": { - "key": "loading_Sheet1_prompt_33", + "key": "loading_Sheet1_prompt_22", "text": "由人们的恐惧转化而来,人们越恐惧,它们就越强,应对它们的最好办法是……
别怕!" } }, @@ -317,7 +317,7 @@ "text": "「博克岛」" }, "prompt": { - "key": "loading_Sheet1_prompt_11", + "key": "loading_Sheet1_prompt_23", "text": "这里是博克岛。
一般来说,这个板块会介绍气候、风土、民俗什么的;但提起博克岛,你需要知道的只有——龙!" } }, @@ -331,7 +331,7 @@ "text": "「原始人聚集地」" }, "prompt": { - "key": "loading_Sheet1_prompt_20", + "key": "loading_Sheet1_prompt_24", "text": "见到咕噜一家之前,中轴城的学者们用了很多手段,来研究这片原野上有没有人类居住。
后来……如果不是盖来到中轴城,这里还是一片自然保护区。" } }, @@ -345,7 +345,7 @@ "text": "「罪恶都市」" }, "prompt": { - "key": "loading_Sheet1_prompt_21", + "key": "loading_Sheet1_prompt_25", "text": "最多的坏人……最近好像都变成了好人?最严密的监狱……最近好像一直被越狱?
好吧,或许这座城市该换个名字了。" } }, @@ -359,7 +359,7 @@ "text": "「童话王国」" }, "prompt": { - "key": "loading_Sheet1_prompt_22", + "key": "loading_Sheet1_prompt_26", "text": "有公主和王子,有反派和丑角;有英雄救美,有佳偶天成;善良就会美满,作恶总有报应……
什么?门票?不不,不好意思,我们不是迪士尼。" } }, @@ -373,7 +373,7 @@ "text": "「主线第5章」" }, "prompt": { - "key": "loading_Sheet1_prompt_23", + "key": "loading_Sheet1_prompt_27", "text": "山有猛龙,狂嗅薄荷。何意万龙王,化为绕指柔。" } }, @@ -387,7 +387,7 @@ "text": "「主线第6章」" }, "prompt": { - "key": "loading_Sheet1_prompt_24", + "key": "loading_Sheet1_prompt_28", "text": "天性是不可被束缚的,再幼小的身躯也能爆发出惊人的力量。" } }, @@ -401,7 +401,7 @@ "text": "「主线第7章」" }, "prompt": { - "key": "loading_Sheet1_prompt_25", + "key": "loading_Sheet1_prompt_29", "text": "我们是魔发精灵,会唱歌,会跳舞,散播欢乐和爱。" } }, @@ -415,7 +415,7 @@ "text": "「主线第8章」" }, "prompt": { - "key": "loading_Sheet1_prompt_26", + "key": "loading_Sheet1_prompt_30", "text": "很多人并不是我们想象中的那副样子,重要的是,试着多了解对方。" } }, @@ -429,7 +429,7 @@ "text": "「主线第9章」" }, "prompt": { - "key": "loading_Sheet1_prompt_27", + "key": "loading_Sheet1_prompt_31", "text": "尽管我们互看不顺眼,总是吵吵闹闹,我还是愿意把所有的爱给你。" } }, @@ -443,7 +443,7 @@ "text": "「主线第10章」" }, "prompt": { - "key": "loading_Sheet1_prompt_28", + "key": "loading_Sheet1_prompt_32", "text": "即使有95%的几率会完蛋,也不能放弃5%的奇遇和辉煌。" } }, @@ -457,7 +457,7 @@ "text": "「主线第11章」" }, "prompt": { - "key": "loading_Sheet1_prompt_29", + "key": "loading_Sheet1_prompt_33", "text": "我们已经拯救过世界无数次,这次也是。" } }, @@ -471,7 +471,7 @@ "text": "「主线第12章」" }, "prompt": { - "key": "loading_Sheet1_prompt_30", + "key": "loading_Sheet1_prompt_34", "text": "守护与被守护,永远是相互的。" } }, @@ -481,12 +481,12 @@ "image": "ld_mh_bg_fc", "icon": "loading_icon_fc", "title": { - "key": "loading_Sheet1_title_23", - "text": "「博克岛」" + "key": "loading_Sheet1_title_35", + "text": "「希卡普的故事」" }, "prompt": { - "key": "loading_Sheet1_prompt_11", - "text": "这里是博克岛。
一般来说,这个板块会介绍气候、风土、民俗什么的;但提起博克岛,你需要知道的只有——龙!" + "key": "loading_Sheet1_prompt_35", + "text": "这里是博克岛。维京人的领地。
而我们维京人的族长,在这里,发起了新的改革……" } }, { @@ -495,11 +495,11 @@ "image": "ld_mh_bg_zc02", "icon": "loading_icon_fc", "title": { - "key": "loading_Sheet1_title_35", + "key": "loading_Sheet1_title_36", "text": "「中轴城」" }, "prompt": { - "key": "loading_Sheet1_prompt_32", + "key": "loading_Sheet1_prompt_36", "text": "终极之战后,月中人陷入沉睡,为了更好地守护月之大陆,守护者们把力量集中起来,建立了中轴城。
这是一座用火球煮咖啡,用扫描仪复制魔法卷轴的神奇城市,坐落于月之大陆的中心,是世界文明交流的枢纽。" } }, @@ -509,11 +509,11 @@ "image": "ld_mh_bg_sd", "icon": "loading_icon_jgsd", "title": { - "key": "loading_Sheet1_title_36", + "key": "loading_Sheet1_title_37", "text": "「商队列车」" }, "prompt": { - "key": "loading_Sheet1_prompt_34", + "key": "loading_Sheet1_prompt_37", "text": "星辰之下,飞驰的列车在各区间自由穿梭着。" } }, @@ -523,11 +523,11 @@ "image": "ld_mh_bg_fc", "icon": "loading_icon_fc", "title": { - "key": "loading_Sheet1_title_37", + "key": "loading_Sheet1_title_38", "text": "「石阵秘境」" }, "prompt": { - "key": "loading_Sheet1_prompt_35", + "key": "loading_Sheet1_prompt_38", "text": "走出这里其实很简单,只要先右拐再前进再右拐再左拐……不好意思,是先右拐两次……不,不对,好像是先左拐?呃,算了,给骇客蛛发消息吧……" } }, @@ -537,11 +537,11 @@ "image": "ld_mh_bg_fc", "icon": "loading_icon_fc", "title": { - "key": "loading_Sheet1_title_38", + "key": "loading_Sheet1_title_39", "text": "「石阵秘境」" }, "prompt": { - "key": "loading_Sheet1_prompt_36", + "key": "loading_Sheet1_prompt_39", "text": "走出这里其实很简单,只要先右拐再前进再右拐再左拐……不好意思,是先右拐两次……不,不对,好像是先左拐?呃,算了,给骇客蛛发消息吧……" } }, @@ -551,11 +551,11 @@ "image": "ld_mh_bg_fc", "icon": "loading_icon_fc", "title": { - "key": "loading_Sheet1_title_39", + "key": "loading_Sheet1_title_40", "text": "「石阵秘境」" }, "prompt": { - "key": "loading_Sheet1_prompt_37", + "key": "loading_Sheet1_prompt_40", "text": "走出这里其实很简单,只要先右拐再前进再右拐再左拐……不好意思,是先右拐两次……不,不对,好像是先左拐?呃,算了,给骇客蛛发消息吧……" } }, @@ -565,11 +565,11 @@ "image": "ld_mh_bg_fc", "icon": "loading_icon_fc", "title": { - "key": "loading_Sheet1_title_40", + "key": "loading_Sheet1_title_41", "text": "「石阵秘境」" }, "prompt": { - "key": "loading_Sheet1_prompt_38", + "key": "loading_Sheet1_prompt_41", "text": "走出这里其实很简单,只要先右拐再前进再右拐再左拐……不好意思,是先右拐两次……不,不对,好像是先左拐?呃,算了,给骇客蛛发消息吧……" } } diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json index 4a74b7677..1177a101a 100644 --- a/bin/json/game_mainstage.json +++ b/bin/json/game_mainstage.json @@ -11422,7 +11422,7 @@ "timelineplayer": false, "stroyshow": false, "frontstoryid": 201240, - "afterstoryid": 0, + "afterstoryid": 201243, "maingroupName": { "key": "", "text": "" @@ -39964,9 +39964,7 @@ "id": 1201001, "chapterid": 12001, "group_id": 200101, - "previous_group_id": [ - 200100 - ], + "previous_group_id": [], "previoustage": 0, "buried_type": 0, "buried": 0, diff --git a/bin/json/game_monsterformat.json b/bin/json/game_monsterformat.json index 5b978ab1b..aa68b5741 100644 --- a/bin/json/game_monsterformat.json +++ b/bin/json/game_monsterformat.json @@ -392200,7 +392200,8 @@ "star": 3, "equip": [], "newskill": [ - 100000001 + 100000001, + 100000002 ], "lv": 100, "hppro": 750, @@ -392209,7 +392210,7 @@ "skill1": 1, "skill2": 1, "skill3": 1, - "speed": 140, + "speed": 150, "modelsize": 1, "skillSequence": [ 1, @@ -392347,7 +392348,8 @@ "star": 3, "equip": [], "newskill": [ - 100000001 + 100000001, + 100000002 ], "lv": 100, "hppro": 750, @@ -392356,7 +392358,7 @@ "skill1": 1, "skill2": 1, "skill3": 1, - "speed": 140, + "speed": 150, "modelsize": 1, "skillSequence": [ 1, @@ -392494,7 +392496,8 @@ "star": 3, "equip": [], "newskill": [ - 100000001 + 100000001, + 100000002 ], "lv": 100, "hppro": 750, @@ -392503,7 +392506,7 @@ "skill1": 1, "skill2": 1, "skill3": 1, - "speed": 140, + "speed": 150, "modelsize": 1, "skillSequence": [ 1, diff --git a/bin/json/game_playingmethod.json b/bin/json/game_playingmethod.json index 1cf6b89d8..c931b5000 100644 --- a/bin/json/game_playingmethod.json +++ b/bin/json/game_playingmethod.json @@ -41,7 +41,7 @@ }, "txt": { "key": "consume_consume_playingmethod_txt_04", - "text": "基础方块新增烟火方块,可以消除指定方向所以方块。" + "text": "基础方块新增烟火方块,可以消除指定方向。" }, "type": 2, "detail": 1, diff --git a/bin/json/game_rdtasknpc.json b/bin/json/game_rdtasknpc.json index 908f8d5ba..df1474d26 100644 --- a/bin/json/game_rdtasknpc.json +++ b/bin/json/game_rdtasknpc.json @@ -10153,7 +10153,7 @@ }, { "id": 60350, - "heroid": 35007, + "heroid": 34007, "Levelid": 0, "datas": [ "GameMain", @@ -10222,7 +10222,7 @@ }, { "id": 60380, - "heroid": 25001, + "heroid": 25002, "Levelid": 0, "datas": [ "GameMain", @@ -10315,7 +10315,7 @@ }, { "id": 60420, - "heroid": 25001, + "heroid": 45004, "Levelid": 0, "datas": [ "GameMain", diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index cf12d93a9..dc72a68f0 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -56069,7 +56069,7 @@ { "Id": 835002217, "EmitPR": 1000, - "From": 12, + "From": 3, "Where": [], "Order": "", "Limit": 10, diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index 70cccb18d..b8bc86f9d 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -61632,5 +61632,38 @@ }, "buffid": [], "map": "" + }, + { + "id": 100000002, + "level": 1, + "MaxLV": 1, + "UnavailablePlayTypes": [], + "SkillFlag": 0, + "EffectFlag": 0, + "Priority": 0, + "Name": { + "key": "skill_skill_atk_Name_100000002", + "text": "" + }, + "ico": "", + "CorrectPos": 0, + "IsMelee": 0, + "act": "", + "Type": 4, + "CD": 0, + "Where": [], + "Target": 0, + "ChildSkill": { + "Id": [ + 255007311 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_100000002_1", + "text": "" + }, + "buffid": [], + "map": "" } ] \ No newline at end of file diff --git a/bin/json/game_systemchattext.json b/bin/json/game_systemchattext.json index a19e079de..fc19aad29 100644 --- a/bin/json/game_systemchattext.json +++ b/bin/json/game_systemchattext.json @@ -17,7 +17,7 @@ "text": "公告栏上的任务已完成完毕!现在立马去领取吗?" }, "delay": 500, - "jumpid": 10002 + "jumpid": 10006 }, { "id": 100003, @@ -34,219 +34,149 @@ "talkhero": "44004", "talktext": { "key": "systemnotice_chattext_talktext_4", - "text": "木桩上的守护者锻炼好了!现在立马去领取吗?" + "text": "周常奖励还没领取!现在立马去领取吗?" }, "delay": 500, - "jumpid": 10004 + "jumpid": 110 }, { "id": 100005, "talkhero": "44004", "talktext": { "key": "systemnotice_chattext_talktext_5", - "text": "木桩上的守护者锻炼好了!现在立马去领取吗?" + "text": "跑环任务还没完成,现在去完成吗?" }, "delay": 500, - "jumpid": 10005 + "jumpid": 0 }, { "id": 100006, "talkhero": "44004", "talktext": { "key": "systemnotice_chattext_talktext_6", - "text": "木桩上的守护者锻炼好了!现在立马去领取吗?" + "text": "周常奖励还没领取!现在立马去领取吗?" }, "delay": 500, - "jumpid": 10006 + "jumpid": 110 }, { "id": 100007, "talkhero": "44004", "talktext": { "key": "systemnotice_chattext_talktext_7", - "text": "木桩上的守护者锻炼好了!现在立马去领取吗?" + "text": "周常奖励还没领取!现在立马去领取吗?" }, "delay": 500, - "jumpid": 10007 + "jumpid": 110 }, { "id": 100008, "talkhero": "44004", "talktext": { "key": "systemnotice_chattext_talktext_8", - "text": "木桩上的守护者锻炼好了!现在立马去领取吗?" + "text": "冒险之旅还有未完成的主线关卡,是否去挑战?" }, "delay": 500, - "jumpid": 10008 + "jumpid": 166 }, { "id": 100009, "talkhero": "44004", "talktext": { "key": "systemnotice_chattext_talktext_9", - "text": "木桩上的守护者锻炼好了!现在立马去领取吗?" + "text": "本周的捕羊大赛奖励还能继续挑战获得,是否去游玩?" }, "delay": 500, - "jumpid": 10009 + "jumpid": 10042 }, { "id": 100010, "talkhero": "44004", "talktext": { "key": "systemnotice_chattext_talktext_10", - "text": "木桩上的守护者锻炼好了!现在立马去领取吗?" + "text": "博克岛上好像还存在着未探索的秘密,现在去寻找吗?" }, "delay": 500, - "jumpid": 10010 + "jumpid": 166 }, { "id": 100011, "talkhero": "44004", "talktext": { "key": "systemnotice_chattext_talktext_11", - "text": "木桩上的守护者锻炼好了!现在立马去领取吗?" + "text": "挑战维京远征可以获取打造材料!现在去挑战吗?" }, "delay": 500, - "jumpid": 10011 + "jumpid": 10022 }, { "id": 100012, "talkhero": "44004", "talktext": { "key": "systemnotice_chattext_talktext_12", - "text": "木桩上的守护者锻炼好了!现在立马去领取吗?" + "text": "挑战猎魂副本可以获取回响材料!现在去挑战吗?" }, "delay": 500, - "jumpid": 10012 + "jumpid": 10024 }, { "id": 100013, "talkhero": "44004", "talktext": { "key": "systemnotice_chattext_talktext_13", - "text": "木桩上的守护者锻炼好了!现在立马去领取吗?" + "text": "挑战塔岗监狱可以获取升级经验材料,现在去挑战吗?" }, "delay": 500, - "jumpid": 10013 + "jumpid": 10005 }, { "id": 100014, "talkhero": "44004", "talktext": { "key": "systemnotice_chattext_talktext_14", - "text": "木桩上的守护者锻炼好了!现在立马去领取吗?" + "text": "缤纷乐声的每周积分奖励还没全部获取,要去游玩吗?" }, "delay": 500, - "jumpid": 10014 + "jumpid": 10062 }, { "id": 100015, "talkhero": "44004", "talktext": { "key": "systemnotice_chattext_talktext_15", - "text": "木桩上的守护者锻炼好了!现在立马去领取吗?" + "text": "扑克对决的每周连胜奖励还没全部获取,要去游玩吗?" }, "delay": 500, - "jumpid": 10015 + "jumpid": 10061 }, { "id": 100016, "talkhero": "44004", "talktext": { "key": "systemnotice_chattext_talktext_16", - "text": "木桩上的守护者锻炼好了!现在立马去领取吗?" + "text": "胜者为王现在赛季开启时,要去游玩吗?" }, "delay": 500, - "jumpid": 10016 + "jumpid": 10073 }, { "id": 100017, "talkhero": "44004", "talktext": { "key": "systemnotice_chattext_talktext_17", - "text": "木桩上的守护者锻炼好了!现在立马去领取吗?" + "text": "与驴同行现在赛季开启时,要去游玩吗?" }, "delay": 500, - "jumpid": 10017 + "jumpid": 10070 }, { "id": 100018, "talkhero": "44004", "talktext": { "key": "systemnotice_chattext_talktext_18", - "text": "木桩上的守护者锻炼好了!现在立马去领取吗?" + "text": "猎食大冒险的每周积分奖励还没全部获取,要去游玩吗?" }, "delay": 500, - "jumpid": 10018 - }, - { - "id": 100019, - "talkhero": "44004", - "talktext": { - "key": "systemnotice_chattext_talktext_19", - "text": "木桩上的守护者锻炼好了!现在立马去领取吗?" - }, - "delay": 500, - "jumpid": 10019 - }, - { - "id": 100020, - "talkhero": "44004", - "talktext": { - "key": "systemnotice_chattext_talktext_20", - "text": "木桩上的守护者锻炼好了!现在立马去领取吗?" - }, - "delay": 500, - "jumpid": 10020 - }, - { - "id": 100021, - "talkhero": "44004", - "talktext": { - "key": "systemnotice_chattext_talktext_21", - "text": "木桩上的守护者锻炼好了!现在立马去领取吗?" - }, - "delay": 500, - "jumpid": 10021 - }, - { - "id": 100022, - "talkhero": "44004", - "talktext": { - "key": "systemnotice_chattext_talktext_22", - "text": "木桩上的守护者锻炼好了!现在立马去领取吗?" - }, - "delay": 500, - "jumpid": 10022 - }, - { - "id": 100023, - "talkhero": "44004", - "talktext": { - "key": "systemnotice_chattext_talktext_23", - "text": "木桩上的守护者锻炼好了!现在立马去领取吗?" - }, - "delay": 500, - "jumpid": 10023 - }, - { - "id": 100024, - "talkhero": "44004", - "talktext": { - "key": "systemnotice_chattext_talktext_24", - "text": "木桩上的守护者锻炼好了!现在立马去领取吗?" - }, - "delay": 500, - "jumpid": 10024 - }, - { - "id": 100025, - "talkhero": "44004", - "talktext": { - "key": "systemnotice_chattext_talktext_25", - "text": "木桩上的守护者锻炼好了!现在立马去领取吗?" - }, - "delay": 500, - "jumpid": 10025 + "jumpid": 10068 } ] \ No newline at end of file diff --git a/bin/json/game_systemnotice.json b/bin/json/game_systemnotice.json index c4b2dd7af..b5f836884 100644 --- a/bin/json/game_systemnotice.json +++ b/bin/json/game_systemnotice.json @@ -178,25 +178,5 @@ "noticetext": [ 100018 ] - }, - { - "id": 19, - "redid": 12101, - "priority": 19, - "systemtype": 2, - "jumpid": 0, - "noticetext": [ - 100019 - ] - }, - { - "id": 20, - "redid": 12101, - "priority": 20, - "systemtype": 2, - "jumpid": 0, - "noticetext": [ - 100020 - ] } ] \ No newline at end of file diff --git a/bin/json/game_worldall.json b/bin/json/game_worldall.json index e9e42b919..424ead1cc 100644 --- a/bin/json/game_worldall.json +++ b/bin/json/game_worldall.json @@ -98,9 +98,9 @@ "id": 301, "name": { "key": "worldtask_world_all_name_6", - "text": "功夫熊猫" + "text": "酋长蜕变" }, - "task_icon": "rw_img_ab", + "task_icon": "rw_img_xlgs", "task_txt": { "key": "", "text": "" @@ -111,9 +111,9 @@ "id": 302, "name": { "key": "worldtask_world_all_name_7", - "text": "驯龙高手" + "text": "\"伊\"路向前" }, - "task_icon": "rw_img_xlgs", + "task_icon": "rw_img_fkysr", "task_txt": { "key": "", "text": "" @@ -124,9 +124,9 @@ "id": 320, "name": { "key": "worldtask_world_all_name_8", - "text": "功能开启" + "text": "坏蛋艺术家" }, - "task_icon": "rw_img_mdjsj", + "task_icon": "rw_img_hdlm", "task_txt": { "key": "", "text": "" diff --git a/modules/enchant/model_enchant.go b/modules/enchant/model_enchant.go index 7358c0c78..8e085bfe5 100644 --- a/modules/enchant/model_enchant.go +++ b/modules/enchant/model_enchant.go @@ -38,7 +38,9 @@ func (this *modelEnchant) getEnchantList(uid string) (result *pb.DBEnchant, err return } if mgo.MongodbNil == err { - result = &pb.DBEnchant{} + result = &pb.DBEnchant{ + Boss: make(map[int32]*pb.DBEnchantBoos), + } } err = nil diff --git a/sys/configure/structs/Game.IntegralBuffData.go b/sys/configure/structs/Game.IntegralBuffData.go index 9f585718e..f055ae80f 100644 --- a/sys/configure/structs/Game.IntegralBuffData.go +++ b/sys/configure/structs/Game.IntegralBuffData.go @@ -12,6 +12,7 @@ import "errors" type GameIntegralBuffData struct { Skillid int32 + ShowGroup int32 Type int32 Val int32 Show int32 @@ -29,6 +30,7 @@ func (*GameIntegralBuffData) GetTypeId() int32 { func (_v *GameIntegralBuffData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skillid"].(float64); !_ok_ { err = errors.New("skillid error"); return }; _v.Skillid = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["showGroup"].(float64); !_ok_ { err = errors.New("showGroup error"); return }; _v.ShowGroup = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["val"].(float64); !_ok_ { err = errors.New("val error"); return }; _v.Val = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["show"].(float64); !_ok_ { err = errors.New("show error"); return }; _v.Show = int32(_tempNum_) } diff --git a/sys/configure/structs/TEnum.EChapterGameType.go b/sys/configure/structs/TEnum.EChapterGameType.go index 2d31063f3..c71493bed 100644 --- a/sys/configure/structs/TEnum.EChapterGameType.go +++ b/sys/configure/structs/TEnum.EChapterGameType.go @@ -18,4 +18,5 @@ const ( TEnumEChapterGameType_TD = 6 TEnumEChapterGameType_Card = 7 TEnumEChapterGameType_Three = 8 + TEnumEChapterGameType_RabbitHound = 9 ) diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go index d66c37126..cf7b59deb 100644 --- a/sys/configure/structs/Tables.go +++ b/sys/configure/structs/Tables.go @@ -356,6 +356,7 @@ type Tables struct { SystemStroyTalk *GameSystemStroyTalk ActiveKing *GameActiveKing ActiveTask *GameActiveTask + EnchantbossReward *GameEnchantbossReward } func NewTables(loader JsonLoader) (*Tables, error) { @@ -2433,5 +2434,11 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.ActiveTask, err = NewGameActiveTask(buf) ; err != nil { return nil, err } + if buf, err = loader("game_enchantbossreward") ; err != nil { + return nil, err + } + if tables.EnchantbossReward, err = NewGameEnchantbossReward(buf) ; err != nil { + return nil, err + } return tables, nil } diff --git a/sys/configure/structs/game.globalData.go b/sys/configure/structs/game.globalData.go index 0bee0608b..66985702b 100644 --- a/sys/configure/structs/game.globalData.go +++ b/sys/configure/structs/game.globalData.go @@ -287,6 +287,7 @@ type GameGlobalData struct { PvpEndtime int32 PvpMaintenancetime int32 PvpIntegraltool string + SxReturnspeed float32 } const TypeId_GameGlobalData = 477542761 @@ -1105,6 +1106,7 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pvp_endtime"].(float64); !_ok_ { err = errors.New("pvp_endtime error"); return }; _v.PvpEndtime = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pvp_maintenancetime"].(float64); !_ok_ { err = errors.New("pvp_maintenancetime error"); return }; _v.PvpMaintenancetime = int32(_tempNum_) } { var _ok_ bool; if _v.PvpIntegraltool, _ok_ = _buf["pvp_integraltool"].(string); !_ok_ { err = errors.New("pvp_integraltool error"); return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["sx_returnspeed"].(float64); !_ok_ { err = errors.New("sx_returnspeed error"); return }; _v.SxReturnspeed = float32(_tempNum_) } return }