From acb30f546ae4686082d203a3390d85dd0b9f1053 Mon Sep 17 00:00:00 2001 From: chenxingzhi <1721823980@qq.com> Date: Fri, 28 May 2021 20:39:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E5=85=B3=E5=8D=A1?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shared/resource/jsons/dic_zyz_gk_main.json | 4 + shared/resource/jsons/dic_zyz_hero.json | 491 ++++++++++++++++++++- 2 files changed, 487 insertions(+), 8 deletions(-) diff --git a/shared/resource/jsons/dic_zyz_gk_main.json b/shared/resource/jsons/dic_zyz_gk_main.json index 003a12215..7ff760284 100644 --- a/shared/resource/jsons/dic_zyz_gk_main.json +++ b/shared/resource/jsons/dic_zyz_gk_main.json @@ -32,7 +32,11 @@ { "war_id": 102, "dispatchJsonId": 102, +<<<<<<< Updated upstream "bg_img_id": 601, +======= + "bg_img_id": 603, +>>>>>>> Stashed changes "chapter": 0, "script_id": "R_102&S_102&RE_102", "fixReward": "31001&1001", diff --git a/shared/resource/jsons/dic_zyz_hero.json b/shared/resource/jsons/dic_zyz_hero.json index a25ab226a..426881024 100644 --- a/shared/resource/jsons/dic_zyz_hero.json +++ b/shared/resource/jsons/dic_zyz_hero.json @@ -42,8 +42,13 @@ "initialSkin": 41001, "gender": 1, "atkSpineEffect": "liqi", +<<<<<<< Updated upstream "showinRecruit": "0&", "recruit": "0&" +======= + "showinRecruit": "1&", + "recruit": "1&" +>>>>>>> Stashed changes }, { "heroId": 2, @@ -88,8 +93,13 @@ "initialSkin": 41003, "gender": 1, "atkSpineEffect": "liqi", +<<<<<<< Updated upstream "showinRecruit": "0&", "recruit": "0&" +======= + "showinRecruit": "1&", + "recruit": "1&" +>>>>>>> Stashed changes }, { "heroId": 3, @@ -134,8 +144,13 @@ "initialSkin": 41004, "gender": 1, "atkSpineEffect": "liqi", +<<<<<<< Updated upstream "showinRecruit": "0&", "recruit": "0&" +======= + "showinRecruit": "1&", + "recruit": "1&" +>>>>>>> Stashed changes }, { "heroId": 4, @@ -180,8 +195,13 @@ "initialSkin": 41005, "gender": 1, "atkSpineEffect": "gong", +<<<<<<< Updated upstream "showinRecruit": "0&", "recruit": "0&" +======= + "showinRecruit": "1&", + "recruit": "1&" +>>>>>>> Stashed changes }, { "heroId": 5, @@ -226,8 +246,13 @@ "initialSkin": 41006, "gender": 1, "atkSpineEffect": "faqi", +<<<<<<< Updated upstream "showinRecruit": "0&", "recruit": "0&" +======= + "showinRecruit": "1&", + "recruit": "1&" +>>>>>>> Stashed changes }, { "heroId": 6, @@ -241,7 +266,7 @@ "camp": 1, "area": 0, "cost": 0, - "jobid": 26, + "jobid": 31, "skill": 6, "pieceId": 21006, "hp": 980, @@ -272,8 +297,13 @@ "initialSkin": 41007, "gender": 1, "atkSpineEffect": "faqi", +<<<<<<< Updated upstream "showinRecruit": "0&", "recruit": "0&" +======= + "showinRecruit": "1&", + "recruit": "1&" +>>>>>>> Stashed changes }, { "heroId": 7, @@ -318,8 +348,13 @@ "initialSkin": 41008, "gender": 1, "atkSpineEffect": "liqi", +<<<<<<< Updated upstream "showinRecruit": "0&", "recruit": "0&" +======= + "showinRecruit": "1&", + "recruit": "1&" +>>>>>>> Stashed changes }, { "heroId": 8, @@ -364,8 +399,13 @@ "initialSkin": 41009, "gender": 1, "atkSpineEffect": "liqi", +<<<<<<< Updated upstream "showinRecruit": "0&", "recruit": "0&" +======= + "showinRecruit": "1&", + "recruit": "1&" +>>>>>>> Stashed changes }, { "heroId": 9, @@ -410,8 +450,13 @@ "initialSkin": 41010, "gender": 1, "atkSpineEffect": "liqi", +<<<<<<< Updated upstream "showinRecruit": "0&", "recruit": "0&" +======= + "showinRecruit": "1&", + "recruit": "1&" +>>>>>>> Stashed changes }, { "heroId": 10, @@ -456,8 +501,13 @@ "initialSkin": 41011, "gender": 1, "atkSpineEffect": "liqi", +<<<<<<< Updated upstream "showinRecruit": "0&", "recruit": "0&" +======= + "showinRecruit": "1&", + "recruit": "1&" +>>>>>>> Stashed changes }, { "heroId": 11, @@ -502,8 +552,13 @@ "initialSkin": 41012, "gender": 1, "atkSpineEffect": "liqi", +<<<<<<< Updated upstream "showinRecruit": "0&", "recruit": "0&" +======= + "showinRecruit": "1&", + "recruit": "1&" +>>>>>>> Stashed changes }, { "heroId": 12, @@ -548,8 +603,13 @@ "initialSkin": 41013, "gender": 1, "atkSpineEffect": "gong", +<<<<<<< Updated upstream "showinRecruit": "0&", "recruit": "0&" +======= + "showinRecruit": "1&", + "recruit": "1&" +>>>>>>> Stashed changes }, { "heroId": 13, @@ -594,8 +654,13 @@ "initialSkin": 41014, "gender": 2, "atkSpineEffect": "faqi", +<<<<<<< Updated upstream "showinRecruit": "0&", "recruit": "0&" +======= + "showinRecruit": "1&", + "recruit": "1&" +>>>>>>> Stashed changes }, { "heroId": 14, @@ -609,7 +674,7 @@ "camp": 1, "area": 0, "cost": 0, - "jobid": 26, + "jobid": 31, "skill": 14, "pieceId": 21014, "hp": 850, @@ -640,8 +705,13 @@ "initialSkin": 41015, "gender": 1, "atkSpineEffect": "faqi", +<<<<<<< Updated upstream "showinRecruit": "0&", "recruit": "0&" +======= + "showinRecruit": "1&", + "recruit": "1&" +>>>>>>> Stashed changes }, { "heroId": 15, @@ -686,8 +756,13 @@ "initialSkin": 41016, "gender": 1, "atkSpineEffect": "dunqi", +<<<<<<< Updated upstream "showinRecruit": "0&", "recruit": "0&" +======= + "showinRecruit": "1&", + "recruit": "1&" +>>>>>>> Stashed changes }, { "heroId": 16, @@ -732,8 +807,13 @@ "initialSkin": 41017, "gender": 1, "atkSpineEffect": "liqi", +<<<<<<< Updated upstream "showinRecruit": "0&", "recruit": "0&" +======= + "showinRecruit": "1&", + "recruit": "1&" +>>>>>>> Stashed changes }, { "heroId": 17, @@ -778,8 +858,13 @@ "initialSkin": 41018, "gender": 1, "atkSpineEffect": "liqi", +<<<<<<< Updated upstream "showinRecruit": "0&", "recruit": "0&" +======= + "showinRecruit": "1&", + "recruit": "1&" +>>>>>>> Stashed changes }, { "heroId": 18, @@ -916,8 +1001,13 @@ "initialSkin": 41021, "gender": 1, "atkSpineEffect": "liqi", +<<<<<<< Updated upstream "showinRecruit": "0&", "recruit": "0&" +======= + "showinRecruit": "1&", + "recruit": "1&" +>>>>>>> Stashed changes }, { "heroId": 21, @@ -962,8 +1052,13 @@ "initialSkin": 41022, "gender": 1, "atkSpineEffect": "gong", +<<<<<<< Updated upstream "showinRecruit": "0&", "recruit": "0&" +======= + "showinRecruit": "1&", + "recruit": "1&" +>>>>>>> Stashed changes }, { "heroId": 22, @@ -1054,8 +1149,13 @@ "initialSkin": 41024, "gender": 1, "atkSpineEffect": "faqi", +<<<<<<< Updated upstream "showinRecruit": "0&", "recruit": "0&" +======= + "showinRecruit": "1&", + "recruit": "1&" +>>>>>>> Stashed changes }, { "heroId": 24, @@ -1100,8 +1200,13 @@ "initialSkin": 41025, "gender": 1, "atkSpineEffect": "dunqi", +<<<<<<< Updated upstream "showinRecruit": "0&", "recruit": "0&" +======= + "showinRecruit": "1&", + "recruit": "1&" +>>>>>>> Stashed changes }, { "heroId": 25, @@ -1146,8 +1251,13 @@ "initialSkin": 41026, "gender": 1, "atkSpineEffect": "liqi", +<<<<<<< Updated upstream "showinRecruit": "0&", "recruit": "0&" +======= + "showinRecruit": "1&", + "recruit": "1&" +>>>>>>> Stashed changes }, { "heroId": 26, @@ -1192,8 +1302,13 @@ "initialSkin": 41027, "gender": 2, "atkSpineEffect": "liqi", +<<<<<<< Updated upstream "showinRecruit": "0&", "recruit": "0&" +======= + "showinRecruit": "1&", + "recruit": "1&" +>>>>>>> Stashed changes }, { "heroId": 27, @@ -1238,8 +1353,13 @@ "initialSkin": 41028, "gender": 2, "atkSpineEffect": "liqi", +<<<<<<< Updated upstream "showinRecruit": "0&", "recruit": "0&" +======= + "showinRecruit": "1&", + "recruit": "1&" +>>>>>>> Stashed changes }, { "heroId": 28, @@ -1330,8 +1450,13 @@ "initialSkin": 41030, "gender": 2, "atkSpineEffect": "faqi", +<<<<<<< Updated upstream "showinRecruit": "0&", "recruit": "0&" +======= + "showinRecruit": "1&", + "recruit": "1&" +>>>>>>> Stashed changes }, { "heroId": 30, @@ -1376,8 +1501,13 @@ "initialSkin": 41031, "gender": 1, "atkSpineEffect": "gong", +<<<<<<< Updated upstream "showinRecruit": "0&", "recruit": "0&" +======= + "showinRecruit": "1&", + "recruit": "1&" +>>>>>>> Stashed changes }, { "heroId": 31, @@ -1422,8 +1552,13 @@ "initialSkin": 41032, "gender": 1, "atkSpineEffect": "faqi", +<<<<<<< Updated upstream "showinRecruit": "0&", "recruit": "0&" +======= + "showinRecruit": "1&", + "recruit": "1&" +>>>>>>> Stashed changes }, { "heroId": 32, @@ -1514,8 +1649,13 @@ "initialSkin": 41034, "gender": 1, "atkSpineEffect": "liqi", +<<<<<<< Updated upstream "showinRecruit": "0&", "recruit": "0&" +======= + "showinRecruit": "1&", + "recruit": "1&" +>>>>>>> Stashed changes }, { "heroId": 34, @@ -1560,8 +1700,13 @@ "initialSkin": 41035, "gender": 1, "atkSpineEffect": "faqi", +<<<<<<< Updated upstream "showinRecruit": "0&", "recruit": "0&" +======= + "showinRecruit": "1&", + "recruit": "1&" +>>>>>>> Stashed changes }, { "heroId": 35, @@ -1606,8 +1751,13 @@ "initialSkin": 41036, "gender": 1, "atkSpineEffect": "liqi", +<<<<<<< Updated upstream "showinRecruit": "0&", "recruit": "0&" +======= + "showinRecruit": "1&", + "recruit": "1&" +>>>>>>> Stashed changes }, { "heroId": 36, @@ -1652,8 +1802,13 @@ "initialSkin": 41037, "gender": 1, "atkSpineEffect": "liqi", +<<<<<<< Updated upstream "showinRecruit": "0&", "recruit": "0&" +======= + "showinRecruit": "1&", + "recruit": "1&" +>>>>>>> Stashed changes }, { "heroId": 37, @@ -1698,8 +1853,13 @@ "initialSkin": 41038, "gender": 1, "atkSpineEffect": "liqi", +<<<<<<< Updated upstream "showinRecruit": "0&", "recruit": "0&" +======= + "showinRecruit": "1&", + "recruit": "1&" +>>>>>>> Stashed changes }, { "heroId": 38, @@ -1744,8 +1904,13 @@ "initialSkin": 41039, "gender": 2, "atkSpineEffect": "gong", +<<<<<<< Updated upstream "showinRecruit": "0&", "recruit": "0&" +======= + "showinRecruit": "1&", + "recruit": "1&" +>>>>>>> Stashed changes }, { "heroId": 39, @@ -1790,8 +1955,13 @@ "initialSkin": 41040, "gender": 1, "atkSpineEffect": "faqi", +<<<<<<< Updated upstream "showinRecruit": "0&", "recruit": "0&" +======= + "showinRecruit": "1&", + "recruit": "1&" +>>>>>>> Stashed changes }, { "heroId": 40, @@ -1882,8 +2052,13 @@ "initialSkin": 41042, "gender": 2, "atkSpineEffect": "faqi", +<<<<<<< Updated upstream "showinRecruit": "0&", "recruit": "0&" +======= + "showinRecruit": "1&", + "recruit": "1&" +>>>>>>> Stashed changes }, { "heroId": 42, @@ -1928,8 +2103,13 @@ "initialSkin": 41043, "gender": 2, "atkSpineEffect": "gong", +<<<<<<< Updated upstream "showinRecruit": "0&", "recruit": "0&" +======= + "showinRecruit": "1&", + "recruit": "1&" +>>>>>>> Stashed changes }, { "heroId": 43, @@ -1974,8 +2154,13 @@ "initialSkin": 41044, "gender": 1, "atkSpineEffect": "faqi", +<<<<<<< Updated upstream "showinRecruit": "0&", "recruit": "0&" +======= + "showinRecruit": "1&", + "recruit": "1&" +>>>>>>> Stashed changes }, { "heroId": 44, @@ -2020,8 +2205,13 @@ "initialSkin": 41045, "gender": 1, "atkSpineEffect": "liqi", +<<<<<<< Updated upstream "showinRecruit": "0&", "recruit": "0&" +======= + "showinRecruit": "1&", + "recruit": "1&" +>>>>>>> Stashed changes }, { "heroId": 45, @@ -2066,8 +2256,13 @@ "initialSkin": 41046, "gender": 1, "atkSpineEffect": "gong", +<<<<<<< Updated upstream "showinRecruit": "0&", "recruit": "0&" +======= + "showinRecruit": "1&", + "recruit": "1&" +>>>>>>> Stashed changes }, { "heroId": 46, @@ -2127,7 +2322,7 @@ "camp": 4, "area": 0, "cost": 0, - "jobid": 26, + "jobid": 31, "skill": 47, "pieceId": 21047, "hp": 920, @@ -2158,8 +2353,13 @@ "initialSkin": 41048, "gender": 1, "atkSpineEffect": "faqi", +<<<<<<< Updated upstream "showinRecruit": "0&", "recruit": "0&" +======= + "showinRecruit": "1&", + "recruit": "1&" +>>>>>>> Stashed changes }, { "heroId": 48, @@ -2173,7 +2373,7 @@ "camp": 4, "area": 0, "cost": 0, - "jobid": 26, + "jobid": 31, "skill": 48, "pieceId": 21048, "hp": 980, @@ -2204,8 +2404,13 @@ "initialSkin": 41049, "gender": 2, "atkSpineEffect": "faqi", +<<<<<<< Updated upstream "showinRecruit": "0&", "recruit": "0&" +======= + "showinRecruit": "1&", + "recruit": "1&" +>>>>>>> Stashed changes }, { "heroId": 49, @@ -2250,8 +2455,13 @@ "initialSkin": 41050, "gender": 1, "atkSpineEffect": "liqi", +<<<<<<< Updated upstream "showinRecruit": "0&", "recruit": "0&" +======= + "showinRecruit": "1&", + "recruit": "1&" +>>>>>>> Stashed changes }, { "heroId": 50, @@ -2296,8 +2506,13 @@ "initialSkin": 41051, "gender": 1, "atkSpineEffect": "gong", +<<<<<<< Updated upstream "showinRecruit": "0&", "recruit": "0&" +======= + "showinRecruit": "1&", + "recruit": "1&" +>>>>>>> Stashed changes }, { "heroId": 51, @@ -2342,8 +2557,13 @@ "initialSkin": 41052, "gender": 1, "atkSpineEffect": "faqi", +<<<<<<< Updated upstream "showinRecruit": "0&", "recruit": "0&" +======= + "showinRecruit": "1&", + "recruit": "1&" +>>>>>>> Stashed changes }, { "heroId": 52, @@ -2388,8 +2608,13 @@ "initialSkin": 41053, "gender": 2, "atkSpineEffect": "liqi", +<<<<<<< Updated upstream "showinRecruit": "0&", "recruit": "0&" +======= + "showinRecruit": "1&", + "recruit": "1&" +>>>>>>> Stashed changes }, { "heroId": 53, @@ -2480,8 +2705,13 @@ "initialSkin": 41055, "gender": 1, "atkSpineEffect": "liqi", +<<<<<<< Updated upstream "showinRecruit": "0&", "recruit": "0&" +======= + "showinRecruit": "1&", + "recruit": "1&" +>>>>>>> Stashed changes }, { "heroId": 55, @@ -2526,8 +2756,13 @@ "initialSkin": 41056, "gender": 1, "atkSpineEffect": "dunqi", +<<<<<<< Updated upstream "showinRecruit": "0&", "recruit": "0&" +======= + "showinRecruit": "1&", + "recruit": "1&" +>>>>>>> Stashed changes }, { "heroId": 56, @@ -2617,7 +2852,11 @@ "position": "30&40&30", "initialSkin": 0, "gender": 1, +<<<<<<< Updated upstream "atkSpineEffect": "liqi", +======= + "atkSpineEffect": "dunqi", +>>>>>>> Stashed changes "showinRecruit": "0&", "recruit": "0&" }, @@ -2670,7 +2909,11 @@ { "heroId": 59, "spineName": "tongyuan", +<<<<<<< Updated upstream "rSpineName": "LH_tongyuan", +======= + "rSpineName": "&", +>>>>>>> Stashed changes "name": "童渊", "face_id": "tongyuan", "quality": 3, @@ -2679,6 +2922,7 @@ "camp": 4, "area": 0, "cost": 0, +<<<<<<< Updated upstream "jobid": 10, "skill": 59, "pieceId": 21057, @@ -2695,6 +2939,24 @@ "mdef_up": 1000, "agi_up": 1000, "luk_up": 1000, +======= + "jobid": 6, + "skill": 0, + "pieceId": 21057, + "hp": 100, + "atk": 20, + "def": 20, + "mdef": 20, + "agi": 20, + "luk": 20, + "hp_up": 10, + "atk_up": 1, + "matk_up": 1, + "def_up": 1, + "mdef_up": 1, + "agi_up": 1, + "luk_up": 1, +>>>>>>> Stashed changes "killid": 0, "sound_click": 57, "sound_fight": 57, @@ -2702,23 +2964,40 @@ "retreat": "大丈夫死于乱世。", "info": "我是高玩", "actorinfo": "远程职业的法师，菜的一笔。", +<<<<<<< Updated upstream "imgPosofDialog": "518&-160", "imgPosofInfoUI": "-343&-159", "imgPosofInfoMVP": "-493&-36", +======= + "imgPosofDialog": "864&208", + "imgPosofInfoUI": "-702&-188", + "imgPosofInfoMVP": "-702&-188", +>>>>>>> Stashed changes "skillScroll": "&", "position": "30&40&30", "initialSkin": 0, "gender": 1, +<<<<<<< Updated upstream "atkSpineEffect": "liqi", +======= + "atkSpineEffect": "dunqi", +>>>>>>> Stashed changes "showinRecruit": "0&", "recruit": "0&" }, { "heroId": 60, +<<<<<<< Updated upstream "spineName": "shaonianzhaoyun", "rSpineName": "LH_shaonianzhaoyun", "name": "赵云", "face_id": "shaonianzhaoyun", +======= + "spineName": "shaonainzhaoyun", + "rSpineName": "&", + "name": "少年赵云", + "face_id": "shaonainzhaoyun", +>>>>>>> Stashed changes "quality": 3, "initialStars": 3, "pieceCount": 100, @@ -2726,6 +3005,7 @@ "area": 0, "cost": 0, "jobid": 6, +<<<<<<< Updated upstream "skill": 60, "pieceId": 21058, "hp": 1000, @@ -2751,19 +3031,55 @@ "imgPosofDialog": "500&-110", "imgPosofInfoUI": "-325&-116", "imgPosofInfoMVP": "-475&14", +======= + "skill": 0, + "pieceId": 21056, + "hp": 100, + "atk": 20, + "def": 20, + "mdef": 20, + "agi": 20, + "luk": 20, + "hp_up": 10, + "atk_up": 1, + "matk_up": 1, + "def_up": 1, + "mdef_up": 1, + "agi_up": 1, + "luk_up": 1, + "killid": 0, + "sound_click": 57, + "sound_fight": 57, + "kill": "看看我长枪的威力！", + "retreat": "大丈夫死于乱世。", + "info": "我是高玩", + "actorinfo": "物理职业的步兵，强的一笔。", + "imgPosofDialog": "588&-221", + "imgPosofInfoUI": "-471&-162", + "imgPosofInfoMVP": "-471&-162", +>>>>>>> Stashed changes "skillScroll": "&", "position": "30&40&30", "initialSkin": 0, "gender": 1, +<<<<<<< Updated upstream "atkSpineEffect": "liqi", +======= + "atkSpineEffect": "dunqi", +>>>>>>> Stashed changes "showinRecruit": "0&", "recruit": "0&" }, { "heroId": 61, "spineName": "shaonianxiahouqingyi", +<<<<<<< Updated upstream "rSpineName": "LH_shaonianxiahouqingyi", "name": "夏侯轻衣", +======= + "rSpineName": "&", + "name": "少年夏侯轻衣", +>>>>>>> Stashed changes "face_id": "shaonianxiahouqingyi", "quality": 3, "initialStars": 3, @@ -2772,6 +3088,7 @@ "area": 0, "cost": 0, "jobid": 21, +<<<<<<< Updated upstream "skill": 61, "pieceId": 21059, "hp": 1000, @@ -2787,6 +3104,23 @@ "mdef_up": 500, "agi_up": 500, "luk_up": 500, +======= + "skill": 0, + "pieceId": 21055, + "hp": 100, + "atk": 20, + "def": 20, + "mdef": 20, + "agi": 20, + "luk": 20, + "hp_up": 10, + "atk_up": 1, + "matk_up": 1, + "def_up": 1, + "mdef_up": 1, + "agi_up": 1, + "luk_up": 1, +>>>>>>> Stashed changes "killid": 0, "sound_click": 57, "sound_fight": 57, @@ -2794,9 +3128,15 @@ "retreat": "大丈夫死于乱世。", "info": "我是高玩", "actorinfo": "远程职业的法师，菜的一笔。", +<<<<<<< Updated upstream "imgPosofDialog": "518&-178", "imgPosofInfoUI": "-343&-184", "imgPosofInfoMVP": "-493&-54", +======= + "imgPosofDialog": "864&209", + "imgPosofInfoUI": "-702&-189", + "imgPosofInfoMVP": "-702&-189", +>>>>>>> Stashed changes "skillScroll": "&", "position": "30&40&30", "initialSkin": 0, @@ -2804,6 +3144,7 @@ "atkSpineEffect": "dunqi", "showinRecruit": "0&", "recruit": "0&" +<<<<<<< Updated upstream }, { "heroId": 62, @@ -2942,6 +3283,8 @@ "atkSpineEffect": "liqi", "showinRecruit": "0&", "recruit": "0&" +======= +>>>>>>> Stashed changes }, { "heroId": 301, @@ -3185,7 +3528,7 @@ "camp": 1, "area": 0, "cost": 0, - "jobid": 26, + "jobid": 31, "skill": 6, "pieceId": 0, "hp": 60, @@ -3536,7 +3879,11 @@ "skillScroll": "&", "position": "30&40&30", "initialSkin": 0, +<<<<<<< Updated upstream "gender": 2, +======= + "gender": 1, +>>>>>>> Stashed changes "atkSpineEffect": "faqi", "showinRecruit": "0&", "recruit": "0&" @@ -3553,7 +3900,7 @@ "camp": 1, "area": 0, "cost": 0, - "jobid": 26, + "jobid": 31, "skill": 14, "pieceId": 0, "hp": 60, @@ -4134,7 +4481,11 @@ "skillScroll": "&", "position": "30&40&30", "initialSkin": 0, +<<<<<<< Updated upstream "gender": 2, +======= + "gender": 1, +>>>>>>> Stashed changes "atkSpineEffect": "liqi", "showinRecruit": "0&", "recruit": "0&" @@ -4180,7 +4531,11 @@ "skillScroll": "&", "position": "30&40&30", "initialSkin": 0, +<<<<<<< Updated upstream "gender": 2, +======= + "gender": 1, +>>>>>>> Stashed changes "atkSpineEffect": "liqi", "showinRecruit": "0&", "recruit": "0&" @@ -4272,7 +4627,11 @@ "skillScroll": "&", "position": "30&40&30", "initialSkin": 0, +<<<<<<< Updated upstream "gender": 2, +======= + "gender": 1, +>>>>>>> Stashed changes "atkSpineEffect": "faqi", "showinRecruit": "0&", "recruit": "0&" @@ -4686,7 +5045,11 @@ "skillScroll": "&", "position": "30&40&30", "initialSkin": 0, +<<<<<<< Updated upstream "gender": 2, +======= + "gender": 1, +>>>>>>> Stashed changes "atkSpineEffect": "gong", "showinRecruit": "0&", "recruit": "0&" @@ -4778,7 +5141,11 @@ "skillScroll": "&", "position": "30&40&30", "initialSkin": 0, +<<<<<<< Updated upstream "gender": 2, +======= + "gender": 1, +>>>>>>> Stashed changes "atkSpineEffect": "faqi", "showinRecruit": "0&", "recruit": "0&" @@ -4824,7 +5191,11 @@ "skillScroll": "&", "position": "30&40&30", "initialSkin": 0, +<<<<<<< Updated upstream "gender": 2, +======= + "gender": 1, +>>>>>>> Stashed changes "atkSpineEffect": "faqi", "showinRecruit": "0&", "recruit": "0&" @@ -4870,7 +5241,11 @@ "skillScroll": "&", "position": "30&40&30", "initialSkin": 0, +<<<<<<< Updated upstream "gender": 2, +======= + "gender": 1, +>>>>>>> Stashed changes "atkSpineEffect": "gong", "showinRecruit": "0&", "recruit": "0&" @@ -5071,7 +5446,7 @@ "camp": 4, "area": 0, "cost": 0, - "jobid": 26, + "jobid": 31, "skill": 47, "pieceId": 0, "hp": 60, @@ -5117,7 +5492,7 @@ "camp": 4, "area": 0, "cost": 0, - "jobid": 26, + "jobid": 31, "skill": 48, "pieceId": 0, "hp": 60, @@ -5146,7 +5521,11 @@ "skillScroll": "&", "position": "30&40&30", "initialSkin": 0, +<<<<<<< Updated upstream "gender": 2, +======= + "gender": 1, +>>>>>>> Stashed changes "atkSpineEffect": "faqi", "showinRecruit": "0&", "recruit": "0&" @@ -5330,7 +5709,11 @@ "skillScroll": "&", "position": "30&40&30", "initialSkin": 0, +<<<<<<< Updated upstream "gender": 2, +======= + "gender": 1, +>>>>>>> Stashed changes "atkSpineEffect": "liqi", "showinRecruit": "0&", "recruit": "0&" @@ -5376,7 +5759,11 @@ "skillScroll": "&", "position": "30&40&30", "initialSkin": 0, +<<<<<<< Updated upstream "gender": 2, +======= + "gender": 1, +>>>>>>> Stashed changes "atkSpineEffect": "dunqi", "showinRecruit": "0&", "recruit": "0&" @@ -5514,7 +5901,11 @@ "skillScroll": "&", "position": "30&40&30", "initialSkin": 0, +<<<<<<< Updated upstream "gender": 2, +======= + "gender": 1, +>>>>>>> Stashed changes "atkSpineEffect": "faqi", "showinRecruit": "0&", "recruit": "0&" @@ -5791,7 +6182,11 @@ "position": "30&40&30", "initialSkin": 0, "gender": 1, +<<<<<<< Updated upstream "atkSpineEffect": "liqi", +======= + "atkSpineEffect": "dunqi", +>>>>>>> Stashed changes "showinRecruit": "0&", "recruit": "0&" }, @@ -6388,7 +6783,11 @@ "skillScroll": "&", "position": "30&40&30", "initialSkin": 0, +<<<<<<< Updated upstream "gender": 0, +======= + "gender": 1, +>>>>>>> Stashed changes "atkSpineEffect": "liqi", "showinRecruit": "0&", "recruit": "0&" @@ -6434,7 +6833,11 @@ "skillScroll": "&", "position": "30&40&30", "initialSkin": 0, +<<<<<<< Updated upstream "gender": 0, +======= + "gender": 1, +>>>>>>> Stashed changes "atkSpineEffect": "liqi", "showinRecruit": "0&", "recruit": "0&" @@ -6986,7 +7389,11 @@ "skillScroll": "&", "position": "30&40&30", "initialSkin": 0, +<<<<<<< Updated upstream "gender": 0, +======= + "gender": 1, +>>>>>>> Stashed changes "atkSpineEffect": "liqi", "showinRecruit": "0&", "recruit": "0&" @@ -7032,7 +7439,11 @@ "skillScroll": "&", "position": "30&40&30", "initialSkin": 0, +<<<<<<< Updated upstream "gender": 0, +======= + "gender": 1, +>>>>>>> Stashed changes "atkSpineEffect": "liqi", "showinRecruit": "0&", "recruit": "0&" @@ -7078,7 +7489,11 @@ "skillScroll": "&", "position": "30&40&30", "initialSkin": 0, +<<<<<<< Updated upstream "gender": 0, +======= + "gender": 1, +>>>>>>> Stashed changes "atkSpineEffect": "liqi", "showinRecruit": "0&", "recruit": "0&" @@ -7124,7 +7539,11 @@ "skillScroll": "&", "position": "30&40&30", "initialSkin": 0, +<<<<<<< Updated upstream "gender": 0, +======= + "gender": 1, +>>>>>>> Stashed changes "atkSpineEffect": "liqi", "showinRecruit": "0&", "recruit": "0&" @@ -7400,7 +7819,11 @@ "skillScroll": "1&18|2&19", "position": "30&40&30", "initialSkin": 0, +<<<<<<< Updated upstream "gender": 0, +======= + "gender": 1, +>>>>>>> Stashed changes "atkSpineEffect": "liqi", "showinRecruit": "0&", "recruit": "0&" @@ -7952,7 +8375,11 @@ "skillScroll": "&", "position": "30&40&30", "initialSkin": 0, +<<<<<<< Updated upstream "gender": 0, +======= + "gender": 1, +>>>>>>> Stashed changes "atkSpineEffect": "liqi", "showinRecruit": "0&", "recruit": "0&" @@ -7998,7 +8425,11 @@ "skillScroll": "&", "position": "30&40&30", "initialSkin": 0, +<<<<<<< Updated upstream "gender": 2, +======= + "gender": 1, +>>>>>>> Stashed changes "atkSpineEffect": "liqi", "showinRecruit": "0&", "recruit": "0&" @@ -8228,7 +8659,11 @@ "skillScroll": "&", "position": "30&40&30", "initialSkin": 0, +<<<<<<< Updated upstream "gender": 2, +======= + "gender": 1, +>>>>>>> Stashed changes "atkSpineEffect": "liqi", "showinRecruit": "0&", "recruit": "0&" @@ -8412,7 +8847,11 @@ "skillScroll": "&", "position": "30&40&30", "initialSkin": 0, +<<<<<<< Updated upstream "gender": 0, +======= + "gender": 1, +>>>>>>> Stashed changes "atkSpineEffect": "liqi", "showinRecruit": "0&", "recruit": "0&" @@ -8872,7 +9311,11 @@ "skillScroll": "&", "position": "30&40&30", "initialSkin": 0, +<<<<<<< Updated upstream "gender": 0, +======= + "gender": 1, +>>>>>>> Stashed changes "atkSpineEffect": "liqi", "showinRecruit": "0&", "recruit": "0&" @@ -8918,7 +9361,11 @@ "skillScroll": "&", "position": "30&40&30", "initialSkin": 0, +<<<<<<< Updated upstream "gender": 0, +======= + "gender": 1, +>>>>>>> Stashed changes "atkSpineEffect": "liqi", "showinRecruit": "0&", "recruit": "0&" @@ -9194,7 +9641,11 @@ "skillScroll": "&", "position": "30&40&30", "initialSkin": 0, +<<<<<<< Updated upstream "gender": 0, +======= + "gender": 1, +>>>>>>> Stashed changes "atkSpineEffect": "liqi", "showinRecruit": "0&", "recruit": "0&" @@ -9332,7 +9783,11 @@ "skillScroll": "&", "position": "30&40&30", "initialSkin": 0, +<<<<<<< Updated upstream "gender": 2, +======= + "gender": 1, +>>>>>>> Stashed changes "atkSpineEffect": "liqi", "showinRecruit": "0&", "recruit": "0&" @@ -9470,7 +9925,11 @@ "skillScroll": "&", "position": "30&40&30", "initialSkin": 0, +<<<<<<< Updated upstream "gender": 2, +======= + "gender": 1, +>>>>>>> Stashed changes "atkSpineEffect": "liqi", "showinRecruit": "0&", "recruit": "0&" @@ -9654,7 +10113,11 @@ "skillScroll": "&", "position": "30&40&30", "initialSkin": 0, +<<<<<<< Updated upstream "gender": 2, +======= + "gender": 1, +>>>>>>> Stashed changes "atkSpineEffect": "liqi", "showinRecruit": "0&", "recruit": "0&" @@ -9700,7 +10163,11 @@ "skillScroll": "&", "position": "30&40&30", "initialSkin": 0, +<<<<<<< Updated upstream "gender": 2, +======= + "gender": 1, +>>>>>>> Stashed changes "atkSpineEffect": "liqi", "showinRecruit": "0&", "recruit": "0&" @@ -9884,7 +10351,11 @@ "skillScroll": "&", "position": "30&40&30", "initialSkin": 0, +<<<<<<< Updated upstream "gender": 2, +======= + "gender": 1, +>>>>>>> Stashed changes "atkSpineEffect": "liqi", "showinRecruit": "0&", "recruit": "0&" @@ -10068,7 +10539,11 @@ "skillScroll": "&", "position": "30&40&30", "initialSkin": 0, +<<<<<<< Updated upstream "gender": 0, +======= + "gender": 1, +>>>>>>> Stashed changes "atkSpineEffect": "liqi", "showinRecruit": "0&", "recruit": "0&"