diff --git a/bin/json/game_battleready.json b/bin/json/game_battleready.json index 505f5d2c2..6b90f96fc 100644 --- a/bin/json/game_battleready.json +++ b/bin/json/game_battleready.json @@ -35,7 +35,7 @@ "id": 102, "PlayType": "MainLine", "HeroCount": 5, - "readyScene": "scenesfight_role_interface_02", + "readyScene": "scenesfight_role_interface_03", "battleScenes": [ "scenesfight_05_01" ], @@ -291,7 +291,7 @@ "id": 118, "PlayType": "test", "HeroCount": 5, - "readyScene": "scenesfight_role_interface_02", + "readyScene": "scenesfight_role_interface_03", "battleScenes": [ "scenesfight_05_01" ], diff --git a/bin/json/game_dispatch_task.json b/bin/json/game_dispatch_task.json index eea76c28d..074c99304 100644 --- a/bin/json/game_dispatch_task.json +++ b/bin/json/game_dispatch_task.json @@ -8,7 +8,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 125, + "tasktime": 138, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -56,7 +56,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 141, + "tasktime": 170, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -104,7 +104,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 110, + "tasktime": 170, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -152,7 +152,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 176, + "tasktime": 117, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -200,7 +200,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 66, + "tasktime": 120, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -248,7 +248,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 129, + "tasktime": 141, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -296,7 +296,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 64, + "tasktime": 138, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -344,7 +344,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 136, + "tasktime": 148, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -392,7 +392,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 126, + "tasktime": 104, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -440,7 +440,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 164, + "tasktime": 91, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -488,7 +488,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 145, + "tasktime": 90, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -536,7 +536,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 116, + "tasktime": 135, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -584,7 +584,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 153, + "tasktime": 103, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -632,7 +632,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 89, + "tasktime": 114, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -680,7 +680,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 120, + "tasktime": 180, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -728,7 +728,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 87, + "tasktime": 132, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -776,7 +776,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 99, + "tasktime": 122, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -824,7 +824,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 77, + "tasktime": 177, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -872,7 +872,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 80, + "tasktime": 163, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -920,7 +920,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 92, + "tasktime": 136, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -968,7 +968,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 75, + "tasktime": 147, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -1016,7 +1016,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 91, + "tasktime": 140, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -1064,7 +1064,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 74, + "tasktime": 139, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -1112,7 +1112,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 93, + "tasktime": 110, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -1208,7 +1208,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 132, + "tasktime": 122, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -1256,7 +1256,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 74, + "tasktime": 105, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -1304,7 +1304,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 63, + "tasktime": 176, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -1352,7 +1352,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 118, + "tasktime": 65, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -1400,7 +1400,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 83, + "tasktime": 142, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -1448,7 +1448,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 164, + "tasktime": 117, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -1496,7 +1496,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 139, + "tasktime": 61, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -1544,7 +1544,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 107, + "tasktime": 63, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -1592,7 +1592,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 160, + "tasktime": 95, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -1640,7 +1640,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 73, + "tasktime": 151, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -1688,7 +1688,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 111, + "tasktime": 145, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -1736,7 +1736,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 154, + "tasktime": 135, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -1784,7 +1784,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 150, + "tasktime": 157, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -1832,7 +1832,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 134, + "tasktime": 114, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -1880,7 +1880,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 150, + "tasktime": 82, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -1928,7 +1928,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 99, + "tasktime": 150, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -1976,7 +1976,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 72, + "tasktime": 80, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -2024,7 +2024,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 106, + "tasktime": 92, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -2072,7 +2072,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 165, + "tasktime": 99, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -2120,7 +2120,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 95, + "tasktime": 154, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -2168,7 +2168,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 175, + "tasktime": 123, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -2216,7 +2216,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 168, + "tasktime": 70, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -2264,7 +2264,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 83, + "tasktime": 118, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -2312,7 +2312,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 122, + "tasktime": 176, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -2360,7 +2360,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 168, + "tasktime": 165, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -2408,7 +2408,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 171, + "tasktime": 115, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -2456,7 +2456,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 174, + "tasktime": 67, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -2504,7 +2504,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 78, + "tasktime": 169, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -2552,7 +2552,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 94, + "tasktime": 158, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -2600,7 +2600,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 62, + "tasktime": 170, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -2648,7 +2648,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 152, + "tasktime": 87, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -2696,7 +2696,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 146, + "tasktime": 131, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -2744,7 +2744,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 128, + "tasktime": 80, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -2792,7 +2792,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 165, + "tasktime": 82, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -2840,7 +2840,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 140, + "tasktime": 97, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -2888,7 +2888,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 124, + "tasktime": 127, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -2936,7 +2936,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 63, + "tasktime": 77, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -2984,7 +2984,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 121, + "tasktime": 174, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -3032,7 +3032,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 120, + "tasktime": 102, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -3080,7 +3080,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 73, + "tasktime": 133, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -3128,7 +3128,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 146, + "tasktime": 125, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -3176,7 +3176,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 126, + "tasktime": 105, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -3272,7 +3272,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 163, + "tasktime": 162, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -3320,7 +3320,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 166, + "tasktime": 70, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -3368,7 +3368,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 80, + "tasktime": 175, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -3416,7 +3416,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 119, + "tasktime": 179, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -3464,7 +3464,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 78, + "tasktime": 68, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -3512,7 +3512,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 159, + "tasktime": 122, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" diff --git a/bin/json/game_dreamlandtrigger.json b/bin/json/game_dreamlandtrigger.json index 9f7be62eb..0637a088a 100644 --- a/bin/json/game_dreamlandtrigger.json +++ b/bin/json/game_dreamlandtrigger.json @@ -1,27 +1 @@ -[ - { - "id": 1, - "dreamland_pro": 1000, - "open": true - }, - { - "id": 2, - "dreamland_pro": 1000, - "open": true - }, - { - "id": 3, - "dreamland_pro": 1000, - "open": true - }, - { - "id": 4, - "dreamland_pro": 1000, - "open": true - }, - { - "id": 5, - "dreamland_pro": 1000, - "open": true - } -] \ No newline at end of file +[] \ No newline at end of file diff --git a/bin/json/game_equip.json b/bin/json/game_equip.json index d2781f703..a0e65c375 100644 --- a/bin/json/game_equip.json +++ b/bin/json/game_equip.json @@ -3,7 +3,7 @@ "id": "10110", "equip_id": 1, "name": { - "key": "equip_13001", + "key": "equip_100", "text": "无极神功套装.I" }, "atlas_id": "10110", @@ -52,7 +52,7 @@ "id": "10111", "equip_id": 1, "name": { - "key": "equip_13002", + "key": "equip_101", "text": "无极神功套装.II" }, "atlas_id": "10111", @@ -101,7 +101,7 @@ "id": "10112", "equip_id": 1, "name": { - "key": "equip_13003", + "key": "equip_102", "text": "无极神功套装.III" }, "atlas_id": "10112", @@ -150,7 +150,7 @@ "id": "10113", "equip_id": 1, "name": { - "key": "equip_13004", + "key": "equip_103", "text": "无极神功套装.IV" }, "atlas_id": "10113", @@ -199,7 +199,7 @@ "id": "10114", "equip_id": 1, "name": { - "key": "equip_13005", + "key": "equip_104", "text": "无极神功套装.V" }, "atlas_id": "10114", @@ -248,7 +248,7 @@ "id": "10115", "equip_id": 1, "name": { - "key": "equip_13006", + "key": "equip_105", "text": "无极神功套装.VI" }, "atlas_id": "10115", @@ -297,7 +297,7 @@ "id": "10120", "equip_id": 1, "name": { - "key": "equip_13007", + "key": "equip_100", "text": "无极神功套装.I" }, "atlas_id": "10110", @@ -346,7 +346,7 @@ "id": "10121", "equip_id": 1, "name": { - "key": "equip_13008", + "key": "equip_101", "text": "无极神功套装.II" }, "atlas_id": "10111", @@ -395,7 +395,7 @@ "id": "10122", "equip_id": 1, "name": { - "key": "equip_13009", + "key": "equip_102", "text": "无极神功套装.III" }, "atlas_id": "10112", @@ -444,7 +444,7 @@ "id": "10123", "equip_id": 1, "name": { - "key": "equip_13010", + "key": "equip_103", "text": "无极神功套装.IV" }, "atlas_id": "10113", @@ -493,7 +493,7 @@ "id": "10124", "equip_id": 1, "name": { - "key": "equip_13011", + "key": "equip_104", "text": "无极神功套装.V" }, "atlas_id": "10114", @@ -542,7 +542,7 @@ "id": "10125", "equip_id": 1, "name": { - "key": "equip_13012", + "key": "equip_105", "text": "无极神功套装.VI" }, "atlas_id": "10115", @@ -591,7 +591,7 @@ "id": "10130", "equip_id": 1, "name": { - "key": "equip_13013", + "key": "equip_100", "text": "无极神功套装.I" }, "atlas_id": "10110", @@ -640,7 +640,7 @@ "id": "10131", "equip_id": 1, "name": { - "key": "equip_13014", + "key": "equip_101", "text": "无极神功套装.II" }, "atlas_id": "10111", @@ -689,7 +689,7 @@ "id": "10132", "equip_id": 1, "name": { - "key": "equip_13015", + "key": "equip_102", "text": "无极神功套装.III" }, "atlas_id": "10112", @@ -738,7 +738,7 @@ "id": "10133", "equip_id": 1, "name": { - "key": "equip_13016", + "key": "equip_103", "text": "无极神功套装.IV" }, "atlas_id": "10113", @@ -787,7 +787,7 @@ "id": "10134", "equip_id": 1, "name": { - "key": "equip_13017", + "key": "equip_104", "text": "无极神功套装.V" }, "atlas_id": "10114", @@ -836,7 +836,7 @@ "id": "10135", "equip_id": 1, "name": { - "key": "equip_13018", + "key": "equip_105", "text": "无极神功套装.VI" }, "atlas_id": "10115", @@ -885,7 +885,7 @@ "id": "10140", "equip_id": 1, "name": { - "key": "equip_13019", + "key": "equip_100", "text": "无极神功套装.I" }, "atlas_id": "10110", @@ -934,7 +934,7 @@ "id": "10141", "equip_id": 1, "name": { - "key": "equip_13020", + "key": "equip_101", "text": "无极神功套装.II" }, "atlas_id": "10111", @@ -983,7 +983,7 @@ "id": "10142", "equip_id": 1, "name": { - "key": "equip_13021", + "key": "equip_102", "text": "无极神功套装.III" }, "atlas_id": "10112", @@ -1032,7 +1032,7 @@ "id": "10143", "equip_id": 1, "name": { - "key": "equip_13022", + "key": "equip_103", "text": "无极神功套装.IV" }, "atlas_id": "10113", @@ -1081,7 +1081,7 @@ "id": "10144", "equip_id": 1, "name": { - "key": "equip_13023", + "key": "equip_104", "text": "无极神功套装.V" }, "atlas_id": "10114", @@ -1130,7 +1130,7 @@ "id": "10145", "equip_id": 1, "name": { - "key": "equip_13024", + "key": "equip_105", "text": "无极神功套装.VI" }, "atlas_id": "10115", @@ -1179,7 +1179,7 @@ "id": "10150", "equip_id": 1, "name": { - "key": "equip_13025", + "key": "equip_100", "text": "无极神功套装.I" }, "atlas_id": "10110", @@ -1228,7 +1228,7 @@ "id": "10151", "equip_id": 1, "name": { - "key": "equip_13026", + "key": "equip_101", "text": "无极神功套装.II" }, "atlas_id": "10111", @@ -1277,7 +1277,7 @@ "id": "10152", "equip_id": 1, "name": { - "key": "equip_13027", + "key": "equip_102", "text": "无极神功套装.III" }, "atlas_id": "10112", @@ -1326,7 +1326,7 @@ "id": "10153", "equip_id": 1, "name": { - "key": "equip_13028", + "key": "equip_103", "text": "无极神功套装.IV" }, "atlas_id": "10113", @@ -1375,7 +1375,7 @@ "id": "10154", "equip_id": 1, "name": { - "key": "equip_13029", + "key": "equip_104", "text": "无极神功套装.V" }, "atlas_id": "10114", @@ -1424,7 +1424,7 @@ "id": "10155", "equip_id": 1, "name": { - "key": "equip_13030", + "key": "equip_105", "text": "无极神功套装.VI" }, "atlas_id": "10115", @@ -1473,7 +1473,7 @@ "id": "10160", "equip_id": 1, "name": { - "key": "equip_13031", + "key": "equip_100", "text": "无极神功套装.I" }, "atlas_id": "10110", @@ -1522,7 +1522,7 @@ "id": "10161", "equip_id": 1, "name": { - "key": "equip_13032", + "key": "equip_101", "text": "无极神功套装.II" }, "atlas_id": "10111", @@ -1571,7 +1571,7 @@ "id": "10162", "equip_id": 1, "name": { - "key": "equip_13033", + "key": "equip_102", "text": "无极神功套装.III" }, "atlas_id": "10112", @@ -1620,7 +1620,7 @@ "id": "10163", "equip_id": 1, "name": { - "key": "equip_13034", + "key": "equip_103", "text": "无极神功套装.IV" }, "atlas_id": "10113", @@ -1669,7 +1669,7 @@ "id": "10164", "equip_id": 1, "name": { - "key": "equip_13035", + "key": "equip_104", "text": "无极神功套装.V" }, "atlas_id": "10114", @@ -1718,7 +1718,7 @@ "id": "10165", "equip_id": 1, "name": { - "key": "equip_13036", + "key": "equip_105", "text": "无极神功套装.VI" }, "atlas_id": "10115", @@ -1767,7 +1767,7 @@ "id": "10210", "equip_id": 1, "name": { - "key": "equip_13037", + "key": "equip_200", "text": "驯龙套装.I" }, "atlas_id": "10210", @@ -1816,7 +1816,7 @@ "id": "10211", "equip_id": 1, "name": { - "key": "equip_13038", + "key": "equip_201", "text": "驯龙套装.II" }, "atlas_id": "10211", @@ -1865,7 +1865,7 @@ "id": "10212", "equip_id": 1, "name": { - "key": "equip_13039", + "key": "equip_202", "text": "驯龙套装.III" }, "atlas_id": "10212", @@ -1914,7 +1914,7 @@ "id": "10213", "equip_id": 1, "name": { - "key": "equip_13040", + "key": "equip_203", "text": "驯龙套装.IV" }, "atlas_id": "10213", @@ -1963,7 +1963,7 @@ "id": "10214", "equip_id": 1, "name": { - "key": "equip_13041", + "key": "equip_204", "text": "驯龙套装.V" }, "atlas_id": "10214", @@ -2012,7 +2012,7 @@ "id": "10215", "equip_id": 1, "name": { - "key": "equip_13042", + "key": "equip_205", "text": "驯龙套装.VI" }, "atlas_id": "10215", @@ -2061,7 +2061,7 @@ "id": "10220", "equip_id": 1, "name": { - "key": "equip_13043", + "key": "equip_200", "text": "驯龙套装.I" }, "atlas_id": "10210", @@ -2110,7 +2110,7 @@ "id": "10221", "equip_id": 1, "name": { - "key": "equip_13044", + "key": "equip_201", "text": "驯龙套装.II" }, "atlas_id": "10211", @@ -2159,7 +2159,7 @@ "id": "10222", "equip_id": 1, "name": { - "key": "equip_13045", + "key": "equip_202", "text": "驯龙套装.III" }, "atlas_id": "10212", @@ -2208,7 +2208,7 @@ "id": "10223", "equip_id": 1, "name": { - "key": "equip_13046", + "key": "equip_203", "text": "驯龙套装.IV" }, "atlas_id": "10213", @@ -2257,7 +2257,7 @@ "id": "10224", "equip_id": 1, "name": { - "key": "equip_13047", + "key": "equip_204", "text": "驯龙套装.V" }, "atlas_id": "10214", @@ -2306,7 +2306,7 @@ "id": "10225", "equip_id": 1, "name": { - "key": "equip_13048", + "key": "equip_205", "text": "驯龙套装.VI" }, "atlas_id": "10215", @@ -2355,7 +2355,7 @@ "id": "10230", "equip_id": 1, "name": { - "key": "equip_13049", + "key": "equip_200", "text": "驯龙套装.I" }, "atlas_id": "10210", @@ -2404,7 +2404,7 @@ "id": "10231", "equip_id": 1, "name": { - "key": "equip_13050", + "key": "equip_201", "text": "驯龙套装.II" }, "atlas_id": "10211", @@ -2453,7 +2453,7 @@ "id": "10232", "equip_id": 1, "name": { - "key": "equip_13051", + "key": "equip_202", "text": "驯龙套装.III" }, "atlas_id": "10212", @@ -2502,7 +2502,7 @@ "id": "10233", "equip_id": 1, "name": { - "key": "equip_13052", + "key": "equip_203", "text": "驯龙套装.IV" }, "atlas_id": "10213", @@ -2551,7 +2551,7 @@ "id": "10234", "equip_id": 1, "name": { - "key": "equip_13053", + "key": "equip_204", "text": "驯龙套装.V" }, "atlas_id": "10214", @@ -2600,7 +2600,7 @@ "id": "10235", "equip_id": 1, "name": { - "key": "equip_13054", + "key": "equip_205", "text": "驯龙套装.VI" }, "atlas_id": "10215", @@ -2649,7 +2649,7 @@ "id": "10240", "equip_id": 1, "name": { - "key": "equip_13055", + "key": "equip_200", "text": "驯龙套装.I" }, "atlas_id": "10210", @@ -2698,7 +2698,7 @@ "id": "10241", "equip_id": 1, "name": { - "key": "equip_13056", + "key": "equip_201", "text": "驯龙套装.II" }, "atlas_id": "10211", @@ -2747,7 +2747,7 @@ "id": "10242", "equip_id": 1, "name": { - "key": "equip_13057", + "key": "equip_202", "text": "驯龙套装.III" }, "atlas_id": "10212", @@ -2796,7 +2796,7 @@ "id": "10243", "equip_id": 1, "name": { - "key": "equip_13058", + "key": "equip_203", "text": "驯龙套装.IV" }, "atlas_id": "10213", @@ -2845,7 +2845,7 @@ "id": "10244", "equip_id": 1, "name": { - "key": "equip_13059", + "key": "equip_204", "text": "驯龙套装.V" }, "atlas_id": "10214", @@ -2894,7 +2894,7 @@ "id": "10245", "equip_id": 1, "name": { - "key": "equip_13060", + "key": "equip_205", "text": "驯龙套装.VI" }, "atlas_id": "10215", @@ -2943,7 +2943,7 @@ "id": "10250", "equip_id": 1, "name": { - "key": "equip_13061", + "key": "equip_200", "text": "驯龙套装.I" }, "atlas_id": "10210", @@ -2992,7 +2992,7 @@ "id": "10251", "equip_id": 1, "name": { - "key": "equip_13062", + "key": "equip_201", "text": "驯龙套装.II" }, "atlas_id": "10211", @@ -3041,7 +3041,7 @@ "id": "10252", "equip_id": 1, "name": { - "key": "equip_13063", + "key": "equip_202", "text": "驯龙套装.III" }, "atlas_id": "10212", @@ -3090,7 +3090,7 @@ "id": "10253", "equip_id": 1, "name": { - "key": "equip_13064", + "key": "equip_203", "text": "驯龙套装.IV" }, "atlas_id": "10213", @@ -3139,7 +3139,7 @@ "id": "10254", "equip_id": 1, "name": { - "key": "equip_13065", + "key": "equip_204", "text": "驯龙套装.V" }, "atlas_id": "10214", @@ -3188,7 +3188,7 @@ "id": "10255", "equip_id": 1, "name": { - "key": "equip_13066", + "key": "equip_205", "text": "驯龙套装.VI" }, "atlas_id": "10215", @@ -3237,7 +3237,7 @@ "id": "10260", "equip_id": 1, "name": { - "key": "equip_13067", + "key": "equip_200", "text": "驯龙套装.I" }, "atlas_id": "10210", @@ -3286,7 +3286,7 @@ "id": "10261", "equip_id": 1, "name": { - "key": "equip_13068", + "key": "equip_201", "text": "驯龙套装.II" }, "atlas_id": "10211", @@ -3335,7 +3335,7 @@ "id": "10262", "equip_id": 1, "name": { - "key": "equip_13069", + "key": "equip_202", "text": "驯龙套装.III" }, "atlas_id": "10212", @@ -3384,7 +3384,7 @@ "id": "10263", "equip_id": 1, "name": { - "key": "equip_13070", + "key": "equip_203", "text": "驯龙套装.IV" }, "atlas_id": "10213", @@ -3433,7 +3433,7 @@ "id": "10264", "equip_id": 1, "name": { - "key": "equip_13071", + "key": "equip_204", "text": "驯龙套装.V" }, "atlas_id": "10214", @@ -3482,7 +3482,7 @@ "id": "10265", "equip_id": 1, "name": { - "key": "equip_13072", + "key": "equip_205", "text": "驯龙套装.VI" }, "atlas_id": "10215", @@ -3531,7 +3531,7 @@ "id": "10310", "equip_id": 1, "name": { - "key": "equip_13073", + "key": "equip_300", "text": "雪精灵套装.I" }, "atlas_id": "10310", @@ -3580,7 +3580,7 @@ "id": "10311", "equip_id": 1, "name": { - "key": "equip_13074", + "key": "equip_301", "text": "雪精灵套装.II" }, "atlas_id": "10311", @@ -3629,7 +3629,7 @@ "id": "10312", "equip_id": 1, "name": { - "key": "equip_13075", + "key": "equip_302", "text": "雪精灵套装.III" }, "atlas_id": "10312", @@ -3678,7 +3678,7 @@ "id": "10313", "equip_id": 1, "name": { - "key": "equip_13076", + "key": "equip_303", "text": "雪精灵套装.IV" }, "atlas_id": "10313", @@ -3727,7 +3727,7 @@ "id": "10314", "equip_id": 1, "name": { - "key": "equip_13077", + "key": "equip_304", "text": "雪精灵套装.V" }, "atlas_id": "10314", @@ -3776,7 +3776,7 @@ "id": "10315", "equip_id": 1, "name": { - "key": "equip_13078", + "key": "equip_305", "text": "雪精灵套装.VI" }, "atlas_id": "10315", @@ -3825,7 +3825,7 @@ "id": "10320", "equip_id": 1, "name": { - "key": "equip_13079", + "key": "equip_300", "text": "雪精灵套装.I" }, "atlas_id": "10310", @@ -3874,7 +3874,7 @@ "id": "10321", "equip_id": 1, "name": { - "key": "equip_13080", + "key": "equip_301", "text": "雪精灵套装.II" }, "atlas_id": "10311", @@ -3923,7 +3923,7 @@ "id": "10322", "equip_id": 1, "name": { - "key": "equip_13081", + "key": "equip_302", "text": "雪精灵套装.III" }, "atlas_id": "10312", @@ -3972,7 +3972,7 @@ "id": "10323", "equip_id": 1, "name": { - "key": "equip_13082", + "key": "equip_303", "text": "雪精灵套装.IV" }, "atlas_id": "10313", @@ -4021,7 +4021,7 @@ "id": "10324", "equip_id": 1, "name": { - "key": "equip_13083", + "key": "equip_304", "text": "雪精灵套装.V" }, "atlas_id": "10314", @@ -4070,7 +4070,7 @@ "id": "10325", "equip_id": 1, "name": { - "key": "equip_13084", + "key": "equip_305", "text": "雪精灵套装.VI" }, "atlas_id": "10315", @@ -4119,7 +4119,7 @@ "id": "10330", "equip_id": 1, "name": { - "key": "equip_13085", + "key": "equip_300", "text": "雪精灵套装.I" }, "atlas_id": "10310", @@ -4168,7 +4168,7 @@ "id": "10331", "equip_id": 1, "name": { - "key": "equip_13086", + "key": "equip_301", "text": "雪精灵套装.II" }, "atlas_id": "10311", @@ -4217,7 +4217,7 @@ "id": "10332", "equip_id": 1, "name": { - "key": "equip_13087", + "key": "equip_302", "text": "雪精灵套装.III" }, "atlas_id": "10312", @@ -4266,7 +4266,7 @@ "id": "10333", "equip_id": 1, "name": { - "key": "equip_13088", + "key": "equip_303", "text": "雪精灵套装.IV" }, "atlas_id": "10313", @@ -4315,7 +4315,7 @@ "id": "10334", "equip_id": 1, "name": { - "key": "equip_13089", + "key": "equip_304", "text": "雪精灵套装.V" }, "atlas_id": "10314", @@ -4364,7 +4364,7 @@ "id": "10335", "equip_id": 1, "name": { - "key": "equip_13090", + "key": "equip_305", "text": "雪精灵套装.VI" }, "atlas_id": "10315", @@ -4413,7 +4413,7 @@ "id": "10340", "equip_id": 1, "name": { - "key": "equip_13091", + "key": "equip_300", "text": "雪精灵套装.I" }, "atlas_id": "10310", @@ -4462,7 +4462,7 @@ "id": "10341", "equip_id": 1, "name": { - "key": "equip_13092", + "key": "equip_301", "text": "雪精灵套装.II" }, "atlas_id": "10311", @@ -4511,7 +4511,7 @@ "id": "10342", "equip_id": 1, "name": { - "key": "equip_13093", + "key": "equip_302", "text": "雪精灵套装.III" }, "atlas_id": "10312", @@ -4560,7 +4560,7 @@ "id": "10343", "equip_id": 1, "name": { - "key": "equip_13094", + "key": "equip_303", "text": "雪精灵套装.IV" }, "atlas_id": "10313", @@ -4609,7 +4609,7 @@ "id": "10344", "equip_id": 1, "name": { - "key": "equip_13095", + "key": "equip_304", "text": "雪精灵套装.V" }, "atlas_id": "10314", @@ -4658,7 +4658,7 @@ "id": "10345", "equip_id": 1, "name": { - "key": "equip_13096", + "key": "equip_305", "text": "雪精灵套装.VI" }, "atlas_id": "10315", @@ -4707,7 +4707,7 @@ "id": "10350", "equip_id": 1, "name": { - "key": "equip_13097", + "key": "equip_300", "text": "雪精灵套装.I" }, "atlas_id": "10310", @@ -4756,7 +4756,7 @@ "id": "10351", "equip_id": 1, "name": { - "key": "equip_13098", + "key": "equip_301", "text": "雪精灵套装.II" }, "atlas_id": "10311", @@ -4805,7 +4805,7 @@ "id": "10352", "equip_id": 1, "name": { - "key": "equip_13099", + "key": "equip_302", "text": "雪精灵套装.III" }, "atlas_id": "10312", @@ -4854,7 +4854,7 @@ "id": "10353", "equip_id": 1, "name": { - "key": "equip_13100", + "key": "equip_303", "text": "雪精灵套装.IV" }, "atlas_id": "10313", @@ -4903,7 +4903,7 @@ "id": "10354", "equip_id": 1, "name": { - "key": "equip_13101", + "key": "equip_304", "text": "雪精灵套装.V" }, "atlas_id": "10314", @@ -4952,7 +4952,7 @@ "id": "10355", "equip_id": 1, "name": { - "key": "equip_13102", + "key": "equip_305", "text": "雪精灵套装.VI" }, "atlas_id": "10315", @@ -5001,7 +5001,7 @@ "id": "10360", "equip_id": 1, "name": { - "key": "equip_13103", + "key": "equip_300", "text": "雪精灵套装.I" }, "atlas_id": "10310", @@ -5050,7 +5050,7 @@ "id": "10361", "equip_id": 1, "name": { - "key": "equip_13104", + "key": "equip_301", "text": "雪精灵套装.II" }, "atlas_id": "10311", @@ -5099,7 +5099,7 @@ "id": "10362", "equip_id": 1, "name": { - "key": "equip_13105", + "key": "equip_302", "text": "雪精灵套装.III" }, "atlas_id": "10312", @@ -5148,7 +5148,7 @@ "id": "10363", "equip_id": 1, "name": { - "key": "equip_13106", + "key": "equip_303", "text": "雪精灵套装.IV" }, "atlas_id": "10313", @@ -5197,7 +5197,7 @@ "id": "10364", "equip_id": 1, "name": { - "key": "equip_13107", + "key": "equip_304", "text": "雪精灵套装.V" }, "atlas_id": "10314", @@ -5246,7 +5246,7 @@ "id": "10365", "equip_id": 1, "name": { - "key": "equip_13108", + "key": "equip_305", "text": "雪精灵套装.VI" }, "atlas_id": "10315", @@ -5295,7 +5295,7 @@ "id": "10410", "equip_id": 1, "name": { - "key": "equip_13109", + "key": "equip_400", "text": "噩梦漩涡套装.I" }, "atlas_id": "10410", @@ -5344,7 +5344,7 @@ "id": "10411", "equip_id": 1, "name": { - "key": "equip_13110", + "key": "equip_401", "text": "噩梦漩涡套装.II" }, "atlas_id": "10411", @@ -5393,7 +5393,7 @@ "id": "10412", "equip_id": 1, "name": { - "key": "equip_13111", + "key": "equip_402", "text": "噩梦漩涡套装.III" }, "atlas_id": "10412", @@ -5442,7 +5442,7 @@ "id": "10413", "equip_id": 1, "name": { - "key": "equip_13112", + "key": "equip_403", "text": "噩梦漩涡套装.IV" }, "atlas_id": "10413", @@ -5491,7 +5491,7 @@ "id": "10414", "equip_id": 1, "name": { - "key": "equip_13113", + "key": "equip_404", "text": "噩梦漩涡套装.V" }, "atlas_id": "10414", @@ -5540,7 +5540,7 @@ "id": "10415", "equip_id": 1, "name": { - "key": "equip_13114", + "key": "equip_405", "text": "噩梦漩涡套装.VI" }, "atlas_id": "10415", @@ -5589,7 +5589,7 @@ "id": "10420", "equip_id": 1, "name": { - "key": "equip_13115", + "key": "equip_400", "text": "噩梦漩涡套装.I" }, "atlas_id": "10410", @@ -5638,7 +5638,7 @@ "id": "10421", "equip_id": 1, "name": { - "key": "equip_13116", + "key": "equip_401", "text": "噩梦漩涡套装.II" }, "atlas_id": "10411", @@ -5687,7 +5687,7 @@ "id": "10422", "equip_id": 1, "name": { - "key": "equip_13117", + "key": "equip_402", "text": "噩梦漩涡套装.III" }, "atlas_id": "10412", @@ -5736,7 +5736,7 @@ "id": "10423", "equip_id": 1, "name": { - "key": "equip_13118", + "key": "equip_403", "text": "噩梦漩涡套装.IV" }, "atlas_id": "10413", @@ -5785,7 +5785,7 @@ "id": "10424", "equip_id": 1, "name": { - "key": "equip_13119", + "key": "equip_404", "text": "噩梦漩涡套装.V" }, "atlas_id": "10414", @@ -5834,7 +5834,7 @@ "id": "10425", "equip_id": 1, "name": { - "key": "equip_13120", + "key": "equip_405", "text": "噩梦漩涡套装.VI" }, "atlas_id": "10415", @@ -5883,7 +5883,7 @@ "id": "10430", "equip_id": 1, "name": { - "key": "equip_13121", + "key": "equip_400", "text": "噩梦漩涡套装.I" }, "atlas_id": "10410", @@ -5932,7 +5932,7 @@ "id": "10431", "equip_id": 1, "name": { - "key": "equip_13122", + "key": "equip_401", "text": "噩梦漩涡套装.II" }, "atlas_id": "10411", @@ -5981,7 +5981,7 @@ "id": "10432", "equip_id": 1, "name": { - "key": "equip_13123", + "key": "equip_402", "text": "噩梦漩涡套装.III" }, "atlas_id": "10412", @@ -6030,7 +6030,7 @@ "id": "10433", "equip_id": 1, "name": { - "key": "equip_13124", + "key": "equip_403", "text": "噩梦漩涡套装.IV" }, "atlas_id": "10413", @@ -6079,7 +6079,7 @@ "id": "10434", "equip_id": 1, "name": { - "key": "equip_13125", + "key": "equip_404", "text": "噩梦漩涡套装.V" }, "atlas_id": "10414", @@ -6128,7 +6128,7 @@ "id": "10435", "equip_id": 1, "name": { - "key": "equip_13126", + "key": "equip_405", "text": "噩梦漩涡套装.VI" }, "atlas_id": "10415", @@ -6177,7 +6177,7 @@ "id": "10440", "equip_id": 1, "name": { - "key": "equip_13127", + "key": "equip_400", "text": "噩梦漩涡套装.I" }, "atlas_id": "10410", @@ -6226,7 +6226,7 @@ "id": "10441", "equip_id": 1, "name": { - "key": "equip_13128", + "key": "equip_401", "text": "噩梦漩涡套装.II" }, "atlas_id": "10411", @@ -6275,7 +6275,7 @@ "id": "10442", "equip_id": 1, "name": { - "key": "equip_13129", + "key": "equip_402", "text": "噩梦漩涡套装.III" }, "atlas_id": "10412", @@ -6324,7 +6324,7 @@ "id": "10443", "equip_id": 1, "name": { - "key": "equip_13130", + "key": "equip_403", "text": "噩梦漩涡套装.IV" }, "atlas_id": "10413", @@ -6373,7 +6373,7 @@ "id": "10444", "equip_id": 1, "name": { - "key": "equip_13131", + "key": "equip_404", "text": "噩梦漩涡套装.V" }, "atlas_id": "10414", @@ -6422,7 +6422,7 @@ "id": "10445", "equip_id": 1, "name": { - "key": "equip_13132", + "key": "equip_405", "text": "噩梦漩涡套装.VI" }, "atlas_id": "10415", @@ -6471,7 +6471,7 @@ "id": "10450", "equip_id": 1, "name": { - "key": "equip_13133", + "key": "equip_400", "text": "噩梦漩涡套装.I" }, "atlas_id": "10410", @@ -6520,7 +6520,7 @@ "id": "10451", "equip_id": 1, "name": { - "key": "equip_13134", + "key": "equip_401", "text": "噩梦漩涡套装.II" }, "atlas_id": "10411", @@ -6569,7 +6569,7 @@ "id": "10452", "equip_id": 1, "name": { - "key": "equip_13135", + "key": "equip_402", "text": "噩梦漩涡套装.III" }, "atlas_id": "10412", @@ -6618,7 +6618,7 @@ "id": "10453", "equip_id": 1, "name": { - "key": "equip_13136", + "key": "equip_403", "text": "噩梦漩涡套装.IV" }, "atlas_id": "10413", @@ -6667,7 +6667,7 @@ "id": "10454", "equip_id": 1, "name": { - "key": "equip_13137", + "key": "equip_404", "text": "噩梦漩涡套装.V" }, "atlas_id": "10414", @@ -6716,7 +6716,7 @@ "id": "10455", "equip_id": 1, "name": { - "key": "equip_13138", + "key": "equip_405", "text": "噩梦漩涡套装.VI" }, "atlas_id": "10415", @@ -6765,7 +6765,7 @@ "id": "10460", "equip_id": 1, "name": { - "key": "equip_13139", + "key": "equip_400", "text": "噩梦漩涡套装.I" }, "atlas_id": "10410", @@ -6814,7 +6814,7 @@ "id": "10461", "equip_id": 1, "name": { - "key": "equip_13140", + "key": "equip_401", "text": "噩梦漩涡套装.II" }, "atlas_id": "10411", @@ -6863,7 +6863,7 @@ "id": "10462", "equip_id": 1, "name": { - "key": "equip_13141", + "key": "equip_402", "text": "噩梦漩涡套装.III" }, "atlas_id": "10412", @@ -6912,7 +6912,7 @@ "id": "10463", "equip_id": 1, "name": { - "key": "equip_13142", + "key": "equip_403", "text": "噩梦漩涡套装.IV" }, "atlas_id": "10413", @@ -6961,7 +6961,7 @@ "id": "10464", "equip_id": 1, "name": { - "key": "equip_13143", + "key": "equip_404", "text": "噩梦漩涡套装.V" }, "atlas_id": "10414", @@ -7010,7 +7010,7 @@ "id": "10465", "equip_id": 1, "name": { - "key": "equip_13144", + "key": "equip_405", "text": "噩梦漩涡套装.VI" }, "atlas_id": "10415", @@ -7059,7 +7059,7 @@ "id": "10510", "equip_id": 1, "name": { - "key": "equip_13145", + "key": "equip_500", "text": "音乐精灵套装.I" }, "atlas_id": "10510", @@ -7108,7 +7108,7 @@ "id": "10511", "equip_id": 1, "name": { - "key": "equip_13146", + "key": "equip_501", "text": "音乐精灵套装.II" }, "atlas_id": "10511", @@ -7157,7 +7157,7 @@ "id": "10512", "equip_id": 1, "name": { - "key": "equip_13147", + "key": "equip_502", "text": "音乐精灵套装.III" }, "atlas_id": "10512", @@ -7206,7 +7206,7 @@ "id": "10513", "equip_id": 1, "name": { - "key": "equip_13148", + "key": "equip_503", "text": "音乐精灵套装.IV" }, "atlas_id": "10513", @@ -7255,7 +7255,7 @@ "id": "10514", "equip_id": 1, "name": { - "key": "equip_13149", + "key": "equip_504", "text": "音乐精灵套装.V" }, "atlas_id": "10514", @@ -7304,7 +7304,7 @@ "id": "10515", "equip_id": 1, "name": { - "key": "equip_13150", + "key": "equip_505", "text": "音乐精灵套装.VI" }, "atlas_id": "10515", @@ -7353,7 +7353,7 @@ "id": "10520", "equip_id": 1, "name": { - "key": "equip_13151", + "key": "equip_500", "text": "音乐精灵套装.I" }, "atlas_id": "10510", @@ -7402,7 +7402,7 @@ "id": "10521", "equip_id": 1, "name": { - "key": "equip_13152", + "key": "equip_501", "text": "音乐精灵套装.II" }, "atlas_id": "10511", @@ -7451,7 +7451,7 @@ "id": "10522", "equip_id": 1, "name": { - "key": "equip_13153", + "key": "equip_502", "text": "音乐精灵套装.III" }, "atlas_id": "10512", @@ -7500,7 +7500,7 @@ "id": "10523", "equip_id": 1, "name": { - "key": "equip_13154", + "key": "equip_503", "text": "音乐精灵套装.IV" }, "atlas_id": "10513", @@ -7549,7 +7549,7 @@ "id": "10524", "equip_id": 1, "name": { - "key": "equip_13155", + "key": "equip_504", "text": "音乐精灵套装.V" }, "atlas_id": "10514", @@ -7598,7 +7598,7 @@ "id": "10525", "equip_id": 1, "name": { - "key": "equip_13156", + "key": "equip_505", "text": "音乐精灵套装.VI" }, "atlas_id": "10515", @@ -7647,7 +7647,7 @@ "id": "10530", "equip_id": 1, "name": { - "key": "equip_13157", + "key": "equip_500", "text": "音乐精灵套装.I" }, "atlas_id": "10510", @@ -7696,7 +7696,7 @@ "id": "10531", "equip_id": 1, "name": { - "key": "equip_13158", + "key": "equip_501", "text": "音乐精灵套装.II" }, "atlas_id": "10511", @@ -7745,7 +7745,7 @@ "id": "10532", "equip_id": 1, "name": { - "key": "equip_13159", + "key": "equip_502", "text": "音乐精灵套装.III" }, "atlas_id": "10512", @@ -7794,7 +7794,7 @@ "id": "10533", "equip_id": 1, "name": { - "key": "equip_13160", + "key": "equip_503", "text": "音乐精灵套装.IV" }, "atlas_id": "10513", @@ -7843,7 +7843,7 @@ "id": "10534", "equip_id": 1, "name": { - "key": "equip_13161", + "key": "equip_504", "text": "音乐精灵套装.V" }, "atlas_id": "10514", @@ -7892,7 +7892,7 @@ "id": "10535", "equip_id": 1, "name": { - "key": "equip_13162", + "key": "equip_505", "text": "音乐精灵套装.VI" }, "atlas_id": "10515", @@ -7941,7 +7941,7 @@ "id": "10540", "equip_id": 1, "name": { - "key": "equip_13163", + "key": "equip_500", "text": "音乐精灵套装.I" }, "atlas_id": "10510", @@ -7990,7 +7990,7 @@ "id": "10541", "equip_id": 1, "name": { - "key": "equip_13164", + "key": "equip_501", "text": "音乐精灵套装.II" }, "atlas_id": "10511", @@ -8039,7 +8039,7 @@ "id": "10542", "equip_id": 1, "name": { - "key": "equip_13165", + "key": "equip_502", "text": "音乐精灵套装.III" }, "atlas_id": "10512", @@ -8088,7 +8088,7 @@ "id": "10543", "equip_id": 1, "name": { - "key": "equip_13166", + "key": "equip_503", "text": "音乐精灵套装.IV" }, "atlas_id": "10513", @@ -8137,7 +8137,7 @@ "id": "10544", "equip_id": 1, "name": { - "key": "equip_13167", + "key": "equip_504", "text": "音乐精灵套装.V" }, "atlas_id": "10514", @@ -8186,7 +8186,7 @@ "id": "10545", "equip_id": 1, "name": { - "key": "equip_13168", + "key": "equip_505", "text": "音乐精灵套装.VI" }, "atlas_id": "10515", @@ -8235,7 +8235,7 @@ "id": "10550", "equip_id": 1, "name": { - "key": "equip_13169", + "key": "equip_500", "text": "音乐精灵套装.I" }, "atlas_id": "10510", @@ -8284,7 +8284,7 @@ "id": "10551", "equip_id": 1, "name": { - "key": "equip_13170", + "key": "equip_501", "text": "音乐精灵套装.II" }, "atlas_id": "10511", @@ -8333,7 +8333,7 @@ "id": "10552", "equip_id": 1, "name": { - "key": "equip_13171", + "key": "equip_502", "text": "音乐精灵套装.III" }, "atlas_id": "10512", @@ -8382,7 +8382,7 @@ "id": "10553", "equip_id": 1, "name": { - "key": "equip_13172", + "key": "equip_503", "text": "音乐精灵套装.IV" }, "atlas_id": "10513", @@ -8431,7 +8431,7 @@ "id": "10554", "equip_id": 1, "name": { - "key": "equip_13173", + "key": "equip_504", "text": "音乐精灵套装.V" }, "atlas_id": "10514", @@ -8480,7 +8480,7 @@ "id": "10555", "equip_id": 1, "name": { - "key": "equip_13174", + "key": "equip_505", "text": "音乐精灵套装.VI" }, "atlas_id": "10515", @@ -8529,7 +8529,7 @@ "id": "10560", "equip_id": 1, "name": { - "key": "equip_13175", + "key": "equip_500", "text": "音乐精灵套装.I" }, "atlas_id": "10510", @@ -8578,7 +8578,7 @@ "id": "10561", "equip_id": 1, "name": { - "key": "equip_13176", + "key": "equip_501", "text": "音乐精灵套装.II" }, "atlas_id": "10511", @@ -8627,7 +8627,7 @@ "id": "10562", "equip_id": 1, "name": { - "key": "equip_13177", + "key": "equip_502", "text": "音乐精灵套装.III" }, "atlas_id": "10512", @@ -8676,7 +8676,7 @@ "id": "10563", "equip_id": 1, "name": { - "key": "equip_13178", + "key": "equip_503", "text": "音乐精灵套装.IV" }, "atlas_id": "10513", @@ -8725,7 +8725,7 @@ "id": "10564", "equip_id": 1, "name": { - "key": "equip_13179", + "key": "equip_504", "text": "音乐精灵套装.V" }, "atlas_id": "10514", @@ -8774,7 +8774,7 @@ "id": "10565", "equip_id": 1, "name": { - "key": "equip_13180", + "key": "equip_505", "text": "音乐精灵套装.VI" }, "atlas_id": "10515", @@ -8823,7 +8823,7 @@ "id": "10610", "equip_id": 1, "name": { - "key": "equip_13181", + "key": "equip_600", "text": "永恒萌狗套装.I" }, "atlas_id": "10610", @@ -8872,7 +8872,7 @@ "id": "10611", "equip_id": 1, "name": { - "key": "equip_13182", + "key": "equip_601", "text": "永恒萌狗套装.II" }, "atlas_id": "10611", @@ -8921,7 +8921,7 @@ "id": "10612", "equip_id": 1, "name": { - "key": "equip_13183", + "key": "equip_602", "text": "永恒萌狗套装.III" }, "atlas_id": "10612", @@ -8970,7 +8970,7 @@ "id": "10613", "equip_id": 1, "name": { - "key": "equip_13184", + "key": "equip_603", "text": "永恒萌狗套装.IV" }, "atlas_id": "10613", @@ -9019,7 +9019,7 @@ "id": "10614", "equip_id": 1, "name": { - "key": "equip_13185", + "key": "equip_604", "text": "永恒萌狗套装.V" }, "atlas_id": "10614", @@ -9068,7 +9068,7 @@ "id": "10615", "equip_id": 1, "name": { - "key": "equip_13186", + "key": "equip_605", "text": "永恒萌狗套装.VI" }, "atlas_id": "10615", @@ -9117,7 +9117,7 @@ "id": "10620", "equip_id": 1, "name": { - "key": "equip_13187", + "key": "equip_600", "text": "永恒萌狗套装.I" }, "atlas_id": "10610", @@ -9166,7 +9166,7 @@ "id": "10621", "equip_id": 1, "name": { - "key": "equip_13188", + "key": "equip_601", "text": "永恒萌狗套装.II" }, "atlas_id": "10611", @@ -9215,7 +9215,7 @@ "id": "10622", "equip_id": 1, "name": { - "key": "equip_13189", + "key": "equip_602", "text": "永恒萌狗套装.III" }, "atlas_id": "10612", @@ -9264,7 +9264,7 @@ "id": "10623", "equip_id": 1, "name": { - "key": "equip_13190", + "key": "equip_603", "text": "永恒萌狗套装.IV" }, "atlas_id": "10613", @@ -9313,7 +9313,7 @@ "id": "10624", "equip_id": 1, "name": { - "key": "equip_13191", + "key": "equip_604", "text": "永恒萌狗套装.V" }, "atlas_id": "10614", @@ -9362,7 +9362,7 @@ "id": "10625", "equip_id": 1, "name": { - "key": "equip_13192", + "key": "equip_605", "text": "永恒萌狗套装.VI" }, "atlas_id": "10615", @@ -9411,7 +9411,7 @@ "id": "10630", "equip_id": 1, "name": { - "key": "equip_13193", + "key": "equip_600", "text": "永恒萌狗套装.I" }, "atlas_id": "10610", @@ -9460,7 +9460,7 @@ "id": "10631", "equip_id": 1, "name": { - "key": "equip_13194", + "key": "equip_601", "text": "永恒萌狗套装.II" }, "atlas_id": "10611", @@ -9509,7 +9509,7 @@ "id": "10632", "equip_id": 1, "name": { - "key": "equip_13195", + "key": "equip_602", "text": "永恒萌狗套装.III" }, "atlas_id": "10612", @@ -9558,7 +9558,7 @@ "id": "10633", "equip_id": 1, "name": { - "key": "equip_13196", + "key": "equip_603", "text": "永恒萌狗套装.IV" }, "atlas_id": "10613", @@ -9607,7 +9607,7 @@ "id": "10634", "equip_id": 1, "name": { - "key": "equip_13197", + "key": "equip_604", "text": "永恒萌狗套装.V" }, "atlas_id": "10614", @@ -9656,7 +9656,7 @@ "id": "10635", "equip_id": 1, "name": { - "key": "equip_13198", + "key": "equip_605", "text": "永恒萌狗套装.VI" }, "atlas_id": "10615", @@ -9705,7 +9705,7 @@ "id": "10640", "equip_id": 1, "name": { - "key": "equip_13199", + "key": "equip_600", "text": "永恒萌狗套装.I" }, "atlas_id": "10610", @@ -9754,7 +9754,7 @@ "id": "10641", "equip_id": 1, "name": { - "key": "equip_13200", + "key": "equip_601", "text": "永恒萌狗套装.II" }, "atlas_id": "10611", @@ -9803,7 +9803,7 @@ "id": "10642", "equip_id": 1, "name": { - "key": "equip_13201", + "key": "equip_602", "text": "永恒萌狗套装.III" }, "atlas_id": "10612", @@ -9852,7 +9852,7 @@ "id": "10643", "equip_id": 1, "name": { - "key": "equip_13202", + "key": "equip_603", "text": "永恒萌狗套装.IV" }, "atlas_id": "10613", @@ -9901,7 +9901,7 @@ "id": "10644", "equip_id": 1, "name": { - "key": "equip_13203", + "key": "equip_604", "text": "永恒萌狗套装.V" }, "atlas_id": "10614", @@ -9950,7 +9950,7 @@ "id": "10645", "equip_id": 1, "name": { - "key": "equip_13204", + "key": "equip_605", "text": "永恒萌狗套装.VI" }, "atlas_id": "10615", @@ -9999,7 +9999,7 @@ "id": "10650", "equip_id": 1, "name": { - "key": "equip_13205", + "key": "equip_600", "text": "永恒萌狗套装.I" }, "atlas_id": "10610", @@ -10048,7 +10048,7 @@ "id": "10651", "equip_id": 1, "name": { - "key": "equip_13206", + "key": "equip_601", "text": "永恒萌狗套装.II" }, "atlas_id": "10611", @@ -10097,7 +10097,7 @@ "id": "10652", "equip_id": 1, "name": { - "key": "equip_13207", + "key": "equip_602", "text": "永恒萌狗套装.III" }, "atlas_id": "10612", @@ -10146,7 +10146,7 @@ "id": "10653", "equip_id": 1, "name": { - "key": "equip_13208", + "key": "equip_603", "text": "永恒萌狗套装.IV" }, "atlas_id": "10613", @@ -10195,7 +10195,7 @@ "id": "10654", "equip_id": 1, "name": { - "key": "equip_13209", + "key": "equip_604", "text": "永恒萌狗套装.V" }, "atlas_id": "10614", @@ -10244,7 +10244,7 @@ "id": "10655", "equip_id": 1, "name": { - "key": "equip_13210", + "key": "equip_605", "text": "永恒萌狗套装.VI" }, "atlas_id": "10615", @@ -10293,7 +10293,7 @@ "id": "10660", "equip_id": 1, "name": { - "key": "equip_13211", + "key": "equip_600", "text": "永恒萌狗套装.I" }, "atlas_id": "10610", @@ -10342,7 +10342,7 @@ "id": "10661", "equip_id": 1, "name": { - "key": "equip_13212", + "key": "equip_601", "text": "永恒萌狗套装.II" }, "atlas_id": "10611", @@ -10391,7 +10391,7 @@ "id": "10662", "equip_id": 1, "name": { - "key": "equip_13213", + "key": "equip_602", "text": "永恒萌狗套装.III" }, "atlas_id": "10612", @@ -10440,7 +10440,7 @@ "id": "10663", "equip_id": 1, "name": { - "key": "equip_13214", + "key": "equip_603", "text": "永恒萌狗套装.IV" }, "atlas_id": "10613", @@ -10489,7 +10489,7 @@ "id": "10664", "equip_id": 1, "name": { - "key": "equip_13215", + "key": "equip_604", "text": "永恒萌狗套装.V" }, "atlas_id": "10614", @@ -10538,7 +10538,7 @@ "id": "10665", "equip_id": 1, "name": { - "key": "equip_13216", + "key": "equip_605", "text": "永恒萌狗套装.VI" }, "atlas_id": "10615", @@ -10587,7 +10587,7 @@ "id": "10710", "equip_id": 1, "name": { - "key": "equip_13217", + "key": "equip_700", "text": "原始狩猎套装.I" }, "atlas_id": "10710", @@ -10636,7 +10636,7 @@ "id": "10711", "equip_id": 1, "name": { - "key": "equip_13218", + "key": "equip_701", "text": "原始狩猎套装.II" }, "atlas_id": "10711", @@ -10685,7 +10685,7 @@ "id": "10712", "equip_id": 1, "name": { - "key": "equip_13219", + "key": "equip_702", "text": "原始狩猎套装.III" }, "atlas_id": "10712", @@ -10734,7 +10734,7 @@ "id": "10713", "equip_id": 1, "name": { - "key": "equip_13220", + "key": "equip_703", "text": "原始狩猎套装.IV" }, "atlas_id": "10713", @@ -10783,7 +10783,7 @@ "id": "10714", "equip_id": 1, "name": { - "key": "equip_13221", + "key": "equip_704", "text": "原始狩猎套装.V" }, "atlas_id": "10714", @@ -10832,7 +10832,7 @@ "id": "10715", "equip_id": 1, "name": { - "key": "equip_13222", + "key": "equip_705", "text": "原始狩猎套装.VI" }, "atlas_id": "10715", @@ -10881,7 +10881,7 @@ "id": "10720", "equip_id": 1, "name": { - "key": "equip_13223", + "key": "equip_700", "text": "原始狩猎套装.I" }, "atlas_id": "10710", @@ -10930,7 +10930,7 @@ "id": "10721", "equip_id": 1, "name": { - "key": "equip_13224", + "key": "equip_701", "text": "原始狩猎套装.II" }, "atlas_id": "10711", @@ -10979,7 +10979,7 @@ "id": "10722", "equip_id": 1, "name": { - "key": "equip_13225", + "key": "equip_702", "text": "原始狩猎套装.III" }, "atlas_id": "10712", @@ -11028,7 +11028,7 @@ "id": "10723", "equip_id": 1, "name": { - "key": "equip_13226", + "key": "equip_703", "text": "原始狩猎套装.IV" }, "atlas_id": "10713", @@ -11077,7 +11077,7 @@ "id": "10724", "equip_id": 1, "name": { - "key": "equip_13227", + "key": "equip_704", "text": "原始狩猎套装.V" }, "atlas_id": "10714", @@ -11126,7 +11126,7 @@ "id": "10725", "equip_id": 1, "name": { - "key": "equip_13228", + "key": "equip_705", "text": "原始狩猎套装.VI" }, "atlas_id": "10715", @@ -11175,7 +11175,7 @@ "id": "10730", "equip_id": 1, "name": { - "key": "equip_13229", + "key": "equip_700", "text": "原始狩猎套装.I" }, "atlas_id": "10710", @@ -11224,7 +11224,7 @@ "id": "10731", "equip_id": 1, "name": { - "key": "equip_13230", + "key": "equip_701", "text": "原始狩猎套装.II" }, "atlas_id": "10711", @@ -11273,7 +11273,7 @@ "id": "10732", "equip_id": 1, "name": { - "key": "equip_13231", + "key": "equip_702", "text": "原始狩猎套装.III" }, "atlas_id": "10712", @@ -11322,7 +11322,7 @@ "id": "10733", "equip_id": 1, "name": { - "key": "equip_13232", + "key": "equip_703", "text": "原始狩猎套装.IV" }, "atlas_id": "10713", @@ -11371,7 +11371,7 @@ "id": "10734", "equip_id": 1, "name": { - "key": "equip_13233", + "key": "equip_704", "text": "原始狩猎套装.V" }, "atlas_id": "10714", @@ -11420,7 +11420,7 @@ "id": "10735", "equip_id": 1, "name": { - "key": "equip_13234", + "key": "equip_705", "text": "原始狩猎套装.VI" }, "atlas_id": "10715", @@ -11469,7 +11469,7 @@ "id": "10740", "equip_id": 1, "name": { - "key": "equip_13235", + "key": "equip_700", "text": "原始狩猎套装.I" }, "atlas_id": "10710", @@ -11518,7 +11518,7 @@ "id": "10741", "equip_id": 1, "name": { - "key": "equip_13236", + "key": "equip_701", "text": "原始狩猎套装.II" }, "atlas_id": "10711", @@ -11567,7 +11567,7 @@ "id": "10742", "equip_id": 1, "name": { - "key": "equip_13237", + "key": "equip_702", "text": "原始狩猎套装.III" }, "atlas_id": "10712", @@ -11616,7 +11616,7 @@ "id": "10743", "equip_id": 1, "name": { - "key": "equip_13238", + "key": "equip_703", "text": "原始狩猎套装.IV" }, "atlas_id": "10713", @@ -11665,7 +11665,7 @@ "id": "10744", "equip_id": 1, "name": { - "key": "equip_13239", + "key": "equip_704", "text": "原始狩猎套装.V" }, "atlas_id": "10714", @@ -11714,7 +11714,7 @@ "id": "10745", "equip_id": 1, "name": { - "key": "equip_13240", + "key": "equip_705", "text": "原始狩猎套装.VI" }, "atlas_id": "10715", @@ -11763,7 +11763,7 @@ "id": "10750", "equip_id": 1, "name": { - "key": "equip_13241", + "key": "equip_700", "text": "原始狩猎套装.I" }, "atlas_id": "10710", @@ -11812,7 +11812,7 @@ "id": "10751", "equip_id": 1, "name": { - "key": "equip_13242", + "key": "equip_701", "text": "原始狩猎套装.II" }, "atlas_id": "10711", @@ -11861,7 +11861,7 @@ "id": "10752", "equip_id": 1, "name": { - "key": "equip_13243", + "key": "equip_702", "text": "原始狩猎套装.III" }, "atlas_id": "10712", @@ -11910,7 +11910,7 @@ "id": "10753", "equip_id": 1, "name": { - "key": "equip_13244", + "key": "equip_703", "text": "原始狩猎套装.IV" }, "atlas_id": "10713", @@ -11959,7 +11959,7 @@ "id": "10754", "equip_id": 1, "name": { - "key": "equip_13245", + "key": "equip_704", "text": "原始狩猎套装.V" }, "atlas_id": "10714", @@ -12008,7 +12008,7 @@ "id": "10755", "equip_id": 1, "name": { - "key": "equip_13246", + "key": "equip_705", "text": "原始狩猎套装.VI" }, "atlas_id": "10715", @@ -12057,7 +12057,7 @@ "id": "10760", "equip_id": 1, "name": { - "key": "equip_13247", + "key": "equip_700", "text": "原始狩猎套装.I" }, "atlas_id": "10710", @@ -12106,7 +12106,7 @@ "id": "10761", "equip_id": 1, "name": { - "key": "equip_13248", + "key": "equip_701", "text": "原始狩猎套装.II" }, "atlas_id": "10711", @@ -12155,7 +12155,7 @@ "id": "10762", "equip_id": 1, "name": { - "key": "equip_13249", + "key": "equip_702", "text": "原始狩猎套装.III" }, "atlas_id": "10712", @@ -12204,7 +12204,7 @@ "id": "10763", "equip_id": 1, "name": { - "key": "equip_13250", + "key": "equip_703", "text": "原始狩猎套装.IV" }, "atlas_id": "10713", @@ -12253,7 +12253,7 @@ "id": "10764", "equip_id": 1, "name": { - "key": "equip_13251", + "key": "equip_704", "text": "原始狩猎套装.V" }, "atlas_id": "10714", @@ -12302,7 +12302,7 @@ "id": "10765", "equip_id": 1, "name": { - "key": "equip_13252", + "key": "equip_705", "text": "原始狩猎套装.VI" }, "atlas_id": "10715", @@ -12351,7 +12351,7 @@ "id": "10810", "equip_id": 1, "name": { - "key": "equip_13253", + "key": "equip_800", "text": "气功大师套装.I" }, "atlas_id": "10810", @@ -12400,7 +12400,7 @@ "id": "10811", "equip_id": 1, "name": { - "key": "equip_13254", + "key": "equip_801", "text": "气功大师套装.II" }, "atlas_id": "10811", @@ -12449,7 +12449,7 @@ "id": "10812", "equip_id": 1, "name": { - "key": "equip_13255", + "key": "equip_802", "text": "气功大师套装.III" }, "atlas_id": "10812", @@ -12498,7 +12498,7 @@ "id": "10813", "equip_id": 1, "name": { - "key": "equip_13256", + "key": "equip_803", "text": "气功大师套装.IV" }, "atlas_id": "10813", @@ -12547,7 +12547,7 @@ "id": "10814", "equip_id": 1, "name": { - "key": "equip_13257", + "key": "equip_804", "text": "气功大师套装.V" }, "atlas_id": "10814", @@ -12596,7 +12596,7 @@ "id": "10815", "equip_id": 1, "name": { - "key": "equip_13258", + "key": "equip_805", "text": "气功大师套装.VI" }, "atlas_id": "10815", @@ -12645,7 +12645,7 @@ "id": "10820", "equip_id": 1, "name": { - "key": "equip_13259", + "key": "equip_800", "text": "气功大师套装.I" }, "atlas_id": "10810", @@ -12694,7 +12694,7 @@ "id": "10821", "equip_id": 1, "name": { - "key": "equip_13260", + "key": "equip_801", "text": "气功大师套装.II" }, "atlas_id": "10811", @@ -12743,7 +12743,7 @@ "id": "10822", "equip_id": 1, "name": { - "key": "equip_13261", + "key": "equip_802", "text": "气功大师套装.III" }, "atlas_id": "10812", @@ -12792,7 +12792,7 @@ "id": "10823", "equip_id": 1, "name": { - "key": "equip_13262", + "key": "equip_803", "text": "气功大师套装.IV" }, "atlas_id": "10813", @@ -12841,7 +12841,7 @@ "id": "10824", "equip_id": 1, "name": { - "key": "equip_13263", + "key": "equip_804", "text": "气功大师套装.V" }, "atlas_id": "10814", @@ -12890,7 +12890,7 @@ "id": "10825", "equip_id": 1, "name": { - "key": "equip_13264", + "key": "equip_805", "text": "气功大师套装.VI" }, "atlas_id": "10815", @@ -12939,7 +12939,7 @@ "id": "10830", "equip_id": 1, "name": { - "key": "equip_13265", + "key": "equip_800", "text": "气功大师套装.I" }, "atlas_id": "10810", @@ -12988,7 +12988,7 @@ "id": "10831", "equip_id": 1, "name": { - "key": "equip_13266", + "key": "equip_801", "text": "气功大师套装.II" }, "atlas_id": "10811", @@ -13037,7 +13037,7 @@ "id": "10832", "equip_id": 1, "name": { - "key": "equip_13267", + "key": "equip_802", "text": "气功大师套装.III" }, "atlas_id": "10812", @@ -13086,7 +13086,7 @@ "id": "10833", "equip_id": 1, "name": { - "key": "equip_13268", + "key": "equip_803", "text": "气功大师套装.IV" }, "atlas_id": "10813", @@ -13135,7 +13135,7 @@ "id": "10834", "equip_id": 1, "name": { - "key": "equip_13269", + "key": "equip_804", "text": "气功大师套装.V" }, "atlas_id": "10814", @@ -13184,7 +13184,7 @@ "id": "10835", "equip_id": 1, "name": { - "key": "equip_13270", + "key": "equip_805", "text": "气功大师套装.VI" }, "atlas_id": "10815", @@ -13233,7 +13233,7 @@ "id": "10840", "equip_id": 1, "name": { - "key": "equip_13271", + "key": "equip_800", "text": "气功大师套装.I" }, "atlas_id": "10810", @@ -13282,7 +13282,7 @@ "id": "10841", "equip_id": 1, "name": { - "key": "equip_13272", + "key": "equip_801", "text": "气功大师套装.II" }, "atlas_id": "10811", @@ -13331,7 +13331,7 @@ "id": "10842", "equip_id": 1, "name": { - "key": "equip_13273", + "key": "equip_802", "text": "气功大师套装.III" }, "atlas_id": "10812", @@ -13380,7 +13380,7 @@ "id": "10843", "equip_id": 1, "name": { - "key": "equip_13274", + "key": "equip_803", "text": "气功大师套装.IV" }, "atlas_id": "10813", @@ -13429,7 +13429,7 @@ "id": "10844", "equip_id": 1, "name": { - "key": "equip_13275", + "key": "equip_804", "text": "气功大师套装.V" }, "atlas_id": "10814", @@ -13478,7 +13478,7 @@ "id": "10845", "equip_id": 1, "name": { - "key": "equip_13276", + "key": "equip_805", "text": "气功大师套装.VI" }, "atlas_id": "10815", @@ -13527,7 +13527,7 @@ "id": "10850", "equip_id": 1, "name": { - "key": "equip_13277", + "key": "equip_800", "text": "气功大师套装.I" }, "atlas_id": "10810", @@ -13576,7 +13576,7 @@ "id": "10851", "equip_id": 1, "name": { - "key": "equip_13278", + "key": "equip_801", "text": "气功大师套装.II" }, "atlas_id": "10811", @@ -13625,7 +13625,7 @@ "id": "10852", "equip_id": 1, "name": { - "key": "equip_13279", + "key": "equip_802", "text": "气功大师套装.III" }, "atlas_id": "10812", @@ -13674,7 +13674,7 @@ "id": "10853", "equip_id": 1, "name": { - "key": "equip_13280", + "key": "equip_803", "text": "气功大师套装.IV" }, "atlas_id": "10813", @@ -13723,7 +13723,7 @@ "id": "10854", "equip_id": 1, "name": { - "key": "equip_13281", + "key": "equip_804", "text": "气功大师套装.V" }, "atlas_id": "10814", @@ -13772,7 +13772,7 @@ "id": "10855", "equip_id": 1, "name": { - "key": "equip_13282", + "key": "equip_805", "text": "气功大师套装.VI" }, "atlas_id": "10815", @@ -13821,7 +13821,7 @@ "id": "10860", "equip_id": 1, "name": { - "key": "equip_13283", + "key": "equip_800", "text": "气功大师套装.I" }, "atlas_id": "10810", @@ -13870,7 +13870,7 @@ "id": "10861", "equip_id": 1, "name": { - "key": "equip_13284", + "key": "equip_801", "text": "气功大师套装.II" }, "atlas_id": "10811", @@ -13919,7 +13919,7 @@ "id": "10862", "equip_id": 1, "name": { - "key": "equip_13285", + "key": "equip_802", "text": "气功大师套装.III" }, "atlas_id": "10812", @@ -13968,7 +13968,7 @@ "id": "10863", "equip_id": 1, "name": { - "key": "equip_13286", + "key": "equip_803", "text": "气功大师套装.IV" }, "atlas_id": "10813", @@ -14017,7 +14017,7 @@ "id": "10864", "equip_id": 1, "name": { - "key": "equip_13287", + "key": "equip_804", "text": "气功大师套装.V" }, "atlas_id": "10814", @@ -14066,7 +14066,7 @@ "id": "10865", "equip_id": 1, "name": { - "key": "equip_13288", + "key": "equip_805", "text": "气功大师套装.VI" }, "atlas_id": "10815", @@ -14115,7 +14115,7 @@ "id": "11010", "equip_id": 1, "name": { - "key": "equip_13289", + "key": "equip_1000", "text": "马术套装.I" }, "atlas_id": "11010", @@ -14164,7 +14164,7 @@ "id": "11011", "equip_id": 1, "name": { - "key": "equip_13290", + "key": "equip_1001", "text": "马术套装.II" }, "atlas_id": "11011", @@ -14213,7 +14213,7 @@ "id": "11012", "equip_id": 1, "name": { - "key": "equip_13291", + "key": "equip_1002", "text": "马术套装.III" }, "atlas_id": "11012", @@ -14262,7 +14262,7 @@ "id": "11013", "equip_id": 1, "name": { - "key": "equip_13292", + "key": "equip_1003", "text": "马术套装.IV" }, "atlas_id": "11013", @@ -14311,7 +14311,7 @@ "id": "11014", "equip_id": 1, "name": { - "key": "equip_13293", + "key": "equip_1004", "text": "马术套装.V" }, "atlas_id": "11014", @@ -14360,7 +14360,7 @@ "id": "11015", "equip_id": 1, "name": { - "key": "equip_13294", + "key": "equip_1005", "text": "马术套装.VI" }, "atlas_id": "11015", @@ -14409,7 +14409,7 @@ "id": "11020", "equip_id": 1, "name": { - "key": "equip_13295", + "key": "equip_1000", "text": "马术套装.I" }, "atlas_id": "11010", @@ -14458,7 +14458,7 @@ "id": "11021", "equip_id": 1, "name": { - "key": "equip_13296", + "key": "equip_1001", "text": "马术套装.II" }, "atlas_id": "11011", @@ -14507,7 +14507,7 @@ "id": "11022", "equip_id": 1, "name": { - "key": "equip_13297", + "key": "equip_1002", "text": "马术套装.III" }, "atlas_id": "11012", @@ -14556,7 +14556,7 @@ "id": "11023", "equip_id": 1, "name": { - "key": "equip_13298", + "key": "equip_1003", "text": "马术套装.IV" }, "atlas_id": "11013", @@ -14605,7 +14605,7 @@ "id": "11024", "equip_id": 1, "name": { - "key": "equip_13299", + "key": "equip_1004", "text": "马术套装.V" }, "atlas_id": "11014", @@ -14654,7 +14654,7 @@ "id": "11025", "equip_id": 1, "name": { - "key": "equip_13300", + "key": "equip_1005", "text": "马术套装.VI" }, "atlas_id": "11015", @@ -14703,7 +14703,7 @@ "id": "11030", "equip_id": 1, "name": { - "key": "equip_13301", + "key": "equip_1000", "text": "马术套装.I" }, "atlas_id": "11010", @@ -14752,7 +14752,7 @@ "id": "11031", "equip_id": 1, "name": { - "key": "equip_13302", + "key": "equip_1001", "text": "马术套装.II" }, "atlas_id": "11011", @@ -14801,7 +14801,7 @@ "id": "11032", "equip_id": 1, "name": { - "key": "equip_13303", + "key": "equip_1002", "text": "马术套装.III" }, "atlas_id": "11012", @@ -14850,7 +14850,7 @@ "id": "11033", "equip_id": 1, "name": { - "key": "equip_13304", + "key": "equip_1003", "text": "马术套装.IV" }, "atlas_id": "11013", @@ -14899,7 +14899,7 @@ "id": "11034", "equip_id": 1, "name": { - "key": "equip_13305", + "key": "equip_1004", "text": "马术套装.V" }, "atlas_id": "11014", @@ -14948,7 +14948,7 @@ "id": "11035", "equip_id": 1, "name": { - "key": "equip_13306", + "key": "equip_1005", "text": "马术套装.VI" }, "atlas_id": "11015", @@ -14997,7 +14997,7 @@ "id": "11040", "equip_id": 1, "name": { - "key": "equip_13307", + "key": "equip_1000", "text": "马术套装.I" }, "atlas_id": "11010", @@ -15046,7 +15046,7 @@ "id": "11041", "equip_id": 1, "name": { - "key": "equip_13308", + "key": "equip_1001", "text": "马术套装.II" }, "atlas_id": "11011", @@ -15095,7 +15095,7 @@ "id": "11042", "equip_id": 1, "name": { - "key": "equip_13309", + "key": "equip_1002", "text": "马术套装.III" }, "atlas_id": "11012", @@ -15144,7 +15144,7 @@ "id": "11043", "equip_id": 1, "name": { - "key": "equip_13310", + "key": "equip_1003", "text": "马术套装.IV" }, "atlas_id": "11013", @@ -15193,7 +15193,7 @@ "id": "11044", "equip_id": 1, "name": { - "key": "equip_13311", + "key": "equip_1004", "text": "马术套装.V" }, "atlas_id": "11014", @@ -15242,7 +15242,7 @@ "id": "11045", "equip_id": 1, "name": { - "key": "equip_13312", + "key": "equip_1005", "text": "马术套装.VI" }, "atlas_id": "11015", @@ -15291,7 +15291,7 @@ "id": "11050", "equip_id": 1, "name": { - "key": "equip_13313", + "key": "equip_1000", "text": "马术套装.I" }, "atlas_id": "11010", @@ -15340,7 +15340,7 @@ "id": "11051", "equip_id": 1, "name": { - "key": "equip_13314", + "key": "equip_1001", "text": "马术套装.II" }, "atlas_id": "11011", @@ -15389,7 +15389,7 @@ "id": "11052", "equip_id": 1, "name": { - "key": "equip_13315", + "key": "equip_1002", "text": "马术套装.III" }, "atlas_id": "11012", @@ -15438,7 +15438,7 @@ "id": "11053", "equip_id": 1, "name": { - "key": "equip_13316", + "key": "equip_1003", "text": "马术套装.IV" }, "atlas_id": "11013", @@ -15487,7 +15487,7 @@ "id": "11054", "equip_id": 1, "name": { - "key": "equip_13317", + "key": "equip_1004", "text": "马术套装.V" }, "atlas_id": "11014", @@ -15536,7 +15536,7 @@ "id": "11055", "equip_id": 1, "name": { - "key": "equip_13318", + "key": "equip_1005", "text": "马术套装.VI" }, "atlas_id": "11015", @@ -15585,7 +15585,7 @@ "id": "11060", "equip_id": 1, "name": { - "key": "equip_13319", + "key": "equip_1000", "text": "马术套装.I" }, "atlas_id": "11010", @@ -15634,7 +15634,7 @@ "id": "11061", "equip_id": 1, "name": { - "key": "equip_13320", + "key": "equip_1001", "text": "马术套装.II" }, "atlas_id": "11011", @@ -15683,7 +15683,7 @@ "id": "11062", "equip_id": 1, "name": { - "key": "equip_13321", + "key": "equip_1002", "text": "马术套装.III" }, "atlas_id": "11012", @@ -15732,7 +15732,7 @@ "id": "11063", "equip_id": 1, "name": { - "key": "equip_13322", + "key": "equip_1003", "text": "马术套装.IV" }, "atlas_id": "11013", @@ -15781,7 +15781,7 @@ "id": "11064", "equip_id": 1, "name": { - "key": "equip_13323", + "key": "equip_1004", "text": "马术套装.V" }, "atlas_id": "11014", @@ -15830,7 +15830,7 @@ "id": "11065", "equip_id": 1, "name": { - "key": "equip_13324", + "key": "equip_1005", "text": "马术套装.VI" }, "atlas_id": "11015", @@ -15879,7 +15879,7 @@ "id": "11110", "equip_id": 1, "name": { - "key": "equip_13325", + "key": "equip_1100", "text": "波波星套装.I" }, "atlas_id": "11110", @@ -15928,7 +15928,7 @@ "id": "11111", "equip_id": 1, "name": { - "key": "equip_13326", + "key": "equip_1101", "text": "波波星套装.II" }, "atlas_id": "11111", @@ -15977,7 +15977,7 @@ "id": "11112", "equip_id": 1, "name": { - "key": "equip_13327", + "key": "equip_1102", "text": "波波星套装.III" }, "atlas_id": "11112", @@ -16026,7 +16026,7 @@ "id": "11113", "equip_id": 1, "name": { - "key": "equip_13328", + "key": "equip_1103", "text": "波波星套装.IV" }, "atlas_id": "11113", @@ -16075,7 +16075,7 @@ "id": "11114", "equip_id": 1, "name": { - "key": "equip_13329", + "key": "equip_1104", "text": "波波星套装.V" }, "atlas_id": "11114", @@ -16124,7 +16124,7 @@ "id": "11115", "equip_id": 1, "name": { - "key": "equip_13330", + "key": "equip_1105", "text": "波波星套装.VI" }, "atlas_id": "11115", @@ -16173,7 +16173,7 @@ "id": "11120", "equip_id": 1, "name": { - "key": "equip_13331", + "key": "equip_1100", "text": "波波星套装.I" }, "atlas_id": "11110", @@ -16222,7 +16222,7 @@ "id": "11121", "equip_id": 1, "name": { - "key": "equip_13332", + "key": "equip_1101", "text": "波波星套装.II" }, "atlas_id": "11111", @@ -16271,7 +16271,7 @@ "id": "11122", "equip_id": 1, "name": { - "key": "equip_13333", + "key": "equip_1102", "text": "波波星套装.III" }, "atlas_id": "11112", @@ -16320,7 +16320,7 @@ "id": "11123", "equip_id": 1, "name": { - "key": "equip_13334", + "key": "equip_1103", "text": "波波星套装.IV" }, "atlas_id": "11113", @@ -16369,7 +16369,7 @@ "id": "11124", "equip_id": 1, "name": { - "key": "equip_13335", + "key": "equip_1104", "text": "波波星套装.V" }, "atlas_id": "11114", @@ -16418,7 +16418,7 @@ "id": "11125", "equip_id": 1, "name": { - "key": "equip_13336", + "key": "equip_1105", "text": "波波星套装.VI" }, "atlas_id": "11115", @@ -16467,7 +16467,7 @@ "id": "11130", "equip_id": 1, "name": { - "key": "equip_13337", + "key": "equip_1100", "text": "波波星套装.I" }, "atlas_id": "11110", @@ -16516,7 +16516,7 @@ "id": "11131", "equip_id": 1, "name": { - "key": "equip_13338", + "key": "equip_1101", "text": "波波星套装.II" }, "atlas_id": "11111", @@ -16565,7 +16565,7 @@ "id": "11132", "equip_id": 1, "name": { - "key": "equip_13339", + "key": "equip_1102", "text": "波波星套装.III" }, "atlas_id": "11112", @@ -16614,7 +16614,7 @@ "id": "11133", "equip_id": 1, "name": { - "key": "equip_13340", + "key": "equip_1103", "text": "波波星套装.IV" }, "atlas_id": "11113", @@ -16663,7 +16663,7 @@ "id": "11134", "equip_id": 1, "name": { - "key": "equip_13341", + "key": "equip_1104", "text": "波波星套装.V" }, "atlas_id": "11114", @@ -16712,7 +16712,7 @@ "id": "11135", "equip_id": 1, "name": { - "key": "equip_13342", + "key": "equip_1105", "text": "波波星套装.VI" }, "atlas_id": "11115", @@ -16761,7 +16761,7 @@ "id": "11140", "equip_id": 1, "name": { - "key": "equip_13343", + "key": "equip_1100", "text": "波波星套装.I" }, "atlas_id": "11110", @@ -16810,7 +16810,7 @@ "id": "11141", "equip_id": 1, "name": { - "key": "equip_13344", + "key": "equip_1101", "text": "波波星套装.II" }, "atlas_id": "11111", @@ -16859,7 +16859,7 @@ "id": "11142", "equip_id": 1, "name": { - "key": "equip_13345", + "key": "equip_1102", "text": "波波星套装.III" }, "atlas_id": "11112", @@ -16908,7 +16908,7 @@ "id": "11143", "equip_id": 1, "name": { - "key": "equip_13346", + "key": "equip_1103", "text": "波波星套装.IV" }, "atlas_id": "11113", @@ -16957,7 +16957,7 @@ "id": "11144", "equip_id": 1, "name": { - "key": "equip_13347", + "key": "equip_1104", "text": "波波星套装.V" }, "atlas_id": "11114", @@ -17006,7 +17006,7 @@ "id": "11145", "equip_id": 1, "name": { - "key": "equip_13348", + "key": "equip_1105", "text": "波波星套装.VI" }, "atlas_id": "11115", @@ -17055,7 +17055,7 @@ "id": "11150", "equip_id": 1, "name": { - "key": "equip_13349", + "key": "equip_1100", "text": "波波星套装.I" }, "atlas_id": "11110", @@ -17104,7 +17104,7 @@ "id": "11151", "equip_id": 1, "name": { - "key": "equip_13350", + "key": "equip_1101", "text": "波波星套装.II" }, "atlas_id": "11111", @@ -17153,7 +17153,7 @@ "id": "11152", "equip_id": 1, "name": { - "key": "equip_13351", + "key": "equip_1102", "text": "波波星套装.III" }, "atlas_id": "11112", @@ -17202,7 +17202,7 @@ "id": "11153", "equip_id": 1, "name": { - "key": "equip_13352", + "key": "equip_1103", "text": "波波星套装.IV" }, "atlas_id": "11113", @@ -17251,7 +17251,7 @@ "id": "11154", "equip_id": 1, "name": { - "key": "equip_13353", + "key": "equip_1104", "text": "波波星套装.V" }, "atlas_id": "11114", @@ -17300,7 +17300,7 @@ "id": "11155", "equip_id": 1, "name": { - "key": "equip_13354", + "key": "equip_1105", "text": "波波星套装.VI" }, "atlas_id": "11115", @@ -17349,7 +17349,7 @@ "id": "11160", "equip_id": 1, "name": { - "key": "equip_13355", + "key": "equip_1100", "text": "波波星套装.I" }, "atlas_id": "11110", @@ -17398,7 +17398,7 @@ "id": "11161", "equip_id": 1, "name": { - "key": "equip_13356", + "key": "equip_1101", "text": "波波星套装.II" }, "atlas_id": "11111", @@ -17447,7 +17447,7 @@ "id": "11162", "equip_id": 1, "name": { - "key": "equip_13357", + "key": "equip_1102", "text": "波波星套装.III" }, "atlas_id": "11112", @@ -17496,7 +17496,7 @@ "id": "11163", "equip_id": 1, "name": { - "key": "equip_13358", + "key": "equip_1103", "text": "波波星套装.IV" }, "atlas_id": "11113", @@ -17545,7 +17545,7 @@ "id": "11164", "equip_id": 1, "name": { - "key": "equip_13359", + "key": "equip_1104", "text": "波波星套装.V" }, "atlas_id": "11114", @@ -17594,7 +17594,7 @@ "id": "11165", "equip_id": 1, "name": { - "key": "equip_13360", + "key": "equip_1105", "text": "波波星套装.VI" }, "atlas_id": "11115", @@ -17643,7 +17643,7 @@ "id": "11210", "equip_id": 1, "name": { - "key": "equip_13361", + "key": "equip_1200", "text": "穴居人套装.I" }, "atlas_id": "11210", @@ -17692,7 +17692,7 @@ "id": "11211", "equip_id": 1, "name": { - "key": "equip_13362", + "key": "equip_1201", "text": "穴居人套装.II" }, "atlas_id": "11211", @@ -17741,7 +17741,7 @@ "id": "11212", "equip_id": 1, "name": { - "key": "equip_13363", + "key": "equip_1202", "text": "穴居人套装.III" }, "atlas_id": "11212", @@ -17790,7 +17790,7 @@ "id": "11213", "equip_id": 1, "name": { - "key": "equip_13364", + "key": "equip_1203", "text": "穴居人套装.IV" }, "atlas_id": "11213", @@ -17839,7 +17839,7 @@ "id": "11214", "equip_id": 1, "name": { - "key": "equip_13365", + "key": "equip_1204", "text": "穴居人套装.V" }, "atlas_id": "11214", @@ -17888,7 +17888,7 @@ "id": "11215", "equip_id": 1, "name": { - "key": "equip_13366", + "key": "equip_1205", "text": "穴居人套装.VI" }, "atlas_id": "11215", @@ -17937,7 +17937,7 @@ "id": "11220", "equip_id": 1, "name": { - "key": "equip_13367", + "key": "equip_1200", "text": "穴居人套装.I" }, "atlas_id": "11210", @@ -17986,7 +17986,7 @@ "id": "11221", "equip_id": 1, "name": { - "key": "equip_13368", + "key": "equip_1201", "text": "穴居人套装.II" }, "atlas_id": "11211", @@ -18035,7 +18035,7 @@ "id": "11222", "equip_id": 1, "name": { - "key": "equip_13369", + "key": "equip_1202", "text": "穴居人套装.III" }, "atlas_id": "11212", @@ -18084,7 +18084,7 @@ "id": "11223", "equip_id": 1, "name": { - "key": "equip_13370", + "key": "equip_1203", "text": "穴居人套装.IV" }, "atlas_id": "11213", @@ -18133,7 +18133,7 @@ "id": "11224", "equip_id": 1, "name": { - "key": "equip_13371", + "key": "equip_1204", "text": "穴居人套装.V" }, "atlas_id": "11214", @@ -18182,7 +18182,7 @@ "id": "11225", "equip_id": 1, "name": { - "key": "equip_13372", + "key": "equip_1205", "text": "穴居人套装.VI" }, "atlas_id": "11215", @@ -18231,7 +18231,7 @@ "id": "11230", "equip_id": 1, "name": { - "key": "equip_13373", + "key": "equip_1200", "text": "穴居人套装.I" }, "atlas_id": "11210", @@ -18280,7 +18280,7 @@ "id": "11231", "equip_id": 1, "name": { - "key": "equip_13374", + "key": "equip_1201", "text": "穴居人套装.II" }, "atlas_id": "11211", @@ -18329,7 +18329,7 @@ "id": "11232", "equip_id": 1, "name": { - "key": "equip_13375", + "key": "equip_1202", "text": "穴居人套装.III" }, "atlas_id": "11212", @@ -18378,7 +18378,7 @@ "id": "11233", "equip_id": 1, "name": { - "key": "equip_13376", + "key": "equip_1203", "text": "穴居人套装.IV" }, "atlas_id": "11213", @@ -18427,7 +18427,7 @@ "id": "11234", "equip_id": 1, "name": { - "key": "equip_13377", + "key": "equip_1204", "text": "穴居人套装.V" }, "atlas_id": "11214", @@ -18476,7 +18476,7 @@ "id": "11235", "equip_id": 1, "name": { - "key": "equip_13378", + "key": "equip_1205", "text": "穴居人套装.VI" }, "atlas_id": "11215", @@ -18525,7 +18525,7 @@ "id": "11240", "equip_id": 1, "name": { - "key": "equip_13379", + "key": "equip_1200", "text": "穴居人套装.I" }, "atlas_id": "11210", @@ -18574,7 +18574,7 @@ "id": "11241", "equip_id": 1, "name": { - "key": "equip_13380", + "key": "equip_1201", "text": "穴居人套装.II" }, "atlas_id": "11211", @@ -18623,7 +18623,7 @@ "id": "11242", "equip_id": 1, "name": { - "key": "equip_13381", + "key": "equip_1202", "text": "穴居人套装.III" }, "atlas_id": "11212", @@ -18672,7 +18672,7 @@ "id": "11243", "equip_id": 1, "name": { - "key": "equip_13382", + "key": "equip_1203", "text": "穴居人套装.IV" }, "atlas_id": "11213", @@ -18721,7 +18721,7 @@ "id": "11244", "equip_id": 1, "name": { - "key": "equip_13383", + "key": "equip_1204", "text": "穴居人套装.V" }, "atlas_id": "11214", @@ -18770,7 +18770,7 @@ "id": "11245", "equip_id": 1, "name": { - "key": "equip_13384", + "key": "equip_1205", "text": "穴居人套装.VI" }, "atlas_id": "11215", @@ -18819,7 +18819,7 @@ "id": "11250", "equip_id": 1, "name": { - "key": "equip_13385", + "key": "equip_1200", "text": "穴居人套装.I" }, "atlas_id": "11210", @@ -18868,7 +18868,7 @@ "id": "11251", "equip_id": 1, "name": { - "key": "equip_13386", + "key": "equip_1201", "text": "穴居人套装.II" }, "atlas_id": "11211", @@ -18917,7 +18917,7 @@ "id": "11252", "equip_id": 1, "name": { - "key": "equip_13387", + "key": "equip_1202", "text": "穴居人套装.III" }, "atlas_id": "11212", @@ -18966,7 +18966,7 @@ "id": "11253", "equip_id": 1, "name": { - "key": "equip_13388", + "key": "equip_1203", "text": "穴居人套装.IV" }, "atlas_id": "11213", @@ -19015,7 +19015,7 @@ "id": "11254", "equip_id": 1, "name": { - "key": "equip_13389", + "key": "equip_1204", "text": "穴居人套装.V" }, "atlas_id": "11214", @@ -19064,7 +19064,7 @@ "id": "11255", "equip_id": 1, "name": { - "key": "equip_13390", + "key": "equip_1205", "text": "穴居人套装.VI" }, "atlas_id": "11215", @@ -19113,7 +19113,7 @@ "id": "11260", "equip_id": 1, "name": { - "key": "equip_13391", + "key": "equip_1200", "text": "穴居人套装.I" }, "atlas_id": "11210", @@ -19162,7 +19162,7 @@ "id": "11261", "equip_id": 1, "name": { - "key": "equip_13392", + "key": "equip_1201", "text": "穴居人套装.II" }, "atlas_id": "11211", @@ -19211,7 +19211,7 @@ "id": "11262", "equip_id": 1, "name": { - "key": "equip_13393", + "key": "equip_1202", "text": "穴居人套装.III" }, "atlas_id": "11212", @@ -19260,7 +19260,7 @@ "id": "11263", "equip_id": 1, "name": { - "key": "equip_13394", + "key": "equip_1203", "text": "穴居人套装.IV" }, "atlas_id": "11213", @@ -19309,7 +19309,7 @@ "id": "11264", "equip_id": 1, "name": { - "key": "equip_13395", + "key": "equip_1204", "text": "穴居人套装.V" }, "atlas_id": "11214", @@ -19358,7 +19358,7 @@ "id": "11265", "equip_id": 1, "name": { - "key": "equip_13396", + "key": "equip_1205", "text": "穴居人套装.VI" }, "atlas_id": "11215", @@ -19407,7 +19407,7 @@ "id": "11310", "equip_id": 1, "name": { - "key": "equip_13397", + "key": "equip_1300", "text": "文明人套装.I" }, "atlas_id": "11310", @@ -19456,7 +19456,7 @@ "id": "11311", "equip_id": 1, "name": { - "key": "equip_13398", + "key": "equip_1301", "text": "文明人套装.II" }, "atlas_id": "11311", @@ -19505,7 +19505,7 @@ "id": "11312", "equip_id": 1, "name": { - "key": "equip_13399", + "key": "equip_1302", "text": "文明人套装.III" }, "atlas_id": "11312", @@ -19554,7 +19554,7 @@ "id": "11313", "equip_id": 1, "name": { - "key": "equip_13400", + "key": "equip_1303", "text": "文明人套装.IV" }, "atlas_id": "11313", @@ -19603,7 +19603,7 @@ "id": "11314", "equip_id": 1, "name": { - "key": "equip_13401", + "key": "equip_1304", "text": "文明人套装.V" }, "atlas_id": "11314", @@ -19652,7 +19652,7 @@ "id": "11315", "equip_id": 1, "name": { - "key": "equip_13402", + "key": "equip_1305", "text": "文明人套装.VI" }, "atlas_id": "11315", @@ -19701,7 +19701,7 @@ "id": "11320", "equip_id": 1, "name": { - "key": "equip_13403", + "key": "equip_1300", "text": "文明人套装.I" }, "atlas_id": "11310", @@ -19750,7 +19750,7 @@ "id": "11321", "equip_id": 1, "name": { - "key": "equip_13404", + "key": "equip_1301", "text": "文明人套装.II" }, "atlas_id": "11311", @@ -19799,7 +19799,7 @@ "id": "11322", "equip_id": 1, "name": { - "key": "equip_13405", + "key": "equip_1302", "text": "文明人套装.III" }, "atlas_id": "11312", @@ -19848,7 +19848,7 @@ "id": "11323", "equip_id": 1, "name": { - "key": "equip_13406", + "key": "equip_1303", "text": "文明人套装.IV" }, "atlas_id": "11313", @@ -19897,7 +19897,7 @@ "id": "11324", "equip_id": 1, "name": { - "key": "equip_13407", + "key": "equip_1304", "text": "文明人套装.V" }, "atlas_id": "11314", @@ -19946,7 +19946,7 @@ "id": "11325", "equip_id": 1, "name": { - "key": "equip_13408", + "key": "equip_1305", "text": "文明人套装.VI" }, "atlas_id": "11315", @@ -19995,7 +19995,7 @@ "id": "11330", "equip_id": 1, "name": { - "key": "equip_13409", + "key": "equip_1300", "text": "文明人套装.I" }, "atlas_id": "11310", @@ -20044,7 +20044,7 @@ "id": "11331", "equip_id": 1, "name": { - "key": "equip_13410", + "key": "equip_1301", "text": "文明人套装.II" }, "atlas_id": "11311", @@ -20093,7 +20093,7 @@ "id": "11332", "equip_id": 1, "name": { - "key": "equip_13411", + "key": "equip_1302", "text": "文明人套装.III" }, "atlas_id": "11312", @@ -20142,7 +20142,7 @@ "id": "11333", "equip_id": 1, "name": { - "key": "equip_13412", + "key": "equip_1303", "text": "文明人套装.IV" }, "atlas_id": "11313", @@ -20191,7 +20191,7 @@ "id": "11334", "equip_id": 1, "name": { - "key": "equip_13413", + "key": "equip_1304", "text": "文明人套装.V" }, "atlas_id": "11314", @@ -20240,7 +20240,7 @@ "id": "11335", "equip_id": 1, "name": { - "key": "equip_13414", + "key": "equip_1305", "text": "文明人套装.VI" }, "atlas_id": "11315", @@ -20289,7 +20289,7 @@ "id": "11340", "equip_id": 1, "name": { - "key": "equip_13415", + "key": "equip_1300", "text": "文明人套装.I" }, "atlas_id": "11310", @@ -20338,7 +20338,7 @@ "id": "11341", "equip_id": 1, "name": { - "key": "equip_13416", + "key": "equip_1301", "text": "文明人套装.II" }, "atlas_id": "11311", @@ -20387,7 +20387,7 @@ "id": "11342", "equip_id": 1, "name": { - "key": "equip_13417", + "key": "equip_1302", "text": "文明人套装.III" }, "atlas_id": "11312", @@ -20436,7 +20436,7 @@ "id": "11343", "equip_id": 1, "name": { - "key": "equip_13418", + "key": "equip_1303", "text": "文明人套装.IV" }, "atlas_id": "11313", @@ -20485,7 +20485,7 @@ "id": "11344", "equip_id": 1, "name": { - "key": "equip_13419", + "key": "equip_1304", "text": "文明人套装.V" }, "atlas_id": "11314", @@ -20534,7 +20534,7 @@ "id": "11345", "equip_id": 1, "name": { - "key": "equip_13420", + "key": "equip_1305", "text": "文明人套装.VI" }, "atlas_id": "11315", @@ -20583,7 +20583,7 @@ "id": "11350", "equip_id": 1, "name": { - "key": "equip_13421", + "key": "equip_1300", "text": "文明人套装.I" }, "atlas_id": "11310", @@ -20632,7 +20632,7 @@ "id": "11351", "equip_id": 1, "name": { - "key": "equip_13422", + "key": "equip_1301", "text": "文明人套装.II" }, "atlas_id": "11311", @@ -20681,7 +20681,7 @@ "id": "11352", "equip_id": 1, "name": { - "key": "equip_13423", + "key": "equip_1302", "text": "文明人套装.III" }, "atlas_id": "11312", @@ -20730,7 +20730,7 @@ "id": "11353", "equip_id": 1, "name": { - "key": "equip_13424", + "key": "equip_1303", "text": "文明人套装.IV" }, "atlas_id": "11313", @@ -20779,7 +20779,7 @@ "id": "11354", "equip_id": 1, "name": { - "key": "equip_13425", + "key": "equip_1304", "text": "文明人套装.V" }, "atlas_id": "11314", @@ -20828,7 +20828,7 @@ "id": "11355", "equip_id": 1, "name": { - "key": "equip_13426", + "key": "equip_1305", "text": "文明人套装.VI" }, "atlas_id": "11315", @@ -20877,7 +20877,7 @@ "id": "11360", "equip_id": 1, "name": { - "key": "equip_13427", + "key": "equip_1300", "text": "文明人套装.I" }, "atlas_id": "11310", @@ -20926,7 +20926,7 @@ "id": "11361", "equip_id": 1, "name": { - "key": "equip_13428", + "key": "equip_1301", "text": "文明人套装.II" }, "atlas_id": "11311", @@ -20975,7 +20975,7 @@ "id": "11362", "equip_id": 1, "name": { - "key": "equip_13429", + "key": "equip_1302", "text": "文明人套装.III" }, "atlas_id": "11312", @@ -21024,7 +21024,7 @@ "id": "11363", "equip_id": 1, "name": { - "key": "equip_13430", + "key": "equip_1303", "text": "文明人套装.IV" }, "atlas_id": "11313", @@ -21073,7 +21073,7 @@ "id": "11364", "equip_id": 1, "name": { - "key": "equip_13431", + "key": "equip_1304", "text": "文明人套装.V" }, "atlas_id": "11314", @@ -21122,7 +21122,7 @@ "id": "11365", "equip_id": 1, "name": { - "key": "equip_13432", + "key": "equip_1305", "text": "文明人套装.VI" }, "atlas_id": "11315", @@ -21171,7 +21171,7 @@ "id": "11410", "equip_id": 1, "name": { - "key": "equip_13433", + "key": "equip_1400", "text": "马戏团套装.I" }, "atlas_id": "11410", @@ -21220,7 +21220,7 @@ "id": "11411", "equip_id": 1, "name": { - "key": "equip_13434", + "key": "equip_1401", "text": "马戏团套装.II" }, "atlas_id": "11411", @@ -21269,7 +21269,7 @@ "id": "11412", "equip_id": 1, "name": { - "key": "equip_13435", + "key": "equip_1402", "text": "马戏团套装.III" }, "atlas_id": "11412", @@ -21318,7 +21318,7 @@ "id": "11413", "equip_id": 1, "name": { - "key": "equip_13436", + "key": "equip_1403", "text": "马戏团套装.IV" }, "atlas_id": "11413", @@ -21367,7 +21367,7 @@ "id": "11414", "equip_id": 1, "name": { - "key": "equip_13437", + "key": "equip_1404", "text": "马戏团套装.V" }, "atlas_id": "11414", @@ -21416,7 +21416,7 @@ "id": "11415", "equip_id": 1, "name": { - "key": "equip_13438", + "key": "equip_1405", "text": "马戏团套装.VI" }, "atlas_id": "11415", @@ -21465,7 +21465,7 @@ "id": "11420", "equip_id": 1, "name": { - "key": "equip_13439", + "key": "equip_1400", "text": "马戏团套装.I" }, "atlas_id": "11410", @@ -21514,7 +21514,7 @@ "id": "11421", "equip_id": 1, "name": { - "key": "equip_13440", + "key": "equip_1401", "text": "马戏团套装.II" }, "atlas_id": "11411", @@ -21563,7 +21563,7 @@ "id": "11422", "equip_id": 1, "name": { - "key": "equip_13441", + "key": "equip_1402", "text": "马戏团套装.III" }, "atlas_id": "11412", @@ -21612,7 +21612,7 @@ "id": "11423", "equip_id": 1, "name": { - "key": "equip_13442", + "key": "equip_1403", "text": "马戏团套装.IV" }, "atlas_id": "11413", @@ -21661,7 +21661,7 @@ "id": "11424", "equip_id": 1, "name": { - "key": "equip_13443", + "key": "equip_1404", "text": "马戏团套装.V" }, "atlas_id": "11414", @@ -21710,7 +21710,7 @@ "id": "11425", "equip_id": 1, "name": { - "key": "equip_13444", + "key": "equip_1405", "text": "马戏团套装.VI" }, "atlas_id": "11415", @@ -21759,7 +21759,7 @@ "id": "11430", "equip_id": 1, "name": { - "key": "equip_13445", + "key": "equip_1400", "text": "马戏团套装.I" }, "atlas_id": "11410", @@ -21808,7 +21808,7 @@ "id": "11431", "equip_id": 1, "name": { - "key": "equip_13446", + "key": "equip_1401", "text": "马戏团套装.II" }, "atlas_id": "11411", @@ -21857,7 +21857,7 @@ "id": "11432", "equip_id": 1, "name": { - "key": "equip_13447", + "key": "equip_1402", "text": "马戏团套装.III" }, "atlas_id": "11412", @@ -21906,7 +21906,7 @@ "id": "11433", "equip_id": 1, "name": { - "key": "equip_13448", + "key": "equip_1403", "text": "马戏团套装.IV" }, "atlas_id": "11413", @@ -21955,7 +21955,7 @@ "id": "11434", "equip_id": 1, "name": { - "key": "equip_13449", + "key": "equip_1404", "text": "马戏团套装.V" }, "atlas_id": "11414", @@ -22004,7 +22004,7 @@ "id": "11435", "equip_id": 1, "name": { - "key": "equip_13450", + "key": "equip_1405", "text": "马戏团套装.VI" }, "atlas_id": "11415", @@ -22053,7 +22053,7 @@ "id": "11440", "equip_id": 1, "name": { - "key": "equip_13451", + "key": "equip_1400", "text": "马戏团套装.I" }, "atlas_id": "11410", @@ -22102,7 +22102,7 @@ "id": "11441", "equip_id": 1, "name": { - "key": "equip_13452", + "key": "equip_1401", "text": "马戏团套装.II" }, "atlas_id": "11411", @@ -22151,7 +22151,7 @@ "id": "11442", "equip_id": 1, "name": { - "key": "equip_13453", + "key": "equip_1402", "text": "马戏团套装.III" }, "atlas_id": "11412", @@ -22200,7 +22200,7 @@ "id": "11443", "equip_id": 1, "name": { - "key": "equip_13454", + "key": "equip_1403", "text": "马戏团套装.IV" }, "atlas_id": "11413", @@ -22249,7 +22249,7 @@ "id": "11444", "equip_id": 1, "name": { - "key": "equip_13455", + "key": "equip_1404", "text": "马戏团套装.V" }, "atlas_id": "11414", @@ -22298,7 +22298,7 @@ "id": "11445", "equip_id": 1, "name": { - "key": "equip_13456", + "key": "equip_1405", "text": "马戏团套装.VI" }, "atlas_id": "11415", @@ -22347,7 +22347,7 @@ "id": "11450", "equip_id": 1, "name": { - "key": "equip_13457", + "key": "equip_1400", "text": "马戏团套装.I" }, "atlas_id": "11410", @@ -22396,7 +22396,7 @@ "id": "11451", "equip_id": 1, "name": { - "key": "equip_13458", + "key": "equip_1401", "text": "马戏团套装.II" }, "atlas_id": "11411", @@ -22445,7 +22445,7 @@ "id": "11452", "equip_id": 1, "name": { - "key": "equip_13459", + "key": "equip_1402", "text": "马戏团套装.III" }, "atlas_id": "11412", @@ -22494,7 +22494,7 @@ "id": "11453", "equip_id": 1, "name": { - "key": "equip_13460", + "key": "equip_1403", "text": "马戏团套装.IV" }, "atlas_id": "11413", @@ -22543,7 +22543,7 @@ "id": "11454", "equip_id": 1, "name": { - "key": "equip_13461", + "key": "equip_1404", "text": "马戏团套装.V" }, "atlas_id": "11414", @@ -22592,7 +22592,7 @@ "id": "11455", "equip_id": 1, "name": { - "key": "equip_13462", + "key": "equip_1405", "text": "马戏团套装.VI" }, "atlas_id": "11415", @@ -22641,7 +22641,7 @@ "id": "11460", "equip_id": 1, "name": { - "key": "equip_13463", + "key": "equip_1400", "text": "马戏团套装.I" }, "atlas_id": "11410", @@ -22690,7 +22690,7 @@ "id": "11461", "equip_id": 1, "name": { - "key": "equip_13464", + "key": "equip_1401", "text": "马戏团套装.II" }, "atlas_id": "11411", @@ -22739,7 +22739,7 @@ "id": "11462", "equip_id": 1, "name": { - "key": "equip_13465", + "key": "equip_1402", "text": "马戏团套装.III" }, "atlas_id": "11412", @@ -22788,7 +22788,7 @@ "id": "11463", "equip_id": 1, "name": { - "key": "equip_13466", + "key": "equip_1403", "text": "马戏团套装.IV" }, "atlas_id": "11413", @@ -22837,7 +22837,7 @@ "id": "11464", "equip_id": 1, "name": { - "key": "equip_13467", + "key": "equip_1404", "text": "马戏团套装.V" }, "atlas_id": "11414", @@ -22886,7 +22886,7 @@ "id": "11465", "equip_id": 1, "name": { - "key": "equip_13468", + "key": "equip_1405", "text": "马戏团套装.VI" }, "atlas_id": "11415", @@ -22935,7 +22935,7 @@ "id": "11510", "equip_id": 1, "name": { - "key": "equip_13469", + "key": "equip_1500", "text": "泰坦套装.I" }, "atlas_id": "11510", @@ -22984,7 +22984,7 @@ "id": "11511", "equip_id": 1, "name": { - "key": "equip_13470", + "key": "equip_1501", "text": "泰坦套装.II" }, "atlas_id": "11511", @@ -23033,7 +23033,7 @@ "id": "11512", "equip_id": 1, "name": { - "key": "equip_13471", + "key": "equip_1502", "text": "泰坦套装.III" }, "atlas_id": "11512", @@ -23082,7 +23082,7 @@ "id": "11513", "equip_id": 1, "name": { - "key": "equip_13472", + "key": "equip_1503", "text": "泰坦套装.IV" }, "atlas_id": "11513", @@ -23131,7 +23131,7 @@ "id": "11514", "equip_id": 1, "name": { - "key": "equip_13473", + "key": "equip_1504", "text": "泰坦套装.V" }, "atlas_id": "11514", @@ -23180,7 +23180,7 @@ "id": "11515", "equip_id": 1, "name": { - "key": "equip_13474", + "key": "equip_1505", "text": "泰坦套装.VI" }, "atlas_id": "11515", @@ -23229,7 +23229,7 @@ "id": "11520", "equip_id": 1, "name": { - "key": "equip_13475", + "key": "equip_1500", "text": "泰坦套装.I" }, "atlas_id": "11510", @@ -23278,7 +23278,7 @@ "id": "11521", "equip_id": 1, "name": { - "key": "equip_13476", + "key": "equip_1501", "text": "泰坦套装.II" }, "atlas_id": "11511", @@ -23327,7 +23327,7 @@ "id": "11522", "equip_id": 1, "name": { - "key": "equip_13477", + "key": "equip_1502", "text": "泰坦套装.III" }, "atlas_id": "11512", @@ -23376,7 +23376,7 @@ "id": "11523", "equip_id": 1, "name": { - "key": "equip_13478", + "key": "equip_1503", "text": "泰坦套装.IV" }, "atlas_id": "11513", @@ -23425,7 +23425,7 @@ "id": "11524", "equip_id": 1, "name": { - "key": "equip_13479", + "key": "equip_1504", "text": "泰坦套装.V" }, "atlas_id": "11514", @@ -23474,7 +23474,7 @@ "id": "11525", "equip_id": 1, "name": { - "key": "equip_13480", + "key": "equip_1505", "text": "泰坦套装.VI" }, "atlas_id": "11515", @@ -23523,7 +23523,7 @@ "id": "11530", "equip_id": 1, "name": { - "key": "equip_13481", + "key": "equip_1500", "text": "泰坦套装.I" }, "atlas_id": "11510", @@ -23572,7 +23572,7 @@ "id": "11531", "equip_id": 1, "name": { - "key": "equip_13482", + "key": "equip_1501", "text": "泰坦套装.II" }, "atlas_id": "11511", @@ -23621,7 +23621,7 @@ "id": "11532", "equip_id": 1, "name": { - "key": "equip_13483", + "key": "equip_1502", "text": "泰坦套装.III" }, "atlas_id": "11512", @@ -23670,7 +23670,7 @@ "id": "11533", "equip_id": 1, "name": { - "key": "equip_13484", + "key": "equip_1503", "text": "泰坦套装.IV" }, "atlas_id": "11513", @@ -23719,7 +23719,7 @@ "id": "11534", "equip_id": 1, "name": { - "key": "equip_13485", + "key": "equip_1504", "text": "泰坦套装.V" }, "atlas_id": "11514", @@ -23768,7 +23768,7 @@ "id": "11535", "equip_id": 1, "name": { - "key": "equip_13486", + "key": "equip_1505", "text": "泰坦套装.VI" }, "atlas_id": "11515", @@ -23817,7 +23817,7 @@ "id": "11540", "equip_id": 1, "name": { - "key": "equip_13487", + "key": "equip_1500", "text": "泰坦套装.I" }, "atlas_id": "11510", @@ -23866,7 +23866,7 @@ "id": "11541", "equip_id": 1, "name": { - "key": "equip_13488", + "key": "equip_1501", "text": "泰坦套装.II" }, "atlas_id": "11511", @@ -23915,7 +23915,7 @@ "id": "11542", "equip_id": 1, "name": { - "key": "equip_13489", + "key": "equip_1502", "text": "泰坦套装.III" }, "atlas_id": "11512", @@ -23964,7 +23964,7 @@ "id": "11543", "equip_id": 1, "name": { - "key": "equip_13490", + "key": "equip_1503", "text": "泰坦套装.IV" }, "atlas_id": "11513", @@ -24013,7 +24013,7 @@ "id": "11544", "equip_id": 1, "name": { - "key": "equip_13491", + "key": "equip_1504", "text": "泰坦套装.V" }, "atlas_id": "11514", @@ -24062,7 +24062,7 @@ "id": "11545", "equip_id": 1, "name": { - "key": "equip_13492", + "key": "equip_1505", "text": "泰坦套装.VI" }, "atlas_id": "11515", @@ -24111,7 +24111,7 @@ "id": "11550", "equip_id": 1, "name": { - "key": "equip_13493", + "key": "equip_1500", "text": "泰坦套装.I" }, "atlas_id": "11510", @@ -24160,7 +24160,7 @@ "id": "11551", "equip_id": 1, "name": { - "key": "equip_13494", + "key": "equip_1501", "text": "泰坦套装.II" }, "atlas_id": "11511", @@ -24209,7 +24209,7 @@ "id": "11552", "equip_id": 1, "name": { - "key": "equip_13495", + "key": "equip_1502", "text": "泰坦套装.III" }, "atlas_id": "11512", @@ -24258,7 +24258,7 @@ "id": "11553", "equip_id": 1, "name": { - "key": "equip_13496", + "key": "equip_1503", "text": "泰坦套装.IV" }, "atlas_id": "11513", @@ -24307,7 +24307,7 @@ "id": "11554", "equip_id": 1, "name": { - "key": "equip_13497", + "key": "equip_1504", "text": "泰坦套装.V" }, "atlas_id": "11514", @@ -24356,7 +24356,7 @@ "id": "11555", "equip_id": 1, "name": { - "key": "equip_13498", + "key": "equip_1505", "text": "泰坦套装.VI" }, "atlas_id": "11515", @@ -24405,7 +24405,7 @@ "id": "11560", "equip_id": 1, "name": { - "key": "equip_13499", + "key": "equip_1500", "text": "泰坦套装.I" }, "atlas_id": "11510", @@ -24454,7 +24454,7 @@ "id": "11561", "equip_id": 1, "name": { - "key": "equip_13500", + "key": "equip_1501", "text": "泰坦套装.II" }, "atlas_id": "11511", @@ -24503,7 +24503,7 @@ "id": "11562", "equip_id": 1, "name": { - "key": "equip_13501", + "key": "equip_1502", "text": "泰坦套装.III" }, "atlas_id": "11512", @@ -24552,7 +24552,7 @@ "id": "11563", "equip_id": 1, "name": { - "key": "equip_13502", + "key": "equip_1503", "text": "泰坦套装.IV" }, "atlas_id": "11513", @@ -24601,7 +24601,7 @@ "id": "11564", "equip_id": 1, "name": { - "key": "equip_13503", + "key": "equip_1504", "text": "泰坦套装.V" }, "atlas_id": "11514", @@ -24650,7 +24650,7 @@ "id": "11565", "equip_id": 1, "name": { - "key": "equip_13504", + "key": "equip_1505", "text": "泰坦套装.VI" }, "atlas_id": "11515", @@ -24699,7 +24699,7 @@ "id": "11610", "equip_id": 1, "name": { - "key": "equip_13505", + "key": "equip_1600", "text": "巨怪猎人套装.I" }, "atlas_id": "11610", @@ -24748,7 +24748,7 @@ "id": "11611", "equip_id": 1, "name": { - "key": "equip_13506", + "key": "equip_1601", "text": "巨怪猎人套装.II" }, "atlas_id": "11611", @@ -24797,7 +24797,7 @@ "id": "11612", "equip_id": 1, "name": { - "key": "equip_13507", + "key": "equip_1602", "text": "巨怪猎人套装.III" }, "atlas_id": "11612", @@ -24846,7 +24846,7 @@ "id": "11613", "equip_id": 1, "name": { - "key": "equip_13508", + "key": "equip_1603", "text": "巨怪猎人套装.IV" }, "atlas_id": "11613", @@ -24895,7 +24895,7 @@ "id": "11614", "equip_id": 1, "name": { - "key": "equip_13509", + "key": "equip_1604", "text": "巨怪猎人套装.V" }, "atlas_id": "11614", @@ -24944,7 +24944,7 @@ "id": "11615", "equip_id": 1, "name": { - "key": "equip_13510", + "key": "equip_1605", "text": "巨怪猎人套装.VI" }, "atlas_id": "11615", @@ -24993,7 +24993,7 @@ "id": "11620", "equip_id": 1, "name": { - "key": "equip_13511", + "key": "equip_1600", "text": "巨怪猎人套装.I" }, "atlas_id": "11610", @@ -25042,7 +25042,7 @@ "id": "11621", "equip_id": 1, "name": { - "key": "equip_13512", + "key": "equip_1601", "text": "巨怪猎人套装.II" }, "atlas_id": "11611", @@ -25091,7 +25091,7 @@ "id": "11622", "equip_id": 1, "name": { - "key": "equip_13513", + "key": "equip_1602", "text": "巨怪猎人套装.III" }, "atlas_id": "11612", @@ -25140,7 +25140,7 @@ "id": "11623", "equip_id": 1, "name": { - "key": "equip_13514", + "key": "equip_1603", "text": "巨怪猎人套装.IV" }, "atlas_id": "11613", @@ -25189,7 +25189,7 @@ "id": "11624", "equip_id": 1, "name": { - "key": "equip_13515", + "key": "equip_1604", "text": "巨怪猎人套装.V" }, "atlas_id": "11614", @@ -25238,7 +25238,7 @@ "id": "11625", "equip_id": 1, "name": { - "key": "equip_13516", + "key": "equip_1605", "text": "巨怪猎人套装.VI" }, "atlas_id": "11615", @@ -25287,7 +25287,7 @@ "id": "11630", "equip_id": 1, "name": { - "key": "equip_13517", + "key": "equip_1600", "text": "巨怪猎人套装.I" }, "atlas_id": "11610", @@ -25336,7 +25336,7 @@ "id": "11631", "equip_id": 1, "name": { - "key": "equip_13518", + "key": "equip_1601", "text": "巨怪猎人套装.II" }, "atlas_id": "11611", @@ -25385,7 +25385,7 @@ "id": "11632", "equip_id": 1, "name": { - "key": "equip_13519", + "key": "equip_1602", "text": "巨怪猎人套装.III" }, "atlas_id": "11612", @@ -25434,7 +25434,7 @@ "id": "11633", "equip_id": 1, "name": { - "key": "equip_13520", + "key": "equip_1603", "text": "巨怪猎人套装.IV" }, "atlas_id": "11613", @@ -25483,7 +25483,7 @@ "id": "11634", "equip_id": 1, "name": { - "key": "equip_13521", + "key": "equip_1604", "text": "巨怪猎人套装.V" }, "atlas_id": "11614", @@ -25532,7 +25532,7 @@ "id": "11635", "equip_id": 1, "name": { - "key": "equip_13522", + "key": "equip_1605", "text": "巨怪猎人套装.VI" }, "atlas_id": "11615", @@ -25581,7 +25581,7 @@ "id": "11640", "equip_id": 1, "name": { - "key": "equip_13523", + "key": "equip_1600", "text": "巨怪猎人套装.I" }, "atlas_id": "11610", @@ -25630,7 +25630,7 @@ "id": "11641", "equip_id": 1, "name": { - "key": "equip_13524", + "key": "equip_1601", "text": "巨怪猎人套装.II" }, "atlas_id": "11611", @@ -25679,7 +25679,7 @@ "id": "11642", "equip_id": 1, "name": { - "key": "equip_13525", + "key": "equip_1602", "text": "巨怪猎人套装.III" }, "atlas_id": "11612", @@ -25728,7 +25728,7 @@ "id": "11643", "equip_id": 1, "name": { - "key": "equip_13526", + "key": "equip_1603", "text": "巨怪猎人套装.IV" }, "atlas_id": "11613", @@ -25777,7 +25777,7 @@ "id": "11644", "equip_id": 1, "name": { - "key": "equip_13527", + "key": "equip_1604", "text": "巨怪猎人套装.V" }, "atlas_id": "11614", @@ -25826,7 +25826,7 @@ "id": "11645", "equip_id": 1, "name": { - "key": "equip_13528", + "key": "equip_1605", "text": "巨怪猎人套装.VI" }, "atlas_id": "11615", @@ -25875,7 +25875,7 @@ "id": "11650", "equip_id": 1, "name": { - "key": "equip_13529", + "key": "equip_1600", "text": "巨怪猎人套装.I" }, "atlas_id": "11610", @@ -25924,7 +25924,7 @@ "id": "11651", "equip_id": 1, "name": { - "key": "equip_13530", + "key": "equip_1601", "text": "巨怪猎人套装.II" }, "atlas_id": "11611", @@ -25973,7 +25973,7 @@ "id": "11652", "equip_id": 1, "name": { - "key": "equip_13531", + "key": "equip_1602", "text": "巨怪猎人套装.III" }, "atlas_id": "11612", @@ -26022,7 +26022,7 @@ "id": "11653", "equip_id": 1, "name": { - "key": "equip_13532", + "key": "equip_1603", "text": "巨怪猎人套装.IV" }, "atlas_id": "11613", @@ -26071,7 +26071,7 @@ "id": "11654", "equip_id": 1, "name": { - "key": "equip_13533", + "key": "equip_1604", "text": "巨怪猎人套装.V" }, "atlas_id": "11614", @@ -26120,7 +26120,7 @@ "id": "11655", "equip_id": 1, "name": { - "key": "equip_13534", + "key": "equip_1605", "text": "巨怪猎人套装.VI" }, "atlas_id": "11615", @@ -26169,7 +26169,7 @@ "id": "11660", "equip_id": 1, "name": { - "key": "equip_13535", + "key": "equip_1600", "text": "巨怪猎人套装.I" }, "atlas_id": "11610", @@ -26218,7 +26218,7 @@ "id": "11661", "equip_id": 1, "name": { - "key": "equip_13536", + "key": "equip_1601", "text": "巨怪猎人套装.II" }, "atlas_id": "11611", @@ -26267,7 +26267,7 @@ "id": "11662", "equip_id": 1, "name": { - "key": "equip_13537", + "key": "equip_1602", "text": "巨怪猎人套装.III" }, "atlas_id": "11612", @@ -26316,7 +26316,7 @@ "id": "11663", "equip_id": 1, "name": { - "key": "equip_13538", + "key": "equip_1603", "text": "巨怪猎人套装.IV" }, "atlas_id": "11613", @@ -26365,7 +26365,7 @@ "id": "11664", "equip_id": 1, "name": { - "key": "equip_13539", + "key": "equip_1604", "text": "巨怪猎人套装.V" }, "atlas_id": "11614", @@ -26414,7 +26414,7 @@ "id": "11665", "equip_id": 1, "name": { - "key": "equip_13540", + "key": "equip_1605", "text": "巨怪猎人套装.VI" }, "atlas_id": "11615", @@ -26463,7 +26463,7 @@ "id": "11710", "equip_id": 1, "name": { - "key": "equip_13541", + "key": "equip_1700", "text": "天外陨石套装.I" }, "atlas_id": "11710", @@ -26512,7 +26512,7 @@ "id": "11711", "equip_id": 1, "name": { - "key": "equip_13542", + "key": "equip_1701", "text": "天外陨石套装.II" }, "atlas_id": "11711", @@ -26561,7 +26561,7 @@ "id": "11712", "equip_id": 1, "name": { - "key": "equip_13543", + "key": "equip_1702", "text": "天外陨石套装.III" }, "atlas_id": "11712", @@ -26610,7 +26610,7 @@ "id": "11713", "equip_id": 1, "name": { - "key": "equip_13544", + "key": "equip_1703", "text": "天外陨石套装.IV" }, "atlas_id": "11713", @@ -26659,7 +26659,7 @@ "id": "11714", "equip_id": 1, "name": { - "key": "equip_13545", + "key": "equip_1704", "text": "天外陨石套装.V" }, "atlas_id": "11714", @@ -26708,7 +26708,7 @@ "id": "11715", "equip_id": 1, "name": { - "key": "equip_13546", + "key": "equip_1705", "text": "天外陨石套装.VI" }, "atlas_id": "11715", @@ -26757,7 +26757,7 @@ "id": "11720", "equip_id": 1, "name": { - "key": "equip_13547", + "key": "equip_1700", "text": "天外陨石套装.I" }, "atlas_id": "11710", @@ -26806,7 +26806,7 @@ "id": "11721", "equip_id": 1, "name": { - "key": "equip_13548", + "key": "equip_1701", "text": "天外陨石套装.II" }, "atlas_id": "11711", @@ -26855,7 +26855,7 @@ "id": "11722", "equip_id": 1, "name": { - "key": "equip_13549", + "key": "equip_1702", "text": "天外陨石套装.III" }, "atlas_id": "11712", @@ -26904,7 +26904,7 @@ "id": "11723", "equip_id": 1, "name": { - "key": "equip_13550", + "key": "equip_1703", "text": "天外陨石套装.IV" }, "atlas_id": "11713", @@ -26953,7 +26953,7 @@ "id": "11724", "equip_id": 1, "name": { - "key": "equip_13551", + "key": "equip_1704", "text": "天外陨石套装.V" }, "atlas_id": "11714", @@ -27002,7 +27002,7 @@ "id": "11725", "equip_id": 1, "name": { - "key": "equip_13552", + "key": "equip_1705", "text": "天外陨石套装.VI" }, "atlas_id": "11715", @@ -27051,7 +27051,7 @@ "id": "11730", "equip_id": 1, "name": { - "key": "equip_13553", + "key": "equip_1700", "text": "天外陨石套装.I" }, "atlas_id": "11710", @@ -27100,7 +27100,7 @@ "id": "11731", "equip_id": 1, "name": { - "key": "equip_13554", + "key": "equip_1701", "text": "天外陨石套装.II" }, "atlas_id": "11711", @@ -27149,7 +27149,7 @@ "id": "11732", "equip_id": 1, "name": { - "key": "equip_13555", + "key": "equip_1702", "text": "天外陨石套装.III" }, "atlas_id": "11712", @@ -27198,7 +27198,7 @@ "id": "11733", "equip_id": 1, "name": { - "key": "equip_13556", + "key": "equip_1703", "text": "天外陨石套装.IV" }, "atlas_id": "11713", @@ -27247,7 +27247,7 @@ "id": "11734", "equip_id": 1, "name": { - "key": "equip_13557", + "key": "equip_1704", "text": "天外陨石套装.V" }, "atlas_id": "11714", @@ -27296,7 +27296,7 @@ "id": "11735", "equip_id": 1, "name": { - "key": "equip_13558", + "key": "equip_1705", "text": "天外陨石套装.VI" }, "atlas_id": "11715", @@ -27345,7 +27345,7 @@ "id": "11740", "equip_id": 1, "name": { - "key": "equip_13559", + "key": "equip_1700", "text": "天外陨石套装.I" }, "atlas_id": "11710", @@ -27394,7 +27394,7 @@ "id": "11741", "equip_id": 1, "name": { - "key": "equip_13560", + "key": "equip_1701", "text": "天外陨石套装.II" }, "atlas_id": "11711", @@ -27443,7 +27443,7 @@ "id": "11742", "equip_id": 1, "name": { - "key": "equip_13561", + "key": "equip_1702", "text": "天外陨石套装.III" }, "atlas_id": "11712", @@ -27492,7 +27492,7 @@ "id": "11743", "equip_id": 1, "name": { - "key": "equip_13562", + "key": "equip_1703", "text": "天外陨石套装.IV" }, "atlas_id": "11713", @@ -27541,7 +27541,7 @@ "id": "11744", "equip_id": 1, "name": { - "key": "equip_13563", + "key": "equip_1704", "text": "天外陨石套装.V" }, "atlas_id": "11714", @@ -27590,7 +27590,7 @@ "id": "11745", "equip_id": 1, "name": { - "key": "equip_13564", + "key": "equip_1705", "text": "天外陨石套装.VI" }, "atlas_id": "11715", @@ -27639,7 +27639,7 @@ "id": "11750", "equip_id": 1, "name": { - "key": "equip_13565", + "key": "equip_1700", "text": "天外陨石套装.I" }, "atlas_id": "11710", @@ -27688,7 +27688,7 @@ "id": "11751", "equip_id": 1, "name": { - "key": "equip_13566", + "key": "equip_1701", "text": "天外陨石套装.II" }, "atlas_id": "11711", @@ -27737,7 +27737,7 @@ "id": "11752", "equip_id": 1, "name": { - "key": "equip_13567", + "key": "equip_1702", "text": "天外陨石套装.III" }, "atlas_id": "11712", @@ -27786,7 +27786,7 @@ "id": "11753", "equip_id": 1, "name": { - "key": "equip_13568", + "key": "equip_1703", "text": "天外陨石套装.IV" }, "atlas_id": "11713", @@ -27835,7 +27835,7 @@ "id": "11754", "equip_id": 1, "name": { - "key": "equip_13569", + "key": "equip_1704", "text": "天外陨石套装.V" }, "atlas_id": "11714", @@ -27884,7 +27884,7 @@ "id": "11755", "equip_id": 1, "name": { - "key": "equip_13570", + "key": "equip_1705", "text": "天外陨石套装.VI" }, "atlas_id": "11715", @@ -27933,7 +27933,7 @@ "id": "11760", "equip_id": 1, "name": { - "key": "equip_13571", + "key": "equip_1700", "text": "天外陨石套装.I" }, "atlas_id": "11710", @@ -27982,7 +27982,7 @@ "id": "11761", "equip_id": 1, "name": { - "key": "equip_13572", + "key": "equip_1701", "text": "天外陨石套装.II" }, "atlas_id": "11711", @@ -28031,7 +28031,7 @@ "id": "11762", "equip_id": 1, "name": { - "key": "equip_13573", + "key": "equip_1702", "text": "天外陨石套装.III" }, "atlas_id": "11712", @@ -28080,7 +28080,7 @@ "id": "11763", "equip_id": 1, "name": { - "key": "equip_13574", + "key": "equip_1703", "text": "天外陨石套装.IV" }, "atlas_id": "11713", @@ -28129,7 +28129,7 @@ "id": "11764", "equip_id": 1, "name": { - "key": "equip_13575", + "key": "equip_1704", "text": "天外陨石套装.V" }, "atlas_id": "11714", @@ -28178,7 +28178,7 @@ "id": "11765", "equip_id": 1, "name": { - "key": "equip_13576", + "key": "equip_1705", "text": "天外陨石套装.VI" }, "atlas_id": "11715", @@ -28227,7 +28227,7 @@ "id": "11810", "equip_id": 1, "name": { - "key": "equip_13577", + "key": "equip_1800", "text": "沼泽怪物套装.I" }, "atlas_id": "11810", @@ -28276,7 +28276,7 @@ "id": "11811", "equip_id": 1, "name": { - "key": "equip_13578", + "key": "equip_1801", "text": "沼泽怪物套装.II" }, "atlas_id": "11811", @@ -28325,7 +28325,7 @@ "id": "11812", "equip_id": 1, "name": { - "key": "equip_13579", + "key": "equip_1802", "text": "沼泽怪物套装.III" }, "atlas_id": "11812", @@ -28374,7 +28374,7 @@ "id": "11813", "equip_id": 1, "name": { - "key": "equip_13580", + "key": "equip_1803", "text": "沼泽怪物套装.IV" }, "atlas_id": "11813", @@ -28423,7 +28423,7 @@ "id": "11814", "equip_id": 1, "name": { - "key": "equip_13581", + "key": "equip_1804", "text": "沼泽怪物套装.V" }, "atlas_id": "11814", @@ -28472,7 +28472,7 @@ "id": "11815", "equip_id": 1, "name": { - "key": "equip_13582", + "key": "equip_1805", "text": "沼泽怪物套装.VI" }, "atlas_id": "11815", @@ -28521,7 +28521,7 @@ "id": "11820", "equip_id": 1, "name": { - "key": "equip_13583", + "key": "equip_1800", "text": "沼泽怪物套装.I" }, "atlas_id": "11810", @@ -28570,7 +28570,7 @@ "id": "11821", "equip_id": 1, "name": { - "key": "equip_13584", + "key": "equip_1801", "text": "沼泽怪物套装.II" }, "atlas_id": "11811", @@ -28619,7 +28619,7 @@ "id": "11822", "equip_id": 1, "name": { - "key": "equip_13585", + "key": "equip_1802", "text": "沼泽怪物套装.III" }, "atlas_id": "11812", @@ -28668,7 +28668,7 @@ "id": "11823", "equip_id": 1, "name": { - "key": "equip_13586", + "key": "equip_1803", "text": "沼泽怪物套装.IV" }, "atlas_id": "11813", @@ -28717,7 +28717,7 @@ "id": "11824", "equip_id": 1, "name": { - "key": "equip_13587", + "key": "equip_1804", "text": "沼泽怪物套装.V" }, "atlas_id": "11814", @@ -28766,7 +28766,7 @@ "id": "11825", "equip_id": 1, "name": { - "key": "equip_13588", + "key": "equip_1805", "text": "沼泽怪物套装.VI" }, "atlas_id": "11815", @@ -28815,7 +28815,7 @@ "id": "11830", "equip_id": 1, "name": { - "key": "equip_13589", + "key": "equip_1800", "text": "沼泽怪物套装.I" }, "atlas_id": "11810", @@ -28864,7 +28864,7 @@ "id": "11831", "equip_id": 1, "name": { - "key": "equip_13590", + "key": "equip_1801", "text": "沼泽怪物套装.II" }, "atlas_id": "11811", @@ -28913,7 +28913,7 @@ "id": "11832", "equip_id": 1, "name": { - "key": "equip_13591", + "key": "equip_1802", "text": "沼泽怪物套装.III" }, "atlas_id": "11812", @@ -28962,7 +28962,7 @@ "id": "11833", "equip_id": 1, "name": { - "key": "equip_13592", + "key": "equip_1803", "text": "沼泽怪物套装.IV" }, "atlas_id": "11813", @@ -29011,7 +29011,7 @@ "id": "11834", "equip_id": 1, "name": { - "key": "equip_13593", + "key": "equip_1804", "text": "沼泽怪物套装.V" }, "atlas_id": "11814", @@ -29060,7 +29060,7 @@ "id": "11835", "equip_id": 1, "name": { - "key": "equip_13594", + "key": "equip_1805", "text": "沼泽怪物套装.VI" }, "atlas_id": "11815", @@ -29109,7 +29109,7 @@ "id": "11840", "equip_id": 1, "name": { - "key": "equip_13595", + "key": "equip_1800", "text": "沼泽怪物套装.I" }, "atlas_id": "11810", @@ -29158,7 +29158,7 @@ "id": "11841", "equip_id": 1, "name": { - "key": "equip_13596", + "key": "equip_1801", "text": "沼泽怪物套装.II" }, "atlas_id": "11811", @@ -29207,7 +29207,7 @@ "id": "11842", "equip_id": 1, "name": { - "key": "equip_13597", + "key": "equip_1802", "text": "沼泽怪物套装.III" }, "atlas_id": "11812", @@ -29256,7 +29256,7 @@ "id": "11843", "equip_id": 1, "name": { - "key": "equip_13598", + "key": "equip_1803", "text": "沼泽怪物套装.IV" }, "atlas_id": "11813", @@ -29305,7 +29305,7 @@ "id": "11844", "equip_id": 1, "name": { - "key": "equip_13599", + "key": "equip_1804", "text": "沼泽怪物套装.V" }, "atlas_id": "11814", @@ -29354,7 +29354,7 @@ "id": "11845", "equip_id": 1, "name": { - "key": "equip_13600", + "key": "equip_1805", "text": "沼泽怪物套装.VI" }, "atlas_id": "11815", @@ -29403,7 +29403,7 @@ "id": "11850", "equip_id": 1, "name": { - "key": "equip_13601", + "key": "equip_1800", "text": "沼泽怪物套装.I" }, "atlas_id": "11810", @@ -29452,7 +29452,7 @@ "id": "11851", "equip_id": 1, "name": { - "key": "equip_13602", + "key": "equip_1801", "text": "沼泽怪物套装.II" }, "atlas_id": "11811", @@ -29501,7 +29501,7 @@ "id": "11852", "equip_id": 1, "name": { - "key": "equip_13603", + "key": "equip_1802", "text": "沼泽怪物套装.III" }, "atlas_id": "11812", @@ -29550,7 +29550,7 @@ "id": "11853", "equip_id": 1, "name": { - "key": "equip_13604", + "key": "equip_1803", "text": "沼泽怪物套装.IV" }, "atlas_id": "11813", @@ -29599,7 +29599,7 @@ "id": "11854", "equip_id": 1, "name": { - "key": "equip_13605", + "key": "equip_1804", "text": "沼泽怪物套装.V" }, "atlas_id": "11814", @@ -29648,7 +29648,7 @@ "id": "11855", "equip_id": 1, "name": { - "key": "equip_13606", + "key": "equip_1805", "text": "沼泽怪物套装.VI" }, "atlas_id": "11815", @@ -29697,7 +29697,7 @@ "id": "11860", "equip_id": 1, "name": { - "key": "equip_13607", + "key": "equip_1800", "text": "沼泽怪物套装.I" }, "atlas_id": "11810", @@ -29746,7 +29746,7 @@ "id": "11861", "equip_id": 1, "name": { - "key": "equip_13608", + "key": "equip_1801", "text": "沼泽怪物套装.II" }, "atlas_id": "11811", @@ -29795,7 +29795,7 @@ "id": "11862", "equip_id": 1, "name": { - "key": "equip_13609", + "key": "equip_1802", "text": "沼泽怪物套装.III" }, "atlas_id": "11812", @@ -29844,7 +29844,7 @@ "id": "11863", "equip_id": 1, "name": { - "key": "equip_13610", + "key": "equip_1803", "text": "沼泽怪物套装.IV" }, "atlas_id": "11813", @@ -29893,7 +29893,7 @@ "id": "11864", "equip_id": 1, "name": { - "key": "equip_13611", + "key": "equip_1804", "text": "沼泽怪物套装.V" }, "atlas_id": "11814", @@ -29942,7 +29942,7 @@ "id": "11865", "equip_id": 1, "name": { - "key": "equip_13612", + "key": "equip_1805", "text": "沼泽怪物套装.VI" }, "atlas_id": "11815", @@ -29991,7 +29991,7 @@ "id": "11910", "equip_id": 1, "name": { - "key": "equip_13613", + "key": "equip_1900", "text": "守护神套装.I" }, "atlas_id": "11910", @@ -30040,7 +30040,7 @@ "id": "11911", "equip_id": 1, "name": { - "key": "equip_13614", + "key": "equip_1901", "text": "守护神套装.II" }, "atlas_id": "11911", @@ -30089,7 +30089,7 @@ "id": "11912", "equip_id": 1, "name": { - "key": "equip_13615", + "key": "equip_1902", "text": "守护神套装.III" }, "atlas_id": "11912", @@ -30138,7 +30138,7 @@ "id": "11913", "equip_id": 1, "name": { - "key": "equip_13616", + "key": "equip_1903", "text": "守护神套装.IV" }, "atlas_id": "11913", @@ -30187,7 +30187,7 @@ "id": "11914", "equip_id": 1, "name": { - "key": "equip_13617", + "key": "equip_1904", "text": "守护神套装.V" }, "atlas_id": "11914", @@ -30236,7 +30236,7 @@ "id": "11915", "equip_id": 1, "name": { - "key": "equip_13618", + "key": "equip_1905", "text": "守护神套装.VI" }, "atlas_id": "11915", @@ -30285,7 +30285,7 @@ "id": "11920", "equip_id": 1, "name": { - "key": "equip_13619", + "key": "equip_1900", "text": "守护神套装.I" }, "atlas_id": "11910", @@ -30334,7 +30334,7 @@ "id": "11921", "equip_id": 1, "name": { - "key": "equip_13620", + "key": "equip_1901", "text": "守护神套装.II" }, "atlas_id": "11911", @@ -30383,7 +30383,7 @@ "id": "11922", "equip_id": 1, "name": { - "key": "equip_13621", + "key": "equip_1902", "text": "守护神套装.III" }, "atlas_id": "11912", @@ -30432,7 +30432,7 @@ "id": "11923", "equip_id": 1, "name": { - "key": "equip_13622", + "key": "equip_1903", "text": "守护神套装.IV" }, "atlas_id": "11913", @@ -30481,7 +30481,7 @@ "id": "11924", "equip_id": 1, "name": { - "key": "equip_13623", + "key": "equip_1904", "text": "守护神套装.V" }, "atlas_id": "11914", @@ -30530,7 +30530,7 @@ "id": "11925", "equip_id": 1, "name": { - "key": "equip_13624", + "key": "equip_1905", "text": "守护神套装.VI" }, "atlas_id": "11915", @@ -30579,7 +30579,7 @@ "id": "11930", "equip_id": 1, "name": { - "key": "equip_13625", + "key": "equip_1900", "text": "守护神套装.I" }, "atlas_id": "11910", @@ -30628,7 +30628,7 @@ "id": "11931", "equip_id": 1, "name": { - "key": "equip_13626", + "key": "equip_1901", "text": "守护神套装.II" }, "atlas_id": "11911", @@ -30677,7 +30677,7 @@ "id": "11932", "equip_id": 1, "name": { - "key": "equip_13627", + "key": "equip_1902", "text": "守护神套装.III" }, "atlas_id": "11912", @@ -30726,7 +30726,7 @@ "id": "11933", "equip_id": 1, "name": { - "key": "equip_13628", + "key": "equip_1903", "text": "守护神套装.IV" }, "atlas_id": "11913", @@ -30775,7 +30775,7 @@ "id": "11934", "equip_id": 1, "name": { - "key": "equip_13629", + "key": "equip_1904", "text": "守护神套装.V" }, "atlas_id": "11914", @@ -30824,7 +30824,7 @@ "id": "11935", "equip_id": 1, "name": { - "key": "equip_13630", + "key": "equip_1905", "text": "守护神套装.VI" }, "atlas_id": "11915", @@ -30873,7 +30873,7 @@ "id": "11940", "equip_id": 1, "name": { - "key": "equip_13631", + "key": "equip_1900", "text": "守护神套装.I" }, "atlas_id": "11910", @@ -30922,7 +30922,7 @@ "id": "11941", "equip_id": 1, "name": { - "key": "equip_13632", + "key": "equip_1901", "text": "守护神套装.II" }, "atlas_id": "11911", @@ -30971,7 +30971,7 @@ "id": "11942", "equip_id": 1, "name": { - "key": "equip_13633", + "key": "equip_1902", "text": "守护神套装.III" }, "atlas_id": "11912", @@ -31020,7 +31020,7 @@ "id": "11943", "equip_id": 1, "name": { - "key": "equip_13634", + "key": "equip_1903", "text": "守护神套装.IV" }, "atlas_id": "11913", @@ -31069,7 +31069,7 @@ "id": "11944", "equip_id": 1, "name": { - "key": "equip_13635", + "key": "equip_1904", "text": "守护神套装.V" }, "atlas_id": "11914", @@ -31118,7 +31118,7 @@ "id": "11945", "equip_id": 1, "name": { - "key": "equip_13636", + "key": "equip_1905", "text": "守护神套装.VI" }, "atlas_id": "11915", @@ -31167,7 +31167,7 @@ "id": "11950", "equip_id": 1, "name": { - "key": "equip_13637", + "key": "equip_1900", "text": "守护神套装.I" }, "atlas_id": "11910", @@ -31216,7 +31216,7 @@ "id": "11951", "equip_id": 1, "name": { - "key": "equip_13638", + "key": "equip_1901", "text": "守护神套装.II" }, "atlas_id": "11911", @@ -31265,7 +31265,7 @@ "id": "11952", "equip_id": 1, "name": { - "key": "equip_13639", + "key": "equip_1902", "text": "守护神套装.III" }, "atlas_id": "11912", @@ -31314,7 +31314,7 @@ "id": "11953", "equip_id": 1, "name": { - "key": "equip_13640", + "key": "equip_1903", "text": "守护神套装.IV" }, "atlas_id": "11913", @@ -31363,7 +31363,7 @@ "id": "11954", "equip_id": 1, "name": { - "key": "equip_13641", + "key": "equip_1904", "text": "守护神套装.V" }, "atlas_id": "11914", @@ -31412,7 +31412,7 @@ "id": "11955", "equip_id": 1, "name": { - "key": "equip_13642", + "key": "equip_1905", "text": "守护神套装.VI" }, "atlas_id": "11915", @@ -31461,7 +31461,7 @@ "id": "11960", "equip_id": 1, "name": { - "key": "equip_13643", + "key": "equip_1900", "text": "守护神套装.I" }, "atlas_id": "11910", @@ -31510,7 +31510,7 @@ "id": "11961", "equip_id": 1, "name": { - "key": "equip_13644", + "key": "equip_1901", "text": "守护神套装.II" }, "atlas_id": "11911", @@ -31559,7 +31559,7 @@ "id": "11962", "equip_id": 1, "name": { - "key": "equip_13645", + "key": "equip_1902", "text": "守护神套装.III" }, "atlas_id": "11912", @@ -31608,7 +31608,7 @@ "id": "11963", "equip_id": 1, "name": { - "key": "equip_13646", + "key": "equip_1903", "text": "守护神套装.IV" }, "atlas_id": "11913", @@ -31657,7 +31657,7 @@ "id": "11964", "equip_id": 1, "name": { - "key": "equip_13647", + "key": "equip_1904", "text": "守护神套装.V" }, "atlas_id": "11914", @@ -31706,7 +31706,7 @@ "id": "11965", "equip_id": 1, "name": { - "key": "equip_13648", + "key": "equip_1905", "text": "守护神套装.VI" }, "atlas_id": "11915", diff --git a/bin/json/game_equipsuit.json b/bin/json/game_equipsuit.json index e6ea9f7e7..e57792995 100644 --- a/bin/json/game_equipsuit.json +++ b/bin/json/game_equipsuit.json @@ -4,7 +4,7 @@ "suitnum": 6, "skill": 0, "skillname": { - "key": "suit_13001", + "key": "suit_1", "text": "无极神功套装" }, "icon": "tz_icon_qg", @@ -25,7 +25,7 @@ "suitnum": 6, "skill": 0, "skillname": { - "key": "suit_13002", + "key": "suit_2", "text": "驯龙套装" }, "icon": "tz_icon_xl", @@ -46,7 +46,7 @@ "suitnum": 6, "skill": 100003001, "skillname": { - "key": "suit_13003", + "key": "suit_3", "text": "雪精灵套装" }, "icon": "tz_icon_xjl", @@ -62,7 +62,7 @@ "suitnum": 6, "skill": 0, "skillname": { - "key": "suit_13004", + "key": "suit_4", "text": "噩梦漩涡套装" }, "icon": "tz_icon_em", @@ -83,7 +83,7 @@ "suitnum": 6, "skill": 0, "skillname": { - "key": "suit_13005", + "key": "suit_5", "text": "音乐精灵套装" }, "icon": "tz_icon_yy", @@ -104,7 +104,7 @@ "suitnum": 6, "skill": 100006001, "skillname": { - "key": "suit_13006", + "key": "suit_6", "text": "永恒萌狗套装" }, "icon": "tz_icon_mg", @@ -120,7 +120,7 @@ "suitnum": 6, "skill": 100007001, "skillname": { - "key": "suit_13007", + "key": "suit_7", "text": "原始狩猎套装" }, "icon": "tz_icon_sl", @@ -136,7 +136,7 @@ "suitnum": 6, "skill": 0, "skillname": { - "key": "suit_13008", + "key": "suit_8", "text": "气功大师套装" }, "icon": "tz_icon_wj", @@ -157,8 +157,8 @@ "suitnum": 6, "skill": 100009001, "skillname": { - "key": "suit_13009", - "text": "黄金包子" + "key": "suit_9", + "text": "黄金包子套装" }, "icon": "tz_icon_ms", "FloatIcon": "ty_zd_buff_z007", @@ -173,7 +173,7 @@ "suitnum": 6, "skill": 100001001, "skillname": { - "key": "suit_13010", + "key": "suit_10", "text": "马术套装" }, "icon": "tz_icon_ms", @@ -189,7 +189,7 @@ "suitnum": 6, "skill": 0, "skillname": { - "key": "suit_13011", + "key": "suit_11", "text": "波波星套装" }, "icon": "tz_icon_pp", @@ -210,7 +210,7 @@ "suitnum": 6, "skill": 0, "skillname": { - "key": "suit_13012", + "key": "suit_12", "text": "穴居人套装" }, "icon": "tz_icon_xj", @@ -231,7 +231,7 @@ "suitnum": 6, "skill": 0, "skillname": { - "key": "suit_13013", + "key": "suit_13", "text": "文明人套装" }, "icon": "tz_icon_wm", @@ -252,7 +252,7 @@ "suitnum": 6, "skill": 100001401, "skillname": { - "key": "suit_13014", + "key": "suit_14", "text": "马戏团套装" }, "icon": "tz_icon_mxt", @@ -268,7 +268,7 @@ "suitnum": 6, "skill": 100001501, "skillname": { - "key": "suit_13015", + "key": "suit_15", "text": "泰坦套装" }, "icon": "tz_icon_tt", @@ -284,7 +284,7 @@ "suitnum": 6, "skill": 0, "skillname": { - "key": "suit_13016", + "key": "suit_16", "text": "巨怪猎人套装" }, "icon": "tz_icon_jg", @@ -305,7 +305,7 @@ "suitnum": 6, "skill": 100001701, "skillname": { - "key": "suit_13017", + "key": "suit_17", "text": "天外陨石套装" }, "icon": "tz_icon_ys", @@ -321,7 +321,7 @@ "suitnum": 6, "skill": 0, "skillname": { - "key": "suit_13018", + "key": "suit_18", "text": "沼泽怪物套装" }, "icon": "tz_icon_zz", @@ -342,7 +342,7 @@ "suitnum": 6, "skill": 100001901, "skillname": { - "key": "suit_13019", + "key": "suit_19", "text": "守护神套装" }, "icon": "tz_icon_shs", diff --git a/bin/json/game_item.json b/bin/json/game_item.json index a90bcd974..8f3b1e709 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -9939,5 +9939,42 @@ "sale": [], "synthetize_deplete": [], "decompose_deplete": [] + }, + { + "id": "9999999", + "name": { + "key": "weektask_dj_9999999", + "text": "时限道具（测试）" + }, + "usetype": 3, + "color": 1, + "bagtype": 1, + "index": 1, + "special_type": 0, + "time": 2, + "reddottype": 0, + "effects": "", + "modelName": "", + "box_id": 0, + "synthetize_num": 0, + "access": [ + 1001 + ], + "use_skip": 1001, + "upper_limit": -1, + "img": "tj_icon_flower", + "intr": { + "key": "itemdesc_9999999", + "text": "测试时限道具，2分钟消失" + }, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "synthetize_deplete": [], + "decompose_deplete": [] } ] \ No newline at end of file diff --git a/bin/json/game_mainchapter.json b/bin/json/game_mainchapter.json index cd168a92f..4cc965646 100644 --- a/bin/json/game_mainchapter.json +++ b/bin/json/game_mainchapter.json @@ -13,7 +13,7 @@ "text": "第1章：功夫熊猫" }, "desc": { - "key": "mainchapter_desc_10001", + "key": "mainchapter_desc_11001", "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。话说熊猫阿宝是一家面条店的学徒，虽然笨手笨脚，也勉强算是谋到了一份职业。" }, "starreward": 11001 @@ -32,7 +32,7 @@ "text": "第2章：疯狂原始人" }, "desc": { - "key": "mainchapter_desc_10002", + "key": "mainchapter_desc_11002", "text": "别看阿宝所在的“和平谷”一派欣欣向荣的安详景象，其实是一个卧虎藏龙的风水宝地，先不说五大功夫高手皆坐镇于此，更有一大师级别的宗师在这里隐居。" }, "starreward": 11002 @@ -51,7 +51,7 @@ "text": "第3章：怪物史莱克" }, "desc": { - "key": "mainchapter_desc_10003", + "key": "mainchapter_desc_11003", "text": "可是在一场特殊的比武大会上胜出的人要代表“和平谷”将邪恶的大龙永久地驱除出去，啥都不会的阿宝却在经历了一系列阴差阳错之后屏雀中选，让所有人都大跌眼镜。" }, "starreward": 11003 @@ -70,7 +70,7 @@ "text": "第4章：乌龟大师" }, "desc": { - "key": "mainchapter_desc_10004", + "key": "mainchapter_desc_11004", "text": "自负的毒蛇大师虽然给人的感觉稍显轻浮，但对这件事的态度就有如她善变的性格，不太明朗；螳螂大师算是几位高手中最聪明的一个，对阿宝的现状很是无奈，总是暗中帮忙。" }, "starreward": 11004 @@ -89,7 +89,7 @@ "text": "第5章：激烈战斗" }, "desc": { - "key": "mainchapter_desc_10005", + "key": "mainchapter_desc_11005", "text": "最后要将阿宝调教成“功夫高手”的一代宗师“师父”华丽丽地出场了，然而有着一身好功夫并不意味着就是完美的，“师父”因为过去犯下的一个错误，一直纠结着没办法释然。" }, "starreward": 11005 @@ -108,7 +108,7 @@ "text": "第6章：下山" }, "desc": { - "key": "mainchapter_desc_10006", + "key": "mainchapter_desc_11006", "text": "至于那个让人人都如临大敌的太郎，则是一只非常自恋的雪豹，他等待复仇的这一天，已经整整等了20年了，可是他做梦也没想到，自己等来的竟然是一只大熊猫。" }, "starreward": 11006 @@ -127,7 +127,7 @@ "text": "第7章：事件余波" }, "desc": { - "key": "mainchapter_desc_10007", + "key": "mainchapter_desc_11007", "text": "激烈的战斗后，阿宝以自己对武功的悟性和师父传授的武术，战胜了太郎，拯救了山谷，为山谷带来了和平。" }, "starreward": 11007 @@ -146,7 +146,7 @@ "text": "第8章：乌龟大师" }, "desc": { - "key": "mainchapter_desc_10008", + "key": "mainchapter_desc_11008", "text": "可是在一场特殊的比武大会上胜出的人要代表“和平谷”将邪恶的大龙永久地驱除出去，啥都不会的阿宝却在经历了一系列阴差阳错之后屏雀中选，让所有人都大跌眼镜。" }, "starreward": 11008 @@ -165,7 +165,7 @@ "text": "第9章：太狼来袭" }, "desc": { - "key": "mainchapter_desc_10009", + "key": "mainchapter_desc_11009", "text": "可是在一场特殊的比武大会上胜出的人要代表“和平谷”将邪恶的大龙永久地驱除出去，啥都不会的阿宝却在经历了一系列阴差阳错之后屏雀中选，让所有人都大跌眼镜。" }, "starreward": 11009 @@ -184,7 +184,7 @@ "text": "第10章：乌龟大师" }, "desc": { - "key": "mainchapter_desc_10010", + "key": "mainchapter_desc_11010", "text": "可是在一场特殊的比武大会上胜出的人要代表“和平谷”将邪恶的大龙永久地驱除出去，啥都不会的阿宝却在经历了一系列阴差阳错之后屏雀中选，让所有人都大跌眼镜。" }, "starreward": 11010 @@ -203,7 +203,7 @@ "text": "第11章：太狼来袭" }, "desc": { - "key": "mainchapter_desc_10011", + "key": "mainchapter_desc_11011", "text": "可是在一场特殊的比武大会上胜出的人要代表“和平谷”将邪恶的大龙永久地驱除出去，啥都不会的阿宝却在经历了一系列阴差阳错之后屏雀中选，让所有人都大跌眼镜。" }, "starreward": 11011 @@ -222,7 +222,7 @@ "text": "第12章：乌龟大师" }, "desc": { - "key": "mainchapter_desc_10012", + "key": "mainchapter_desc_11012", "text": "可是在一场特殊的比武大会上胜出的人要代表“和平谷”将邪恶的大龙永久地驱除出去，啥都不会的阿宝却在经历了一系列阴差阳错之后屏雀中选，让所有人都大跌眼镜。" }, "starreward": 11012 @@ -241,7 +241,7 @@ "text": "第1章：功夫世界" }, "desc": { - "key": "mainchapter_desc_10001", + "key": "mainchapter_desc_12001", "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。话说熊猫阿宝是一家面条店的学徒，虽然笨手笨脚，也勉强算是谋到了一份职业。" }, "starreward": 11013 @@ -260,7 +260,7 @@ "text": "第2章：练功房" }, "desc": { - "key": "mainchapter_desc_10002", + "key": "mainchapter_desc_12002", "text": "别看阿宝所在的“和平谷”一派欣欣向荣的安详景象，其实是一个卧虎藏龙的风水宝地，先不说五大功夫高手皆坐镇于此，更有一大师级别的宗师在这里隐居。" }, "starreward": 11014 @@ -279,7 +279,7 @@ "text": "第3章：太狼来袭" }, "desc": { - "key": "mainchapter_desc_10003", + "key": "mainchapter_desc_12003", "text": "可是在一场特殊的比武大会上胜出的人要代表“和平谷”将邪恶的大龙永久地驱除出去，啥都不会的阿宝却在经历了一系列阴差阳错之后屏雀中选，让所有人都大跌眼镜。" }, "starreward": 11015 @@ -298,7 +298,7 @@ "text": "第4章：乌龟大师" }, "desc": { - "key": "mainchapter_desc_10004", + "key": "mainchapter_desc_12004", "text": "自负的毒蛇大师虽然给人的感觉稍显轻浮，但对这件事的态度就有如她善变的性格，不太明朗；螳螂大师算是几位高手中最聪明的一个，对阿宝的现状很是无奈，总是暗中帮忙。" }, "starreward": 11016 @@ -317,7 +317,7 @@ "text": "第5章：激烈战斗" }, "desc": { - "key": "mainchapter_desc_10005", + "key": "mainchapter_desc_12005", "text": "最后要将阿宝调教成“功夫高手”的一代宗师“师父”华丽丽地出场了，然而有着一身好功夫并不意味着就是完美的，“师父”因为过去犯下的一个错误，一直纠结着没办法释然。" }, "starreward": 11017 @@ -336,7 +336,7 @@ "text": "第6章：下山" }, "desc": { - "key": "mainchapter_desc_10006", + "key": "mainchapter_desc_12006", "text": "至于那个让人人都如临大敌的太郎，则是一只非常自恋的雪豹，他等待复仇的这一天，已经整整等了20年了，可是他做梦也没想到，自己等来的竟然是一只大熊猫。" }, "starreward": 11018 @@ -355,7 +355,7 @@ "text": "第7章：事件余波" }, "desc": { - "key": "mainchapter_desc_10007", + "key": "mainchapter_desc_12007", "text": "激烈的战斗后，阿宝以自己对武功的悟性和师父传授的武术，战胜了太郎，拯救了山谷，为山谷带来了和平。" }, "starreward": 11019 @@ -374,7 +374,7 @@ "text": "第8章：乌龟大师" }, "desc": { - "key": "mainchapter_desc_10008", + "key": "mainchapter_desc_12008", "text": "可是在一场特殊的比武大会上胜出的人要代表“和平谷”将邪恶的大龙永久地驱除出去，啥都不会的阿宝却在经历了一系列阴差阳错之后屏雀中选，让所有人都大跌眼镜。" }, "starreward": 11020 @@ -393,7 +393,7 @@ "text": "第9章：太狼来袭" }, "desc": { - "key": "mainchapter_desc_10009", + "key": "mainchapter_desc_12009", "text": "可是在一场特殊的比武大会上胜出的人要代表“和平谷”将邪恶的大龙永久地驱除出去，啥都不会的阿宝却在经历了一系列阴差阳错之后屏雀中选，让所有人都大跌眼镜。" }, "starreward": 11021 @@ -412,7 +412,7 @@ "text": "第10章：乌龟大师" }, "desc": { - "key": "mainchapter_desc_10010", + "key": "mainchapter_desc_12010", "text": "可是在一场特殊的比武大会上胜出的人要代表“和平谷”将邪恶的大龙永久地驱除出去，啥都不会的阿宝却在经历了一系列阴差阳错之后屏雀中选，让所有人都大跌眼镜。" }, "starreward": 11022 @@ -431,7 +431,7 @@ "text": "第11章：太狼来袭" }, "desc": { - "key": "mainchapter_desc_10011", + "key": "mainchapter_desc_12011", "text": "可是在一场特殊的比武大会上胜出的人要代表“和平谷”将邪恶的大龙永久地驱除出去，啥都不会的阿宝却在经历了一系列阴差阳错之后屏雀中选，让所有人都大跌眼镜。" }, "starreward": 11023 @@ -450,7 +450,7 @@ "text": "第12章：乌龟大师" }, "desc": { - "key": "mainchapter_desc_10012", + "key": "mainchapter_desc_12012", "text": "可是在一场特殊的比武大会上胜出的人要代表“和平谷”将邪恶的大龙永久地驱除出去，啥都不会的阿宝却在经历了一系列阴差阳错之后屏雀中选，让所有人都大跌眼镜。" }, "starreward": 11024 diff --git a/bin/json/game_pandamasmryl.json b/bin/json/game_pandamasmryl.json index 78284c4c6..23ff64c7c 100644 --- a/bin/json/game_pandamasmryl.json +++ b/bin/json/game_pandamasmryl.json @@ -7,7 +7,7 @@ }, "icon": "开合跳", "des": { - "key": "wuguandongzuo_开合跳", + "key": "wuguandongzuo_kaihetiao", "text": "双脚并立,双臂自然垂在身体的两侧。向上跳,双腿打开,双手举过头顶。\n再向上跳,双脚并拢,手臂放回身体两侧，重复这个动作。这项运动锻炼身体所有的大肌肉群。" }, "ticks": 3, @@ -27,7 +27,7 @@ }, "icon": "手臂环绕", "des": { - "key": "wuguandongzuo_手臂环绕", + "key": "wuguandongzuo_shoubihuanrao", "text": "双腿与肩同宽,双臂与肩同高平伸于身体两侧。\n然后双臂进行顺时针绕环活动,之后逆时针绕环。" }, "ticks": 3, diff --git a/bin/json/game_vikingboss.json b/bin/json/game_vikingboss.json index 6121185e7..ee93489c4 100644 --- a/bin/json/game_vikingboss.json +++ b/bin/json/game_vikingboss.json @@ -55,7 +55,7 @@ "n": 1 } ], - "drop": 1001, + "drop": 1004, "scene": "bossfight_spinymandrilla_02", "bossmodel": 11009, "boss_skill": 51004, @@ -133,7 +133,7 @@ "n": 1 } ], - "drop": 1002, + "drop": 1005, "scene": "bossfight_spinymandrilla_02", "bossmodel": 11009, "boss_skill": 51004, @@ -211,7 +211,7 @@ "n": 1 } ], - "drop": 1003, + "drop": 1006, "scene": "bossfight_spinymandrilla_02", "bossmodel": 11009, "boss_skill": 51004, @@ -289,7 +289,7 @@ "n": 1 } ], - "drop": 1004, + "drop": 1007, "scene": "bossfight_spinymandrilla_02", "bossmodel": 11009, "boss_skill": 51004, @@ -367,7 +367,7 @@ "n": 1 } ], - "drop": 1005, + "drop": 1008, "scene": "bossfight_spinymandrilla_02", "bossmodel": 11009, "boss_skill": 51004, @@ -445,7 +445,7 @@ "n": 1 } ], - "drop": 1006, + "drop": 1009, "scene": "bossfight_spinymandrilla_02", "bossmodel": 11009, "boss_skill": 51004, @@ -523,7 +523,7 @@ "n": 1 } ], - "drop": 1007, + "drop": 1010, "scene": "bossfight_spinymandrilla_02", "bossmodel": 11009, "boss_skill": 51004, @@ -601,7 +601,7 @@ "n": 1 } ], - "drop": 1008, + "drop": 1011, "scene": "bossfight_spinymandrilla_02", "bossmodel": 11009, "boss_skill": 51004, @@ -679,7 +679,7 @@ "n": 1 } ], - "drop": 1009, + "drop": 1012, "scene": "bossfight_spinymandrilla_02", "bossmodel": 11009, "boss_skill": 51004, @@ -757,7 +757,7 @@ "n": 1 } ], - "drop": 1010, + "drop": 1013, "scene": "bossfight_spinymandrilla_02", "bossmodel": 11009, "boss_skill": 51004, @@ -835,7 +835,7 @@ "n": 1 } ], - "drop": 1011, + "drop": 1014, "scene": "bossfight_spinymandrilla_02", "bossmodel": 11003, "boss_skill": 51004, @@ -913,7 +913,7 @@ "n": 1 } ], - "drop": 1012, + "drop": 1015, "scene": "bossfight_spinymandrilla_02", "bossmodel": 11003, "boss_skill": 51004, @@ -991,7 +991,7 @@ "n": 1 } ], - "drop": 1013, + "drop": 1016, "scene": "bossfight_spinymandrilla_02", "bossmodel": 11003, "boss_skill": 51004, @@ -1069,7 +1069,7 @@ "n": 1 } ], - "drop": 1014, + "drop": 1017, "scene": "bossfight_spinymandrilla_02", "bossmodel": 11003, "boss_skill": 51004, @@ -1147,7 +1147,7 @@ "n": 1 } ], - "drop": 1015, + "drop": 1018, "scene": "bossfight_spinymandrilla_02", "bossmodel": 11003, "boss_skill": 51004, @@ -1225,7 +1225,7 @@ "n": 1 } ], - "drop": 1016, + "drop": 1019, "scene": "bossfight_spinymandrilla_02", "bossmodel": 11003, "boss_skill": 51004, @@ -1303,7 +1303,7 @@ "n": 1 } ], - "drop": 1017, + "drop": 1020, "scene": "bossfight_spinymandrilla_02", "bossmodel": 11003, "boss_skill": 51004, @@ -1381,7 +1381,7 @@ "n": 1 } ], - "drop": 1018, + "drop": 1021, "scene": "bossfight_spinymandrilla_02", "bossmodel": 11003, "boss_skill": 51004, @@ -1459,7 +1459,7 @@ "n": 1 } ], - "drop": 1019, + "drop": 1022, "scene": "bossfight_spinymandrilla_02", "bossmodel": 11003, "boss_skill": 51004, @@ -1537,7 +1537,7 @@ "n": 1 } ], - "drop": 1020, + "drop": 1023, "scene": "bossfight_spinymandrilla_02", "bossmodel": 11003, "boss_skill": 51004, @@ -1615,7 +1615,7 @@ "n": 1 } ], - "drop": 1021, + "drop": 1024, "scene": "bossfight_spinymandrilla_02", "bossmodel": 11018, "boss_skill": 51004, @@ -1693,7 +1693,7 @@ "n": 1 } ], - "drop": 1022, + "drop": 1025, "scene": "bossfight_spinymandrilla_02", "bossmodel": 11018, "boss_skill": 51004, @@ -1771,7 +1771,7 @@ "n": 1 } ], - "drop": 1023, + "drop": 1026, "scene": "bossfight_spinymandrilla_02", "bossmodel": 11018, "boss_skill": 51004, @@ -1849,7 +1849,7 @@ "n": 1 } ], - "drop": 1024, + "drop": 1027, "scene": "bossfight_spinymandrilla_02", "bossmodel": 11018, "boss_skill": 51004, @@ -1927,7 +1927,7 @@ "n": 1 } ], - "drop": 1025, + "drop": 1028, "scene": "bossfight_spinymandrilla_02", "bossmodel": 11018, "boss_skill": 51004, @@ -2005,7 +2005,7 @@ "n": 1 } ], - "drop": 1026, + "drop": 1029, "scene": "bossfight_spinymandrilla_02", "bossmodel": 11018, "boss_skill": 51004, @@ -2083,7 +2083,7 @@ "n": 1 } ], - "drop": 1027, + "drop": 1030, "scene": "bossfight_spinymandrilla_02", "bossmodel": 11018, "boss_skill": 51004, @@ -2161,7 +2161,7 @@ "n": 1 } ], - "drop": 1028, + "drop": 1004, "scene": "bossfight_spinymandrilla_02", "bossmodel": 11018, "boss_skill": 51004, @@ -2239,7 +2239,7 @@ "n": 1 } ], - "drop": 1029, + "drop": 1005, "scene": "bossfight_spinymandrilla_02", "bossmodel": 11018, "boss_skill": 51004, @@ -2317,7 +2317,7 @@ "n": 1 } ], - "drop": 1030, + "drop": 1006, "scene": "bossfight_spinymandrilla_02", "bossmodel": 11018, "boss_skill": 51004, @@ -2395,7 +2395,7 @@ "n": 1 } ], - "drop": 1001, + "drop": 1007, "scene": "", "bossmodel": 11009, "boss_skill": 51004, @@ -2473,7 +2473,7 @@ "n": 1 } ], - "drop": 1002, + "drop": 1008, "scene": "", "bossmodel": 11009, "boss_skill": 51004, diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index e4303c234..fc993d095 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -635,28 +635,28 @@ "des": 3, "icon": "", "task_Tname": { - "key": "welcom_txt", + "key": "Side_Quest0_task_Tname", "text": "欢迎到来" }, "task_name": { - "key": "welcom_txt", - "text": "欢迎到来" + "key": "Side_Quest0_task_name", + "text": "初次来到世界" }, "npctxt": { - "key": "welcom_txt1", + "key": "Side_Quest0_npctxt", "text": "和门口的小家伙聊聊" }, "npc": 70070, "completetasktxt": { - "key": "welcom_txt", - "text": "欢迎到来" + "key": "Side_Quest0_npctxt", + "text": "和门口的小家伙聊聊" }, "completetask": [ 0 ], "deliver_npctxt": { - "key": "welcom_txt", - "text": "欢迎到来" + "key": "Side_Quest0_npctxt", + "text": "和门口的小家伙聊聊" }, "deliver_npc": 0, "auto_accept": 0, diff --git a/comm/imodule.go b/comm/imodule.go index 4205c006a..940f1744b 100644 --- a/comm/imodule.go +++ b/comm/imodule.go @@ -28,6 +28,9 @@ type ( ISys interface { IsAccess(funcName string, uid string) (code pb.ErrorCode) ValidCond(uid string, conf *cfg.GameOpencondData) string + CheckLvUpCond(session IUserSession, lv int32) + CheckTaskCond(session IUserSession, id int32) + CheckMlineCond(session IUserSession, id int32) } //邮件业务模块对外接口定义 提供给其他模块使用的 diff --git a/modules/library/api_activationfetter.go b/modules/library/api_activationfetter.go index c1e3749f7..6a7fd32d8 100644 --- a/modules/library/api_activationfetter.go +++ b/modules/library/api_activationfetter.go @@ -25,14 +25,14 @@ func (this *apiComp) ActivationFetter(session comm.IUserSession, req *pb.Library code = pb.ErrorCode_LibraryNoData return } - if fetter.Activation { + if fetter.Fidlv != 0 { code = pb.ErrorCode_LibraryActivation return } - fetter.Activation = true + fetter.Fidlv = 1 mapData := make(map[string]interface{}, 0) - mapData["activation"] = fetter.Activation + mapData["fidlv"] = fetter.Fidlv this.module.modelLibrary.modifyLibraryDataByObjId(session.GetUserId(), fetter.Id, mapData) rsp.Data = fetter diff --git a/modules/library/api_getstoryreward.go b/modules/library/api_getstoryreward.go index 2a6289719..4c9cf0950 100644 --- a/modules/library/api_getstoryreward.go +++ b/modules/library/api_getstoryreward.go @@ -46,9 +46,9 @@ func (this *apiComp) GetStoryReward(session comm.IUserSession, req *pb.LibraryGe } } // 等级规则校验 - l := len(_heroFetter.History) - if len(favorConf.Favorlv) < l { - if favorConf.Favorlv[l] > _heroFetter.Favorlv { // 等级不够 + _len := len(_heroFetter.History) + if len(favorConf.Favorlv) < _len { + if favorConf.Favorlv[_len] > _heroFetter.Favorlv { // 等级不够 code = pb.ErrorCode_LibraryLvReward return } @@ -57,26 +57,25 @@ func (this *apiComp) GetStoryReward(session comm.IUserSession, req *pb.LibraryGe var res []*cfg.Gameatn if v == req.History { - switch iPos { - case 1: + if iPos == 0 { res = append(res, favorConf.BiographyReward1...) - case 2: + } else if iPos == 1 { res = append(res, favorConf.BiographyReward2...) - case 3: + } else if iPos == 2 { res = append(res, favorConf.BiographyReward3...) } + + if len(res) > 0 { + if code = this.module.DispenseRes(session, res, true); code != pb.ErrorCode_Success { + return + } + } else { + this.module.Errorf("领取奖励配置错误:%d", req.History) + code = pb.ErrorCode_LibraryLvReward + return + } break } - if len(res) > 0 { - if code = this.module.DispenseRes(session, res, true); code != pb.ErrorCode_Success { - return - } - } else { - this.module.Errorf("领取奖励配置错误:%d", req.History) - code = pb.ErrorCode_LibraryLvReward - return - } - } _heroFetter.History = append(_heroFetter.History, req.History) diff --git a/modules/library/api_getreward.go b/modules/library/api_lvup.go similarity index 69% rename from modules/library/api_getreward.go rename to modules/library/api_lvup.go index b7c054067..6eb7f8bef 100644 --- a/modules/library/api_getreward.go +++ b/modules/library/api_lvup.go @@ -7,27 +7,27 @@ import ( ) //参数校验 -func (this *apiComp) GetRewardCheck(session comm.IUserSession, req *pb.LibraryGetRewardReq) (code pb.ErrorCode) { - if req.ObjId == "" || req.Fetterlv == 0 { +func (this *apiComp) FetterLvUpCheck(session comm.IUserSession, req *pb.LibraryFetterLvUpReq) (code pb.ErrorCode) { + if req.LibOid == "" { code = pb.ErrorCode_ReqParameterError } return } // 羁绊等级奖励 -func (this *apiComp) GetReward(session comm.IUserSession, req *pb.LibraryGetRewardReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) FetterLvUp(session comm.IUserSession, req *pb.LibraryFetterLvUpReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( totalFetterLv int32 //羁绊总等级 ) - code = this.GetRewardCheck(session, req) + code = this.FetterLvUpCheck(session, req) if code != pb.ErrorCode_Success { return // 参数校验失败直接返回 } // 配置校验 - rsp := &pb.LibraryGetRewardResp{} - fetter := this.module.getLibraryByObjID(session.GetUserId(), req.ObjId) + rsp := &pb.LibraryFetterLvUpResp{} + fetter := this.module.getLibraryByObjID(session.GetUserId(), req.LibOid) if fetter == nil { code = pb.ErrorCode_LibraryNoData return @@ -38,22 +38,23 @@ func (this *apiComp) GetReward(session comm.IUserSession, req *pb.LibraryGetRewa } } totalFetterLv = 0 - conf := this.module.configure.GetFriendData(fetter.Fid, req.Fetterlv) + conf := this.module.configure.GetFriendData(fetter.Fid, fetter.Fidlv+1) if len(conf) == 0 { code = pb.ErrorCode_ConfigNoFound return } else { + fetter.Fidlv += 1 if conf[0].FavorabilityLv > totalFetterLv { code = pb.ErrorCode_LibraryLvReward return } } - if _, ok := fetter.Prize[req.Fetterlv]; ok { + if _, ok := fetter.Prize[fetter.Fidlv]; ok { code = pb.ErrorCode_LibraryReward return } - fetter.Prize[req.Fetterlv] = 1 + fetter.Prize[fetter.Fidlv] = 1 // 发奖 hProperty := make(map[string][]*cfg.Gameatr, 0) @@ -71,8 +72,9 @@ func (this *apiComp) GetReward(session comm.IUserSession, req *pb.LibraryGetRewa this.module.ModuleHero.AddHeroFetterAttribute(session, hProperty) mapData := make(map[string]interface{}, 0) mapData["prize"] = fetter.Prize + mapData["fidlv"] = fetter.Fidlv this.module.ModifyLibraryData(session.GetUserId(), fetter.Id, mapData) // 更新内存信息 rsp.Data = fetter - session.SendMsg(string(this.module.GetType()), LibraryGetRewardResp, rsp) + session.SendMsg(string(this.module.GetType()), "fetterlvup", rsp) return } diff --git a/modules/parkour/api_invitehandle.go b/modules/parkour/api_invitehandle.go index 1a6198a1f..6faadbc21 100644 --- a/modules/parkour/api_invitehandle.go +++ b/modules/parkour/api_invitehandle.go @@ -42,10 +42,10 @@ func (this *apiComp) InviteHandle(session comm.IUserSession, req *pb.ParkourInvi code = pb.ErrorCode_ParkourMemberFull return } - if req.State == 1 { + if req.State == 3 { ok = false for i, v := range tean.Invite { - if v.Uid == session.GetUserId() && !configure.Now().Before(time.Unix(v.Expired, 0)) { //邀请未过期 + if v.Uid == session.GetUserId() && configure.Now().Before(time.Unix(v.Expired, 0)) { //邀请未过期 invite = v index = int32(i) ok = true @@ -64,6 +64,7 @@ func (this *apiComp) InviteHandle(session comm.IUserSession, req *pb.ParkourInvi code = pb.ErrorCode_ConfigNoFound return } + users = append(users, invite.Uid) member = &pb.DBRaceMember{Uid: invite.Uid, Name: invite.Name, Avatar: invite.Avatar, Lv: invite.Lv, Mount: info.Dfmount, Hp: mount.Hp} tean.Captainid = tean.Uid tean.State = pb.RaceTeamState_teaming @@ -93,6 +94,6 @@ func (this *apiComp) InviteHandle(session comm.IUserSession, req *pb.ParkourInvi &pb.ParkourInviteNoticePush{Team: tean, State: 3}, tean.Captainid) } - session.SendMsg(string(this.module.GetType()), "invite", &pb.ParkourInviteHandleResp{IsSucc: true}) + session.SendMsg(string(this.module.GetType()), "invitehandle", &pb.ParkourInviteHandleResp{IsSucc: true}) return } diff --git a/modules/parkour/api_jointeam.go b/modules/parkour/api_jointeam.go index daf9d08f7..7f06d5a07 100644 --- a/modules/parkour/api_jointeam.go +++ b/modules/parkour/api_jointeam.go @@ -8,6 +8,10 @@ import ( //参数校验 func (this *apiComp) JoinTeamCheck(session comm.IUserSession, req *pb.ParkourJoinTeamReq) (code pb.ErrorCode) { + if session.GetUserId() == req.Uid { + code = pb.ErrorCode_ReqParameterError + } + return } @@ -36,7 +40,7 @@ func (this *apiComp) JoinTeam(session comm.IUserSession, req *pb.ParkourJoinTeam } if len(info.Member) > 3 { - code = pb.ErrorCode_ReqParameterError + code = pb.ErrorCode_ParkourMemberFull return } if tean, err = this.module.parkourComp.queryinfo(req.Uid); err != nil { @@ -58,7 +62,7 @@ func (this *apiComp) JoinTeam(session comm.IUserSession, req *pb.ParkourJoinTeam code = pb.ErrorCode_ConfigNoFound return } - member = &pb.DBRaceMember{Uid: session.GetUserId(), Name: user.Name, Avatar: user.Avatar, Lv: user.Lv, Mount: tean.Dfmount, Hp: mount.Hp} + member = &pb.DBRaceMember{Uid: user.Uid, Name: user.Name, Avatar: user.Avatar, Lv: user.Lv, Mount: tean.Dfmount, Hp: mount.Hp} tean.Captainid = tean.Uid tean.State = pb.RaceTeamState_teaming tean.Member = append(tean.Member, member) @@ -71,7 +75,7 @@ func (this *apiComp) JoinTeam(session comm.IUserSession, req *pb.ParkourJoinTeam return } user := this.module.ModuleUser.GetUser(session.GetUserId()) - member = &pb.DBRaceMember{Uid: session.GetUserId(), Name: user.Name, Avatar: user.Avatar, Lv: user.Lv, Mount: info.Dfmount, Hp: mount.Hp} + member = &pb.DBRaceMember{Uid: user.Uid, Name: user.Name, Avatar: user.Avatar, Lv: user.Lv, Mount: info.Dfmount, Hp: mount.Hp} tean.Member = append(tean.Member, member) if err = this.module.parkourComp.Change(session.GetUserId(), map[string]interface{}{ "state": tean.State, diff --git a/modules/parkour/api_racematch.go b/modules/parkour/api_racematch.go index 18400c836..6246c336f 100644 --- a/modules/parkour/api_racematch.go +++ b/modules/parkour/api_racematch.go @@ -3,6 +3,7 @@ package parkour import ( "go_dreamfactory/comm" "go_dreamfactory/pb" + cfg "go_dreamfactory/sys/configure/structs" ) //参数校验 @@ -17,6 +18,8 @@ func (this *apiComp) RaceMatchCheck(session comm.IUserSession, req *pb.ParkourRa func (this *apiComp) RaceMatch(session comm.IUserSession, req *pb.ParkourRaceMatchReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( team *pb.DBParkour + tuser *pb.DBUser + mount *cfg.GameBuzkashiMountData users []string err error ) @@ -27,10 +30,31 @@ func (this *apiComp) RaceMatch(session comm.IUserSession, req *pb.ParkourRaceMat code = pb.ErrorCode_DBError return } - if team.Captainid != session.GetUserId() { + if team.Captainid != "" && team.Captainid != session.GetUserId() { code = pb.ErrorCode_ReqParameterError return } + if team.Captainid == "" { //为组队情况 + team.Captainid = team.Uid + team.State = pb.RaceTeamState_teaming + if tuser = this.module.ModuleUser.GetUser(session.GetUserId()); tuser == nil { + code = pb.ErrorCode_SystemError + return + } + if mount, err = this.module.configure.getGameBuzkashiMount(team.Dfmount); err != nil { + code = pb.ErrorCode_ConfigNoFound + return + } + team.Member = append(team.Member, &pb.DBRaceMember{Uid: tuser.Uid, Name: tuser.Name, Avatar: tuser.Avatar, Lv: tuser.Lv, Mount: team.Dfmount, Hp: mount.Hp}) + if err = this.module.parkourComp.Change(team.Captainid, map[string]interface{}{ + "state": team.State, + "captainid": team.Captainid, + "member": team.Member, + }); err != nil { + code = pb.ErrorCode_DBError + return + } + } if err = this.module.match(team); err != nil { code = pb.ErrorCode_DBError diff --git a/modules/parkour/api_viewplayer.go b/modules/parkour/api_viewplayer.go index 350088c11..df8a1d9fe 100644 --- a/modules/parkour/api_viewplayer.go +++ b/modules/parkour/api_viewplayer.go @@ -18,7 +18,9 @@ func (this *apiComp) ViewPlayer(session comm.IUserSession, req *pb.ParkourViewPl if code = this.ViewPlayerCheck(session, req); code != pb.ErrorCode_Success { return } - + resp = &pb.ParkourViewPlayerResp{ + Player: make([]*pb.ParkourData, 0), + } for _, uid := range req.Uid { if u := this.module.ModuleUser.GetUser(uid); u != nil { { diff --git a/modules/parkour/module.go b/modules/parkour/module.go index 276af9215..ed423ec99 100644 --- a/modules/parkour/module.go +++ b/modules/parkour/module.go @@ -148,11 +148,12 @@ func (this *Parkour) createbattle(ctx context.Context, req *pb.RPCParkourMatchSu v.Ready = true } } + battle.BuleMember = req.Bule + for _, v := range battle.Session { sessions = append(sessions, v) } - battle.BuleMember = req.Bule if err = this.raceComp.addrace(race); err != nil { return } @@ -406,17 +407,6 @@ func (this *Parkour) useroffline(uid, sessionid string) { } if info.State == pb.RaceTeamState_teaming { if info.Captainid == uid { - info.Invite = info.Invite[:0] - info.Member = info.Member[:0] - if err = this.parkourComp.Change(uid, map[string]interface{}{ - "captainid": "", - "state": 0, - "Invite": info.Invite, - "member": info.Member, - }); err != nil { - this.Error("用户离线! 处理数据", log.Field{Key: "uid", Value: uid}, log.Field{Key: "err", Value: err.Error()}) - return - } users = make([]string, 0) for _, v := range info.Member { if v.Uid != uid && !v.Isai { @@ -430,6 +420,17 @@ func (this *Parkour) useroffline(uid, sessionid string) { } } } + info.Invite = info.Invite[:0] + info.Member = info.Member[:0] + if err = this.parkourComp.Change(uid, map[string]interface{}{ + "captainid": "", + "state": 0, + "Invite": info.Invite, + "member": info.Member, + }); err != nil { + this.Error("用户离线! 处理数据", log.Field{Key: "uid", Value: uid}, log.Field{Key: "err", Value: err.Error()}) + return + } if len(users) > 0 { if err = this.SendMsgToUsers(string(comm.ModulePvp), "teamdisbandnotice", &pb.ParkourTeamDisbandNoticePush{}, users...); err != nil { this.Errorln(err) diff --git a/modules/smithy/api_forgeequip.go b/modules/smithy/api_forgeequip.go index edfd5e596..10a184727 100644 --- a/modules/smithy/api_forgeequip.go +++ b/modules/smithy/api_forgeequip.go @@ -87,7 +87,7 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq needTemperatureCos = reelcfg.TemperatureCos * req.Count // 熟练度减少的温度 t := this.module.modelStove.CheckTemperature(req.ReelId, stove.Data[req.ReelId].Lv) - needTemperatureCos = reelcfg.TemperatureCos * (1000 - t) / 1000 // 千分比 + needTemperatureCos = needTemperatureCos * (1000 - t) / 1000 // 千分比 if req.Lava > 0 { // 熔岩打造 exemption := this.module.ModuleTools.GetGlobalConf().ExemptionTemperatureCos // 预计消耗温度 diff --git a/modules/sys/config.go b/modules/sys/config.go index ced4517fc..a3c4bde4d 100644 --- a/modules/sys/config.go +++ b/modules/sys/config.go @@ -4,7 +4,9 @@ import ( "fmt" "go_dreamfactory/lego/core" "go_dreamfactory/modules" + "go_dreamfactory/sys/configure" cfg "go_dreamfactory/sys/configure/structs" + "sync" ) const ( @@ -13,15 +15,61 @@ const ( type configureComp struct { modules.MCompConfigure + module *ModuleSys + + hlock sync.RWMutex + maplv map[int32][]string // 监听等级大于1 的配置 + maptask map[int32][]string + mapmline map[int32][]string } func (this *configureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { err = this.MCompConfigure.Init(service, module, comp, options) - this.LoadConfigure(gameOpencond, cfg.NewGameOpencond) + //this.LoadConfigure(gameOpencond, cfg.NewGameOpencond) + configure.RegisterConfigure(gameOpencond, cfg.NewGameOpencond, this.LoadCondConfig) + this.module = module.(*ModuleSys) + this.getFuncCfg("sign") return } +func (this *configureComp) LoadCondConfig() { + this.maplv = make(map[int32][]string, 0) + this.maptask = make(map[int32][]string, 0) + this.mapmline = make(map[int32][]string, 0) + if v, err := this.GetConfigure(gameOpencond); err == nil { + + if data, ok := v.(*cfg.GameOpencond); ok { + for _, v := range data.GetDataList() { + for _, v1 := range v.Main { + if v.ActivateType == 2 { + if v1.Key == 1 && v1.Param > 1 { + this.maplv[v1.Param] = append(this.maplv[v1.Param], v.Id) + } + if v1.Key == 3 && v1.Param > 1 { + this.maptask[v1.Param] = append(this.maptask[v1.Param], v.Id) + } + if v1.Key == 2 && v1.Param > 1 { + this.mapmline[v1.Param] = append(this.mapmline[v1.Param], v.Id) + } + } + } + } + } + } +} + +func (this *configureComp) GetOpencondLv(lv int32) []string { + return this.maplv[lv] +} + +func (this *configureComp) getOpencondMline(id int32) []string { + return this.mapmline[id] +} + +func (this *configureComp) getOpencondTask(id int32) []string { + return this.maptask[id] +} func (this *configureComp) getOpencondCfg() (data *cfg.GameOpencond, err error) { var ( v interface{} diff --git a/modules/sys/module.go b/modules/sys/module.go index 23c5be9e2..8ba9adbcf 100644 --- a/modules/sys/module.go +++ b/modules/sys/module.go @@ -45,3 +45,52 @@ func (this *ModuleSys) IsAccess(funcName string, userId string) (code pb.ErrorCo func (this *ModuleSys) ValidCond(uid string, conf *cfg.GameOpencondData) string { return this.modelSys.validCond(uid, conf) } + +func (this *ModuleSys) CheckLvUpCond(session comm.IUserSession, lv int32) { + if cond := this.configure.GetOpencondLv(lv); len(cond) > 0 { + this.AutoActivate(session, cond) + } +} +func (this *ModuleSys) CheckMlineCond(session comm.IUserSession, id int32) { + if cond := this.configure.getOpencondMline(id); len(cond) > 0 { + this.AutoActivate(session, cond) + } +} +func (this *ModuleSys) CheckTaskCond(session comm.IUserSession, id int32) { + if cond := this.configure.getOpencondTask(id); len(cond) > 0 { + this.AutoActivate(session, cond) + } +} + +// 自动激活 +func (this *ModuleSys) AutoActivate(session comm.IUserSession, cids []string) bool { + var ( + szOpen []string + ) + list, _ := this.modelSys.GetOpenCondList(session.GetUserId()) + for _, cid := range cids { + opencfg := this.configure.getOpencondCfgByCid(cid) + if opencfg != nil { + if id := this.modelSys.validCond(session.GetUserId(), opencfg); id == "" { // 条件不满足 + break + } + } + for k, v := range list.Cond { + if k == cid && v != 0 { + list.Cond[cid] = 1 + szOpen = append(szOpen, cid) + break + } + } + } + if len(szOpen) > 0 { + this.modelSys.ChangeOpenCondData(session.GetUserId(), map[string]interface{}{ + "cond": list.Cond, + }) + } + // 推送变化 + session.SendMsg(string(this.GetType()), "open", &pb.SysFuncOpnePush{ + Cid: szOpen, + }) + return true +} diff --git a/modules/timer/parkour.go b/modules/timer/parkour.go index 3a479595a..9fd033a70 100644 --- a/modules/timer/parkour.go +++ b/modules/timer/parkour.go @@ -197,6 +197,7 @@ func (this *ParkourComp) cancel(ctx context.Context, req *pb.RPCParkourCancelMat //定时匹配处理 func (this *ParkourComp) timer() { + this.module.Errorf("捕羊大赛 定时匹配,%d", this.total) if this.total == 0 { return } @@ -338,7 +339,7 @@ func (this *ParkourComp) timer() { reduser = append(reduser, this.teams[v]...) } for _, v := range bule { - buleuser = append(reduser, this.teams[v]...) + buleuser = append(buleuser, this.teams[v]...) } if len(users)+rednum+bulenum < 6 { @@ -347,8 +348,9 @@ func (this *ParkourComp) timer() { //补充人员 if len(reduser) < 3 { + n := len(reduser) reduser = append(reduser, users[0:(3-len(reduser))]...) - users = users[(3 - len(reduser)):] + users = users[(3 - n):] for _, v := range reduser[rednum:3] { if v.Name == "" { //同步用户数据 if user, err := this.getuser(v.Uid); err != nil { @@ -357,13 +359,15 @@ func (this *ParkourComp) timer() { } else { v.Name = user.Name v.Avatar = user.Avatar + v.Lv = user.Lv } } } } if len(buleuser) < 3 { + n := len(buleuser) buleuser = append(buleuser, users[0:(3-len(buleuser))]...) - users = users[(3 - len(buleuser)):] + users = users[(3 - n):] for _, v := range buleuser[bulenum:3] { if v.Name == "" { //同步用户数据 if user, err := this.getuser(v.Uid); err != nil { @@ -372,6 +376,7 @@ func (this *ParkourComp) timer() { } else { v.Name = user.Name v.Avatar = user.Avatar + v.Lv = user.Lv } } } diff --git a/modules/user/model_user.go b/modules/user/model_user.go index c15118d2a..7ba162858 100644 --- a/modules/user/model_user.go +++ b/modules/user/model_user.go @@ -289,6 +289,7 @@ func (this *ModelUser) ChangeLevel(event interface{}, next func(event interface{ } et.TriggerEvent(comm.EventOpenCond, ul.session.GetUserId(), funcList) + isys.CheckLvUpCond(ul.session, curLv) // 校验新功能是否开启 } } if err := ul.session.SendMsg(string(this.module.GetType()), UserSubTypeLvChangedPush, diff --git a/modules/viking/api_challengeover.go b/modules/viking/api_challengeover.go index 34dfd2b75..48517bb89 100644 --- a/modules/viking/api_challengeover.go +++ b/modules/viking/api_challengeover.go @@ -25,6 +25,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal atno []*pb.UserAtno // atno 类型 del []string // 自动出售的装备 changExp map[string]int32 + res []*cfg.Gameatn // 最后获得的资源 ) changExp = make(map[string]int32, 0) mapData = make(map[string]interface{}, 0) @@ -102,22 +103,36 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal mapData["bossTime"] = viking.BossTime // 更新时间 reward = this.module.configure.GetDropReward(vikingCfg.Drop) // 获取掉落奖励 - if code, atno = this.module.DispenseAtno(session, reward, true); code != pb.ErrorCode_Success { - return - } - - for _, v := range req.Star { - for _, v1 := range atno { - if v1.A == "equp" { - cfg := this.configure.GetEquipmentConfigureById(v1.T) - if cfg != nil && cfg.Star == v { - del = append(del, v1.O) + // 星级校验 + for _, v := range reward { + bFound := false + if v.A == "equp" { + for _, star := range req.Star { + cfg := this.configure.GetEquipmentConfigureById(v.T) + if cfg != nil && star == cfg.Star { // 自动出售 转换成其他道具 + if len(cfg.Sale) != 0 { + bFound = true + res = append(res, cfg.Sale...) + } + break } } } + // else if v.A == "item" { //道具出售 以后补充 + // if cfg, err := this.configure.GetItemConfigureData(v.T); err != nil { // 自动出售 转换成其他道具 + // if len(cfg.Sale) != 0 { + // bFound = true + // res = append(res, cfg.Sale...) + // } + // } + // } + if !bFound { + res = append(res, v) + } } - if len(del) > 0 { // 自动出售 - this.equip.SellEquipments(session, del) + + if code, atno = this.module.DispenseAtno(session, res, true); code != pb.ErrorCode_Success { + return } code = this.module.ModifyVikingData(session.GetUserId(), mapData) diff --git a/pb/library_db.pb.go b/pb/library_db.pb.go index e78626186..b150c9533 100644 --- a/pb/library_db.pb.go +++ b/pb/library_db.pb.go @@ -31,7 +31,7 @@ type DBLibrary struct { Herofetter map[string]string `protobuf:"bytes,4,rep,name=herofetter,proto3" json:"herofetter" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // key: hid value: DBHeroFetter ObjID Prize map[int32]int32 `protobuf:"bytes,5,rep,name=prize,proto3" json:"prize" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //是否领奖 key 好感度等级 Storyid int32 `protobuf:"varint,6,opt,name=storyid,proto3" json:"storyid"` // 故事id 用来判断是否领奖 - Activation bool `protobuf:"varint,7,opt,name=activation,proto3" json:"activation"` // 是否激活 + Fidlv int32 `protobuf:"varint,7,opt,name=fidlv,proto3" json:"fidlv"` // 羁绊领奖等级 } func (x *DBLibrary) Reset() { @@ -108,11 +108,11 @@ func (x *DBLibrary) GetStoryid() int32 { return 0 } -func (x *DBLibrary) GetActivation() bool { +func (x *DBLibrary) GetFidlv() int32 { if x != nil { - return x.Activation + return x.Fidlv } - return false + return 0 } // 羁绊英雄数据 @@ -398,7 +398,7 @@ var File_library_library_db_proto protoreflect.FileDescriptor var file_library_library_db_proto_rawDesc = []byte{ 0x0a, 0x18, 0x6c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x2f, 0x6c, 0x69, 0x62, 0x72, 0x61, 0x72, - 0x79, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xdb, 0x02, 0x0a, 0x09, 0x44, + 0x79, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xd1, 0x02, 0x0a, 0x09, 0x44, 0x42, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x66, 0x69, @@ -411,55 +411,55 @@ var file_library_library_db_proto_rawDesc = []byte{ 0x61, 0x72, 0x79, 0x2e, 0x50, 0x72, 0x69, 0x7a, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x70, 0x72, 0x69, 0x7a, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x69, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x69, 0x64, 0x12, - 0x1e, 0x0a, 0x0a, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20, - 0x01, 0x28, 0x08, 0x52, 0x0a, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x1a, - 0x3d, 0x0a, 0x0f, 0x48, 0x65, 0x72, 0x6f, 0x66, 0x65, 0x74, 0x74, 0x65, 0x72, 0x45, 0x6e, 0x74, - 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x14, 0x0a, 0x05, 0x66, 0x69, 0x64, 0x6c, 0x76, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, + 0x66, 0x69, 0x64, 0x6c, 0x76, 0x1a, 0x3d, 0x0a, 0x0f, 0x48, 0x65, 0x72, 0x6f, 0x66, 0x65, 0x74, + 0x74, 0x65, 0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, + 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, + 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x38, 0x0a, 0x0a, 0x50, 0x72, 0x69, 0x7a, 0x65, 0x45, 0x6e, 0x74, + 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x38, - 0x0a, 0x0a, 0x50, 0x72, 0x69, 0x7a, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, - 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, - 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, - 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xbe, 0x02, 0x0a, 0x0c, 0x44, 0x42, 0x48, - 0x65, 0x72, 0x6f, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x68, - 0x65, 0x72, 0x6f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, - 0x6f, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x18, 0x04, - 0x20, 0x03, 0x28, 0x05, 0x52, 0x07, 0x68, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x12, 0x18, 0x0a, - 0x07, 0x66, 0x61, 0x76, 0x6f, 0x72, 0x6c, 0x76, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, - 0x66, 0x61, 0x76, 0x6f, 0x72, 0x6c, 0x76, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x61, 0x76, 0x6f, 0x72, - 0x65, 0x78, 0x70, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x66, 0x61, 0x76, 0x6f, 0x72, - 0x65, 0x78, 0x70, 0x12, 0x34, 0x0a, 0x07, 0x6c, 0x76, 0x70, 0x72, 0x69, 0x7a, 0x65, 0x18, 0x08, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x65, 0x74, - 0x74, 0x65, 0x72, 0x2e, 0x4c, 0x76, 0x70, 0x72, 0x69, 0x7a, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, - 0x52, 0x07, 0x6c, 0x76, 0x70, 0x72, 0x69, 0x7a, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x67, 0x69, 0x76, - 0x65, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x67, 0x69, - 0x76, 0x65, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, - 0x18, 0x0a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x1a, 0x3a, 0x0a, - 0x0c, 0x4c, 0x76, 0x70, 0x72, 0x69, 0x7a, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, - 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, - 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, - 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xbe, 0x01, 0x0a, 0x0d, 0x44, 0x42, - 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x69, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, - 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x3e, 0x0a, - 0x0a, 0x66, 0x65, 0x65, 0x74, 0x65, 0x72, 0x54, 0x61, 0x73, 0x6b, 0x18, 0x03, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x1e, 0x2e, 0x44, 0x42, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x74, 0x6f, 0x72, - 0x79, 0x2e, 0x46, 0x65, 0x65, 0x74, 0x65, 0x72, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x6e, 0x74, 0x72, - 0x79, 0x52, 0x0a, 0x66, 0x65, 0x65, 0x74, 0x65, 0x72, 0x54, 0x61, 0x73, 0x6b, 0x1a, 0x4b, 0x0a, - 0x0f, 0x46, 0x65, 0x65, 0x74, 0x65, 0x72, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, - 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, - 0x65, 0x79, 0x12, 0x22, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x0c, 0x2e, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x52, - 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x23, 0x0a, 0x0b, 0x46, 0x65, - 0x74, 0x74, 0x65, 0x72, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x61, 0x73, - 0x6b, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x22, - 0x3c, 0x0a, 0x0a, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x16, 0x0a, - 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, - 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x42, 0x06, 0x5a, - 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xbe, + 0x02, 0x0a, 0x0c, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x12, + 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, + 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, + 0x64, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x69, 0x73, + 0x74, 0x6f, 0x72, 0x79, 0x18, 0x04, 0x20, 0x03, 0x28, 0x05, 0x52, 0x07, 0x68, 0x69, 0x73, 0x74, + 0x6f, 0x72, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x66, 0x61, 0x76, 0x6f, 0x72, 0x6c, 0x76, 0x18, 0x05, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x66, 0x61, 0x76, 0x6f, 0x72, 0x6c, 0x76, 0x12, 0x1a, 0x0a, + 0x08, 0x66, 0x61, 0x76, 0x6f, 0x72, 0x65, 0x78, 0x70, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x08, 0x66, 0x61, 0x76, 0x6f, 0x72, 0x65, 0x78, 0x70, 0x12, 0x34, 0x0a, 0x07, 0x6c, 0x76, 0x70, + 0x72, 0x69, 0x7a, 0x65, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x44, 0x42, 0x48, + 0x65, 0x72, 0x6f, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x2e, 0x4c, 0x76, 0x70, 0x72, 0x69, 0x7a, + 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x6c, 0x76, 0x70, 0x72, 0x69, 0x7a, 0x65, 0x12, + 0x1c, 0x0a, 0x09, 0x67, 0x69, 0x76, 0x65, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x09, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x09, 0x67, 0x69, 0x76, 0x65, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x14, 0x0a, + 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x74, + 0x69, 0x6d, 0x65, 0x1a, 0x3a, 0x0a, 0x0c, 0x4c, 0x76, 0x70, 0x72, 0x69, 0x7a, 0x65, 0x45, 0x6e, + 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, + 0xbe, 0x01, 0x0a, 0x0d, 0x44, 0x42, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x74, 0x6f, 0x72, + 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, + 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, + 0x75, 0x69, 0x64, 0x12, 0x3e, 0x0a, 0x0a, 0x66, 0x65, 0x65, 0x74, 0x65, 0x72, 0x54, 0x61, 0x73, + 0x6b, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x44, 0x42, 0x46, 0x65, 0x74, 0x74, + 0x65, 0x72, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x2e, 0x46, 0x65, 0x65, 0x74, 0x65, 0x72, 0x54, 0x61, + 0x73, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x66, 0x65, 0x65, 0x74, 0x65, 0x72, 0x54, + 0x61, 0x73, 0x6b, 0x1a, 0x4b, 0x0a, 0x0f, 0x46, 0x65, 0x65, 0x74, 0x65, 0x72, 0x54, 0x61, 0x73, + 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x22, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, + 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, + 0x54, 0x61, 0x73, 0x6b, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, + 0x22, 0x23, 0x0a, 0x0b, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x12, + 0x14, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, + 0x74, 0x61, 0x73, 0x6b, 0x73, 0x22, 0x3c, 0x0a, 0x0a, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x54, + 0x61, 0x73, 0x6b, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x73, + 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x74, 0x61, + 0x74, 0x75, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var ( diff --git a/pb/library_msg.pb.go b/pb/library_msg.pb.go index d44d25517..79e62949c 100644 --- a/pb/library_msg.pb.go +++ b/pb/library_msg.pb.go @@ -192,109 +192,6 @@ func (x *LibraryGetFetterListResp) GetData() []*DBHeroFetter { return nil } -// 领取羁绊等级奖励 -type LibraryGetRewardReq struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - ObjId string `protobuf:"bytes,1,opt,name=objId,proto3" json:"objId"` // DBLibrary 的ObjID - Fetterlv int32 `protobuf:"varint,2,opt,name=fetterlv,proto3" json:"fetterlv"` // 羁绊等级 -} - -func (x *LibraryGetRewardReq) Reset() { - *x = LibraryGetRewardReq{} - if protoimpl.UnsafeEnabled { - mi := &file_library_library_msg_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *LibraryGetRewardReq) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*LibraryGetRewardReq) ProtoMessage() {} - -func (x *LibraryGetRewardReq) ProtoReflect() protoreflect.Message { - mi := &file_library_library_msg_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use LibraryGetRewardReq.ProtoReflect.Descriptor instead. -func (*LibraryGetRewardReq) Descriptor() ([]byte, []int) { - return file_library_library_msg_proto_rawDescGZIP(), []int{4} -} - -func (x *LibraryGetRewardReq) GetObjId() string { - if x != nil { - return x.ObjId - } - return "" -} - -func (x *LibraryGetRewardReq) GetFetterlv() int32 { - if x != nil { - return x.Fetterlv - } - return 0 -} - -type LibraryGetRewardResp struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Data *DBLibrary `protobuf:"bytes,1,opt,name=data,proto3" json:"data"` -} - -func (x *LibraryGetRewardResp) Reset() { - *x = LibraryGetRewardResp{} - if protoimpl.UnsafeEnabled { - mi := &file_library_library_msg_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *LibraryGetRewardResp) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*LibraryGetRewardResp) ProtoMessage() {} - -func (x *LibraryGetRewardResp) ProtoReflect() protoreflect.Message { - mi := &file_library_library_msg_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use LibraryGetRewardResp.ProtoReflect.Descriptor instead. -func (*LibraryGetRewardResp) Descriptor() ([]byte, []int) { - return file_library_library_msg_proto_rawDescGZIP(), []int{5} -} - -func (x *LibraryGetRewardResp) GetData() *DBLibrary { - if x != nil { - return x.Data - } - return nil -} - // 领取剧情奖励 type LibraryGetStoryRewardReq struct { state protoimpl.MessageState @@ -308,7 +205,7 @@ type LibraryGetStoryRewardReq struct { func (x *LibraryGetStoryRewardReq) Reset() { *x = LibraryGetStoryRewardReq{} if protoimpl.UnsafeEnabled { - mi := &file_library_library_msg_proto_msgTypes[6] + mi := &file_library_library_msg_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -321,7 +218,7 @@ func (x *LibraryGetStoryRewardReq) String() string { func (*LibraryGetStoryRewardReq) ProtoMessage() {} func (x *LibraryGetStoryRewardReq) ProtoReflect() protoreflect.Message { - mi := &file_library_library_msg_proto_msgTypes[6] + mi := &file_library_library_msg_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -334,7 +231,7 @@ func (x *LibraryGetStoryRewardReq) ProtoReflect() protoreflect.Message { // Deprecated: Use LibraryGetStoryRewardReq.ProtoReflect.Descriptor instead. func (*LibraryGetStoryRewardReq) Descriptor() ([]byte, []int) { - return file_library_library_msg_proto_rawDescGZIP(), []int{6} + return file_library_library_msg_proto_rawDescGZIP(), []int{4} } func (x *LibraryGetStoryRewardReq) GetOid() string { @@ -362,7 +259,7 @@ type LibraryGetStoryRewardResp struct { func (x *LibraryGetStoryRewardResp) Reset() { *x = LibraryGetStoryRewardResp{} if protoimpl.UnsafeEnabled { - mi := &file_library_library_msg_proto_msgTypes[7] + mi := &file_library_library_msg_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -375,7 +272,7 @@ func (x *LibraryGetStoryRewardResp) String() string { func (*LibraryGetStoryRewardResp) ProtoMessage() {} func (x *LibraryGetStoryRewardResp) ProtoReflect() protoreflect.Message { - mi := &file_library_library_msg_proto_msgTypes[7] + mi := &file_library_library_msg_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -388,7 +285,7 @@ func (x *LibraryGetStoryRewardResp) ProtoReflect() protoreflect.Message { // Deprecated: Use LibraryGetStoryRewardResp.ProtoReflect.Descriptor instead. func (*LibraryGetStoryRewardResp) Descriptor() ([]byte, []int) { - return file_library_library_msg_proto_rawDescGZIP(), []int{7} + return file_library_library_msg_proto_rawDescGZIP(), []int{5} } func (x *LibraryGetStoryRewardResp) GetData() *DBHeroFetter { @@ -412,7 +309,7 @@ type LibraryUseGiftReq struct { func (x *LibraryUseGiftReq) Reset() { *x = LibraryUseGiftReq{} if protoimpl.UnsafeEnabled { - mi := &file_library_library_msg_proto_msgTypes[8] + mi := &file_library_library_msg_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -425,7 +322,7 @@ func (x *LibraryUseGiftReq) String() string { func (*LibraryUseGiftReq) ProtoMessage() {} func (x *LibraryUseGiftReq) ProtoReflect() protoreflect.Message { - mi := &file_library_library_msg_proto_msgTypes[8] + mi := &file_library_library_msg_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -438,7 +335,7 @@ func (x *LibraryUseGiftReq) ProtoReflect() protoreflect.Message { // Deprecated: Use LibraryUseGiftReq.ProtoReflect.Descriptor instead. func (*LibraryUseGiftReq) Descriptor() ([]byte, []int) { - return file_library_library_msg_proto_rawDescGZIP(), []int{8} + return file_library_library_msg_proto_rawDescGZIP(), []int{6} } func (x *LibraryUseGiftReq) GetHeroid() string { @@ -473,7 +370,7 @@ type LibraryUseGiftResp struct { func (x *LibraryUseGiftResp) Reset() { *x = LibraryUseGiftResp{} if protoimpl.UnsafeEnabled { - mi := &file_library_library_msg_proto_msgTypes[9] + mi := &file_library_library_msg_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -486,7 +383,7 @@ func (x *LibraryUseGiftResp) String() string { func (*LibraryUseGiftResp) ProtoMessage() {} func (x *LibraryUseGiftResp) ProtoReflect() protoreflect.Message { - mi := &file_library_library_msg_proto_msgTypes[9] + mi := &file_library_library_msg_proto_msgTypes[7] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -499,7 +396,7 @@ func (x *LibraryUseGiftResp) ProtoReflect() protoreflect.Message { // Deprecated: Use LibraryUseGiftResp.ProtoReflect.Descriptor instead. func (*LibraryUseGiftResp) Descriptor() ([]byte, []int) { - return file_library_library_msg_proto_rawDescGZIP(), []int{9} + return file_library_library_msg_proto_rawDescGZIP(), []int{7} } func (x *LibraryUseGiftResp) GetData() *DBHeroFetter { @@ -521,7 +418,7 @@ type LibraryActivationFetterReq struct { func (x *LibraryActivationFetterReq) Reset() { *x = LibraryActivationFetterReq{} if protoimpl.UnsafeEnabled { - mi := &file_library_library_msg_proto_msgTypes[10] + mi := &file_library_library_msg_proto_msgTypes[8] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -534,7 +431,7 @@ func (x *LibraryActivationFetterReq) String() string { func (*LibraryActivationFetterReq) ProtoMessage() {} func (x *LibraryActivationFetterReq) ProtoReflect() protoreflect.Message { - mi := &file_library_library_msg_proto_msgTypes[10] + mi := &file_library_library_msg_proto_msgTypes[8] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -547,7 +444,7 @@ func (x *LibraryActivationFetterReq) ProtoReflect() protoreflect.Message { // Deprecated: Use LibraryActivationFetterReq.ProtoReflect.Descriptor instead. func (*LibraryActivationFetterReq) Descriptor() ([]byte, []int) { - return file_library_library_msg_proto_rawDescGZIP(), []int{10} + return file_library_library_msg_proto_rawDescGZIP(), []int{8} } func (x *LibraryActivationFetterReq) GetOid() string { @@ -568,7 +465,7 @@ type LibraryActivationFetterResp struct { func (x *LibraryActivationFetterResp) Reset() { *x = LibraryActivationFetterResp{} if protoimpl.UnsafeEnabled { - mi := &file_library_library_msg_proto_msgTypes[11] + mi := &file_library_library_msg_proto_msgTypes[9] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -581,7 +478,7 @@ func (x *LibraryActivationFetterResp) String() string { func (*LibraryActivationFetterResp) ProtoMessage() {} func (x *LibraryActivationFetterResp) ProtoReflect() protoreflect.Message { - mi := &file_library_library_msg_proto_msgTypes[11] + mi := &file_library_library_msg_proto_msgTypes[9] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -594,7 +491,7 @@ func (x *LibraryActivationFetterResp) ProtoReflect() protoreflect.Message { // Deprecated: Use LibraryActivationFetterResp.ProtoReflect.Descriptor instead. func (*LibraryActivationFetterResp) Descriptor() ([]byte, []int) { - return file_library_library_msg_proto_rawDescGZIP(), []int{11} + return file_library_library_msg_proto_rawDescGZIP(), []int{9} } func (x *LibraryActivationFetterResp) GetData() *DBLibrary { @@ -617,7 +514,7 @@ type LibraryChangePush struct { func (x *LibraryChangePush) Reset() { *x = LibraryChangePush{} if protoimpl.UnsafeEnabled { - mi := &file_library_library_msg_proto_msgTypes[12] + mi := &file_library_library_msg_proto_msgTypes[10] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -630,7 +527,7 @@ func (x *LibraryChangePush) String() string { func (*LibraryChangePush) ProtoMessage() {} func (x *LibraryChangePush) ProtoReflect() protoreflect.Message { - mi := &file_library_library_msg_proto_msgTypes[12] + mi := &file_library_library_msg_proto_msgTypes[10] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -643,7 +540,7 @@ func (x *LibraryChangePush) ProtoReflect() protoreflect.Message { // Deprecated: Use LibraryChangePush.ProtoReflect.Descriptor instead. func (*LibraryChangePush) Descriptor() ([]byte, []int) { - return file_library_library_msg_proto_rawDescGZIP(), []int{12} + return file_library_library_msg_proto_rawDescGZIP(), []int{10} } func (x *LibraryChangePush) GetData() []*DBLibrary { @@ -673,7 +570,7 @@ type LibraryLvRewardReq struct { func (x *LibraryLvRewardReq) Reset() { *x = LibraryLvRewardReq{} if protoimpl.UnsafeEnabled { - mi := &file_library_library_msg_proto_msgTypes[13] + mi := &file_library_library_msg_proto_msgTypes[11] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -686,7 +583,7 @@ func (x *LibraryLvRewardReq) String() string { func (*LibraryLvRewardReq) ProtoMessage() {} func (x *LibraryLvRewardReq) ProtoReflect() protoreflect.Message { - mi := &file_library_library_msg_proto_msgTypes[13] + mi := &file_library_library_msg_proto_msgTypes[11] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -699,7 +596,7 @@ func (x *LibraryLvRewardReq) ProtoReflect() protoreflect.Message { // Deprecated: Use LibraryLvRewardReq.ProtoReflect.Descriptor instead. func (*LibraryLvRewardReq) Descriptor() ([]byte, []int) { - return file_library_library_msg_proto_rawDescGZIP(), []int{13} + return file_library_library_msg_proto_rawDescGZIP(), []int{11} } func (x *LibraryLvRewardReq) GetOid() string { @@ -727,7 +624,7 @@ type LibraryLvRewardResp struct { func (x *LibraryLvRewardResp) Reset() { *x = LibraryLvRewardResp{} if protoimpl.UnsafeEnabled { - mi := &file_library_library_msg_proto_msgTypes[14] + mi := &file_library_library_msg_proto_msgTypes[12] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -740,7 +637,7 @@ func (x *LibraryLvRewardResp) String() string { func (*LibraryLvRewardResp) ProtoMessage() {} func (x *LibraryLvRewardResp) ProtoReflect() protoreflect.Message { - mi := &file_library_library_msg_proto_msgTypes[14] + mi := &file_library_library_msg_proto_msgTypes[12] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -753,7 +650,7 @@ func (x *LibraryLvRewardResp) ProtoReflect() protoreflect.Message { // Deprecated: Use LibraryLvRewardResp.ProtoReflect.Descriptor instead. func (*LibraryLvRewardResp) Descriptor() ([]byte, []int) { - return file_library_library_msg_proto_rawDescGZIP(), []int{14} + return file_library_library_msg_proto_rawDescGZIP(), []int{12} } func (x *LibraryLvRewardResp) GetData() *DBHeroFetter { @@ -775,7 +672,7 @@ type LibraryFetterstoryTaskReq struct { func (x *LibraryFetterstoryTaskReq) Reset() { *x = LibraryFetterstoryTaskReq{} if protoimpl.UnsafeEnabled { - mi := &file_library_library_msg_proto_msgTypes[15] + mi := &file_library_library_msg_proto_msgTypes[13] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -788,7 +685,7 @@ func (x *LibraryFetterstoryTaskReq) String() string { func (*LibraryFetterstoryTaskReq) ProtoMessage() {} func (x *LibraryFetterstoryTaskReq) ProtoReflect() protoreflect.Message { - mi := &file_library_library_msg_proto_msgTypes[15] + mi := &file_library_library_msg_proto_msgTypes[13] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -801,7 +698,7 @@ func (x *LibraryFetterstoryTaskReq) ProtoReflect() protoreflect.Message { // Deprecated: Use LibraryFetterstoryTaskReq.ProtoReflect.Descriptor instead. func (*LibraryFetterstoryTaskReq) Descriptor() ([]byte, []int) { - return file_library_library_msg_proto_rawDescGZIP(), []int{15} + return file_library_library_msg_proto_rawDescGZIP(), []int{13} } func (x *LibraryFetterstoryTaskReq) GetFetterId() int32 { @@ -822,7 +719,7 @@ type LibraryFetterstoryTaskResp struct { func (x *LibraryFetterstoryTaskResp) Reset() { *x = LibraryFetterstoryTaskResp{} if protoimpl.UnsafeEnabled { - mi := &file_library_library_msg_proto_msgTypes[16] + mi := &file_library_library_msg_proto_msgTypes[14] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -835,7 +732,7 @@ func (x *LibraryFetterstoryTaskResp) String() string { func (*LibraryFetterstoryTaskResp) ProtoMessage() {} func (x *LibraryFetterstoryTaskResp) ProtoReflect() protoreflect.Message { - mi := &file_library_library_msg_proto_msgTypes[16] + mi := &file_library_library_msg_proto_msgTypes[14] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -848,7 +745,7 @@ func (x *LibraryFetterstoryTaskResp) ProtoReflect() protoreflect.Message { // Deprecated: Use LibraryFetterstoryTaskResp.ProtoReflect.Descriptor instead. func (*LibraryFetterstoryTaskResp) Descriptor() ([]byte, []int) { - return file_library_library_msg_proto_rawDescGZIP(), []int{16} + return file_library_library_msg_proto_rawDescGZIP(), []int{14} } func (x *LibraryFetterstoryTaskResp) GetList() []*FetterTask { @@ -858,6 +755,101 @@ func (x *LibraryFetterstoryTaskResp) GetList() []*FetterTask { return nil } +// 手动提升羁绊等级 +type LibraryFetterLvUpReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + LibOid string `protobuf:"bytes,1,opt,name=libOid,proto3" json:"libOid"` // 羁绊对象id +} + +func (x *LibraryFetterLvUpReq) Reset() { + *x = LibraryFetterLvUpReq{} + if protoimpl.UnsafeEnabled { + mi := &file_library_library_msg_proto_msgTypes[15] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *LibraryFetterLvUpReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*LibraryFetterLvUpReq) ProtoMessage() {} + +func (x *LibraryFetterLvUpReq) ProtoReflect() protoreflect.Message { + mi := &file_library_library_msg_proto_msgTypes[15] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use LibraryFetterLvUpReq.ProtoReflect.Descriptor instead. +func (*LibraryFetterLvUpReq) Descriptor() ([]byte, []int) { + return file_library_library_msg_proto_rawDescGZIP(), []int{15} +} + +func (x *LibraryFetterLvUpReq) GetLibOid() string { + if x != nil { + return x.LibOid + } + return "" +} + +type LibraryFetterLvUpResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Data *DBLibrary `protobuf:"bytes,1,opt,name=data,proto3" json:"data"` +} + +func (x *LibraryFetterLvUpResp) Reset() { + *x = LibraryFetterLvUpResp{} + if protoimpl.UnsafeEnabled { + mi := &file_library_library_msg_proto_msgTypes[16] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *LibraryFetterLvUpResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*LibraryFetterLvUpResp) ProtoMessage() {} + +func (x *LibraryFetterLvUpResp) ProtoReflect() protoreflect.Message { + mi := &file_library_library_msg_proto_msgTypes[16] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use LibraryFetterLvUpResp.ProtoReflect.Descriptor instead. +func (*LibraryFetterLvUpResp) Descriptor() ([]byte, []int) { + return file_library_library_msg_proto_rawDescGZIP(), []int{16} +} + +func (x *LibraryFetterLvUpResp) GetData() *DBLibrary { + if x != nil { + return x.Data + } + return nil +} + var File_library_library_msg_proto protoreflect.FileDescriptor var file_library_library_msg_proto_rawDesc = []byte{ @@ -874,61 +866,60 @@ var file_library_library_msg_proto_rawDesc = []byte{ 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x47, 0x65, 0x74, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x65, - 0x74, 0x74, 0x65, 0x72, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x47, 0x0a, 0x13, 0x4c, 0x69, - 0x62, 0x72, 0x61, 0x72, 0x79, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, - 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6f, 0x62, 0x6a, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x05, 0x6f, 0x62, 0x6a, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x65, 0x74, 0x74, 0x65, - 0x72, 0x6c, 0x76, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x66, 0x65, 0x74, 0x74, 0x65, - 0x72, 0x6c, 0x76, 0x22, 0x36, 0x0a, 0x14, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x47, 0x65, - 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, - 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x4c, 0x69, - 0x62, 0x72, 0x61, 0x72, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x46, 0x0a, 0x18, 0x4c, - 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x47, 0x65, 0x74, 0x53, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x65, + 0x74, 0x74, 0x65, 0x72, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x46, 0x0a, 0x18, 0x4c, 0x69, + 0x62, 0x72, 0x61, 0x72, 0x79, 0x47, 0x65, 0x74, 0x53, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x77, + 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x69, 0x73, 0x74, + 0x6f, 0x72, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x68, 0x69, 0x73, 0x74, 0x6f, + 0x72, 0x79, 0x22, 0x3e, 0x0a, 0x19, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x47, 0x65, 0x74, + 0x53, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, + 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, + 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x52, 0x04, 0x64, 0x61, + 0x74, 0x61, 0x22, 0x59, 0x0a, 0x11, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x55, 0x73, 0x65, + 0x47, 0x69, 0x66, 0x74, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, + 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x12, + 0x14, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, + 0x69, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x22, 0x37, 0x0a, + 0x12, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x55, 0x73, 0x65, 0x47, 0x69, 0x66, 0x74, 0x52, + 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, + 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x2e, 0x0a, 0x1a, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, + 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x46, 0x65, 0x74, 0x74, 0x65, + 0x72, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, 0x22, 0x3d, 0x0a, 0x1b, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, + 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x46, 0x65, 0x74, 0x74, 0x65, + 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x52, + 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x5a, 0x0a, 0x11, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, + 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, + 0x74, 0x61, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x4c, 0x69, 0x62, + 0x72, 0x61, 0x72, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x25, 0x0a, 0x06, 0x66, 0x65, + 0x74, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x48, + 0x65, 0x72, 0x6f, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x52, 0x06, 0x66, 0x65, 0x74, 0x74, 0x65, + 0x72, 0x22, 0x36, 0x0a, 0x12, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x4c, 0x76, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x69, 0x73, - 0x74, 0x6f, 0x72, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x68, 0x69, 0x73, 0x74, - 0x6f, 0x72, 0x79, 0x22, 0x3e, 0x0a, 0x19, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x47, 0x65, - 0x74, 0x53, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x22, 0x38, 0x0a, 0x13, 0x4c, 0x69, 0x62, + 0x72, 0x61, 0x72, 0x79, 0x4c, 0x76, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x52, 0x04, 0x64, - 0x61, 0x74, 0x61, 0x22, 0x59, 0x0a, 0x11, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x55, 0x73, - 0x65, 0x47, 0x69, 0x66, 0x74, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, - 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, - 0x12, 0x14, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, - 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x22, 0x37, - 0x0a, 0x12, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x55, 0x73, 0x65, 0x47, 0x69, 0x66, 0x74, - 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x65, 0x74, 0x74, 0x65, - 0x72, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x2e, 0x0a, 0x1a, 0x4c, 0x69, 0x62, 0x72, 0x61, - 0x72, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x46, 0x65, 0x74, 0x74, - 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, 0x22, 0x3d, 0x0a, 0x1b, 0x4c, 0x69, 0x62, 0x72, 0x61, - 0x72, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x46, 0x65, 0x74, 0x74, - 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, - 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x5a, 0x0a, 0x11, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, - 0x79, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1e, 0x0a, 0x04, 0x64, - 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x4c, 0x69, - 0x62, 0x72, 0x61, 0x72, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x25, 0x0a, 0x06, 0x66, - 0x65, 0x74, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, - 0x48, 0x65, 0x72, 0x6f, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x52, 0x06, 0x66, 0x65, 0x74, 0x74, - 0x65, 0x72, 0x22, 0x36, 0x0a, 0x12, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x4c, 0x76, 0x52, - 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x22, 0x38, 0x0a, 0x13, 0x4c, 0x69, - 0x62, 0x72, 0x61, 0x72, 0x79, 0x4c, 0x76, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, - 0x70, 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x0d, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x52, 0x04, - 0x64, 0x61, 0x74, 0x61, 0x22, 0x37, 0x0a, 0x19, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x46, - 0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, - 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x65, 0x74, 0x74, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x08, 0x66, 0x65, 0x74, 0x74, 0x65, 0x72, 0x49, 0x64, 0x22, 0x3d, 0x0a, - 0x1a, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x74, - 0x6f, 0x72, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x6c, - 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x65, 0x74, 0x74, - 0x65, 0x72, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x42, 0x06, 0x5a, 0x04, - 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x61, 0x74, 0x61, 0x22, 0x37, 0x0a, 0x19, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x46, 0x65, + 0x74, 0x74, 0x65, 0x72, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, + 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x65, 0x74, 0x74, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x08, 0x66, 0x65, 0x74, 0x74, 0x65, 0x72, 0x49, 0x64, 0x22, 0x3d, 0x0a, 0x1a, + 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x74, 0x6f, + 0x72, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x6c, 0x69, + 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x65, 0x74, 0x74, 0x65, + 0x72, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x2e, 0x0a, 0x14, 0x4c, + 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x4c, 0x76, 0x55, 0x70, + 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x6c, 0x69, 0x62, 0x4f, 0x69, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x06, 0x6c, 0x69, 0x62, 0x4f, 0x69, 0x64, 0x22, 0x37, 0x0a, 0x15, 0x4c, + 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x4c, 0x76, 0x55, 0x70, + 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x52, 0x04, + 0x64, 0x61, 0x74, 0x61, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -949,19 +940,19 @@ var file_library_library_msg_proto_goTypes = []interface{}{ (*LibraryGetListResp)(nil), // 1: LibraryGetListResp (*LibraryGetFetterListReq)(nil), // 2: LibraryGetFetterListReq (*LibraryGetFetterListResp)(nil), // 3: LibraryGetFetterListResp - (*LibraryGetRewardReq)(nil), // 4: LibraryGetRewardReq - (*LibraryGetRewardResp)(nil), // 5: LibraryGetRewardResp - (*LibraryGetStoryRewardReq)(nil), // 6: LibraryGetStoryRewardReq - (*LibraryGetStoryRewardResp)(nil), // 7: LibraryGetStoryRewardResp - (*LibraryUseGiftReq)(nil), // 8: LibraryUseGiftReq - (*LibraryUseGiftResp)(nil), // 9: LibraryUseGiftResp - (*LibraryActivationFetterReq)(nil), // 10: LibraryActivationFetterReq - (*LibraryActivationFetterResp)(nil), // 11: LibraryActivationFetterResp - (*LibraryChangePush)(nil), // 12: LibraryChangePush - (*LibraryLvRewardReq)(nil), // 13: LibraryLvRewardReq - (*LibraryLvRewardResp)(nil), // 14: LibraryLvRewardResp - (*LibraryFetterstoryTaskReq)(nil), // 15: LibraryFetterstoryTaskReq - (*LibraryFetterstoryTaskResp)(nil), // 16: LibraryFetterstoryTaskResp + (*LibraryGetStoryRewardReq)(nil), // 4: LibraryGetStoryRewardReq + (*LibraryGetStoryRewardResp)(nil), // 5: LibraryGetStoryRewardResp + (*LibraryUseGiftReq)(nil), // 6: LibraryUseGiftReq + (*LibraryUseGiftResp)(nil), // 7: LibraryUseGiftResp + (*LibraryActivationFetterReq)(nil), // 8: LibraryActivationFetterReq + (*LibraryActivationFetterResp)(nil), // 9: LibraryActivationFetterResp + (*LibraryChangePush)(nil), // 10: LibraryChangePush + (*LibraryLvRewardReq)(nil), // 11: LibraryLvRewardReq + (*LibraryLvRewardResp)(nil), // 12: LibraryLvRewardResp + (*LibraryFetterstoryTaskReq)(nil), // 13: LibraryFetterstoryTaskReq + (*LibraryFetterstoryTaskResp)(nil), // 14: LibraryFetterstoryTaskResp + (*LibraryFetterLvUpReq)(nil), // 15: LibraryFetterLvUpReq + (*LibraryFetterLvUpResp)(nil), // 16: LibraryFetterLvUpResp (*DBLibrary)(nil), // 17: DBLibrary (*DBHeroFetter)(nil), // 18: DBHeroFetter (*FetterTask)(nil), // 19: FetterTask @@ -969,14 +960,14 @@ var file_library_library_msg_proto_goTypes = []interface{}{ var file_library_library_msg_proto_depIdxs = []int32{ 17, // 0: LibraryGetListResp.data:type_name -> DBLibrary 18, // 1: LibraryGetFetterListResp.data:type_name -> DBHeroFetter - 17, // 2: LibraryGetRewardResp.data:type_name -> DBLibrary - 18, // 3: LibraryGetStoryRewardResp.data:type_name -> DBHeroFetter - 18, // 4: LibraryUseGiftResp.data:type_name -> DBHeroFetter - 17, // 5: LibraryActivationFetterResp.data:type_name -> DBLibrary - 17, // 6: LibraryChangePush.data:type_name -> DBLibrary - 18, // 7: LibraryChangePush.fetter:type_name -> DBHeroFetter - 18, // 8: LibraryLvRewardResp.data:type_name -> DBHeroFetter - 19, // 9: LibraryFetterstoryTaskResp.list:type_name -> FetterTask + 18, // 2: LibraryGetStoryRewardResp.data:type_name -> DBHeroFetter + 18, // 3: LibraryUseGiftResp.data:type_name -> DBHeroFetter + 17, // 4: LibraryActivationFetterResp.data:type_name -> DBLibrary + 17, // 5: LibraryChangePush.data:type_name -> DBLibrary + 18, // 6: LibraryChangePush.fetter:type_name -> DBHeroFetter + 18, // 7: LibraryLvRewardResp.data:type_name -> DBHeroFetter + 19, // 8: LibraryFetterstoryTaskResp.list:type_name -> FetterTask + 17, // 9: LibraryFetterLvUpResp.data:type_name -> DBLibrary 10, // [10:10] is the sub-list for method output_type 10, // [10:10] is the sub-list for method input_type 10, // [10:10] is the sub-list for extension type_name @@ -1040,30 +1031,6 @@ func file_library_library_msg_proto_init() { } } file_library_library_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*LibraryGetRewardReq); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_library_library_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*LibraryGetRewardResp); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_library_library_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*LibraryGetStoryRewardReq); i { case 0: return &v.state @@ -1075,7 +1042,7 @@ func file_library_library_msg_proto_init() { return nil } } - file_library_library_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_library_library_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*LibraryGetStoryRewardResp); i { case 0: return &v.state @@ -1087,7 +1054,7 @@ func file_library_library_msg_proto_init() { return nil } } - file_library_library_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + file_library_library_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*LibraryUseGiftReq); i { case 0: return &v.state @@ -1099,7 +1066,7 @@ func file_library_library_msg_proto_init() { return nil } } - file_library_library_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + file_library_library_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*LibraryUseGiftResp); i { case 0: return &v.state @@ -1111,7 +1078,7 @@ func file_library_library_msg_proto_init() { return nil } } - file_library_library_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { + file_library_library_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*LibraryActivationFetterReq); i { case 0: return &v.state @@ -1123,7 +1090,7 @@ func file_library_library_msg_proto_init() { return nil } } - file_library_library_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { + file_library_library_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*LibraryActivationFetterResp); i { case 0: return &v.state @@ -1135,7 +1102,7 @@ func file_library_library_msg_proto_init() { return nil } } - file_library_library_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { + file_library_library_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*LibraryChangePush); i { case 0: return &v.state @@ -1147,7 +1114,7 @@ func file_library_library_msg_proto_init() { return nil } } - file_library_library_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { + file_library_library_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*LibraryLvRewardReq); i { case 0: return &v.state @@ -1159,7 +1126,7 @@ func file_library_library_msg_proto_init() { return nil } } - file_library_library_msg_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { + file_library_library_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*LibraryLvRewardResp); i { case 0: return &v.state @@ -1171,7 +1138,7 @@ func file_library_library_msg_proto_init() { return nil } } - file_library_library_msg_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { + file_library_library_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*LibraryFetterstoryTaskReq); i { case 0: return &v.state @@ -1183,7 +1150,7 @@ func file_library_library_msg_proto_init() { return nil } } - file_library_library_msg_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { + file_library_library_msg_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*LibraryFetterstoryTaskResp); i { case 0: return &v.state @@ -1195,6 +1162,30 @@ func file_library_library_msg_proto_init() { return nil } } + file_library_library_msg_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*LibraryFetterLvUpReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_library_library_msg_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*LibraryFetterLvUpResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } type x struct{} out := protoimpl.TypeBuilder{ diff --git a/pb/sys_msg.pb.go b/pb/sys_msg.pb.go index cd9b6a0a9..3199e8bdb 100644 --- a/pb/sys_msg.pb.go +++ b/pb/sys_msg.pb.go @@ -209,6 +209,53 @@ func (x *SysFuncActivateResp) GetCid() string { return "" } +type SysFuncOpnePush struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Cid []string `protobuf:"bytes,1,rep,name=cid,proto3" json:"cid"` +} + +func (x *SysFuncOpnePush) Reset() { + *x = SysFuncOpnePush{} + if protoimpl.UnsafeEnabled { + mi := &file_sys_sys_msg_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *SysFuncOpnePush) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*SysFuncOpnePush) ProtoMessage() {} + +func (x *SysFuncOpnePush) ProtoReflect() protoreflect.Message { + mi := &file_sys_sys_msg_proto_msgTypes[4] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use SysFuncOpnePush.ProtoReflect.Descriptor instead. +func (*SysFuncOpnePush) Descriptor() ([]byte, []int) { + return file_sys_sys_msg_proto_rawDescGZIP(), []int{4} +} + +func (x *SysFuncOpnePush) GetCid() []string { + if x != nil { + return x.Cid + } + return nil +} + var File_sys_sys_msg_proto protoreflect.FileDescriptor var file_sys_sys_msg_proto_rawDesc = []byte{ @@ -229,7 +276,10 @@ var file_sys_sys_msg_proto_rawDesc = []byte{ 0x28, 0x09, 0x52, 0x03, 0x63, 0x69, 0x64, 0x22, 0x27, 0x0a, 0x13, 0x53, 0x79, 0x73, 0x46, 0x75, 0x6e, 0x63, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x63, 0x69, 0x64, - 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x22, 0x23, 0x0a, 0x0f, 0x53, 0x79, 0x73, 0x46, 0x75, 0x6e, 0x63, 0x4f, 0x70, 0x6e, 0x65, 0x50, + 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x69, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, + 0x52, 0x03, 0x63, 0x69, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -244,16 +294,17 @@ func file_sys_sys_msg_proto_rawDescGZIP() []byte { return file_sys_sys_msg_proto_rawDescData } -var file_sys_sys_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 5) +var file_sys_sys_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 6) var file_sys_sys_msg_proto_goTypes = []interface{}{ (*SysFuncGetListReq)(nil), // 0: SysFuncGetListReq (*SysFuncGetListResp)(nil), // 1: SysFuncGetListResp (*SysFuncActivateReq)(nil), // 2: SysFuncActivateReq (*SysFuncActivateResp)(nil), // 3: SysFuncActivateResp - nil, // 4: SysFuncGetListResp.CondEntry + (*SysFuncOpnePush)(nil), // 4: SysFuncOpnePush + nil, // 5: SysFuncGetListResp.CondEntry } var file_sys_sys_msg_proto_depIdxs = []int32{ - 4, // 0: SysFuncGetListResp.cond:type_name -> SysFuncGetListResp.CondEntry + 5, // 0: SysFuncGetListResp.cond:type_name -> SysFuncGetListResp.CondEntry 1, // [1:1] is the sub-list for method output_type 1, // [1:1] is the sub-list for method input_type 1, // [1:1] is the sub-list for extension type_name @@ -315,6 +366,18 @@ func file_sys_sys_msg_proto_init() { return nil } } + file_sys_sys_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*SysFuncOpnePush); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } type x struct{} out := protoimpl.TypeBuilder{ @@ -322,7 +385,7 @@ func file_sys_sys_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_sys_sys_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 5, + NumMessages: 6, NumExtensions: 0, NumServices: 0, }, diff --git a/sys/configure/structs/game.equipAttrlibrary.go b/sys/configure/structs/game.equipAttrlibrary.go index 968f74f27..a6f783bec 100644 --- a/sys/configure/structs/game.equipAttrlibrary.go +++ b/sys/configure/structs/game.equipAttrlibrary.go @@ -9,8 +9,8 @@ package cfg type GameEquipAttrlibrary struct { - _dataMap map[int32]*GameEquipAttrlibraryData - _dataList []*GameEquipAttrlibraryData + _dataMap map[int32]*GameEquipAttrlibraryData + _dataList []*GameEquipAttrlibraryData } func NewGameEquipAttrlibrary(_buf []map[string]interface{}) (*GameEquipAttrlibrary, error) { @@ -24,17 +24,19 @@ func NewGameEquipAttrlibrary(_buf []map[string]interface{}) (*GameEquipAttrlibra dataMap[_v.Key] = _v } } - return &GameEquipAttrlibrary{_dataList: _dataList, _dataMap: dataMap}, nil + return &GameEquipAttrlibrary{_dataList:_dataList, _dataMap:dataMap}, nil } func (table *GameEquipAttrlibrary) GetDataMap() map[int32]*GameEquipAttrlibraryData { - return table._dataMap + return table._dataMap } func (table *GameEquipAttrlibrary) GetDataList() []*GameEquipAttrlibraryData { - return table._dataList + return table._dataList } func (table *GameEquipAttrlibrary) Get(key int32) *GameEquipAttrlibraryData { - return table._dataMap[key] + return table._dataMap[key] } + +