diff --git a/bin/json/game_asklibrary.json b/bin/json/game_asklibrary.json index a13e0ecab..870281fd4 100644 --- a/bin/json/game_asklibrary.json +++ b/bin/json/game_asklibrary.json @@ -649,5 +649,284 @@ "flase": "", "fraction": 1, "plantrue": 2 + }, + { + "id": 22, + "ExaminationGroup": 1008, + "type": 1, + "topic": { + "key": "ask_ask_library_topic_22", + "text": "戴安狐的盗贼外号叫什么？" + }, + "planA": { + "key": "ask_ask_library_planA_22", + "text": "血红爪" + }, + "planB": { + "key": "ask_ask_library_planB_22", + "text": "鬼爪" + }, + "planC": { + "key": "ask_ask_library_planC_22", + "text": "神偷爪" + }, + "planD": { + "key": "ask_ask_library_planD_22", + "text": "猫猫爪" + }, + "weight": 1000, + "pic": "", + "True": "", + "flase": "", + "fraction": 1, + "plantrue": 1 + }, + { + "id": 23, + "ExaminationGroup": 1008, + "type": 1, + "topic": { + "key": "ask_ask_library_topic_23", + "text": "美肚鲨扮演过以下哪副名画？" + }, + "planA": { + "key": "ask_ask_library_planA_23", + "text": "戴珍珠耳环的少女" + }, + "planB": { + "key": "ask_ask_library_planB_23", + "text": "达娜厄" + }, + "planC": { + "key": "ask_ask_library_planC_23", + "text": "蒙娜丽莎" + }, + "planD": { + "key": "ask_ask_library_planD_23", + "text": "维纳斯的诞生" + }, + "weight": 1000, + "pic": "", + "True": "", + "flase": "", + "fraction": 1, + "plantrue": 4 + }, + { + "id": 24, + "ExaminationGroup": 1008, + "type": 1, + "topic": { + "key": "ask_ask_library_topic_24", + "text": "铁拳猴的挚爱是什么？" + }, + "planA": { + "key": "ask_ask_library_planA_24", + "text": "火龙果" + }, + "planB": { + "key": "ask_ask_library_planB_24", + "text": "蓝莓" + }, + "planC": { + "key": "ask_ask_library_planC_24", + "text": "香蕉" + }, + "planD": { + "key": "ask_ask_library_planD_24", + "text": "西瓜" + }, + "weight": 1000, + "pic": "", + "True": "", + "flase": "", + "fraction": 1, + "plantrue": 4 + }, + { + "id": 25, + "ExaminationGroup": 1009, + "type": 1, + "topic": { + "key": "ask_ask_library_topic_25", + "text": "食人鱼的什么东西具有超强杀伤力？" + }, + "planA": { + "key": "ask_ask_library_planA_25", + "text": "口臭" + }, + "planB": { + "key": "ask_ask_library_planB_25", + "text": "脚臭" + }, + "planC": { + "key": "ask_ask_library_planC_25", + "text": "臭屁" + }, + "planD": { + "key": "ask_ask_library_planD_25", + "text": "屎臭" + }, + "weight": 1000, + "pic": "", + "True": "", + "flase": "", + "fraction": 1, + "plantrue": 4 + }, + { + "id": 26, + "ExaminationGroup": 1009, + "type": 1, + "topic": { + "key": "ask_ask_library_topic_26", + "text": "戴塔戴恩是什么音乐品种的精灵？" + }, + "planA": { + "key": "ask_ask_library_planA_26", + "text": "乡村音乐" + }, + "planB": { + "key": "ask_ask_library_planB_26", + "text": "摇滚" + }, + "planC": { + "key": "ask_ask_library_planC_26", + "text": "爵士" + }, + "planD": { + "key": "ask_ask_library_planD_26", + "text": "放克" + }, + "weight": 1000, + "pic": "", + "True": "", + "flase": "", + "fraction": 1, + "plantrue": 1 + }, + { + "id": 27, + "ExaminationGroup": 1009, + "type": 1, + "topic": { + "key": "ask_ask_library_topic_27", + "text": "莫甘娜的师父是谁？" + }, + "planA": { + "key": "ask_ask_library_planA_27", + "text": "史翠克勒" + }, + "planB": { + "key": "ask_ask_library_planB_27", + "text": "吉姆" + }, + "planC": { + "key": "ask_ask_library_planC_27", + "text": "梅林" + }, + "planD": { + "key": "ask_ask_library_planD_27", + "text": "希沙窦斯" + }, + "weight": 1000, + "pic": "", + "True": "", + "flase": "", + "fraction": 1, + "plantrue": 4 + }, + { + "id": 28, + "ExaminationGroup": 1010, + "type": 1, + "topic": { + "key": "ask_ask_library_topic_28", + "text": "都说猫有九条命，那么请问靴猫现在还有几条命？" + }, + "planA": { + "key": "ask_ask_library_planA_28", + "text": "三条命" + }, + "planB": { + "key": "ask_ask_library_planB_28", + "text": "一条命" + }, + "planC": { + "key": "ask_ask_library_planC_28", + "text": "三条命" + }, + "planD": { + "key": "ask_ask_library_planD_28", + "text": "八条命" + }, + "weight": 1000, + "pic": "", + "True": "", + "flase": "", + "fraction": 1, + "plantrue": 2 + }, + { + "id": 29, + "ExaminationGroup": 1010, + "type": 1, + "topic": { + "key": "ask_ask_library_topic_29", + "text": "坦克最沉迷的事情是什么？" + }, + "planA": { + "key": "ask_ask_library_planA_29", + "text": "冲马桶" + }, + "planB": { + "key": "ask_ask_library_planB_29", + "text": "丢竹竿" + }, + "planC": { + "key": "ask_ask_library_planC_29", + "text": "捡球" + }, + "planD": { + "key": "ask_ask_library_planD_29", + "text": "看窗户" + }, + "weight": 1000, + "pic": "", + "True": "", + "flase": "", + "fraction": 1, + "plantrue": 8 + }, + { + "id": 30, + "ExaminationGroup": 1010, + "type": 1, + "topic": { + "key": "ask_ask_library_topic_30", + "text": "哪个徒弟被师傅当儿子一样养大？" + }, + "planA": { + "key": "ask_ask_library_planA_30", + "text": "仙鹤" + }, + "planB": { + "key": "ask_ask_library_planB_30", + "text": "大龙" + }, + "planC": { + "key": "ask_ask_library_planC_30", + "text": "金猴" + }, + "planD": { + "key": "ask_ask_library_planD_30", + "text": "悍娇虎" + }, + "weight": 1000, + "pic": "", + "True": "", + "flase": "", + "fraction": 1, + "plantrue": 2 } ] \ No newline at end of file diff --git a/bin/json/game_catchbugstage.json b/bin/json/game_catchbugstage.json index 0ead39591..29d0a83e8 100644 --- a/bin/json/game_catchbugstage.json +++ b/bin/json/game_catchbugstage.json @@ -54,7 +54,7 @@ }, "stageskill": { "key": "catchbugs_stage_stageskill_1", - "text": "本周天气良好，打猎不会受到任何影响，加油狩猎！" + "text": "本周天气良好，打猎不会受到任何影响，加油狩猎！狩猎成功可以获得16积分！" }, "points": 16, "consume": [ @@ -94,7 +94,7 @@ }, "stageskill": { "key": "catchbugs_stage_stageskill_2", - "text": "本周暗影降临，每隔20秒，场上随机2*2的区域会随机逆时针或者顺时针旋转90度。体验高难度狩猎吧！" + "text": "本周暗影降临，每隔20秒，场上随机2*2的区域会随机逆时针或者顺时针旋转90度。体验高难度狩猎吧！狩猎成功可以获得16积分！" }, "points": 16, "consume": [ @@ -134,7 +134,7 @@ }, "stageskill": { "key": "catchbugs_stage_stageskill_3", - "text": "本周乾坤旋转。每隔30秒，场上以中心点开始，分为4个2*3的对称区域，这个四个区域会随机顺时针或逆时针旋转。体验高难度狩猎吧！" + "text": "本周乾坤旋转。每隔30秒，场上以中心点开始，分为4个2*3的对称区域，这个四个区域会随机顺时针或逆时针旋转。体验高难度狩猎吧！狩猎成功可以获得16积分！" }, "points": 16, "consume": [ @@ -174,7 +174,7 @@ }, "stageskill": { "key": "catchbugs_stage_stageskill_4", - "text": "本周滴泪滚滚，每隔30秒，场上随机数量2的倍数的卡牌（2，4，6）会开始互相随机交换。体验有挑战的狩猎吧！" + "text": "本周地雷滚滚，每隔30秒，场上随机数量2的倍数的卡牌（2，4，6）会开始互相随机交换。体验有挑战的狩猎吧！狩猎成功可以获得16积分！" }, "points": 16, "consume": [ @@ -212,7 +212,7 @@ }, "stageskill": { "key": "catchbugs_stage_stageskill_5", - "text": "本周电光火石，消除失扣除的时间翻倍计算。体验急速的狩猎吧！" + "text": "本周电光火石，消除失扣除的时间翻倍计算。体验急速的狩猎吧！狩猎成功可以获得16积分！" }, "points": 16, "consume": [ diff --git a/bin/json/game_consumehero.json b/bin/json/game_consumehero.json index ab7871910..0611a7572 100644 --- a/bin/json/game_consumehero.json +++ b/bin/json/game_consumehero.json @@ -43,6 +43,11 @@ "bigskillhero": "sx_img_33003", "bigskillcolor": 0, "bigskilleffect": "effect_sx_skill_green", + "division": [ + "sx_sp1_33003", + "sx_sp2_33003", + "sx_sp3_33003" + ], "get": 107, "consume": [], "skilltype": 1, @@ -103,6 +108,11 @@ "bigskillhero": "sx_img_44003", "bigskillcolor": 1, "bigskilleffect": "effect_sx_skill_yellow", + "division": [ + "sx_sp1_44003", + "sx_sp2_44003", + "sx_sp3_44003" + ], "get": 107, "consume": [], "skilltype": 1, @@ -163,6 +173,11 @@ "bigskillhero": "sx_img_43004", "bigskillcolor": 1, "bigskilleffect": "effect_sx_skill_yellow", + "division": [ + "sx_sp1_43004", + "sx_sp2_43004", + "sx_sp3_43004" + ], "get": 107, "consume": [], "skilltype": 1, @@ -223,6 +238,11 @@ "bigskillhero": "sx_img_43004", "bigskillcolor": 1, "bigskilleffect": "effect_sx_skill_yellow", + "division": [ + "sx_sp1_43004", + "sx_sp2_43004", + "sx_sp3_43004" + ], "get": 107, "consume": [ { @@ -289,6 +309,11 @@ "bigskillhero": "sx_img_43004", "bigskillcolor": 1, "bigskilleffect": "effect_sx_skill_yellow", + "division": [ + "sx_sp1_43004", + "sx_sp2_43004", + "sx_sp3_43004" + ], "get": 107, "consume": [ { @@ -355,6 +380,11 @@ "bigskillhero": "sx_img_43004", "bigskillcolor": 1, "bigskilleffect": "effect_sx_skill_yellow", + "division": [ + "sx_sp1_43004", + "sx_sp2_43004", + "sx_sp3_43004" + ], "get": 107, "consume": [ { @@ -421,6 +451,11 @@ "bigskillhero": "sx_img_43004", "bigskillcolor": 1, "bigskilleffect": "effect_sx_skill_yellow", + "division": [ + "sx_sp1_43004", + "sx_sp2_43004", + "sx_sp3_43004" + ], "get": 107, "consume": [ { @@ -487,6 +522,11 @@ "bigskillhero": "sx_img_43004", "bigskillcolor": 1, "bigskilleffect": "effect_sx_skill_yellow", + "division": [ + "sx_sp1_43004", + "sx_sp2_43004", + "sx_sp3_43004" + ], "get": 107, "consume": [ { @@ -553,6 +593,11 @@ "bigskillhero": "sx_img_43004", "bigskillcolor": 1, "bigskilleffect": "effect_sx_skill_yellow", + "division": [ + "sx_sp1_43004", + "sx_sp2_43004", + "sx_sp3_43004" + ], "get": 107, "consume": [ { @@ -619,6 +664,11 @@ "bigskillhero": "sx_img_43004", "bigskillcolor": 1, "bigskilleffect": "effect_sx_skill_yellow", + "division": [ + "sx_sp1_43004", + "sx_sp2_43004", + "sx_sp3_43004" + ], "get": 107, "consume": [ { @@ -685,6 +735,11 @@ "bigskillhero": "sx_img_43004", "bigskillcolor": 1, "bigskilleffect": "effect_sx_skill_yellow", + "division": [ + "sx_sp1_43004", + "sx_sp2_43004", + "sx_sp3_43004" + ], "get": 107, "consume": [ { @@ -751,6 +806,11 @@ "bigskillhero": "sx_img_43004", "bigskillcolor": 1, "bigskilleffect": "effect_sx_skill_yellow", + "division": [ + "sx_sp1_43004", + "sx_sp2_43004", + "sx_sp3_43004" + ], "get": 107, "consume": [ { @@ -817,6 +877,11 @@ "bigskillhero": "sx_img_43004", "bigskillcolor": 1, "bigskilleffect": "effect_sx_skill_yellow", + "division": [ + "sx_sp1_43004", + "sx_sp2_43004", + "sx_sp3_43004" + ], "get": 107, "consume": [ { @@ -883,6 +948,11 @@ "bigskillhero": "sx_img_43004", "bigskillcolor": 1, "bigskilleffect": "effect_sx_skill_yellow", + "division": [ + "sx_sp1_43004", + "sx_sp2_43004", + "sx_sp3_43004" + ], "get": 107, "consume": [ { @@ -949,6 +1019,11 @@ "bigskillhero": "sx_img_43004", "bigskillcolor": 1, "bigskilleffect": "effect_sx_skill_yellow", + "division": [ + "sx_sp1_43004", + "sx_sp2_43004", + "sx_sp3_43004" + ], "get": 107, "consume": [ { @@ -1015,6 +1090,11 @@ "bigskillhero": "sx_img_43004", "bigskillcolor": 1, "bigskilleffect": "effect_sx_skill_yellow", + "division": [ + "sx_sp1_43004", + "sx_sp2_43004", + "sx_sp3_43004" + ], "get": 107, "consume": [ { @@ -1081,6 +1161,11 @@ "bigskillhero": "sx_img_43004", "bigskillcolor": 1, "bigskilleffect": "effect_sx_skill_yellow", + "division": [ + "sx_sp1_43004", + "sx_sp2_43004", + "sx_sp3_43004" + ], "get": 107, "consume": [ { diff --git a/bin/json/game_fightingcapacity.json b/bin/json/game_fightingcapacity.json new file mode 100644 index 000000000..4f9ab318e --- /dev/null +++ b/bin/json/game_fightingcapacity.json @@ -0,0 +1,42 @@ +[ + { + "id": 3, + "value": 100 + }, + { + "id": 4, + "value": 1400 + }, + { + "id": 5, + "value": 1400 + }, + { + "id": 6, + "value": 13500 + }, + { + "id": 7, + "value": 15500 + }, + { + "id": 8, + "value": 11400 + }, + { + "id": 9, + "value": 14000 + }, + { + "id": 10, + "value": 14000 + }, + { + "id": 13, + "value": 20000 + }, + { + "id": 14, + "value": 20000 + } +] \ No newline at end of file diff --git a/bin/json/game_fightingskill.json b/bin/json/game_fightingskill.json new file mode 100644 index 000000000..9f759ed75 --- /dev/null +++ b/bin/json/game_fightingskill.json @@ -0,0 +1,14 @@ +[ + { + "skill": 1, + "value": 400 + }, + { + "skill": 2, + "value": 350 + }, + { + "skill": 3, + "value": 500 + } +] \ No newline at end of file diff --git a/bin/json/game_fightingskilllv.json b/bin/json/game_fightingskilllv.json new file mode 100644 index 000000000..dd8ebecf0 --- /dev/null +++ b/bin/json/game_fightingskilllv.json @@ -0,0 +1,42 @@ +[ + { + "skill_lv": 1, + "value": 1000 + }, + { + "skill_lv": 2, + "value": 1100 + }, + { + "skill_lv": 3, + "value": 1200 + }, + { + "skill_lv": 4, + "value": 1300 + }, + { + "skill_lv": 5, + "value": 1400 + }, + { + "skill_lv": 6, + "value": 1600 + }, + { + "skill_lv": 7, + "value": 1800 + }, + { + "skill_lv": 8, + "value": 2000 + }, + { + "skill_lv": 9, + "value": 2200 + }, + { + "skill_lv": 10, + "value": 2400 + } +] \ No newline at end of file diff --git a/bin/json/game_fightingskillstar.json b/bin/json/game_fightingskillstar.json new file mode 100644 index 000000000..1958890e2 --- /dev/null +++ b/bin/json/game_fightingskillstar.json @@ -0,0 +1,14 @@ +[ + { + "color": 3, + "value": 1000 + }, + { + "color": 4, + "value": 1100 + }, + { + "color": 5, + "value": 1200 + } +] \ No newline at end of file diff --git a/bin/json/game_global.json b/bin/json/game_global.json index aae8dfc33..68c17db3b 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -787,6 +787,8 @@ "td_dailystage_challenge_num_max": 2, "guild_sign_in": 10, "enhanceboss_ps": 10, - "plunder_pvp_battlereadyid": 105 + "plunder_pvp_battlereadyid": 105, + "plunder_pvp_college_num": 400, + "plunder_pvp_college_time": 7 } ] \ No newline at end of file diff --git a/bin/json/game_guide.json b/bin/json/game_guide.json index 1f487fc49..0f82573d6 100644 --- a/bin/json/game_guide.json +++ b/bin/json/game_guide.json @@ -1061,48 +1061,6 @@ "skipgroup": false, "reward": [] }, - { - "id": 1000401, - "group": 4, - "type": 3, - "startPar": "StopTime", - "parameter": "ResiveTime", - "interface": "", - "condition": "flytrigger_Guide1", - "followtj": "", - "followguide": 0, - "finger": [ - "flymain", - "btn_left$" - ], - "offset": { - "x": 0, - "y": 0 - }, - "fingerTime": 0, - "objSize": { - "x": 0, - "y": 0 - }, - "objOffset": { - "x": 0, - "y": 0 - }, - "txt": "1000120", - "txtoffset": { - "x": -200, - "y": 0 - }, - "speakerface": 0, - "sound": "", - "mask": false, - "lock": false, - "uishow": false, - "skiptime": 10000, - "skip": 0, - "skipgroup": false, - "reward": [] - }, { "id": 1000402, "group": 4, diff --git a/bin/json/game_huntingboss.json b/bin/json/game_huntingboss.json index 1b5de09d9..a43ca1dbe 100644 --- a/bin/json/game_huntingboss.json +++ b/bin/json/game_huntingboss.json @@ -51,13 +51,7 @@ "n": 1 } ], - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ] + "captionrecommend": 4 }, { "id": 10002, @@ -111,13 +105,7 @@ "n": 1 } ], - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ] + "captionrecommend": 4 }, { "id": 10003, @@ -176,13 +164,7 @@ "n": 1 } ], - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ] + "captionrecommend": 4 }, { "id": 10004, @@ -241,13 +223,7 @@ "n": 1 } ], - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ] + "captionrecommend": 4 }, { "id": 10005, @@ -306,13 +282,7 @@ "n": 1 } ], - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ] + "captionrecommend": 4 }, { "id": 10006, @@ -371,13 +341,7 @@ "n": 1 } ], - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ] + "captionrecommend": 4 }, { "id": 10007, @@ -441,13 +405,7 @@ "n": 1 } ], - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ] + "captionrecommend": 4 }, { "id": 10008, @@ -511,13 +469,7 @@ "n": 1 } ], - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ] + "captionrecommend": 4 }, { "id": 10009, @@ -581,13 +533,7 @@ "n": 1 } ], - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ] + "captionrecommend": 4 }, { "id": 10010, @@ -651,13 +597,7 @@ "n": 1 } ], - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ] + "captionrecommend": 4 }, { "id": 10011, @@ -721,13 +661,7 @@ "n": 1 } ], - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ] + "captionrecommend": 4 }, { "id": 10012, @@ -791,13 +725,7 @@ "n": 1 } ], - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ] + "captionrecommend": 4 }, { "id": 20001, @@ -851,13 +779,7 @@ "n": 1 } ], - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ] + "captionrecommend": 7 }, { "id": 20002, @@ -911,13 +833,7 @@ "n": 1 } ], - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ] + "captionrecommend": 7 }, { "id": 20003, @@ -976,13 +892,7 @@ "n": 1 } ], - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ] + "captionrecommend": 7 }, { "id": 20004, @@ -1041,13 +951,7 @@ "n": 1 } ], - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ] + "captionrecommend": 7 }, { "id": 20005, @@ -1106,13 +1010,7 @@ "n": 1 } ], - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ] + "captionrecommend": 7 }, { "id": 20006, @@ -1171,13 +1069,7 @@ "n": 1 } ], - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ] + "captionrecommend": 7 }, { "id": 20007, @@ -1241,13 +1133,7 @@ "n": 1 } ], - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ] + "captionrecommend": 7 }, { "id": 20008, @@ -1311,13 +1197,7 @@ "n": 1 } ], - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ] + "captionrecommend": 7 }, { "id": 20009, @@ -1381,13 +1261,7 @@ "n": 1 } ], - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ] + "captionrecommend": 7 }, { "id": 20010, @@ -1451,13 +1325,7 @@ "n": 1 } ], - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ] + "captionrecommend": 7 }, { "id": 20011, @@ -1521,13 +1389,7 @@ "n": 1 } ], - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ] + "captionrecommend": 7 }, { "id": 20012, @@ -1591,13 +1453,7 @@ "n": 1 } ], - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ] + "captionrecommend": 7 }, { "id": 30001, @@ -1651,13 +1507,7 @@ "n": 1 } ], - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ] + "captionrecommend": 5 }, { "id": 30002, @@ -1711,13 +1561,7 @@ "n": 1 } ], - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ] + "captionrecommend": 5 }, { "id": 30003, @@ -1776,13 +1620,7 @@ "n": 1 } ], - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ] + "captionrecommend": 5 }, { "id": 30004, @@ -1841,13 +1679,7 @@ "n": 1 } ], - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ] + "captionrecommend": 5 }, { "id": 30005, @@ -1906,13 +1738,7 @@ "n": 1 } ], - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ] + "captionrecommend": 5 }, { "id": 30006, @@ -1971,13 +1797,7 @@ "n": 1 } ], - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ] + "captionrecommend": 5 }, { "id": 30007, @@ -2041,13 +1861,7 @@ "n": 1 } ], - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ] + "captionrecommend": 5 }, { "id": 30008, @@ -2111,13 +1925,7 @@ "n": 1 } ], - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ] + "captionrecommend": 5 }, { "id": 30009, @@ -2181,13 +1989,7 @@ "n": 1 } ], - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ] + "captionrecommend": 5 }, { "id": 30010, @@ -2251,13 +2053,7 @@ "n": 1 } ], - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ] + "captionrecommend": 5 }, { "id": 30011, @@ -2321,13 +2117,7 @@ "n": 1 } ], - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ] + "captionrecommend": 5 }, { "id": 30012, @@ -2391,13 +2181,7 @@ "n": 1 } ], - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ] + "captionrecommend": 5 }, { "id": 40001, @@ -2451,13 +2235,7 @@ "n": 1 } ], - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ] + "captionrecommend": 6 }, { "id": 40002, @@ -2511,13 +2289,7 @@ "n": 1 } ], - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ] + "captionrecommend": 6 }, { "id": 40003, @@ -2576,13 +2348,7 @@ "n": 1 } ], - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ] + "captionrecommend": 6 }, { "id": 40004, @@ -2641,13 +2407,7 @@ "n": 1 } ], - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ] + "captionrecommend": 6 }, { "id": 40005, @@ -2706,13 +2466,7 @@ "n": 1 } ], - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ] + "captionrecommend": 6 }, { "id": 40006, @@ -2771,13 +2525,7 @@ "n": 1 } ], - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ] + "captionrecommend": 6 }, { "id": 40007, @@ -2841,13 +2589,7 @@ "n": 1 } ], - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ] + "captionrecommend": 6 }, { "id": 40008, @@ -2911,13 +2653,7 @@ "n": 1 } ], - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ] + "captionrecommend": 6 }, { "id": 40009, @@ -2981,13 +2717,7 @@ "n": 1 } ], - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ] + "captionrecommend": 6 }, { "id": 40010, @@ -3051,13 +2781,7 @@ "n": 1 } ], - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ] + "captionrecommend": 6 }, { "id": 40011, @@ -3121,13 +2845,7 @@ "n": 1 } ], - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ] + "captionrecommend": 6 }, { "id": 40012, @@ -3191,12 +2909,6 @@ "n": 1 } ], - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ] + "captionrecommend": 6 } ] \ No newline at end of file diff --git a/bin/json/game_item.json b/bin/json/game_item.json index 248e288e2..c9cf45665 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -1167,11 +1167,11 @@ "decompose_get": [], "access": [], "use_skip": 0, - "upper_limit": 999, + "upper_limit": 2000, "img": "item_10000041", "intr": { "key": "item_item_intr_10000041", - "text": "横扫的消耗道具，使用可以进行横扫功能。" + "text": "扫荡的消耗道具，使用可以进行扫荡功能。" }, "describe": { "key": "item_item_describe_10000041", @@ -46970,5 +46970,46 @@ }, "sale": [], "gm": 0 + }, + { + "id": "30000001", + "name": { + "key": "item_item_name_30000001", + "text": "掠夺勇气值" + }, + "usetype": 1, + "color": 4, + "bagtype": 0, + "index": 1, + "special_type": 0, + "hold": 0, + "time": 0, + "reddottype": 0, + "effects": "", + "modelName": "", + "box_id": 0, + "synthetize_num": 0, + "synthetize_deplete": [], + "synthetize_get": [], + "decompose_deplete": [], + "decompose_get": [], + "access": [], + "use_skip": 0, + "upper_limit": 0, + "img": "item_30000001", + "intr": { + "key": "item_item_intr_30000001", + "text": "掠夺勇气值，用于解锁额外的运输位。" + }, + "describe": { + "key": "item_item_describe_30000001", + "text": "勇气可嘉，勇气可嘉。" + }, + "dialogue": { + "key": "", + "text": "" + }, + "sale": [], + "gm": 0 } ] \ No newline at end of file diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json index 887a62c95..b73754567 100644 --- a/bin/json/game_mainstage.json +++ b/bin/json/game_mainstage.json @@ -108,6 +108,7 @@ "Person/24004/24004_q.prefab" ], "scene_effect": [ + "Effect/Scene/scenes_chapter_05/effect_scenes_chapter_05_shotsnow_01.prefab", "miwu" ], "scene_effectfilter": "", @@ -241,6 +242,7 @@ "Person/24004/24004_q.prefab" ], "scene_effect": [ + "Effect/Scene/scenes_chapter_05/effect_scenes_chapter_05_shotsnow_02.prefab", "miwu" ], "scene_effectfilter": "", @@ -41407,7 +41409,10 @@ }, "venturetype": 0, "ventureavatar": [], - "scene_effect": [], + "scene_effect": [ + "Effect/Scene/scenes_chapter_05/effect_scenes_chapter_05_shotsnow_01.prefab", + "xiaxue" + ], "scene_effectfilter": "", "is_near": false, "openlevel": 1, @@ -41491,7 +41496,10 @@ "sbkp_js_35002", "sbkp_js_14003" ], - "scene_effect": [], + "scene_effect": [ + "Effect/Scene/scenes_chapter_05/effect_scenes_chapter_05_shotsnow_02.prefab", + "xiaxue" + ], "scene_effectfilter": "", "is_near": false, "openlevel": 1, @@ -41572,7 +41580,10 @@ }, "venturetype": 0, "ventureavatar": [], - "scene_effect": [], + "scene_effect": [ + "Effect/Scene/scenes_chapter_05/effect_scenes_chapter_05_shotsnow_02.prefab", + "xiaxue" + ], "scene_effectfilter": "", "is_near": false, "openlevel": 1, @@ -41656,7 +41667,10 @@ "sbkp_js_35002", "sbkp_js_14003" ], - "scene_effect": [], + "scene_effect": [ + "Effect/Scene/scenes_chapter_05/effect_scenes_chapter_05_shotsnow_02.prefab", + "xiaxue" + ], "scene_effectfilter": "", "is_near": false, "openlevel": 1, diff --git a/bin/json/game_monsterformat.json b/bin/json/game_monsterformat.json index ffeedea50..f08595b4e 100644 --- a/bin/json/game_monsterformat.json +++ b/bin/json/game_monsterformat.json @@ -123176,7 +123176,7 @@ "newskill": [], "lv": 55, "hppro": 16, - "atkpro": 1.4, + "atkpro": 1, "defpro": 0.5, "skill1": 1, "skill2": 1, @@ -123476,7 +123476,7 @@ "newskill": [], "lv": 55, "hppro": 20, - "atkpro": 1.4, + "atkpro": 1.2, "defpro": 0.5, "skill1": 1, "skill2": 1, @@ -123775,13 +123775,13 @@ "equip": [], "newskill": [], "lv": 65, - "hppro": 20, - "atkpro": 1.6, - "defpro": 1, + "hppro": 18, + "atkpro": 1.65, + "defpro": 0.5, "skill1": 1, "skill2": 1, "skill3": 1, - "speed": 150, + "speed": 145, "modelsize": 1 }, { @@ -127361,7 +127361,7 @@ "skill1": 1, "skill2": 1, "skill3": 1, - "speed": 155, + "speed": 140, "modelsize": 1 }, { @@ -127376,12 +127376,12 @@ "newskill": [], "lv": 65, "hppro": 20, - "atkpro": 4, + "atkpro": 3, "defpro": 0.5, "skill1": 1, "skill2": 1, "skill3": 1, - "speed": 145, + "speed": 140, "modelsize": 1 }, { @@ -127401,7 +127401,7 @@ "skill1": 1, "skill2": 1, "skill3": 1, - "speed": 155, + "speed": 140, "modelsize": 1 }, { @@ -130937,7 +130937,7 @@ "lv": 65, "hppro": 0.6, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.4, "skill1": 1, "skill2": 1, "skill3": 1, @@ -130955,13 +130955,13 @@ "equip": [], "newskill": [], "lv": 65, - "hppro": 7, - "atkpro": 0.5, - "defpro": 0.8, + "hppro": 17, + "atkpro": 2, + "defpro": 1, "skill1": 1, "skill2": 1, "skill3": 1, - "speed": 120, + "speed": 140, "modelsize": 1 }, { @@ -130975,13 +130975,13 @@ "equip": [], "newskill": [], "lv": 65, - "hppro": 12, - "atkpro": 1.2, - "defpro": 0.4, + "hppro": 22, + "atkpro": 4, + "defpro": 0.5, "skill1": 1, "skill2": 1, "skill3": 1, - "speed": 119, + "speed": 160, "modelsize": 1 }, { @@ -130995,13 +130995,13 @@ "equip": [], "newskill": [], "lv": 65, - "hppro": 7, - "atkpro": 0.5, - "defpro": 0.8, + "hppro": 17, + "atkpro": 2, + "defpro": 1, "skill1": 1, "skill2": 1, "skill3": 1, - "speed": 129, + "speed": 140, "modelsize": 1 }, { @@ -138155,13 +138155,13 @@ "equip": [], "newskill": [], "lv": 65, - "hppro": 6, - "atkpro": 0.5, + "hppro": 13, + "atkpro": 1.3, "defpro": 0.8, "skill1": 1, "skill2": 1, "skill3": 1, - "speed": 108, + "speed": 150, "modelsize": 1 }, { @@ -138175,13 +138175,13 @@ "equip": [], "newskill": [], "lv": 65, - "hppro": 12, - "atkpro": 1.5, - "defpro": 0.1, + "hppro": 20, + "atkpro": 2.5, + "defpro": 1, "skill1": 1, "skill2": 1, "skill3": 1, - "speed": 109, + "speed": 155, "modelsize": 1 }, { @@ -138195,13 +138195,13 @@ "equip": [], "newskill": [], "lv": 65, - "hppro": 6, - "atkpro": 0.5, + "hppro": 13, + "atkpro": 1.3, "defpro": 0.8, "skill1": 1, "skill2": 1, "skill3": 1, - "speed": 112, + "speed": 145, "modelsize": 1 }, { @@ -141775,9 +141775,9 @@ "equip": [], "newskill": [], "lv": 65, - "hppro": 35, - "atkpro": 1.5, - "defpro": 0.3, + "hppro": 50, + "atkpro": 2.5, + "defpro": 1, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145355,13 +145355,13 @@ "equip": [], "newskill": [], "lv": 65, - "hppro": 5.5, - "atkpro": 0.5, - "defpro": 0.1, + "hppro": 15, + "atkpro": 1.5, + "defpro": 1, "skill1": 1, "skill2": 1, "skill3": 1, - "speed": 122, + "speed": 155, "modelsize": 1 }, { @@ -145375,13 +145375,13 @@ "equip": [], "newskill": [], "lv": 65, - "hppro": 13, - "atkpro": 1.5, - "defpro": 0.3, + "hppro": 18, + "atkpro": 2.5, + "defpro": 1, "skill1": 1, "skill2": 1, "skill3": 1, - "speed": 114, + "speed": 160, "modelsize": 1 }, { @@ -145395,13 +145395,13 @@ "equip": [], "newskill": [], "lv": 65, - "hppro": 5.5, - "atkpro": 0.5, - "defpro": 0.1, + "hppro": 15, + "atkpro": 1.5, + "defpro": 1, "skill1": 1, "skill2": 1, "skill3": 1, - "speed": 124, + "speed": 145, "modelsize": 1 }, { @@ -148957,7 +148957,7 @@ "lv": 65, "hppro": 12, "atkpro": 0.5, - "defpro": 0.5, + "defpro": 5, "skill1": 1, "skill2": 1, "skill3": 1, @@ -148977,7 +148977,7 @@ "lv": 65, "hppro": 8, "atkpro": 2, - "defpro": 4, + "defpro": 10, "skill1": 1, "skill2": 1, "skill3": 1, @@ -148997,7 +148997,7 @@ "lv": 65, "hppro": 12, "atkpro": 0.5, - "defpro": 0.5, + "defpro": 5, "skill1": 1, "skill2": 1, "skill3": 1, diff --git a/bin/json/game_msgdistrib.json b/bin/json/game_msgdistrib.json index ba7d9344d..31baef48a 100644 --- a/bin/json/game_msgdistrib.json +++ b/bin/json/game_msgdistrib.json @@ -178,11 +178,5 @@ "open": true, "routrules": "~/worker", "describe": "积分boss" - }, - { - "msgid": "plunder", - "open": false, - "routrules": "~/worker", - "describe": "掠夺" } ] \ No newline at end of file diff --git a/bin/json/game_playingmethod.json b/bin/json/game_playingmethod.json index 5d82ae390..007ce54bc 100644 --- a/bin/json/game_playingmethod.json +++ b/bin/json/game_playingmethod.json @@ -9,7 +9,7 @@ }, "txt": { "key": "consume_consume_playingmethod_txt_01", - "text": "基础的玩法模式，只有6种普通的颜色方块可以被消除" + "text": "只有6种普通的颜色方块可以被消除" }, "type": 1, "detail": 1, @@ -25,7 +25,7 @@ }, "txt": { "key": "consume_consume_playingmethod_txt_03", - "text": "新增炸弹方块，消除后会造成难以预料的结果。" + "text": "基础方块新增炸弹方块" }, "type": 2, "detail": 1, @@ -41,7 +41,7 @@ }, "txt": { "key": "consume_consume_playingmethod_txt_04", - "text": "新增烟火方块，消除后会点燃他的火花，消除指定方向的所有方块。" + "text": "基础方块新增烟火方块" }, "type": 2, "detail": 1, diff --git a/bin/json/game_plunder.json b/bin/json/game_plunder.json index 424744367..ebf250b59 100644 --- a/bin/json/game_plunder.json +++ b/bin/json/game_plunder.json @@ -10,6 +10,7 @@ "key": "mostername_01", "text": "衣衫褴褛的豺狼人" }, + "mosterheadLv": 30, "rarity": 1, "weight": 3000, "battleid": 105, @@ -53,6 +54,7 @@ "key": "mostername_02", "text": "衣着得体的豺狼人" }, + "mosterheadLv": 31, "rarity": 1, "weight": 3000, "battleid": 106, @@ -96,6 +98,7 @@ "key": "mostername_03", "text": "小有积蓄的豺狼人" }, + "mosterheadLv": 32, "rarity": 1, "weight": 3000, "battleid": 107, @@ -139,6 +142,7 @@ "key": "mostername_03", "text": "小有积蓄的豺狼人" }, + "mosterheadLv": 33, "rarity": 1, "weight": 1000, "battleid": 107, @@ -182,6 +186,7 @@ "key": "mostername_04", "text": "中产阶级的豺狼人" }, + "mosterheadLv": 34, "rarity": 2, "weight": 3000, "battleid": 108, @@ -225,6 +230,7 @@ "key": "mostername_05", "text": "资产阶级的豺狼人" }, + "mosterheadLv": 35, "rarity": 2, "weight": 3000, "battleid": 109, @@ -268,6 +274,7 @@ "key": "mostername_06", "text": "衣衫褴褛的豺狼人" }, + "mosterheadLv": 36, "rarity": 2, "weight": 3000, "battleid": 110, @@ -311,6 +318,7 @@ "key": "mostername_06", "text": "衣衫褴褛的豺狼人" }, + "mosterheadLv": 37, "rarity": 2, "weight": 1000, "battleid": 110, @@ -354,6 +362,7 @@ "key": "mostername_07", "text": "衣着得体的豺狼人" }, + "mosterheadLv": 38, "rarity": 3, "weight": 3000, "battleid": 111, @@ -397,6 +406,7 @@ "key": "mostername_08", "text": "小有积蓄的豺狼人" }, + "mosterheadLv": 39, "rarity": 3, "weight": 3000, "battleid": 112, @@ -440,6 +450,7 @@ "key": "mostername_09", "text": "中产阶级的豺狼人" }, + "mosterheadLv": 40, "rarity": 3, "weight": 3000, "battleid": 113, @@ -483,6 +494,7 @@ "key": "mostername_09", "text": "中产阶级的豺狼人" }, + "mosterheadLv": 41, "rarity": 3, "weight": 1000, "battleid": 113, @@ -526,6 +538,7 @@ "key": "mostername_10", "text": "资产阶级的豺狼人" }, + "mosterheadLv": 42, "rarity": 4, "weight": 3000, "battleid": 114, @@ -569,6 +582,7 @@ "key": "mostername_11", "text": "衣衫褴褛的豺狼人" }, + "mosterheadLv": 43, "rarity": 4, "weight": 3000, "battleid": 115, @@ -612,6 +626,7 @@ "key": "mostername_12", "text": "衣着得体的豺狼人" }, + "mosterheadLv": 44, "rarity": 4, "weight": 3000, "battleid": 116, @@ -655,6 +670,7 @@ "key": "mostername_12", "text": "衣着得体的豺狼人" }, + "mosterheadLv": 45, "rarity": 4, "weight": 1000, "battleid": 116, @@ -698,6 +714,7 @@ "key": "mostername_13", "text": "小有积蓄的豺狼人" }, + "mosterheadLv": 46, "rarity": 5, "weight": 3000, "battleid": 117, @@ -741,6 +758,7 @@ "key": "mostername_14", "text": "中产阶级的豺狼人" }, + "mosterheadLv": 47, "rarity": 5, "weight": 3000, "battleid": 118, @@ -784,6 +802,7 @@ "key": "mostername_15", "text": "资产阶级的豺狼人" }, + "mosterheadLv": 48, "rarity": 5, "weight": 3000, "battleid": 119, @@ -827,6 +846,7 @@ "key": "mostername_15", "text": "资产阶级的豺狼人" }, + "mosterheadLv": 49, "rarity": 5, "weight": 1000, "battleid": 119, diff --git a/bin/json/game_rdtasknpc.json b/bin/json/game_rdtasknpc.json index e8f7eab02..8194fefed 100644 --- a/bin/json/game_rdtasknpc.json +++ b/bin/json/game_rdtasknpc.json @@ -8715,7 +8715,7 @@ }, { "id": 60010, - "heroid": 25001, + "heroid": 45001, "Levelid": 0, "datas": [ "CommandScene", @@ -8760,7 +8760,7 @@ }, { "id": 60020, - "heroid": 25001, + "heroid": 45001, "Levelid": 0, "datas": [ "GameMain", @@ -8805,7 +8805,7 @@ }, { "id": 60030, - "heroid": 25001, + "heroid": 45001, "Levelid": 0, "datas": [ "CommandScene", @@ -8850,7 +8850,7 @@ }, { "id": 60040, - "heroid": 25001, + "heroid": 45001, "Levelid": 0, "datas": [ "CommandScene", @@ -8895,7 +8895,7 @@ }, { "id": 60050, - "heroid": 25001, + "heroid": 45001, "Levelid": 0, "datas": [ "CommandScene", @@ -8940,7 +8940,7 @@ }, { "id": 60060, - "heroid": 25001, + "heroid": 45001, "Levelid": 0, "datas": [ "CommandScene", @@ -8985,7 +8985,7 @@ }, { "id": 60070, - "heroid": 25001, + "heroid": 45001, "Levelid": 0, "datas": [ "CommandScene", @@ -9030,7 +9030,7 @@ }, { "id": 60080, - "heroid": 25001, + "heroid": 34001, "Levelid": 0, "datas": [ "GameMain", @@ -9075,7 +9075,7 @@ }, { "id": 60090, - "heroid": 25001, + "heroid": 14003, "Levelid": 0, "datas": [ "GameMain", @@ -9120,7 +9120,7 @@ }, { "id": 60100, - "heroid": 25001, + "heroid": 43004, "Levelid": 0, "datas": [ "GameMain", @@ -9165,7 +9165,7 @@ }, { "id": 60110, - "heroid": 25001, + "heroid": 35006, "Levelid": 0, "datas": [ "GameMain", @@ -9210,7 +9210,7 @@ }, { "id": 60120, - "heroid": 25001, + "heroid": 44003, "Levelid": 0, "datas": [ "GameMain", @@ -9255,7 +9255,7 @@ }, { "id": 60130, - "heroid": 25001, + "heroid": 25004, "Levelid": 0, "datas": [ "GameMain", @@ -9293,7 +9293,7 @@ }, { "id": 60140, - "heroid": 25001, + "heroid": 35002, "Levelid": 0, "datas": [ "GameMain", @@ -9331,7 +9331,7 @@ }, { "id": 60150, - "heroid": 25001, + "heroid": 34007, "Levelid": 0, "datas": [ "GameMain", @@ -9369,7 +9369,7 @@ }, { "id": 60160, - "heroid": 25001, + "heroid": 43007, "Levelid": 0, "datas": [ "GameMain", @@ -9407,7 +9407,7 @@ }, { "id": 60170, - "heroid": 25001, + "heroid": 43001, "Levelid": 0, "datas": [ "GameMain", @@ -9445,7 +9445,7 @@ }, { "id": 60180, - "heroid": 25001, + "heroid": 44004, "Levelid": 0, "datas": [ "CommandScene", @@ -9483,7 +9483,7 @@ }, { "id": 60190, - "heroid": 25001, + "heroid": 35002, "Levelid": 0, "datas": [ "GameMain", @@ -9521,7 +9521,7 @@ }, { "id": 60200, - "heroid": 25001, + "heroid": 24004, "Levelid": 0, "datas": [ "GameMain", @@ -9559,7 +9559,7 @@ }, { "id": 60210, - "heroid": 25001, + "heroid": 44004, "Levelid": 0, "datas": [ "CommandScene", @@ -9597,7 +9597,7 @@ }, { "id": 60220, - "heroid": 25001, + "heroid": 35002, "Levelid": 0, "datas": [ "GameMain", @@ -9680,7 +9680,7 @@ }, { "id": 60240, - "heroid": 25001, + "heroid": 24004, "Levelid": 0, "datas": [ "GameMain", @@ -9747,7 +9747,7 @@ }, { "id": 60250, - "heroid": 25001, + "heroid": 34007, "Levelid": 0, "datas": [ "GameMain", @@ -9814,7 +9814,7 @@ }, { "id": 60260, - "heroid": 25001, + "heroid": 43007, "Levelid": 0, "datas": [ "GameMain", @@ -9881,7 +9881,7 @@ }, { "id": 60270, - "heroid": 25001, + "heroid": 35006, "Levelid": 0, "datas": [ "GameMain", @@ -9948,7 +9948,7 @@ }, { "id": 60280, - "heroid": 25001, + "heroid": 44004, "Levelid": 0, "datas": [ "CommandScene", @@ -10153,7 +10153,7 @@ }, { "id": 60350, - "heroid": 25001, + "heroid": 35007, "Levelid": 0, "datas": [ "GameMain", @@ -10284,7 +10284,7 @@ }, { "id": 60410, - "heroid": 25001, + "heroid": 35007, "Levelid": 0, "datas": [ "GameMain", diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index 3e75a7f1b..1b9c572d5 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -8716,7 +8716,7 @@ 500, 1, 5, - 2100 + 1500 ], "FollowSK": [], "SucFollowSK": [ @@ -8770,7 +8770,7 @@ 500, 1, 5, - 2300 + 1600 ], "FollowSK": [], "SucFollowSK": [ @@ -8824,7 +8824,7 @@ 500, 1, 5, - 2300 + 1700 ], "FollowSK": [], "SucFollowSK": [ @@ -8878,7 +8878,7 @@ 500, 1, 5, - 2500 + 1800 ], "FollowSK": [], "SucFollowSK": [ @@ -8932,7 +8932,7 @@ 500, 1, 5, - 2500 + 1900 ], "FollowSK": [], "SucFollowSK": [ @@ -8986,7 +8986,7 @@ 500, 1, 5, - 2700 + 2000 ], "FollowSK": [], "SucFollowSK": [ @@ -9134,7 +9134,7 @@ "Argu": [ 1, 5, - 1000 + 700 ], "FollowSK": [], "SucFollowSK": [], @@ -9158,7 +9158,7 @@ "Argu": [ 1, 5, - 1250 + 600 ], "FollowSK": [], "SucFollowSK": [ @@ -9237,7 +9237,7 @@ "Argu": [ 1, 5, - 1100 + 700 ], "FollowSK": [], "SucFollowSK": [], @@ -9261,7 +9261,7 @@ "Argu": [ 1, 5, - 1250 + 650 ], "FollowSK": [], "SucFollowSK": [ @@ -9340,7 +9340,7 @@ "Argu": [ 1, 5, - 1200 + 700 ], "FollowSK": [], "SucFollowSK": [], @@ -9364,7 +9364,7 @@ "Argu": [ 1, 5, - 1250 + 700 ], "FollowSK": [], "SucFollowSK": [ @@ -9443,7 +9443,7 @@ "Argu": [ 1, 5, - 1200 + 700 ], "FollowSK": [], "SucFollowSK": [], @@ -9467,7 +9467,7 @@ "Argu": [ 1, 5, - 1300 + 750 ], "FollowSK": [], "SucFollowSK": [ @@ -9546,7 +9546,7 @@ "Argu": [ 1, 5, - 1200 + 700 ], "FollowSK": [], "SucFollowSK": [], @@ -9570,7 +9570,7 @@ "Argu": [ 1, 5, - 1350 + 800 ], "FollowSK": [], "SucFollowSK": [ @@ -9724,7 +9724,7 @@ 1, 4, 6, - 33 + 100 ], "FollowSK": [], "SucFollowSK": [], @@ -10046,7 +10046,7 @@ 1, 4, 6, - 33 + 100 ], "FollowSK": [], "SucFollowSK": [], @@ -10277,7 +10277,7 @@ 1, 4, 6, - 33 + 100 ], "FollowSK": [], "SucFollowSK": [], @@ -10452,7 +10452,7 @@ 1, 4, 6, - 33 + 100 ], "FollowSK": [], "SucFollowSK": [], @@ -30538,7 +30538,7 @@ "Argu": [ 1, 4, - 3000 + 5000 ], "FollowSK": [ 255006112 @@ -30831,7 +30831,7 @@ "Argu": [ 1, 4, - 600 + 1500 ], "FollowSK": [], "SucFollowSK": [ @@ -30937,7 +30937,7 @@ "Argu": [ 1, 4, - 800 + 1600 ], "FollowSK": [ 255007215 @@ -31012,7 +31012,7 @@ "Argu": [ 390001415, 1000, - 1, + 2, -1 ], "FollowSK": [], @@ -31111,7 +31111,7 @@ "Argu": [ 390001415, 1000, - 15, + 10, -1 ], "FollowSK": [], @@ -31896,7 +31896,7 @@ 390001448, 1000, 1, - 2 + 3 ], "FollowSK": [ 255002214, @@ -56832,6 +56832,7 @@ "TriggerAnim": "", "Type": 7, "Argu": [ + 1, 1, 1 ], diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index 8c3038ed3..effdf580f 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -6534,7 +6534,7 @@ "passSkill": [], "Desc": { "key": "skill_skill_atk_Desc_114007111_1", - "text": "攻击1个敌方，伤害为自身攻击力50%及防御力210%，50%概率为目标附加2回合[color=#e5621b]防御下降[/color]。" + "text": "攻击1个敌方，伤害为自身攻击力50%及防御力150%，50%概率为目标附加2回合[color=#e5621b]防御下降[/color]。" }, "buffid": [ 390001007 @@ -6569,7 +6569,7 @@ "passSkill": [], "Desc": { "key": "skill_skill_atk_Desc_114007111_2", - "text": "防御比例伤害提升至230%。" + "text": "防御比例伤害提升至160%。" }, "buffid": [ 390001007 @@ -6639,7 +6639,7 @@ "passSkill": [], "Desc": { "key": "skill_skill_atk_Desc_114007111_4", - "text": "防御比例伤害提升至250%。" + "text": "防御比例伤害提升至170%。" }, "buffid": [ 390001007 @@ -6709,7 +6709,7 @@ "passSkill": [], "Desc": { "key": "skill_skill_atk_Desc_114007111_6", - "text": "防御比例伤害提升至270%。" + "text": "防御比例伤害提升至180%。" }, "buffid": [ 390001007 @@ -6855,7 +6855,7 @@ "passSkill": [], "Desc": { "key": "skill_skill_atk_Desc_114007311_1", - "text": "攻击敌方全体9次，伤害为自身防御力540%，30%概率为目标附加1回合[color=#e5621b]挑衅[/color]；目标防御比自身低时，概率翻倍。" + "text": "攻击敌方全体，伤害为自身防御力330%，30%概率为目标附加1回合[color=#e5621b]挑衅[/color]；目标防御比自身低时，概率翻倍。" }, "buffid": [ 390001110 @@ -6893,7 +6893,7 @@ "passSkill": [], "Desc": { "key": "skill_skill_atk_Desc_114007311_2", - "text": "防御比例伤害提升至405%。" + "text": "防御比例伤害提升至340%。" }, "buffid": [ 390001110 @@ -6969,7 +6969,7 @@ "passSkill": [], "Desc": { "key": "skill_skill_atk_Desc_114007311_4", - "text": "防御比例伤害提升至450%。" + "text": "防御比例伤害提升至350%。" }, "buffid": [ 390001110 @@ -7260,7 +7260,7 @@ "MaxLV": 5, "UnavailablePlayTypes": [], "SkillFlag": 3, - "EffectFlag": 5, + "EffectFlag": 6, "Priority": 2, "Name": { "key": "skill_skill_atk_Name_114003211", @@ -7299,7 +7299,7 @@ "MaxLV": 5, "UnavailablePlayTypes": [], "SkillFlag": 3, - "EffectFlag": 5, + "EffectFlag": 6, "Priority": 2, "Name": { "key": "skill_skill_atk_Name_114003211", @@ -7338,7 +7338,7 @@ "MaxLV": 5, "UnavailablePlayTypes": [], "SkillFlag": 3, - "EffectFlag": 5, + "EffectFlag": 6, "Priority": 2, "Name": { "key": "skill_skill_atk_Name_114003211", @@ -7377,7 +7377,7 @@ "MaxLV": 5, "UnavailablePlayTypes": [], "SkillFlag": 3, - "EffectFlag": 5, + "EffectFlag": 6, "Priority": 2, "Name": { "key": "skill_skill_atk_Name_114003211", @@ -7416,7 +7416,7 @@ "MaxLV": 5, "UnavailablePlayTypes": [], "SkillFlag": 3, - "EffectFlag": 5, + "EffectFlag": 6, "Priority": 2, "Name": { "key": "skill_skill_atk_Name_114003211", @@ -24402,13 +24402,12 @@ "ChildSkill": { "Id": [ 255001211, - 255001213, - 255001215 + 255001213 ] }, "passSkill": [ 255001211, - 255001215 + 255001213 ], "Desc": { "key": "skill_skill_atk_Desc_155001211_1", @@ -24512,7 +24511,10 @@ 255002218 ] }, - "passSkill": [], + "passSkill": [ + 255002212, + 255002211 + ], "Desc": { "key": "skill_skill_atk_Desc_155002211_1", "text": "（被动）当有队友死亡或自身血量首次低于30%时自身进入狂暴化。" @@ -24820,7 +24822,7 @@ "IsMelee": 0, "act": "Skill_2", "Type": 1, - "CD": 1, + "CD": 0, "Where": [ "SelfHasBuff=390001415" ], @@ -24903,8 +24905,7 @@ "ChildSkill": { "Id": [ 255007315, - 255007319, - 255007320 + 255007319 ] }, "passSkill": [], diff --git a/bin/json/game_skillpassive.json b/bin/json/game_skillpassive.json index 204228b67..373608b15 100644 --- a/bin/json/game_skillpassive.json +++ b/bin/json/game_skillpassive.json @@ -2663,7 +2663,7 @@ "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, - "MaxEmitTimesInRound": 1, + "MaxEmitTimesInRound": 2, "Callback": [ 255006315, 155006211 diff --git a/bin/json/game_stoneroom.json b/bin/json/game_stoneroom.json index 8536e8551..04beed094 100644 --- a/bin/json/game_stoneroom.json +++ b/bin/json/game_stoneroom.json @@ -17,7 +17,7 @@ 0 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_1", + "key": "stonehenge_stageconfig_ConditionText_1", "text": "" } }, @@ -39,7 +39,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_2", + "key": "stonehenge_stageconfig_ConditionText_2", "text": "{0}场战斗获得胜利" } }, @@ -61,7 +61,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_3", + "key": "stonehenge_stageconfig_ConditionText_3", "text": "{0}场战斗获得胜利" } }, @@ -83,7 +83,7 @@ 12 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_4", + "key": "stonehenge_stageconfig_ConditionText_4", "text": "触碰{0}次岩画" } }, @@ -105,7 +105,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_5", + "key": "stonehenge_stageconfig_ConditionText_5", "text": "{0}场战斗获得胜利" } }, @@ -125,7 +125,7 @@ "BossEvent": 0, "Condition": [], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_6", + "key": "stonehenge_stageconfig_ConditionText_6", "text": "" } }, @@ -147,7 +147,7 @@ 28 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_7", + "key": "stonehenge_stageconfig_ConditionText_7", "text": "击败{0}次首领" } }, @@ -169,7 +169,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_8", + "key": "stonehenge_stageconfig_ConditionText_8", "text": "{0}场战斗获得胜利" } }, @@ -191,7 +191,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_9", + "key": "stonehenge_stageconfig_ConditionText_9", "text": "{0}场战斗获得胜利" } }, @@ -213,7 +213,7 @@ 12 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_10", + "key": "stonehenge_stageconfig_ConditionText_10", "text": "触碰{0}次岩画" } }, @@ -235,7 +235,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_11", + "key": "stonehenge_stageconfig_ConditionText_11", "text": "{0}场战斗获得胜利" } }, @@ -257,7 +257,7 @@ 12 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_12", + "key": "stonehenge_stageconfig_ConditionText_12", "text": "触碰{0}次岩画" } }, @@ -279,7 +279,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_13", + "key": "stonehenge_stageconfig_ConditionText_13", "text": "{0}场战斗获得胜利" } }, @@ -301,7 +301,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_14", + "key": "stonehenge_stageconfig_ConditionText_14", "text": "{0}场战斗获得胜利" } }, @@ -323,7 +323,7 @@ 12 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_15", + "key": "stonehenge_stageconfig_ConditionText_15", "text": "触碰{0}次岩画" } }, @@ -345,7 +345,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_16", + "key": "stonehenge_stageconfig_ConditionText_16", "text": "{0}场战斗获得胜利" } }, @@ -365,7 +365,7 @@ "BossEvent": 0, "Condition": [], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_17", + "key": "stonehenge_stageconfig_ConditionText_17", "text": "" } }, @@ -387,7 +387,7 @@ 28 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_18", + "key": "stonehenge_stageconfig_ConditionText_18", "text": "击败{0}次首领" } }, @@ -409,7 +409,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_19", + "key": "stonehenge_stageconfig_ConditionText_19", "text": "{0}场战斗获得胜利" } }, @@ -431,7 +431,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_20", + "key": "stonehenge_stageconfig_ConditionText_20", "text": "{0}场战斗获得胜利" } }, @@ -453,7 +453,7 @@ 12 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_21", + "key": "stonehenge_stageconfig_ConditionText_21", "text": "触碰{0}次岩画" } }, @@ -475,7 +475,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_22", + "key": "stonehenge_stageconfig_ConditionText_22", "text": "{0}场战斗获得胜利" } }, @@ -497,7 +497,7 @@ 12 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_23", + "key": "stonehenge_stageconfig_ConditionText_23", "text": "触碰{0}次岩画" } }, @@ -519,7 +519,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_24", + "key": "stonehenge_stageconfig_ConditionText_24", "text": "{0}场战斗获得胜利" } }, @@ -541,7 +541,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_25", + "key": "stonehenge_stageconfig_ConditionText_25", "text": "{0}场战斗获得胜利" } }, @@ -563,7 +563,7 @@ 12 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_26", + "key": "stonehenge_stageconfig_ConditionText_26", "text": "触碰{0}次岩画" } }, @@ -585,7 +585,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_27", + "key": "stonehenge_stageconfig_ConditionText_27", "text": "{0}场战斗获得胜利" } }, @@ -605,7 +605,7 @@ "BossEvent": 0, "Condition": [], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_28", + "key": "stonehenge_stageconfig_ConditionText_28", "text": "" } }, @@ -627,7 +627,7 @@ 28 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_29", + "key": "stonehenge_stageconfig_ConditionText_29", "text": "击败{0}次首领" } }, @@ -649,7 +649,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_30", + "key": "stonehenge_stageconfig_ConditionText_30", "text": "{0}场战斗获得胜利" } }, @@ -671,7 +671,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_31", + "key": "stonehenge_stageconfig_ConditionText_31", "text": "{0}场战斗获得胜利" } }, @@ -693,7 +693,7 @@ 12 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_32", + "key": "stonehenge_stageconfig_ConditionText_32", "text": "触碰{0}次岩画" } }, @@ -715,7 +715,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_33", + "key": "stonehenge_stageconfig_ConditionText_33", "text": "{0}场战斗获得胜利" } }, @@ -737,7 +737,7 @@ 12 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_34", + "key": "stonehenge_stageconfig_ConditionText_34", "text": "触碰{0}次岩画" } }, @@ -759,7 +759,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_35", + "key": "stonehenge_stageconfig_ConditionText_35", "text": "{0}场战斗获得胜利" } }, @@ -781,7 +781,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_36", + "key": "stonehenge_stageconfig_ConditionText_36", "text": "{0}场战斗获得胜利" } }, @@ -803,7 +803,7 @@ 12 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_37", + "key": "stonehenge_stageconfig_ConditionText_37", "text": "触碰{0}次岩画" } }, @@ -825,7 +825,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_38", + "key": "stonehenge_stageconfig_ConditionText_38", "text": "{0}场战斗获得胜利" } }, @@ -847,7 +847,7 @@ 12 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_39", + "key": "stonehenge_stageconfig_ConditionText_39", "text": "触碰{0}次岩画" } }, @@ -867,7 +867,7 @@ "BossEvent": 0, "Condition": [], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_40", + "key": "stonehenge_stageconfig_ConditionText_40", "text": "" } }, @@ -889,7 +889,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_41", + "key": "stonehenge_stageconfig_ConditionText_41", "text": "{0}场战斗获得胜利" } }, @@ -911,7 +911,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_42", + "key": "stonehenge_stageconfig_ConditionText_42", "text": "{0}场战斗获得胜利" } }, @@ -933,7 +933,7 @@ 12 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_43", + "key": "stonehenge_stageconfig_ConditionText_43", "text": "触碰{0}次岩画" } }, @@ -955,7 +955,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_44", + "key": "stonehenge_stageconfig_ConditionText_44", "text": "{0}场战斗获得胜利" } }, @@ -977,7 +977,7 @@ 12 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_45", + "key": "stonehenge_stageconfig_ConditionText_45", "text": "触碰{0}次岩画" } }, @@ -997,7 +997,7 @@ "BossEvent": 0, "Condition": [], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_46", + "key": "stonehenge_stageconfig_ConditionText_46", "text": "" } }, @@ -1019,7 +1019,7 @@ 28 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_47", + "key": "stonehenge_stageconfig_ConditionText_47", "text": "击败{0}次首领" } }, @@ -1041,7 +1041,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_48", + "key": "stonehenge_stageconfig_ConditionText_48", "text": "{0}场战斗获得胜利" } }, @@ -1063,7 +1063,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_49", + "key": "stonehenge_stageconfig_ConditionText_49", "text": "{0}场战斗获得胜利" } }, @@ -1085,7 +1085,7 @@ 12 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_50", + "key": "stonehenge_stageconfig_ConditionText_50", "text": "触碰{0}次岩画" } }, @@ -1107,7 +1107,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_51", + "key": "stonehenge_stageconfig_ConditionText_51", "text": "{0}场战斗获得胜利" } }, @@ -1129,7 +1129,7 @@ 12 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_52", + "key": "stonehenge_stageconfig_ConditionText_52", "text": "触碰{0}次岩画" } }, @@ -1151,7 +1151,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_53", + "key": "stonehenge_stageconfig_ConditionText_53", "text": "{0}场战斗获得胜利" } }, @@ -1173,7 +1173,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_54", + "key": "stonehenge_stageconfig_ConditionText_54", "text": "{0}场战斗获得胜利" } }, @@ -1195,7 +1195,7 @@ 12 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_55", + "key": "stonehenge_stageconfig_ConditionText_55", "text": "触碰{0}次岩画" } }, @@ -1217,7 +1217,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_56", + "key": "stonehenge_stageconfig_ConditionText_56", "text": "{0}场战斗获得胜利" } }, @@ -1239,7 +1239,7 @@ 12 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_57", + "key": "stonehenge_stageconfig_ConditionText_57", "text": "触碰{0}次岩画" } }, @@ -1259,7 +1259,7 @@ "BossEvent": 0, "Condition": [], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_58", + "key": "stonehenge_stageconfig_ConditionText_58", "text": "" } }, @@ -1281,7 +1281,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_59", + "key": "stonehenge_stageconfig_ConditionText_59", "text": "{0}场战斗获得胜利" } }, @@ -1303,7 +1303,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_60", + "key": "stonehenge_stageconfig_ConditionText_60", "text": "{0}场战斗获得胜利" } }, @@ -1325,7 +1325,7 @@ 12 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_61", + "key": "stonehenge_stageconfig_ConditionText_61", "text": "触碰{0}次岩画" } }, @@ -1347,7 +1347,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_62", + "key": "stonehenge_stageconfig_ConditionText_62", "text": "{0}场战斗获得胜利" } }, @@ -1369,7 +1369,7 @@ 12 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_63", + "key": "stonehenge_stageconfig_ConditionText_63", "text": "触碰{0}次岩画" } }, @@ -1389,7 +1389,7 @@ "BossEvent": 0, "Condition": [], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_64", + "key": "stonehenge_stageconfig_ConditionText_64", "text": "" } }, @@ -1411,7 +1411,7 @@ 28 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_65", + "key": "stonehenge_stageconfig_ConditionText_65", "text": "击败{0}次首领" } }, @@ -1433,7 +1433,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_66", + "key": "stonehenge_stageconfig_ConditionText_66", "text": "{0}场战斗获得胜利" } }, @@ -1455,7 +1455,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_67", + "key": "stonehenge_stageconfig_ConditionText_67", "text": "{0}场战斗获得胜利" } }, @@ -1477,7 +1477,7 @@ 12 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_68", + "key": "stonehenge_stageconfig_ConditionText_68", "text": "触碰{0}次岩画" } }, @@ -1499,7 +1499,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_69", + "key": "stonehenge_stageconfig_ConditionText_69", "text": "{0}场战斗获得胜利" } }, @@ -1521,7 +1521,7 @@ 12 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_70", + "key": "stonehenge_stageconfig_ConditionText_70", "text": "触碰{0}次岩画" } }, @@ -1543,7 +1543,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_71", + "key": "stonehenge_stageconfig_ConditionText_71", "text": "{0}场战斗获得胜利" } }, @@ -1565,7 +1565,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_72", + "key": "stonehenge_stageconfig_ConditionText_72", "text": "{0}场战斗获得胜利" } }, @@ -1587,7 +1587,7 @@ 12 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_73", + "key": "stonehenge_stageconfig_ConditionText_73", "text": "触碰{0}次岩画" } }, @@ -1609,7 +1609,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_74", + "key": "stonehenge_stageconfig_ConditionText_74", "text": "{0}场战斗获得胜利" } }, @@ -1631,7 +1631,7 @@ 12 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_75", + "key": "stonehenge_stageconfig_ConditionText_75", "text": "触碰{0}次岩画" } }, @@ -1651,7 +1651,7 @@ "BossEvent": 0, "Condition": [], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_76", + "key": "stonehenge_stageconfig_ConditionText_76", "text": "" } }, @@ -1673,7 +1673,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_77", + "key": "stonehenge_stageconfig_ConditionText_77", "text": "{0}场战斗获得胜利" } }, @@ -1695,7 +1695,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_78", + "key": "stonehenge_stageconfig_ConditionText_78", "text": "{0}场战斗获得胜利" } }, @@ -1717,7 +1717,7 @@ 12 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_79", + "key": "stonehenge_stageconfig_ConditionText_79", "text": "触碰{0}次岩画" } }, @@ -1739,7 +1739,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_80", + "key": "stonehenge_stageconfig_ConditionText_80", "text": "{0}场战斗获得胜利" } }, @@ -1761,7 +1761,7 @@ 12 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_81", + "key": "stonehenge_stageconfig_ConditionText_81", "text": "触碰{0}次岩画" } }, @@ -1781,7 +1781,7 @@ "BossEvent": 0, "Condition": [], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_82", + "key": "stonehenge_stageconfig_ConditionText_82", "text": "" } }, @@ -1803,7 +1803,7 @@ 28 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_83", + "key": "stonehenge_stageconfig_ConditionText_83", "text": "击败{0}次首领" } }, @@ -1825,7 +1825,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_84", + "key": "stonehenge_stageconfig_ConditionText_84", "text": "{0}场战斗获得胜利" } }, @@ -1847,7 +1847,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_85", + "key": "stonehenge_stageconfig_ConditionText_85", "text": "{0}场战斗获得胜利" } }, @@ -1869,7 +1869,7 @@ 12 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_86", + "key": "stonehenge_stageconfig_ConditionText_86", "text": "触碰{0}次岩画" } }, @@ -1891,7 +1891,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_87", + "key": "stonehenge_stageconfig_ConditionText_87", "text": "{0}场战斗获得胜利" } }, @@ -1913,7 +1913,7 @@ 12 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_88", + "key": "stonehenge_stageconfig_ConditionText_88", "text": "触碰{0}次岩画" } }, @@ -1935,7 +1935,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_89", + "key": "stonehenge_stageconfig_ConditionText_89", "text": "{0}场战斗获得胜利" } }, @@ -1957,7 +1957,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_90", + "key": "stonehenge_stageconfig_ConditionText_90", "text": "{0}场战斗获得胜利" } }, @@ -1979,7 +1979,7 @@ 12 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_91", + "key": "stonehenge_stageconfig_ConditionText_91", "text": "触碰{0}次岩画" } }, @@ -2001,7 +2001,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_92", + "key": "stonehenge_stageconfig_ConditionText_92", "text": "{0}场战斗获得胜利" } }, @@ -2023,7 +2023,7 @@ 12 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_93", + "key": "stonehenge_stageconfig_ConditionText_93", "text": "触碰{0}次岩画" } }, @@ -2043,7 +2043,7 @@ "BossEvent": 0, "Condition": [], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_94", + "key": "stonehenge_stageconfig_ConditionText_94", "text": "" } }, @@ -2065,7 +2065,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_95", + "key": "stonehenge_stageconfig_ConditionText_95", "text": "{0}场战斗获得胜利" } }, @@ -2087,7 +2087,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_96", + "key": "stonehenge_stageconfig_ConditionText_96", "text": "{0}场战斗获得胜利" } }, @@ -2109,7 +2109,7 @@ 12 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_97", + "key": "stonehenge_stageconfig_ConditionText_97", "text": "触碰{0}次岩画" } }, @@ -2131,7 +2131,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_98", + "key": "stonehenge_stageconfig_ConditionText_98", "text": "{0}场战斗获得胜利" } }, @@ -2153,7 +2153,7 @@ 12 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_99", + "key": "stonehenge_stageconfig_ConditionText_99", "text": "触碰{0}次岩画" } }, @@ -2173,7 +2173,7 @@ "BossEvent": 0, "Condition": [], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_100", + "key": "stonehenge_stageconfig_ConditionText_100", "text": "" } }, @@ -2195,7 +2195,7 @@ 28 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_101", + "key": "stonehenge_stageconfig_ConditionText_101", "text": "击败{0}次首领" } }, @@ -2217,7 +2217,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_102", + "key": "stonehenge_stageconfig_ConditionText_102", "text": "{0}场战斗获得胜利" } }, @@ -2239,7 +2239,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_103", + "key": "stonehenge_stageconfig_ConditionText_103", "text": "{0}场战斗获得胜利" } }, @@ -2261,7 +2261,7 @@ 12 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_104", + "key": "stonehenge_stageconfig_ConditionText_104", "text": "触碰{0}次岩画" } }, @@ -2283,7 +2283,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_105", + "key": "stonehenge_stageconfig_ConditionText_105", "text": "{0}场战斗获得胜利" } }, @@ -2305,7 +2305,7 @@ 12 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_106", + "key": "stonehenge_stageconfig_ConditionText_106", "text": "触碰{0}次岩画" } }, @@ -2327,7 +2327,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_107", + "key": "stonehenge_stageconfig_ConditionText_107", "text": "{0}场战斗获得胜利" } }, @@ -2349,7 +2349,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_108", + "key": "stonehenge_stageconfig_ConditionText_108", "text": "{0}场战斗获得胜利" } }, @@ -2371,7 +2371,7 @@ 12 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_109", + "key": "stonehenge_stageconfig_ConditionText_109", "text": "触碰{0}次岩画" } }, @@ -2393,7 +2393,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_110", + "key": "stonehenge_stageconfig_ConditionText_110", "text": "{0}场战斗获得胜利" } }, @@ -2415,7 +2415,7 @@ 12 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_111", + "key": "stonehenge_stageconfig_ConditionText_111", "text": "触碰{0}次岩画" } }, @@ -2435,7 +2435,7 @@ "BossEvent": 0, "Condition": [], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_112", + "key": "stonehenge_stageconfig_ConditionText_112", "text": "" } }, @@ -2457,7 +2457,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_113", + "key": "stonehenge_stageconfig_ConditionText_113", "text": "{0}场战斗获得胜利" } }, @@ -2479,7 +2479,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_114", + "key": "stonehenge_stageconfig_ConditionText_114", "text": "{0}场战斗获得胜利" } }, @@ -2501,7 +2501,7 @@ 12 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_115", + "key": "stonehenge_stageconfig_ConditionText_115", "text": "触碰{0}次岩画" } }, @@ -2523,7 +2523,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_116", + "key": "stonehenge_stageconfig_ConditionText_116", "text": "{0}场战斗获得胜利" } }, @@ -2545,7 +2545,7 @@ 12 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_117", + "key": "stonehenge_stageconfig_ConditionText_117", "text": "触碰{0}次岩画" } }, @@ -2565,7 +2565,7 @@ "BossEvent": 0, "Condition": [], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_118", + "key": "stonehenge_stageconfig_ConditionText_118", "text": "" } }, @@ -2587,7 +2587,7 @@ 28 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_119", + "key": "stonehenge_stageconfig_ConditionText_119", "text": "击败{0}次首领" } }, @@ -2609,7 +2609,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_120", + "key": "stonehenge_stageconfig_ConditionText_120", "text": "{0}场战斗获得胜利" } }, @@ -2631,7 +2631,7 @@ 12 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_121", + "key": "stonehenge_stageconfig_ConditionText_121", "text": "触碰{0}次岩画" } }, @@ -2653,7 +2653,7 @@ 14 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_122", + "key": "stonehenge_stageconfig_ConditionText_122", "text": "{0}场战斗获得胜利" } }, @@ -2675,7 +2675,7 @@ 28 ], "ConditionText": { - "key": "stonehenge_roomconfig_ConditionText_123", + "key": "stonehenge_stageconfig_ConditionText_123", "text": "击败{0}次首领" } } diff --git a/bin/json/game_stonestage.json b/bin/json/game_stonestage.json index 0d090c681..b58aef8b2 100644 --- a/bin/json/game_stonestage.json +++ b/bin/json/game_stonestage.json @@ -8,6 +8,7 @@ "key": "stonehenge_stageconfig_StageName_1", "text": "石阵1" }, + "StageEffect": "effect_effect_xuanwo", "RoomId": 1, "RoomGroup": 110100, "PortalGroup": 110200, @@ -86,6 +87,7 @@ "key": "stonehenge_stageconfig_StageName_2", "text": "石阵1" }, + "StageEffect": "", "RoomId": 2, "RoomGroup": 0, "PortalGroup": 110300, @@ -153,6 +155,7 @@ "key": "stonehenge_stageconfig_StageName_3", "text": "石阵1" }, + "StageEffect": "", "RoomId": 3, "RoomGroup": 0, "PortalGroup": 110400, @@ -220,6 +223,7 @@ "key": "stonehenge_stageconfig_StageName_4", "text": "石阵1" }, + "StageEffect": "", "RoomId": 4, "RoomGroup": 0, "PortalGroup": 110500, @@ -287,6 +291,7 @@ "key": "stonehenge_stageconfig_StageName_5", "text": "石阵1" }, + "StageEffect": "", "RoomId": 5, "RoomGroup": 0, "PortalGroup": 99999, @@ -354,6 +359,7 @@ "key": "stonehenge_stageconfig_StageName_6", "text": "石阵2" }, + "StageEffect": "effect_effect_xuanwo_nan", "RoomId": 1, "RoomGroup": 120100, "PortalGroup": 120200, @@ -432,6 +438,7 @@ "key": "stonehenge_stageconfig_StageName_7", "text": "石阵2" }, + "StageEffect": "", "RoomId": 2, "RoomGroup": 0, "PortalGroup": 120300, @@ -499,6 +506,7 @@ "key": "stonehenge_stageconfig_StageName_8", "text": "石阵2" }, + "StageEffect": "", "RoomId": 3, "RoomGroup": 0, "PortalGroup": 120400, @@ -566,6 +574,7 @@ "key": "stonehenge_stageconfig_StageName_9", "text": "石阵2" }, + "StageEffect": "", "RoomId": 4, "RoomGroup": 0, "PortalGroup": 120500, @@ -633,6 +642,7 @@ "key": "stonehenge_stageconfig_StageName_10", "text": "石阵2" }, + "StageEffect": "", "RoomId": 5, "RoomGroup": 0, "PortalGroup": 120600, @@ -700,6 +710,7 @@ "key": "stonehenge_stageconfig_StageName_11", "text": "石阵2" }, + "StageEffect": "", "RoomId": 6, "RoomGroup": 0, "PortalGroup": 120700, @@ -767,6 +778,7 @@ "key": "stonehenge_stageconfig_StageName_12", "text": "石阵2" }, + "StageEffect": "", "RoomId": 7, "RoomGroup": 0, "PortalGroup": 120800, @@ -834,6 +846,7 @@ "key": "stonehenge_stageconfig_StageName_13", "text": "石阵2" }, + "StageEffect": "", "RoomId": 8, "RoomGroup": 0, "PortalGroup": 99999, @@ -901,6 +914,7 @@ "key": "stonehenge_stageconfig_StageName_14", "text": "石阵3" }, + "StageEffect": "effect_effect_xuanwo", "RoomId": 1, "RoomGroup": 130100, "PortalGroup": 130200, @@ -979,6 +993,7 @@ "key": "stonehenge_stageconfig_StageName_15", "text": "石阵3" }, + "StageEffect": "", "RoomId": 2, "RoomGroup": 0, "PortalGroup": 130300, @@ -1046,6 +1061,7 @@ "key": "stonehenge_stageconfig_StageName_16", "text": "石阵3" }, + "StageEffect": "", "RoomId": 3, "RoomGroup": 0, "PortalGroup": 130400, @@ -1113,6 +1129,7 @@ "key": "stonehenge_stageconfig_StageName_17", "text": "石阵3" }, + "StageEffect": "", "RoomId": 4, "RoomGroup": 0, "PortalGroup": 130500, @@ -1180,6 +1197,7 @@ "key": "stonehenge_stageconfig_StageName_18", "text": "石阵3" }, + "StageEffect": "", "RoomId": 5, "RoomGroup": 0, "PortalGroup": 130600, @@ -1247,6 +1265,7 @@ "key": "stonehenge_stageconfig_StageName_19", "text": "石阵3" }, + "StageEffect": "", "RoomId": 6, "RoomGroup": 0, "PortalGroup": 130700, @@ -1314,6 +1333,7 @@ "key": "stonehenge_stageconfig_StageName_20", "text": "石阵3" }, + "StageEffect": "", "RoomId": 7, "RoomGroup": 0, "PortalGroup": 130800, @@ -1381,6 +1401,7 @@ "key": "stonehenge_stageconfig_StageName_21", "text": "石阵3" }, + "StageEffect": "", "RoomId": 8, "RoomGroup": 0, "PortalGroup": 99999, @@ -1448,6 +1469,7 @@ "key": "stonehenge_stageconfig_StageName_22", "text": "石阵4" }, + "StageEffect": "effect_effect_xuanwo_nan", "RoomId": 1, "RoomGroup": 140100, "PortalGroup": 140200, @@ -1526,6 +1548,7 @@ "key": "stonehenge_stageconfig_StageName_23", "text": "石阵4" }, + "StageEffect": "", "RoomId": 2, "RoomGroup": 0, "PortalGroup": 140300, @@ -1593,6 +1616,7 @@ "key": "stonehenge_stageconfig_StageName_24", "text": "石阵4" }, + "StageEffect": "", "RoomId": 3, "RoomGroup": 0, "PortalGroup": 140400, @@ -1660,6 +1684,7 @@ "key": "stonehenge_stageconfig_StageName_25", "text": "石阵4" }, + "StageEffect": "", "RoomId": 4, "RoomGroup": 0, "PortalGroup": 140500, @@ -1727,6 +1752,7 @@ "key": "stonehenge_stageconfig_StageName_26", "text": "石阵4" }, + "StageEffect": "", "RoomId": 5, "RoomGroup": 0, "PortalGroup": 140600, @@ -1794,6 +1820,7 @@ "key": "stonehenge_stageconfig_StageName_27", "text": "石阵4" }, + "StageEffect": "", "RoomId": 6, "RoomGroup": 0, "PortalGroup": 140700, @@ -1861,6 +1888,7 @@ "key": "stonehenge_stageconfig_StageName_28", "text": "石阵4" }, + "StageEffect": "", "RoomId": 7, "RoomGroup": 0, "PortalGroup": 140800, @@ -1928,6 +1956,7 @@ "key": "stonehenge_stageconfig_StageName_29", "text": "石阵4" }, + "StageEffect": "", "RoomId": 8, "RoomGroup": 0, "PortalGroup": 140900, @@ -1995,6 +2024,7 @@ "key": "stonehenge_stageconfig_StageName_30", "text": "石阵4" }, + "StageEffect": "", "RoomId": 9, "RoomGroup": 0, "PortalGroup": 141000, @@ -2062,6 +2092,7 @@ "key": "stonehenge_stageconfig_StageName_31", "text": "石阵4" }, + "StageEffect": "", "RoomId": 10, "RoomGroup": 0, "PortalGroup": 141100, @@ -2129,6 +2160,7 @@ "key": "stonehenge_stageconfig_StageName_32", "text": "石阵4" }, + "StageEffect": "", "RoomId": 11, "RoomGroup": 0, "PortalGroup": 141200, @@ -2196,6 +2228,7 @@ "key": "stonehenge_stageconfig_StageName_33", "text": "石阵4" }, + "StageEffect": "", "RoomId": 12, "RoomGroup": 0, "PortalGroup": 99999, @@ -2263,6 +2296,7 @@ "key": "stonehenge_stageconfig_StageName_34", "text": "石阵5" }, + "StageEffect": "effect_effect_xuanwo", "RoomId": 1, "RoomGroup": 150100, "PortalGroup": 150200, @@ -2341,6 +2375,7 @@ "key": "stonehenge_stageconfig_StageName_35", "text": "石阵5" }, + "StageEffect": "", "RoomId": 2, "RoomGroup": 0, "PortalGroup": 150300, @@ -2408,6 +2443,7 @@ "key": "stonehenge_stageconfig_StageName_36", "text": "石阵5" }, + "StageEffect": "", "RoomId": 3, "RoomGroup": 0, "PortalGroup": 150400, @@ -2475,6 +2511,7 @@ "key": "stonehenge_stageconfig_StageName_37", "text": "石阵5" }, + "StageEffect": "", "RoomId": 4, "RoomGroup": 0, "PortalGroup": 150500, @@ -2542,6 +2579,7 @@ "key": "stonehenge_stageconfig_StageName_38", "text": "石阵5" }, + "StageEffect": "", "RoomId": 5, "RoomGroup": 0, "PortalGroup": 150600, @@ -2609,6 +2647,7 @@ "key": "stonehenge_stageconfig_StageName_39", "text": "石阵5" }, + "StageEffect": "", "RoomId": 6, "RoomGroup": 0, "PortalGroup": 150700, @@ -2676,6 +2715,7 @@ "key": "stonehenge_stageconfig_StageName_40", "text": "石阵5" }, + "StageEffect": "", "RoomId": 7, "RoomGroup": 0, "PortalGroup": 150800, @@ -2743,6 +2783,7 @@ "key": "stonehenge_stageconfig_StageName_41", "text": "石阵5" }, + "StageEffect": "", "RoomId": 8, "RoomGroup": 0, "PortalGroup": 150900, @@ -2810,6 +2851,7 @@ "key": "stonehenge_stageconfig_StageName_42", "text": "石阵5" }, + "StageEffect": "", "RoomId": 9, "RoomGroup": 0, "PortalGroup": 151000, @@ -2877,6 +2919,7 @@ "key": "stonehenge_stageconfig_StageName_43", "text": "石阵5" }, + "StageEffect": "", "RoomId": 10, "RoomGroup": 0, "PortalGroup": 151100, @@ -2944,6 +2987,7 @@ "key": "stonehenge_stageconfig_StageName_44", "text": "石阵5" }, + "StageEffect": "", "RoomId": 11, "RoomGroup": 0, "PortalGroup": 151200, @@ -3011,6 +3055,7 @@ "key": "stonehenge_stageconfig_StageName_45", "text": "石阵5" }, + "StageEffect": "", "RoomId": 12, "RoomGroup": 0, "PortalGroup": 99999, @@ -3078,6 +3123,7 @@ "key": "stonehenge_stageconfig_StageName_46", "text": "石阵6" }, + "StageEffect": "effect_effect_xuanwo_nan", "RoomId": 1, "RoomGroup": 160100, "PortalGroup": 160200, @@ -3156,6 +3202,7 @@ "key": "stonehenge_stageconfig_StageName_47", "text": "石阵6" }, + "StageEffect": "", "RoomId": 2, "RoomGroup": 0, "PortalGroup": 160300, @@ -3223,6 +3270,7 @@ "key": "stonehenge_stageconfig_StageName_48", "text": "石阵6" }, + "StageEffect": "", "RoomId": 3, "RoomGroup": 0, "PortalGroup": 160400, @@ -3290,6 +3338,7 @@ "key": "stonehenge_stageconfig_StageName_49", "text": "石阵6" }, + "StageEffect": "", "RoomId": 4, "RoomGroup": 0, "PortalGroup": 160500, @@ -3357,6 +3406,7 @@ "key": "stonehenge_stageconfig_StageName_50", "text": "石阵6" }, + "StageEffect": "", "RoomId": 5, "RoomGroup": 0, "PortalGroup": 160600, @@ -3424,6 +3474,7 @@ "key": "stonehenge_stageconfig_StageName_51", "text": "石阵6" }, + "StageEffect": "", "RoomId": 6, "RoomGroup": 0, "PortalGroup": 160700, @@ -3491,6 +3542,7 @@ "key": "stonehenge_stageconfig_StageName_52", "text": "石阵6" }, + "StageEffect": "", "RoomId": 7, "RoomGroup": 0, "PortalGroup": 160800, @@ -3558,6 +3610,7 @@ "key": "stonehenge_stageconfig_StageName_53", "text": "石阵6" }, + "StageEffect": "", "RoomId": 8, "RoomGroup": 0, "PortalGroup": 160900, @@ -3625,6 +3678,7 @@ "key": "stonehenge_stageconfig_StageName_54", "text": "石阵6" }, + "StageEffect": "", "RoomId": 9, "RoomGroup": 0, "PortalGroup": 161000, @@ -3692,6 +3746,7 @@ "key": "stonehenge_stageconfig_StageName_55", "text": "石阵6" }, + "StageEffect": "", "RoomId": 10, "RoomGroup": 0, "PortalGroup": 161100, @@ -3759,6 +3814,7 @@ "key": "stonehenge_stageconfig_StageName_56", "text": "石阵6" }, + "StageEffect": "", "RoomId": 11, "RoomGroup": 0, "PortalGroup": 161200, @@ -3826,6 +3882,7 @@ "key": "stonehenge_stageconfig_StageName_57", "text": "石阵6" }, + "StageEffect": "", "RoomId": 12, "RoomGroup": 0, "PortalGroup": 99999, @@ -3893,6 +3950,7 @@ "key": "stonehenge_stageconfig_StageName_58", "text": "石阵7" }, + "StageEffect": "effect_effect_xuanwo", "RoomId": 1, "RoomGroup": 170100, "PortalGroup": 170200, @@ -3971,6 +4029,7 @@ "key": "stonehenge_stageconfig_StageName_59", "text": "石阵7" }, + "StageEffect": "", "RoomId": 2, "RoomGroup": 0, "PortalGroup": 170300, @@ -4038,6 +4097,7 @@ "key": "stonehenge_stageconfig_StageName_60", "text": "石阵7" }, + "StageEffect": "", "RoomId": 3, "RoomGroup": 0, "PortalGroup": 170400, @@ -4105,6 +4165,7 @@ "key": "stonehenge_stageconfig_StageName_61", "text": "石阵7" }, + "StageEffect": "", "RoomId": 4, "RoomGroup": 0, "PortalGroup": 170500, @@ -4172,6 +4233,7 @@ "key": "stonehenge_stageconfig_StageName_62", "text": "石阵7" }, + "StageEffect": "", "RoomId": 5, "RoomGroup": 0, "PortalGroup": 170600, @@ -4239,6 +4301,7 @@ "key": "stonehenge_stageconfig_StageName_63", "text": "石阵7" }, + "StageEffect": "", "RoomId": 6, "RoomGroup": 0, "PortalGroup": 170700, @@ -4306,6 +4369,7 @@ "key": "stonehenge_stageconfig_StageName_64", "text": "石阵7" }, + "StageEffect": "", "RoomId": 7, "RoomGroup": 0, "PortalGroup": 170800, @@ -4373,6 +4437,7 @@ "key": "stonehenge_stageconfig_StageName_65", "text": "石阵7" }, + "StageEffect": "", "RoomId": 8, "RoomGroup": 0, "PortalGroup": 170900, @@ -4440,6 +4505,7 @@ "key": "stonehenge_stageconfig_StageName_66", "text": "石阵7" }, + "StageEffect": "", "RoomId": 9, "RoomGroup": 0, "PortalGroup": 171000, @@ -4507,6 +4573,7 @@ "key": "stonehenge_stageconfig_StageName_67", "text": "石阵7" }, + "StageEffect": "", "RoomId": 10, "RoomGroup": 0, "PortalGroup": 171100, @@ -4574,6 +4641,7 @@ "key": "stonehenge_stageconfig_StageName_68", "text": "石阵7" }, + "StageEffect": "", "RoomId": 11, "RoomGroup": 0, "PortalGroup": 171200, @@ -4641,6 +4709,7 @@ "key": "stonehenge_stageconfig_StageName_69", "text": "石阵7" }, + "StageEffect": "", "RoomId": 12, "RoomGroup": 0, "PortalGroup": 99999, @@ -4708,6 +4777,7 @@ "key": "stonehenge_stageconfig_StageName_70", "text": "石阵8" }, + "StageEffect": "effect_effect_xuanwo_nan", "RoomId": 1, "RoomGroup": 180100, "PortalGroup": 180200, @@ -4786,6 +4856,7 @@ "key": "stonehenge_stageconfig_StageName_71", "text": "石阵8" }, + "StageEffect": "", "RoomId": 2, "RoomGroup": 0, "PortalGroup": 180300, @@ -4853,6 +4924,7 @@ "key": "stonehenge_stageconfig_StageName_72", "text": "石阵8" }, + "StageEffect": "", "RoomId": 3, "RoomGroup": 0, "PortalGroup": 180400, @@ -4920,6 +4992,7 @@ "key": "stonehenge_stageconfig_StageName_73", "text": "石阵8" }, + "StageEffect": "", "RoomId": 4, "RoomGroup": 0, "PortalGroup": 180500, @@ -4987,6 +5060,7 @@ "key": "stonehenge_stageconfig_StageName_74", "text": "石阵8" }, + "StageEffect": "", "RoomId": 5, "RoomGroup": 0, "PortalGroup": 180600, @@ -5054,6 +5128,7 @@ "key": "stonehenge_stageconfig_StageName_75", "text": "石阵8" }, + "StageEffect": "", "RoomId": 6, "RoomGroup": 0, "PortalGroup": 180700, @@ -5121,6 +5196,7 @@ "key": "stonehenge_stageconfig_StageName_76", "text": "石阵8" }, + "StageEffect": "", "RoomId": 7, "RoomGroup": 0, "PortalGroup": 180800, @@ -5188,6 +5264,7 @@ "key": "stonehenge_stageconfig_StageName_77", "text": "石阵8" }, + "StageEffect": "", "RoomId": 8, "RoomGroup": 0, "PortalGroup": 180900, @@ -5255,6 +5332,7 @@ "key": "stonehenge_stageconfig_StageName_78", "text": "石阵8" }, + "StageEffect": "", "RoomId": 9, "RoomGroup": 0, "PortalGroup": 181000, @@ -5322,6 +5400,7 @@ "key": "stonehenge_stageconfig_StageName_79", "text": "石阵8" }, + "StageEffect": "", "RoomId": 10, "RoomGroup": 0, "PortalGroup": 181100, @@ -5389,6 +5468,7 @@ "key": "stonehenge_stageconfig_StageName_80", "text": "石阵8" }, + "StageEffect": "", "RoomId": 11, "RoomGroup": 0, "PortalGroup": 181200, @@ -5456,6 +5536,7 @@ "key": "stonehenge_stageconfig_StageName_81", "text": "石阵8" }, + "StageEffect": "", "RoomId": 12, "RoomGroup": 0, "PortalGroup": 99999, @@ -5523,6 +5604,7 @@ "key": "stonehenge_stageconfig_StageName_82", "text": "新手引导关" }, + "StageEffect": "", "RoomId": 1, "RoomGroup": 991200, "PortalGroup": 991201, @@ -5548,6 +5630,7 @@ "key": "stonehenge_stageconfig_StageName_83", "text": "新手引导关" }, + "StageEffect": "", "RoomId": 2, "RoomGroup": 0, "PortalGroup": 991400, @@ -5573,6 +5656,7 @@ "key": "stonehenge_stageconfig_StageName_84", "text": "新手引导关" }, + "StageEffect": "", "RoomId": 3, "RoomGroup": 0, "PortalGroup": 992800, @@ -5598,6 +5682,7 @@ "key": "stonehenge_stageconfig_StageName_85", "text": "新手引导关" }, + "StageEffect": "", "RoomId": 4, "RoomGroup": 0, "PortalGroup": 99999, diff --git a/bin/json/game_vikingboss.json b/bin/json/game_vikingboss.json index 98c1017f9..36239a6fe 100644 --- a/bin/json/game_vikingboss.json +++ b/bin/json/game_vikingboss.json @@ -13,13 +13,7 @@ 21000001 ], "BattleReadyID": 10500004, - "captionrecommend": [ - 25001, - 25004, - 35005, - 25003, - 15003 - ], + "captionrecommend": 1, "firstprize": [ { "a": "attr", @@ -82,13 +76,7 @@ 21000002 ], "BattleReadyID": 10500001, - "captionrecommend": [ - 25001, - 25004, - 35005, - 25003, - 15003 - ], + "captionrecommend": 1, "firstprize": [ { "a": "attr", @@ -146,13 +134,7 @@ 21000003 ], "BattleReadyID": 10500001, - "captionrecommend": [ - 25001, - 25004, - 35005, - 25003, - 15003 - ], + "captionrecommend": 1, "firstprize": [ { "a": "attr", @@ -215,13 +197,7 @@ 21000004 ], "BattleReadyID": 10500001, - "captionrecommend": [ - 25001, - 25004, - 35005, - 25003, - 15003 - ], + "captionrecommend": 1, "firstprize": [ { "a": "attr", @@ -279,13 +255,7 @@ 21000005 ], "BattleReadyID": 10500001, - "captionrecommend": [ - 25001, - 25004, - 35005, - 25003, - 15003 - ], + "captionrecommend": 1, "firstprize": [ { "a": "attr", @@ -348,13 +318,7 @@ 21000006 ], "BattleReadyID": 10500001, - "captionrecommend": [ - 25001, - 25004, - 35005, - 25003, - 15003 - ], + "captionrecommend": 1, "firstprize": [ { "a": "attr", @@ -417,13 +381,7 @@ 21000007 ], "BattleReadyID": 10500001, - "captionrecommend": [ - 25001, - 25004, - 35005, - 25003, - 15003 - ], + "captionrecommend": 1, "firstprize": [ { "a": "item", @@ -491,13 +449,7 @@ 21000008 ], "BattleReadyID": 10500001, - "captionrecommend": [ - 25001, - 25004, - 35005, - 25003, - 15003 - ], + "captionrecommend": 1, "firstprize": [ { "a": "item", @@ -560,13 +512,7 @@ 21000009 ], "BattleReadyID": 10500001, - "captionrecommend": [ - 25001, - 25004, - 35005, - 25003, - 15003 - ], + "captionrecommend": 1, "firstprize": [ { "a": "item", @@ -634,13 +580,7 @@ 21000010 ], "BattleReadyID": 10500001, - "captionrecommend": [ - 25001, - 25004, - 35005, - 25003, - 15003 - ], + "captionrecommend": 1, "firstprize": [ { "a": "item", @@ -708,13 +648,7 @@ 21000011 ], "BattleReadyID": 10500001, - "captionrecommend": [ - 25001, - 25004, - 35005, - 25003, - 15003 - ], + "captionrecommend": 1, "firstprize": [ { "a": "item", @@ -782,13 +716,7 @@ 21000012 ], "BattleReadyID": 10500001, - "captionrecommend": [ - 25001, - 25004, - 35005, - 25003, - 15003 - ], + "captionrecommend": 1, "firstprize": [ { "a": "item", @@ -851,13 +779,7 @@ 21000013 ], "BattleReadyID": 10500003, - "captionrecommend": [ - 14007, - 25003, - 34006, - 15003, - 14003 - ], + "captionrecommend": 2, "firstprize": [ { "a": "attr", @@ -920,13 +842,7 @@ 21000014 ], "BattleReadyID": 10500003, - "captionrecommend": [ - 14007, - 25003, - 34006, - 15003, - 14003 - ], + "captionrecommend": 2, "firstprize": [ { "a": "attr", @@ -984,13 +900,7 @@ 21000015 ], "BattleReadyID": 10500003, - "captionrecommend": [ - 14007, - 25003, - 34006, - 15003, - 14003 - ], + "captionrecommend": 2, "firstprize": [ { "a": "attr", @@ -1053,13 +963,7 @@ 21000016 ], "BattleReadyID": 10500003, - "captionrecommend": [ - 14007, - 25003, - 34006, - 15003, - 14003 - ], + "captionrecommend": 2, "firstprize": [ { "a": "attr", @@ -1117,13 +1021,7 @@ 21000017 ], "BattleReadyID": 10500003, - "captionrecommend": [ - 14007, - 25003, - 34006, - 15003, - 14003 - ], + "captionrecommend": 2, "firstprize": [ { "a": "attr", @@ -1186,13 +1084,7 @@ 21000018 ], "BattleReadyID": 10500003, - "captionrecommend": [ - 14007, - 25003, - 34006, - 15003, - 14003 - ], + "captionrecommend": 2, "firstprize": [ { "a": "attr", @@ -1255,13 +1147,7 @@ 21000019 ], "BattleReadyID": 10500003, - "captionrecommend": [ - 14007, - 25003, - 34006, - 15003, - 14003 - ], + "captionrecommend": 2, "firstprize": [ { "a": "item", @@ -1329,13 +1215,7 @@ 21000020 ], "BattleReadyID": 10500003, - "captionrecommend": [ - 14007, - 25003, - 34006, - 15003, - 14003 - ], + "captionrecommend": 2, "firstprize": [ { "a": "item", @@ -1398,13 +1278,7 @@ 21000021 ], "BattleReadyID": 10500003, - "captionrecommend": [ - 14007, - 25003, - 34006, - 15003, - 14003 - ], + "captionrecommend": 2, "firstprize": [ { "a": "item", @@ -1472,13 +1346,7 @@ 21000022 ], "BattleReadyID": 10500003, - "captionrecommend": [ - 14007, - 25003, - 34006, - 15003, - 14003 - ], + "captionrecommend": 2, "firstprize": [ { "a": "item", @@ -1546,13 +1414,7 @@ 21000023 ], "BattleReadyID": 10500003, - "captionrecommend": [ - 14007, - 25003, - 34006, - 15003, - 14003 - ], + "captionrecommend": 2, "firstprize": [ { "a": "item", @@ -1620,13 +1482,7 @@ 21000024 ], "BattleReadyID": 10500003, - "captionrecommend": [ - 14007, - 25003, - 34006, - 15003, - 14003 - ], + "captionrecommend": 2, "firstprize": [ { "a": "item", @@ -1689,13 +1545,7 @@ 21000025 ], "BattleReadyID": 10500002, - "captionrecommend": [ - 25003, - 34006, - 14001, - 44006, - 45003 - ], + "captionrecommend": 3, "firstprize": [ { "a": "attr", @@ -1758,13 +1608,7 @@ 21000026 ], "BattleReadyID": 10500002, - "captionrecommend": [ - 25003, - 34006, - 14001, - 44006, - 45003 - ], + "captionrecommend": 3, "firstprize": [ { "a": "attr", @@ -1822,13 +1666,7 @@ 21000027 ], "BattleReadyID": 10500002, - "captionrecommend": [ - 25003, - 34006, - 14001, - 44006, - 45003 - ], + "captionrecommend": 3, "firstprize": [ { "a": "attr", @@ -1891,13 +1729,7 @@ 21000028 ], "BattleReadyID": 10500002, - "captionrecommend": [ - 25003, - 34006, - 14001, - 44006, - 45003 - ], + "captionrecommend": 3, "firstprize": [ { "a": "attr", @@ -1955,13 +1787,7 @@ 21000029 ], "BattleReadyID": 10500002, - "captionrecommend": [ - 25003, - 34006, - 14001, - 44006, - 45003 - ], + "captionrecommend": 3, "firstprize": [ { "a": "attr", @@ -2024,13 +1850,7 @@ 21000030 ], "BattleReadyID": 10500002, - "captionrecommend": [ - 25003, - 34006, - 14001, - 44006, - 45003 - ], + "captionrecommend": 3, "firstprize": [ { "a": "attr", @@ -2093,13 +1913,7 @@ 21000031 ], "BattleReadyID": 10500002, - "captionrecommend": [ - 25003, - 34006, - 14001, - 44006, - 45003 - ], + "captionrecommend": 3, "firstprize": [ { "a": "item", @@ -2167,13 +1981,7 @@ 21000032 ], "BattleReadyID": 10500002, - "captionrecommend": [ - 25003, - 34006, - 14001, - 44006, - 45003 - ], + "captionrecommend": 3, "firstprize": [ { "a": "item", @@ -2236,13 +2044,7 @@ 21000033 ], "BattleReadyID": 10500002, - "captionrecommend": [ - 25003, - 34006, - 14001, - 44006, - 45003 - ], + "captionrecommend": 3, "firstprize": [ { "a": "item", @@ -2310,13 +2112,7 @@ 21000034 ], "BattleReadyID": 10500002, - "captionrecommend": [ - 25003, - 34006, - 14001, - 44006, - 45003 - ], + "captionrecommend": 3, "firstprize": [ { "a": "item", @@ -2384,13 +2180,7 @@ 21000035 ], "BattleReadyID": 10500002, - "captionrecommend": [ - 25003, - 34006, - 14001, - 44006, - 45003 - ], + "captionrecommend": 3, "firstprize": [ { "a": "item", @@ -2458,13 +2248,7 @@ 21000036 ], "BattleReadyID": 10500002, - "captionrecommend": [ - 25003, - 34006, - 14001, - 44006, - 45003 - ], + "captionrecommend": 3, "firstprize": [ { "a": "item", @@ -2525,13 +2309,7 @@ "sweepId": 0, "sweepOpenId": [], "BattleReadyID": 11106001, - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ], + "captionrecommend": 3, "firstprize": [ { "a": "attr", @@ -2607,13 +2385,7 @@ "sweepId": 0, "sweepOpenId": [], "BattleReadyID": 11106001, - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ], + "captionrecommend": 3, "firstprize": [ { "a": "attr", @@ -2689,13 +2461,7 @@ "sweepId": 0, "sweepOpenId": [], "BattleReadyID": 11106001, - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ], + "captionrecommend": 3, "firstprize": [ { "a": "attr", @@ -2771,13 +2537,7 @@ "sweepId": 0, "sweepOpenId": [], "BattleReadyID": 11106001, - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ], + "captionrecommend": 3, "firstprize": [ { "a": "attr", @@ -2853,13 +2613,7 @@ "sweepId": 0, "sweepOpenId": [], "BattleReadyID": 11106001, - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ], + "captionrecommend": 3, "firstprize": [ { "a": "attr", @@ -2935,13 +2689,7 @@ "sweepId": 0, "sweepOpenId": [], "BattleReadyID": 11106001, - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ], + "captionrecommend": 3, "firstprize": [ { "a": "attr", @@ -3017,13 +2765,7 @@ "sweepId": 0, "sweepOpenId": [], "BattleReadyID": 11106001, - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ], + "captionrecommend": 3, "firstprize": [ { "a": "attr", @@ -3099,13 +2841,7 @@ "sweepId": 0, "sweepOpenId": [], "BattleReadyID": 11106001, - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ], + "captionrecommend": 3, "firstprize": [ { "a": "attr", @@ -3181,13 +2917,7 @@ "sweepId": 0, "sweepOpenId": [], "BattleReadyID": 11106001, - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ], + "captionrecommend": 3, "firstprize": [ { "a": "attr", @@ -3263,13 +2993,7 @@ "sweepId": 0, "sweepOpenId": [], "BattleReadyID": 11106001, - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ], + "captionrecommend": 3, "firstprize": [ { "a": "attr", @@ -3345,13 +3069,7 @@ "sweepId": 0, "sweepOpenId": [], "BattleReadyID": 11106001, - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ], + "captionrecommend": 3, "firstprize": [ { "a": "attr", @@ -3427,13 +3145,7 @@ "sweepId": 0, "sweepOpenId": [], "BattleReadyID": 11106001, - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ], + "captionrecommend": 3, "firstprize": [ { "a": "attr", @@ -3509,13 +3221,7 @@ "sweepId": 0, "sweepOpenId": [], "BattleReadyID": 11106001, - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ], + "captionrecommend": 3, "firstprize": [ { "a": "attr", @@ -3591,13 +3297,7 @@ "sweepId": 0, "sweepOpenId": [], "BattleReadyID": 11106001, - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ], + "captionrecommend": 3, "firstprize": [ { "a": "attr", @@ -3673,13 +3373,7 @@ "sweepId": 0, "sweepOpenId": [], "BattleReadyID": 11106001, - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ], + "captionrecommend": 3, "firstprize": [ { "a": "attr", @@ -3755,13 +3449,7 @@ "sweepId": 0, "sweepOpenId": [], "BattleReadyID": 11106001, - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ], + "captionrecommend": 3, "firstprize": [ { "a": "attr", @@ -3837,13 +3525,7 @@ "sweepId": 0, "sweepOpenId": [], "BattleReadyID": 11106001, - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ], + "captionrecommend": 3, "firstprize": [ { "a": "attr", @@ -3919,13 +3601,7 @@ "sweepId": 0, "sweepOpenId": [], "BattleReadyID": 11106001, - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ], + "captionrecommend": 3, "firstprize": [ { "a": "attr", @@ -4001,13 +3677,7 @@ "sweepId": 0, "sweepOpenId": [], "BattleReadyID": 11106001, - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ], + "captionrecommend": 3, "firstprize": [ { "a": "attr", @@ -4083,13 +3753,7 @@ "sweepId": 0, "sweepOpenId": [], "BattleReadyID": 11106001, - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ], + "captionrecommend": 3, "firstprize": [ { "a": "attr", @@ -4167,13 +3831,7 @@ 21000037 ], "BattleReadyID": 11904001, - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ], + "captionrecommend": 8, "firstprize": [ { "a": "attr", @@ -4236,13 +3894,7 @@ 21000038 ], "BattleReadyID": 11904001, - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ], + "captionrecommend": 8, "firstprize": [ { "a": "attr", @@ -4305,13 +3957,7 @@ 21000039 ], "BattleReadyID": 11904001, - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ], + "captionrecommend": 8, "firstprize": [ { "a": "attr", @@ -4374,13 +4020,7 @@ 21000040 ], "BattleReadyID": 11904001, - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ], + "captionrecommend": 8, "firstprize": [ { "a": "attr", @@ -4444,13 +4084,7 @@ 21000041 ], "BattleReadyID": 11904001, - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ], + "captionrecommend": 8, "firstprize": [ { "a": "attr", @@ -4514,13 +4148,7 @@ 21000042 ], "BattleReadyID": 11904001, - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ], + "captionrecommend": 8, "firstprize": [ { "a": "attr", @@ -4584,13 +4212,7 @@ 21000043 ], "BattleReadyID": 11904001, - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ], + "captionrecommend": 8, "firstprize": [ { "a": "item", @@ -4654,13 +4276,7 @@ 21000044 ], "BattleReadyID": 11904001, - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ], + "captionrecommend": 8, "firstprize": [ { "a": "item", @@ -4725,13 +4341,7 @@ 21000045 ], "BattleReadyID": 11904001, - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ], + "captionrecommend": 8, "firstprize": [ { "a": "item", @@ -4801,13 +4411,7 @@ 21000046 ], "BattleReadyID": 11904001, - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ], + "captionrecommend": 8, "firstprize": [ { "a": "item", @@ -4877,13 +4481,7 @@ 21000047 ], "BattleReadyID": 11904001, - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ], + "captionrecommend": 8, "firstprize": [ { "a": "item", @@ -4953,13 +4551,7 @@ 21000048 ], "BattleReadyID": 11904001, - "captionrecommend": [ - 25001, - 25004, - 34006, - 35001, - 35002 - ], + "captionrecommend": 8, "firstprize": [ { "a": "item", diff --git a/bin/json/game_vikingrecommend.json b/bin/json/game_vikingrecommend.json new file mode 100644 index 000000000..5dab430e9 --- /dev/null +++ b/bin/json/game_vikingrecommend.json @@ -0,0 +1,234 @@ +[ + { + "id": 1, + "describe": { + "key": "vikingexpedition_recommend_describe_1", + "text": "BOSS拥有极高的单体伤害能力，且完成击杀后会立即获得回合。
需要持续保证友方队伍的血量安全。" + }, + "recommendtype1": { + "key": "vikingexpedition_recommend_recommendtype1_1", + "text": "输出" + }, + "herolist1": [ + "25001", + "25001", + "25001", + "25001", + "25001" + ], + "recommendtype2": { + "key": "vikingexpedition_recommend_recommendtype2_1", + "text": "治疗" + }, + "herolist2": [ + "25001", + "25001", + "25001", + "25001", + "25001" + ] + }, + { + "id": 2, + "describe": { + "key": "vikingexpedition_recommend_describe_2", + "text": "BOSS拥有特殊的状态，可以抵消指定次数的攻击。且在此状态下拥有极高的输出。
需要使用多段伤害的角色快速打掉改特殊减伤状态。" + }, + "recommendtype1": { + "key": "vikingexpedition_recommend_recommendtype1_2", + "text": "单段输出" + }, + "herolist1": [ + "25001", + "25001", + "25001", + "25001", + "25001" + ], + "recommendtype2": { + "key": "vikingexpedition_recommend_recommendtype2_2", + "text": "净化" + }, + "herolist2": [ + "25001", + "25001", + "25001", + "25001", + "25001" + ] + }, + { + "id": 3, + "describe": { + "key": "vikingexpedition_recommend_describe_3", + "text": "BOSS拥有极高的毒素伤害，且在受到指定次数攻击后会立即进行反击。
需要使用单体单段高爆发类英雄进行输出，同时要带好净化" + }, + "recommendtype1": { + "key": "vikingexpedition_recommend_recommendtype1_3", + "text": "多段输出" + }, + "herolist1": [ + "25001", + "25001", + "25001", + "25001", + "25001" + ], + "recommendtype2": { + "key": "vikingexpedition_recommend_recommendtype2_3", + "text": "治疗" + }, + "herolist2": [ + "25001", + "25001", + "25001", + "25001", + "25001" + ] + }, + { + "id": 4, + "describe": { + "key": "vikingexpedition_recommend_describe_4", + "text": "陷入低血量时会进入狂暴状态，极大提升攻击能力可恢复能力。
需要在BOSS陷入低血量后通过高频打条限制其出手。" + }, + "recommendtype1": { + "key": "vikingexpedition_recommend_recommendtype1_4", + "text": "限制" + }, + "herolist1": [ + "25001", + "25001", + "25001", + "25001", + "25001" + ], + "recommendtype2": { + "key": "vikingexpedition_recommend_recommendtype2_4", + "text": "辅助" + }, + "herolist2": [ + "25001", + "25001", + "25001", + "25001", + "25001" + ] + }, + { + "id": 5, + "describe": { + "key": "vikingexpedition_recommend_describe_5", + "text": "BOSS小怪带有极高回复技能，可极快回复BOSS血量。
需要限制BOSS的受疗效果。" + }, + "recommendtype1": { + "key": "vikingexpedition_recommend_recommendtype1_5", + "text": "爆发" + }, + "herolist1": [ + "25001", + "25001", + "25001", + "25001", + "25001" + ], + "recommendtype2": { + "key": "vikingexpedition_recommend_recommendtype2_5", + "text": "禁疗" + }, + "herolist2": [ + "25001", + "25001", + "25001", + "25001", + "25001" + ] + }, + { + "id": 6, + "describe": { + "key": "vikingexpedition_recommend_describe_6", + "text": "BOSS拥有极高防御，可减免大量伤害。
需要使用无视防御类的伤害攻击BOSS。" + }, + "recommendtype1": { + "key": "vikingexpedition_recommend_recommendtype1_6", + "text": "无视防御" + }, + "herolist1": [ + "25001", + "25001", + "25001", + "25001", + "25001" + ], + "recommendtype2": { + "key": "vikingexpedition_recommend_recommendtype2_6", + "text": "中毒" + }, + "herolist2": [ + "25001", + "25001", + "25001", + "25001", + "25001" + ] + }, + { + "id": 7, + "describe": { + "key": "vikingexpedition_recommend_describe_7", + "text": "BOSS拥有极高血量，极难快速击杀。
需要使用目标血量百分比的伤害攻击BOSS。" + }, + "recommendtype1": { + "key": "vikingexpedition_recommend_recommendtype1_7", + "text": "中毒" + }, + "herolist1": [ + "25001", + "25001", + "25001", + "25001", + "25001" + ], + "recommendtype2": { + "key": "vikingexpedition_recommend_recommendtype2_7", + "text": "治疗" + }, + "herolist2": [ + "25001", + "25001", + "25001", + "25001", + "25001" + ] + }, + { + "id": 8, + "describe": { + "key": "vikingexpedition_recommend_describe_8", + "text": "BOSS拥有极高的单体伤害能力，且完成击杀后会立即获得回合。
需要持续保证友方队伍的血量安全。" + }, + "recommendtype1": { + "key": "vikingexpedition_recommend_recommendtype1_8", + "text": "群体伤害" + }, + "herolist1": [ + "25001", + "25001", + "25001", + "25001", + "25001" + ], + "recommendtype2": { + "key": "vikingexpedition_recommend_recommendtype2_8", + "text": "爆发" + }, + "herolist2": [ + "25001", + "25001", + "25001", + "25001", + "25001" + ] + } +] \ No newline at end of file diff --git a/modules/entertainment/xxlPlat.go b/modules/entertainment/xxlPlat.go index 3596f7c67..087346977 100644 --- a/modules/entertainment/xxlPlat.go +++ b/modules/entertainment/xxlPlat.go @@ -471,7 +471,7 @@ func (this *MapData) CheckMap(color int32, bSkill bool) (szMap []*pb.MapData, xc energy int32 new map[int]int x map[int]struct{} - s map[int]int + //s map[int]int ) for { @@ -480,59 +480,62 @@ func (this *MapData) CheckMap(color int32, bSkill bool) (szMap []*pb.MapData, xc tXiaochu = make(map[int]struct{}) curScore = 0 energy = 0 - s = make(map[int]int) + //s = make(map[int]int) for i := 1; i <= 6; i++ { - tXiaochu, s = this.CheckElem(int32(i)) + xc, s := this.CheckElem(int32(i)) for k, v := range s { new[k] = v } - - for id := range tXiaochu { - if _, ok := new[id]; ok { - if this.Plat[id].Color == color { - energy++ + for _, v := range xc { + for _, v1 := range v { + tXiaochu[v1] = struct{}{} + } + } + } + for id := range tXiaochu { + if _, ok := new[id]; ok { + if this.Plat[id].Color == color { + energy++ + } + curScore += this.Plat[id].Score + this.oid++ // 生成一个新的类型元素 + if this.module == nil { // 稍后删掉 方便测试 + this.Plat[id] = &pb.GirdeData{ + Oid: this.oid, + Color: this.Plat[id].Color, + Cid: 2*(this.Plat[id].Color-1) + 6 + int32(new[id]), + Score: 1, + Special: int32(new[id]), } - curScore += this.Plat[id].Score - this.oid++ // 生成一个新的类型元素 - if this.module == nil { // 稍后删掉 方便测试 + } else { + if s := this.Plat[id].Special; s != 0 { + for key := range this.SpecialElem(id, s) { + x[key] = struct{}{} + } + x[id] = struct{}{} + } + + if conf, err := this.module.configure.GetGameBlock(this.Plat[id].Color, int32(new[id])); err == nil { this.Plat[id] = &pb.GirdeData{ Oid: this.oid, Color: this.Plat[id].Color, - Cid: 2*(this.Plat[id].Color-1) + 6 + int32(new[id]), - Score: 1, - Special: int32(new[id]), - } - } else { - - if s := this.Plat[id].Special; s != 0 { - for key := range this.SpecialElem(id, s) { - x[key] = struct{}{} - } - x[id] = struct{}{} - } - - if conf, err := this.module.configure.GetGameBlock(this.Plat[id].Color, int32(new[id])); err == nil { - this.Plat[id] = &pb.GirdeData{ - Oid: this.oid, - Color: this.Plat[id].Color, - Cid: conf.Key, - Score: conf.Score, - Special: conf.Type, - } + Cid: conf.Key, + Score: conf.Score, + Special: conf.Type, } } - continue } - - if s := this.Plat[id].Special; s != 0 { - for key := range this.SpecialElem(id, s) { - x[key] = struct{}{} - } - - } - x[id] = struct{}{} + continue } + if s := this.Plat[id].Special; s != 0 { + for key := range this.SpecialElem(id, s) { + x[key] = struct{}{} + } + + } + x[id] = struct{}{} } + for id := range x { if this.Plat[id].Color == color { energy++ @@ -1412,14 +1415,12 @@ func (this *MapData) checkSp(e []int) (oid int32) { } // 检测一个元素 -func (this *MapData) CheckElem(color int32) (mtmp map[int]struct{}, sp map[int]int) { +func (this *MapData) CheckElem(color int32) (xc [][]int, sp map[int]int) { var ( w [14][]int32 s1 [][]int // heng s2 [][]int // shu - xc [][]int // ) - mtmp = make(map[int]struct{}, 0) sp = make(map[int]int) for pos, v := range this.Plat { x := pos / Width @@ -1455,7 +1456,6 @@ func (this *MapData) CheckElem(color int32) (mtmp map[int]struct{}, sp map[int]i s = append(s, (i-7)*7+j+3) s = append(s, (i-7)*7+j+4) s1 = append(s1, s) - sp[(i-7)*7+j+2] = FiveType } else { s = append(s, (j)*7+i) s = append(s, (j+1)*7+i) @@ -1463,7 +1463,6 @@ func (this *MapData) CheckElem(color int32) (mtmp map[int]struct{}, sp map[int]i s = append(s, (j+3)*7+i) s = append(s, (j+4)*7+i) s2 = append(s2, s) - sp[(j+2)*7+i] = FiveType } break @@ -1479,24 +1478,18 @@ func (this *MapData) CheckElem(color int32) (mtmp map[int]struct{}, sp map[int]i s = append(s, (i-7)*7+j+2) s = append(s, (i-7)*7+j+3) s1 = append(s1, s) - oid := this.checkSp(s) - if 0 < oid { - sp[int(oid)] = FourUType - } else { - sp[(i-7)*7+j+1] = FourUType - } } else { s = append(s, (j)*7+i) s = append(s, (j+1)*7+i) s = append(s, (j+2)*7+i) s = append(s, (j+3)*7+i) s2 = append(s2, s) - oid := this.checkSp(s) - if 0 < oid { - sp[int(oid)] = FourLType - } else { - sp[(j+1)*7+i] = FourLType - } + //oid := this.checkSp(s) + // if 0 < oid { + // sp[int(oid)] = FourLType + // } else { + // sp[(j+1)*7+i] = FourLType + // } } break } @@ -1531,18 +1524,28 @@ func (this *MapData) CheckElem(color int32) (mtmp map[int]struct{}, sp map[int]i s2 = new[0:][0:] } else { if len(v) >= 5 { - sp[xj] = FiveType + sp[v[len(v)/2]] = FiveType } else if len(v) >= 4 { - sp[len(v)/2] = FourLType + oid := this.checkSp(v) + if 0 < oid { + sp[int(oid)] = FourUType + } else { + sp[v[len(v)/2]] = FourUType + } } xc = append(xc, v) } } for _, v := range s2 { if len(v) >= 5 { - sp[len(v)/2] = FiveType + sp[v[len(v)/2]] = FiveType } else if len(v) >= 4 { - sp[len(v)/2] = FourUType + oid := this.checkSp(v) + if 0 < oid { + sp[int(oid)] = FourLType + } else { + sp[v[len(v)/2]] = FourLType + } } xc = append(xc, v) } diff --git a/sys/configure/structs/Game.ConsumeHeroData.go b/sys/configure/structs/Game.ConsumeHeroData.go index 76ff02bd7..a56e2c410 100644 --- a/sys/configure/structs/Game.ConsumeHeroData.go +++ b/sys/configure/structs/Game.ConsumeHeroData.go @@ -30,6 +30,7 @@ type GameConsumeHeroData struct { Bigskillhero string Bigskillcolor int32 Bigskilleffect string + Division []string Get int32 Consume []*Gameatn Skilltype int32 @@ -65,6 +66,20 @@ func (_v *GameConsumeHeroData)Deserialize(_buf map[string]interface{}) (err erro { var _ok_ bool; if _v.Bigskillhero, _ok_ = _buf["bigskillhero"].(string); !_ok_ { err = errors.New("bigskillhero error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["bigskillcolor"].(float64); !_ok_ { err = errors.New("bigskillcolor error"); return }; _v.Bigskillcolor = int32(_tempNum_) } { var _ok_ bool; if _v.Bigskilleffect, _ok_ = _buf["bigskilleffect"].(string); !_ok_ { err = errors.New("bigskilleffect error"); return } } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["division"].([]interface{}); !_ok_ { err = errors.New("division error"); return } + + _v.Division = make([]string, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ string + { if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } } + _v.Division = append(_v.Division, _list_v_) + } + } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["get"].(float64); !_ok_ { err = errors.New("get error"); return }; _v.Get = int32(_tempNum_) } { var _arr_ []interface{} diff --git a/sys/configure/structs/Game.FightingCapacity.go b/sys/configure/structs/Game.FightingCapacity.go new file mode 100644 index 000000000..cf1ab8fd2 --- /dev/null +++ b/sys/configure/structs/Game.FightingCapacity.go @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +type GameFightingCapacity struct { + _dataMap map[int32]*GameFightingCapacityData + _dataList []*GameFightingCapacityData +} + +func NewGameFightingCapacity(_buf []map[string]interface{}) (*GameFightingCapacity, error) { + _dataList := make([]*GameFightingCapacityData, 0, len(_buf)) + dataMap := make(map[int32]*GameFightingCapacityData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGameFightingCapacityData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Id] = _v + } + } + return &GameFightingCapacity{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GameFightingCapacity) GetDataMap() map[int32]*GameFightingCapacityData { + return table._dataMap +} + +func (table *GameFightingCapacity) GetDataList() []*GameFightingCapacityData { + return table._dataList +} + +func (table *GameFightingCapacity) Get(key int32) *GameFightingCapacityData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.FightingCapacityData.go b/sys/configure/structs/Game.FightingCapacityData.go new file mode 100644 index 000000000..140b7bfb1 --- /dev/null +++ b/sys/configure/structs/Game.FightingCapacityData.go @@ -0,0 +1,37 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +import "errors" + +type GameFightingCapacityData struct { + Id int32 + Value int32 +} + +const TypeId_GameFightingCapacityData = -591422734 + +func (*GameFightingCapacityData) GetTypeId() int32 { + return -591422734 +} + +func (_v *GameFightingCapacityData)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["value"].(float64); !_ok_ { err = errors.New("value error"); return }; _v.Value = int32(_tempNum_) } + return +} + +func DeserializeGameFightingCapacityData(_buf map[string]interface{}) (*GameFightingCapacityData, error) { + v := &GameFightingCapacityData{} + if err := v.Deserialize(_buf); err == nil { + return v, nil + } else { + return nil, err + } +} diff --git a/sys/configure/structs/Game.FightingSkill.go b/sys/configure/structs/Game.FightingSkill.go new file mode 100644 index 000000000..0c4d932d5 --- /dev/null +++ b/sys/configure/structs/Game.FightingSkill.go @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +type GameFightingSkill struct { + _dataMap map[int32]*GameFightingSkillData + _dataList []*GameFightingSkillData +} + +func NewGameFightingSkill(_buf []map[string]interface{}) (*GameFightingSkill, error) { + _dataList := make([]*GameFightingSkillData, 0, len(_buf)) + dataMap := make(map[int32]*GameFightingSkillData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGameFightingSkillData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Skill] = _v + } + } + return &GameFightingSkill{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GameFightingSkill) GetDataMap() map[int32]*GameFightingSkillData { + return table._dataMap +} + +func (table *GameFightingSkill) GetDataList() []*GameFightingSkillData { + return table._dataList +} + +func (table *GameFightingSkill) Get(key int32) *GameFightingSkillData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.FightingSkillData.go b/sys/configure/structs/Game.FightingSkillData.go new file mode 100644 index 000000000..0203810af --- /dev/null +++ b/sys/configure/structs/Game.FightingSkillData.go @@ -0,0 +1,37 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +import "errors" + +type GameFightingSkillData struct { + Skill int32 + Value int32 +} + +const TypeId_GameFightingSkillData = 355628269 + +func (*GameFightingSkillData) GetTypeId() int32 { + return 355628269 +} + +func (_v *GameFightingSkillData)Deserialize(_buf map[string]interface{}) (err error) { + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skill"].(float64); !_ok_ { err = errors.New("skill error"); return }; _v.Skill = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["value"].(float64); !_ok_ { err = errors.New("value error"); return }; _v.Value = int32(_tempNum_) } + return +} + +func DeserializeGameFightingSkillData(_buf map[string]interface{}) (*GameFightingSkillData, error) { + v := &GameFightingSkillData{} + if err := v.Deserialize(_buf); err == nil { + return v, nil + } else { + return nil, err + } +} diff --git a/sys/configure/structs/Game.FightingSkillStar.go b/sys/configure/structs/Game.FightingSkillStar.go new file mode 100644 index 000000000..19750a22e --- /dev/null +++ b/sys/configure/structs/Game.FightingSkillStar.go @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +type GameFightingSkillStar struct { + _dataMap map[int32]*GameFightingSkillStarData + _dataList []*GameFightingSkillStarData +} + +func NewGameFightingSkillStar(_buf []map[string]interface{}) (*GameFightingSkillStar, error) { + _dataList := make([]*GameFightingSkillStarData, 0, len(_buf)) + dataMap := make(map[int32]*GameFightingSkillStarData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGameFightingSkillStarData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Color] = _v + } + } + return &GameFightingSkillStar{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GameFightingSkillStar) GetDataMap() map[int32]*GameFightingSkillStarData { + return table._dataMap +} + +func (table *GameFightingSkillStar) GetDataList() []*GameFightingSkillStarData { + return table._dataList +} + +func (table *GameFightingSkillStar) Get(key int32) *GameFightingSkillStarData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.FightingSkillStarData.go b/sys/configure/structs/Game.FightingSkillStarData.go new file mode 100644 index 000000000..12b682e3a --- /dev/null +++ b/sys/configure/structs/Game.FightingSkillStarData.go @@ -0,0 +1,37 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +import "errors" + +type GameFightingSkillStarData struct { + Color int32 + Value int32 +} + +const TypeId_GameFightingSkillStarData = 2144345311 + +func (*GameFightingSkillStarData) GetTypeId() int32 { + return 2144345311 +} + +func (_v *GameFightingSkillStarData)Deserialize(_buf map[string]interface{}) (err error) { + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["color"].(float64); !_ok_ { err = errors.New("color error"); return }; _v.Color = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["value"].(float64); !_ok_ { err = errors.New("value error"); return }; _v.Value = int32(_tempNum_) } + return +} + +func DeserializeGameFightingSkillStarData(_buf map[string]interface{}) (*GameFightingSkillStarData, error) { + v := &GameFightingSkillStarData{} + if err := v.Deserialize(_buf); err == nil { + return v, nil + } else { + return nil, err + } +} diff --git a/sys/configure/structs/Game.FightingSkilllv.go b/sys/configure/structs/Game.FightingSkilllv.go new file mode 100644 index 000000000..a3b70e101 --- /dev/null +++ b/sys/configure/structs/Game.FightingSkilllv.go @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +type GameFightingSkilllv struct { + _dataMap map[int32]*GameFightingSkilllvData + _dataList []*GameFightingSkilllvData +} + +func NewGameFightingSkilllv(_buf []map[string]interface{}) (*GameFightingSkilllv, error) { + _dataList := make([]*GameFightingSkilllvData, 0, len(_buf)) + dataMap := make(map[int32]*GameFightingSkilllvData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGameFightingSkilllvData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.SkillLv] = _v + } + } + return &GameFightingSkilllv{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GameFightingSkilllv) GetDataMap() map[int32]*GameFightingSkilllvData { + return table._dataMap +} + +func (table *GameFightingSkilllv) GetDataList() []*GameFightingSkilllvData { + return table._dataList +} + +func (table *GameFightingSkilllv) Get(key int32) *GameFightingSkilllvData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.FightingSkilllvData.go b/sys/configure/structs/Game.FightingSkilllvData.go new file mode 100644 index 000000000..432e65a05 --- /dev/null +++ b/sys/configure/structs/Game.FightingSkilllvData.go @@ -0,0 +1,37 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +import "errors" + +type GameFightingSkilllvData struct { + SkillLv int32 + Value int32 +} + +const TypeId_GameFightingSkilllvData = -675483465 + +func (*GameFightingSkilllvData) GetTypeId() int32 { + return -675483465 +} + +func (_v *GameFightingSkilllvData)Deserialize(_buf map[string]interface{}) (err error) { + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skill_lv"].(float64); !_ok_ { err = errors.New("skill_lv error"); return }; _v.SkillLv = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["value"].(float64); !_ok_ { err = errors.New("value error"); return }; _v.Value = int32(_tempNum_) } + return +} + +func DeserializeGameFightingSkilllvData(_buf map[string]interface{}) (*GameFightingSkilllvData, error) { + v := &GameFightingSkilllvData{} + if err := v.Deserialize(_buf); err == nil { + return v, nil + } else { + return nil, err + } +} diff --git a/sys/configure/structs/Game.HuntingBossData.go b/sys/configure/structs/Game.HuntingBossData.go index e76aa8484..202bc0940 100644 --- a/sys/configure/structs/Game.HuntingBossData.go +++ b/sys/configure/structs/Game.HuntingBossData.go @@ -26,7 +26,7 @@ type GameHuntingBossData struct { Boss []int32 PsConsume []*Gameatn PsMg []*Gameatn - Captionrecommend []int32 + Captionrecommend int32 } const TypeId_GameHuntingBossData = -450881718 @@ -129,20 +129,7 @@ func (_v *GameHuntingBossData)Deserialize(_buf map[string]interface{}) (err erro } } - { - var _arr_ []interface{} - var _ok_ bool - if _arr_, _ok_ = _buf["captionrecommend"].([]interface{}); !_ok_ { err = errors.New("captionrecommend error"); return } - - _v.Captionrecommend = 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.Captionrecommend = append(_v.Captionrecommend, _list_v_) - } - } - + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["captionrecommend"].(float64); !_ok_ { err = errors.New("captionrecommend error"); return }; _v.Captionrecommend = int32(_tempNum_) } return } diff --git a/sys/configure/structs/Game.PlunderData.go b/sys/configure/structs/Game.PlunderData.go index 4270dac40..f2e81c4bc 100644 --- a/sys/configure/structs/Game.PlunderData.go +++ b/sys/configure/structs/Game.PlunderData.go @@ -15,6 +15,7 @@ type GamePlunderData struct { Name string Mosterhead string Mostername string + MosterheadLv int32 Rarity int32 Weight int32 Battleid int32 @@ -38,6 +39,7 @@ func (_v *GamePlunderData)Deserialize(_buf map[string]interface{}) (err error) { {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _ok_ bool; if _v.Mosterhead, _ok_ = _buf["mosterhead"].(string); !_ok_ { err = errors.New("mosterhead error"); return } } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["mostername"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Mostername error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Mostername, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["mosterheadLv"].(float64); !_ok_ { err = errors.New("mosterheadLv error"); return }; _v.MosterheadLv = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["rarity"].(float64); !_ok_ { err = errors.New("rarity error"); return }; _v.Rarity = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["weight"].(float64); !_ok_ { err = errors.New("weight error"); return }; _v.Weight = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["battleid"].(float64); !_ok_ { err = errors.New("battleid error"); return }; _v.Battleid = int32(_tempNum_) } diff --git a/sys/configure/structs/Game.StoneStageData.go b/sys/configure/structs/Game.StoneStageData.go index 225150682..31313b0e3 100644 --- a/sys/configure/structs/Game.StoneStageData.go +++ b/sys/configure/structs/Game.StoneStageData.go @@ -16,6 +16,7 @@ type GameStoneStageData struct { StageId int32 PreviouStage int32 StageName string + StageEffect string RoomId int32 RoomGroup int32 PortalGroup int32 @@ -41,6 +42,7 @@ func (_v *GameStoneStageData)Deserialize(_buf map[string]interface{}) (err error { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["StageId"].(float64); !_ok_ { err = errors.New("StageId error"); return }; _v.StageId = int32(_tempNum_) } { 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 __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["StageName"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.StageName error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.StageName, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + { var _ok_ bool; if _v.StageEffect, _ok_ = _buf["StageEffect"].(string); !_ok_ { err = errors.New("StageEffect error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["RoomId"].(float64); !_ok_ { err = errors.New("RoomId error"); return }; _v.RoomId = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["RoomGroup"].(float64); !_ok_ { err = errors.New("RoomGroup error"); return }; _v.RoomGroup = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["PortalGroup"].(float64); !_ok_ { err = errors.New("PortalGroup error"); return }; _v.PortalGroup = int32(_tempNum_) } diff --git a/sys/configure/structs/Game.VikingBossData.go b/sys/configure/structs/Game.VikingBossData.go index 47dec1431..b5180b202 100644 --- a/sys/configure/structs/Game.VikingBossData.go +++ b/sys/configure/structs/Game.VikingBossData.go @@ -19,7 +19,7 @@ type GameVikingBossData struct { SweepId int32 SweepOpenId []int32 BattleReadyID int32 - Captionrecommend []int32 + Captionrecommend int32 Firstprize []*Gameatn Dropshow []*Gameatn Drop int32 @@ -61,20 +61,7 @@ func (_v *GameVikingBossData)Deserialize(_buf map[string]interface{}) (err error } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["BattleReadyID"].(float64); !_ok_ { err = errors.New("BattleReadyID error"); return }; _v.BattleReadyID = int32(_tempNum_) } - { - var _arr_ []interface{} - var _ok_ bool - if _arr_, _ok_ = _buf["captionrecommend"].([]interface{}); !_ok_ { err = errors.New("captionrecommend error"); return } - - _v.Captionrecommend = 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.Captionrecommend = append(_v.Captionrecommend, _list_v_) - } - } - + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["captionrecommend"].(float64); !_ok_ { err = errors.New("captionrecommend error"); return }; _v.Captionrecommend = int32(_tempNum_) } { var _arr_ []interface{} var _ok_ bool diff --git a/sys/configure/structs/Game.VikingRecommend.go b/sys/configure/structs/Game.VikingRecommend.go new file mode 100644 index 000000000..dcff9cde7 --- /dev/null +++ b/sys/configure/structs/Game.VikingRecommend.go @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +type GameVikingRecommend struct { + _dataMap map[int32]*GameVikingRecommendData + _dataList []*GameVikingRecommendData +} + +func NewGameVikingRecommend(_buf []map[string]interface{}) (*GameVikingRecommend, error) { + _dataList := make([]*GameVikingRecommendData, 0, len(_buf)) + dataMap := make(map[int32]*GameVikingRecommendData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGameVikingRecommendData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Id] = _v + } + } + return &GameVikingRecommend{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GameVikingRecommend) GetDataMap() map[int32]*GameVikingRecommendData { + return table._dataMap +} + +func (table *GameVikingRecommend) GetDataList() []*GameVikingRecommendData { + return table._dataList +} + +func (table *GameVikingRecommend) Get(key int32) *GameVikingRecommendData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.VikingRecommendData.go b/sys/configure/structs/Game.VikingRecommendData.go new file mode 100644 index 000000000..e77a0f0ab --- /dev/null +++ b/sys/configure/structs/Game.VikingRecommendData.go @@ -0,0 +1,71 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +import "errors" + +type GameVikingRecommendData struct { + Id int32 + Describe string + Recommendtype1 string + Herolist1 []string + Recommendtype2 string + Herolist2 []string +} + +const TypeId_GameVikingRecommendData = 982029792 + +func (*GameVikingRecommendData) GetTypeId() int32 { + return 982029792 +} + +func (_v *GameVikingRecommendData)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 __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["describe"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Describe error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Describe, _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["recommendtype1"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Recommendtype1 error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Recommendtype1, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["herolist1"].([]interface{}); !_ok_ { err = errors.New("herolist1 error"); return } + + _v.Herolist1 = make([]string, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ string + { if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } } + _v.Herolist1 = append(_v.Herolist1, _list_v_) + } + } + + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["recommendtype2"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Recommendtype2 error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Recommendtype2, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["herolist2"].([]interface{}); !_ok_ { err = errors.New("herolist2 error"); return } + + _v.Herolist2 = make([]string, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ string + { if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } } + _v.Herolist2 = append(_v.Herolist2, _list_v_) + } + } + + return +} + +func DeserializeGameVikingRecommendData(_buf map[string]interface{}) (*GameVikingRecommendData, error) { + v := &GameVikingRecommendData{} + if err := v.Deserialize(_buf); err == nil { + return v, nil + } else { + return nil, err + } +} diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go index bb9441d37..4cdec61a6 100644 --- a/sys/configure/structs/Tables.go +++ b/sys/configure/structs/Tables.go @@ -66,6 +66,7 @@ type Tables struct { VikingBoss *GameVikingBoss VikingLineup *GameVikingLineup VikingEntrance *GameVikingEntrance + VikingRecommend *GameVikingRecommend DreamlandBoos *GameDreamlandBoos DreamlandChallenge *GameDreamlandChallenge DreamlandTrigger *GameDreamlandTrigger @@ -339,6 +340,10 @@ type Tables struct { PlunderBattle *GamePlunderBattle PlunderLog *GamePlunderLog PlunderIsLand *GamePlunderIsLand + FightingCapacity *GameFightingCapacity + FightingSkilllv *GameFightingSkilllv + FightingSkill *GameFightingSkill + FightingSkillStar *GameFightingSkillStar } func NewTables(loader JsonLoader) (*Tables, error) { @@ -676,6 +681,12 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.VikingEntrance, err = NewGameVikingEntrance(buf) ; err != nil { return nil, err } + if buf, err = loader("game_vikingrecommend") ; err != nil { + return nil, err + } + if tables.VikingRecommend, err = NewGameVikingRecommend(buf) ; err != nil { + return nil, err + } if buf, err = loader("game_dreamlandboos") ; err != nil { return nil, err } @@ -2314,5 +2325,29 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.PlunderIsLand, err = NewGamePlunderIsLand(buf) ; err != nil { return nil, err } + if buf, err = loader("game_fightingcapacity") ; err != nil { + return nil, err + } + if tables.FightingCapacity, err = NewGameFightingCapacity(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_fightingskilllv") ; err != nil { + return nil, err + } + if tables.FightingSkilllv, err = NewGameFightingSkilllv(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_fightingskill") ; err != nil { + return nil, err + } + if tables.FightingSkill, err = NewGameFightingSkill(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_fightingskillstar") ; err != nil { + return nil, err + } + if tables.FightingSkillStar, err = NewGameFightingSkillStar(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 d63ad9b92..fff6dd37b 100644 --- a/sys/configure/structs/game.globalData.go +++ b/sys/configure/structs/game.globalData.go @@ -281,6 +281,8 @@ type GameGlobalData struct { GuildSignIn int32 EnhancebossPs int32 PlunderPvpBattlereadyid int32 + PlunderPvpCollegeNum int32 + PlunderPvpCollegeTime int32 } const TypeId_GameGlobalData = 477542761 @@ -1093,6 +1095,8 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["guild_sign_in"].(float64); !_ok_ { err = errors.New("guild_sign_in error"); return }; _v.GuildSignIn = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["enhanceboss_ps"].(float64); !_ok_ { err = errors.New("enhanceboss_ps error"); return }; _v.EnhancebossPs = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["plunder_pvp_battlereadyid"].(float64); !_ok_ { err = errors.New("plunder_pvp_battlereadyid error"); return }; _v.PlunderPvpBattlereadyid = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["plunder_pvp_college_num"].(float64); !_ok_ { err = errors.New("plunder_pvp_college_num error"); return }; _v.PlunderPvpCollegeNum = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["plunder_pvp_college_time"].(float64); !_ok_ { err = errors.New("plunder_pvp_college_time error"); return }; _v.PlunderPvpCollegeTime = int32(_tempNum_) } return }