From 4498dc4952d475eda18597141f582a81933f755b Mon Sep 17 00:00:00 2001 From: chenxingzhi <1721823980@qq.com> Date: Fri, 12 Nov 2021 19:00:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E9=81=97=E8=BF=B9?= =?UTF-8?q?=E5=85=B3=E5=8D=A1=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shared/resource/jsons/dic_zyz_gk_branch.json | 178 ++++++++++++------- 1 file changed, 116 insertions(+), 62 deletions(-) diff --git a/shared/resource/jsons/dic_zyz_gk_branch.json b/shared/resource/jsons/dic_zyz_gk_branch.json index d7fc14507..31e6a7524 100755 --- a/shared/resource/jsons/dic_zyz_gk_branch.json +++ b/shared/resource/jsons/dic_zyz_gk_branch.json @@ -2,7 +2,8 @@ { "war_id": 2011, "dispatchJsonId": 2011, - "bg_img_id": 9211, + "bg_img": 9211, + "mapid": 9211, "script_id": "R_1001&S_1001&RE_10001", "fixReward": "&", "conditionReward": "31001&5000&0|31002&100&0|11002&10&0|22001&2&0", @@ -16,7 +17,7 @@ "fobiddenCharactor": "&", "victoryInfoInUI": "消灭所有敌军", "loseInfoInUI": "我方全部阵亡", - "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利", + "starInfoInUI": "1.我方无人阵亡；\r\n2.在5回合内获得胜利", "cost": 2, "iconInMap": "spine&qingnian", "iconName": "世外小村", @@ -26,12 +27,14 @@ "previousGk": 126, "relatedGk": 1000128, "movePoint": 496, - "needPrepare": 1 + "needPrepare": 1, + "spineInBigMap": "&" }, { "war_id": 2012, "dispatchJsonId": 2012, - "bg_img_id": 9212, + "bg_img": 9212, + "mapid": 9212, "script_id": "R_1002&S_1002&RE_1002", "fixReward": "&", "conditionReward": "31001&5000&0|31002&100&0|11002&10&0|22001&2&0", @@ -45,7 +48,7 @@ "fobiddenCharactor": "&", "victoryInfoInUI": "消灭所有敌军", "loseInfoInUI": "我方全部阵亡", - "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利", + "starInfoInUI": "1.我方无人阵亡；\r\n2.在5回合内获得胜利", "cost": 2, "iconInMap": "spine&yinbingdao", "iconName": "迷雾洞窟", @@ -55,12 +58,14 @@ "previousGk": 2011, "relatedGk": 1000224, "movePoint": 503, - "needPrepare": 1 + "needPrepare": 1, + "spineInBigMap": "&" }, { "war_id": 2013, "dispatchJsonId": 2013, - "bg_img_id": 9213, + "bg_img": 9213, + "mapid": 9213, "script_id": "S_1003", "fixReward": "&", "conditionReward": "31001&5000&0|31002&100&0|11002&10&0|22001&2&0", @@ -74,7 +79,7 @@ "fobiddenCharactor": "&", "victoryInfoInUI": "消灭所有敌军", "loseInfoInUI": "我方全部阵亡", - "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利", + "starInfoInUI": "1.我方无人阵亡；\r\n2.在5回合内获得胜利", "cost": 2, "iconInMap": "spine&zhangjiao", "iconName": "黄天祭坛", @@ -84,12 +89,14 @@ "previousGk": 2012, "relatedGk": 1000324, "movePoint": 507, - "needPrepare": 1 + "needPrepare": 1, + "spineInBigMap": "&" }, { "war_id": 2021, "dispatchJsonId": 2021, - "bg_img_id": 9221, + "bg_img": 9221, + "mapid": 9221, "script_id": "R_9201&S_9201&RE_9201", "fixReward": "&", "conditionReward": "31001&6000&0|31002&100&0|11002&10&0|22001&2&0", @@ -103,7 +110,7 @@ "fobiddenCharactor": "&", "victoryInfoInUI": "消灭所有敌军", "loseInfoInUI": "我方全部阵亡", - "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利", + "starInfoInUI": "1.我方无人阵亡；\r\n2.在5回合内获得胜利", "cost": 2, "iconInMap": "spine&qingnian", "iconName": 0, @@ -113,12 +120,14 @@ "previousGk": 2013, "relatedGk": 1000424, "movePoint": 529, - "needPrepare": 1 + "needPrepare": 1, + "spineInBigMap": "&" }, { "war_id": 2022, "dispatchJsonId": 2022, - "bg_img_id": 9222, + "bg_img": 9222, + "mapid": 9222, "script_id": "R_9202&S_9202&RE_9202", "fixReward": "&", "conditionReward": "31001&6000&0|31002&100&0|11002&10&0|22001&2&0", @@ -132,7 +141,7 @@ "fobiddenCharactor": "&", "victoryInfoInUI": "消灭所有敌军", "loseInfoInUI": "我方全部阵亡", - "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利", + "starInfoInUI": "1.我方无人阵亡；\r\n2.在5回合内获得胜利", "cost": 2, "iconInMap": "spine&yinbingdao", "iconName": 0, @@ -142,12 +151,14 @@ "previousGk": 2021, "relatedGk": 1000528, "movePoint": 534, - "needPrepare": 1 + "needPrepare": 1, + "spineInBigMap": "&" }, { "war_id": 2023, "dispatchJsonId": 2023, - "bg_img_id": 9223, + "bg_img": 9223, + "mapid": 9223, "script_id": "R_9203&S_9203&RE_9203", "fixReward": "&", "conditionReward": "31001&6000&0|31002&100&0|11002&10&0|22001&2&0", @@ -161,7 +172,7 @@ "fobiddenCharactor": "&", "victoryInfoInUI": "消灭所有敌军", "loseInfoInUI": "我方全部阵亡", - "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利", + "starInfoInUI": "1.我方无人阵亡；\r\n2.在5回合内获得胜利", "cost": 2, "iconInMap": "spine&zhangjiao", "iconName": 0, @@ -171,12 +182,14 @@ "previousGk": 2022, "relatedGk": 1000628, "movePoint": 539, - "needPrepare": 1 + "needPrepare": 1, + "spineInBigMap": "&" }, { "war_id": 2031, "dispatchJsonId": 2031, - "bg_img_id": 9231, + "bg_img": 9231, + "mapid": 9231, "script_id": "R_9301&S_9301&RE_9301", "fixReward": "&", "conditionReward": "31001&7000&0|31002&150&0|11002&12&0|22001&2&0", @@ -190,7 +203,7 @@ "fobiddenCharactor": "&", "victoryInfoInUI": "消灭所有敌军", "loseInfoInUI": "我方全部阵亡", - "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利", + "starInfoInUI": "1.我方无人阵亡；\r\n2.在5回合内获得胜利", "cost": 2, "iconInMap": "spine&qingnian", "iconName": 0, @@ -200,12 +213,14 @@ "previousGk": 2023, "relatedGk": 1000728, "movePoint": 544, - "needPrepare": 1 + "needPrepare": 1, + "spineInBigMap": "&" }, { "war_id": 2032, "dispatchJsonId": 2032, - "bg_img_id": 9232, + "bg_img": 9232, + "mapid": 9232, "script_id": "R_9302&S_9302&RE_9302", "fixReward": "&", "conditionReward": "31001&7000&0|31002&150&0|11002&12&0|22001&2&0", @@ -219,7 +234,7 @@ "fobiddenCharactor": "&", "victoryInfoInUI": "消灭所有敌军", "loseInfoInUI": "我方全部阵亡", - "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利", + "starInfoInUI": "1.我方无人阵亡；\r\n2.在5回合内获得胜利", "cost": 2, "iconInMap": "spine&yinbingdao", "iconName": 0, @@ -229,12 +244,14 @@ "previousGk": 2031, "relatedGk": 1000128, "movePoint": 549, - "needPrepare": 1 + "needPrepare": 1, + "spineInBigMap": "&" }, { "war_id": 2033, "dispatchJsonId": 2033, - "bg_img_id": 9233, + "bg_img": 9233, + "mapid": 9233, "script_id": "R_9303&S_9303&RE_9303", "fixReward": "&", "conditionReward": "31001&7000&0|31002&150&0|11002&12&0|22001&2&0", @@ -248,7 +265,7 @@ "fobiddenCharactor": "&", "victoryInfoInUI": "消灭所有敌军", "loseInfoInUI": "我方全部阵亡", - "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利", + "starInfoInUI": "1.我方无人阵亡；\r\n2.在5回合内获得胜利", "cost": 2, "iconInMap": "spine&zhangjiao", "iconName": 0, @@ -258,12 +275,14 @@ "previousGk": 2032, "relatedGk": 1000224, "movePoint": 554, - "needPrepare": 1 + "needPrepare": 1, + "spineInBigMap": "&" }, { "war_id": 2041, "dispatchJsonId": 2041, - "bg_img_id": 9241, + "bg_img": 9241, + "mapid": 9241, "script_id": "R_9401&S_9401&RE_9401", "fixReward": "&", "conditionReward": "31001&8000&0|31002&150&0|11002&12&0|22001&2&0", @@ -277,7 +296,7 @@ "fobiddenCharactor": "&", "victoryInfoInUI": "消灭所有敌军", "loseInfoInUI": "我方全部阵亡", - "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利", + "starInfoInUI": "1.我方无人阵亡；\r\n2.在5回合内获得胜利", "cost": 2, "iconInMap": "spine&qingnian", "iconName": 0, @@ -287,12 +306,14 @@ "previousGk": 2033, "relatedGk": 1000324, "movePoint": 559, - "needPrepare": 1 + "needPrepare": 1, + "spineInBigMap": "&" }, { "war_id": 2042, "dispatchJsonId": 2042, - "bg_img_id": 9242, + "bg_img": 9242, + "mapid": 9242, "script_id": "R_9402&S_9402&RE_9402", "fixReward": "&", "conditionReward": "31001&8000&0|31002&150&0|11002&12&0|22001&2&0", @@ -306,7 +327,7 @@ "fobiddenCharactor": "&", "victoryInfoInUI": "消灭所有敌军", "loseInfoInUI": "我方全部阵亡", - "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利", + "starInfoInUI": "1.我方无人阵亡；\r\n2.在5回合内获得胜利", "cost": 2, "iconInMap": "spine&yinbingdao", "iconName": 0, @@ -316,12 +337,14 @@ "previousGk": 2041, "relatedGk": 1000424, "movePoint": 564, - "needPrepare": 1 + "needPrepare": 1, + "spineInBigMap": "&" }, { "war_id": 2043, "dispatchJsonId": 2043, - "bg_img_id": 9243, + "bg_img": 9243, + "mapid": 9243, "script_id": "R_9403&S_9403&RE_9403", "fixReward": "&", "conditionReward": "31001&8000&0|31002&150&0|11002&12&0|22001&2&0", @@ -335,7 +358,7 @@ "fobiddenCharactor": "&", "victoryInfoInUI": "消灭所有敌军", "loseInfoInUI": "我方全部阵亡", - "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利", + "starInfoInUI": "1.我方无人阵亡；\r\n2.在5回合内获得胜利", "cost": 2, "iconInMap": "spine&zhangjiao", "iconName": 0, @@ -345,12 +368,14 @@ "previousGk": 2042, "relatedGk": 1000528, "movePoint": 569, - "needPrepare": 1 + "needPrepare": 1, + "spineInBigMap": "&" }, { "war_id": 2051, "dispatchJsonId": 2051, - "bg_img_id": 9251, + "bg_img": 9251, + "mapid": 9251, "script_id": "R_9501&S_9501&RE_9501", "fixReward": "&", "conditionReward": "31001&9000&0|31002&200&0|11002&14&0|22001&2&0", @@ -364,7 +389,7 @@ "fobiddenCharactor": "&", "victoryInfoInUI": "消灭所有敌军", "loseInfoInUI": "我方全部阵亡", - "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利", + "starInfoInUI": "1.我方无人阵亡；\r\n2.在5回合内获得胜利", "cost": 2, "iconInMap": "spine&qingnian", "iconName": 0, @@ -374,12 +399,14 @@ "previousGk": 2043, "relatedGk": 1000628, "movePoint": 574, - "needPrepare": 1 + "needPrepare": 1, + "spineInBigMap": "&" }, { "war_id": 2052, "dispatchJsonId": 2052, - "bg_img_id": 9252, + "bg_img": 9252, + "mapid": 9252, "script_id": "R_9502&S_9502&RE_9502", "fixReward": "&", "conditionReward": "31001&9000&0|31002&200&0|11002&14&0|22001&2&0", @@ -393,7 +420,7 @@ "fobiddenCharactor": "&", "victoryInfoInUI": "消灭所有敌军", "loseInfoInUI": "我方全部阵亡", - "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利", + "starInfoInUI": "1.我方无人阵亡；\r\n2.在5回合内获得胜利", "cost": 2, "iconInMap": "spine&yinbingdao", "iconName": 0, @@ -403,12 +430,14 @@ "previousGk": 2051, "relatedGk": 1000728, "movePoint": 579, - "needPrepare": 1 + "needPrepare": 1, + "spineInBigMap": "&" }, { "war_id": 2053, "dispatchJsonId": 2053, - "bg_img_id": 9253, + "bg_img": 9253, + "mapid": 9253, "script_id": "R_9503&S_9503&RE_9503", "fixReward": "&", "conditionReward": "31001&9000&0|31002&200&0|11002&14&0|22001&2&0", @@ -422,7 +451,7 @@ "fobiddenCharactor": "&", "victoryInfoInUI": "消灭所有敌军", "loseInfoInUI": "我方全部阵亡", - "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利", + "starInfoInUI": "1.我方无人阵亡；\r\n2.在5回合内获得胜利", "cost": 2, "iconInMap": "spine&zhangjiao", "iconName": 0, @@ -432,12 +461,18 @@ "previousGk": 2052, "relatedGk": 1000128, "movePoint": 584, - "needPrepare": 1 + "needPrepare": 1, + "spineInBigMap": "&" }, { "war_id": 2061, "dispatchJsonId": 9601, +<<<<<<< Updated upstream "bg_img_id": 9261, +======= + "bg_img": 9261, + "mapid": 9261, +>>>>>>> Stashed changes "script_id": "R_9601&S_9601&RE_9601", "fixReward": "&", "conditionReward": "31001&10000&0|31002&200&0|11002&14&0|22001&2&0", @@ -451,9 +486,9 @@ "fobiddenCharactor": "&", "victoryInfoInUI": "消灭所有敌军", "loseInfoInUI": "我方全部阵亡", - "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利", + "starInfoInUI": "1.我方无人阵亡；\r\n2.在5回合内获得胜利", "cost": 2, - "iconInMap": "spine&yanshi", + "iconInMap": "spine&wangcan", "iconName": 0, "heroInUI": "1&1008|1&1045", "detailUIBg": "1000_16", @@ -461,12 +496,18 @@ "previousGk": 612, "relatedGk": 1000224, "movePoint": 589, - "needPrepare": 1 + "needPrepare": 1, + "spineInBigMap": "&" }, { "war_id": 2062, "dispatchJsonId": 9602, +<<<<<<< Updated upstream "bg_img_id": 9262, +======= + "bg_img": 9262, + "mapid": 9262, +>>>>>>> Stashed changes "script_id": "R_9602&S_9602&RE_9602", "fixReward": "&", "conditionReward": "31001&10000&0|31002&200&0|11002&14&0|22001&2&0", @@ -480,9 +521,9 @@ "fobiddenCharactor": "&", "victoryInfoInUI": "消灭所有敌军", "loseInfoInUI": "我方全部阵亡", - "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利", + "starInfoInUI": "1.我方无人阵亡；\r\n2.在5回合内获得胜利", "cost": 2, - "iconInMap": "spine&wangcan", + "iconInMap": "spine&yanshi", "iconName": 0, "heroInUI": "1&1008|1&1046", "detailUIBg": "1000_17", @@ -490,12 +531,18 @@ "previousGk": 2061, "relatedGk": 1000324, "movePoint": 594, - "needPrepare": 1 + "needPrepare": 1, + "spineInBigMap": "&" }, { "war_id": 2063, "dispatchJsonId": 9603, +<<<<<<< Updated upstream "bg_img_id": 9263, +======= + "bg_img": 9263, + "mapid": 9263, +>>>>>>> Stashed changes "script_id": "R_9603&S_9603&RE_9603", "fixReward": "&", "conditionReward": "31001&10000&0|31002&200&0|11002&14&0|22001&2&0", @@ -509,7 +556,7 @@ "fobiddenCharactor": "&", "victoryInfoInUI": "消灭所有敌军", "loseInfoInUI": "我方全部阵亡", - "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利", + "starInfoInUI": "1.我方无人阵亡；\r\n2.在5回合内获得胜利", "cost": 2, "iconInMap": "spine&zhangjiao", "iconName": 0, @@ -519,12 +566,14 @@ "previousGk": 2062, "relatedGk": 1000424, "movePoint": 599, - "needPrepare": 1 + "needPrepare": 1, + "spineInBigMap": "chapter6_yiji" }, { "war_id": 2071, "dispatchJsonId": 2071, - "bg_img_id": 9271, + "bg_img": 9271, + "mapid": 9271, "script_id": "R_9701&S_9701&RE_9701", "fixReward": "&", "conditionReward": "31001&11000&0|31002&250&0|11002&16&0|22001&2&0", @@ -538,7 +587,7 @@ "fobiddenCharactor": "&", "victoryInfoInUI": "消灭所有敌军", "loseInfoInUI": "我方全部阵亡", - "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利", + "starInfoInUI": "1.我方无人阵亡；\r\n2.在5回合内获得胜利", "cost": 2, "iconInMap": "spine&qingnian", "iconName": 0, @@ -548,12 +597,14 @@ "previousGk": 2063, "relatedGk": 1000528, "movePoint": 604, - "needPrepare": 1 + "needPrepare": 1, + "spineInBigMap": "&" }, { "war_id": 2072, "dispatchJsonId": 2072, - "bg_img_id": 9272, + "bg_img": 9272, + "mapid": 9272, "script_id": "R_9702&S_9702&RE_9702", "fixReward": "&", "conditionReward": "31001&11000&0|31002&250&0|11002&16&0|22001&2&0", @@ -567,7 +618,7 @@ "fobiddenCharactor": "&", "victoryInfoInUI": "消灭所有敌军", "loseInfoInUI": "我方全部阵亡", - "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利", + "starInfoInUI": "1.我方无人阵亡；\r\n2.在5回合内获得胜利", "cost": 2, "iconInMap": "spine&yinbingdao", "iconName": 0, @@ -577,12 +628,14 @@ "previousGk": 2071, "relatedGk": 1000628, "movePoint": 609, - "needPrepare": 1 + "needPrepare": 1, + "spineInBigMap": "&" }, { "war_id": 2073, "dispatchJsonId": 2073, - "bg_img_id": 9273, + "bg_img": 9273, + "mapid": 9273, "script_id": "R_9703&S_9703&RE_9703", "fixReward": "&", "conditionReward": "31001&11000&0|31002&250&0|11002&16&0|22001&2&0", @@ -596,7 +649,7 @@ "fobiddenCharactor": "&", "victoryInfoInUI": "消灭所有敌军", "loseInfoInUI": "我方全部阵亡", - "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利", + "starInfoInUI": "1.我方无人阵亡；\r\n2.在5回合内获得胜利", "cost": 2, "iconInMap": "spine&zhangjiao", "iconName": 0, @@ -606,6 +659,7 @@ "previousGk": 2072, "relatedGk": 1000728, "movePoint": 614, - "needPrepare": 1 + "needPrepare": 1, + "spineInBigMap": "&" } ] \ No newline at end of file