diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..0d7df50 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +FireflyPsAndorid \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 74dd639..b2c751a 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,3 @@ - diff --git a/app/src/main/res/raw/data_in_game_json.json b/app/src/main/res/raw/data_in_game_json.json index e47daa4..ad502b9 100644 --- a/app/src/main/res/raw/data_in_game_json.json +++ b/app/src/main/res/raw/data_in_game_json.json @@ -1,20 +1,20 @@ { "lineups": { - "0": 1408, - "1": 1101, - "2": 1313, - "3": 1309 + "0": 1015, + "1": 1306, + "2": 1403, + "3": 1006 }, "position": { - "x": -37317, - "z": 11924, - "y": -12212, - "rot_y": 81000 + "x": -4030, + "z": -13006, + "y": 0, + "rot_y": 270000 }, "scene": { - "plane_id": 10441, - "floor_id": 10441001, - "entry_id": 1044101 + "plane_id": 10000, + "floor_id": 10000000, + "entry_id": 100000104 }, "char_path": { "main": 8008, diff --git a/app/src/main/res/raw/freesr_data_json.json b/app/src/main/res/raw/freesr_data_json.json index 8f31a96..771380a 100644 --- a/app/src/main/res/raw/freesr_data_json.json +++ b/app/src/main/res/raw/freesr_data_json.json @@ -595,7 +595,7 @@ { "level": 80, "item_id": 21050, - "equip_avatar": 8008, + "equip_avatar": 0, "rank": 5, "promotion": 6, "internal_uid": 74 @@ -642,11 +642,11 @@ }, { "level": 80, - "item_id": 23044, - "equip_avatar": 1408, + "item_id": 23042, + "equip_avatar": 8008, "rank": 1, "promotion": 6, - "internal_uid": 1769 + "internal_uid": 80 } ], "relics": [ @@ -52028,7 +52028,7 @@ } ], "internal_uid": 1713, - "equip_avatar": 1409 + "equip_avatar": 0 }, { "level": 15, @@ -52058,7 +52058,7 @@ } ], "internal_uid": 1714, - "equip_avatar": 1409 + "equip_avatar": 0 }, { "level": 15, @@ -53258,7 +53258,7 @@ } ], "internal_uid": 1754, - "equip_avatar": 1408 + "equip_avatar": 1014 }, { "level": 15, @@ -53288,7 +53288,7 @@ } ], "internal_uid": 1755, - "equip_avatar": 1408 + "equip_avatar": 1014 }, { "level": 15, @@ -53682,153 +53682,123 @@ }, { "level": 15, - "relic_id": 61261, - "relic_set_id": 126, - "main_affix_id": 1, + "relic_id": 63196, + "relic_set_id": 319, + "main_affix_id": 3, "sub_affixes": [ { - "sub_affix_id": 8, + "sub_affix_id": 1, "count": 1, - "step": 0 - }, - { - "sub_affix_id": 9, - "count": 2, - "step": 0 - }, - { - "sub_affix_id": 7, - "count": 2, "step": 2 }, - { - "sub_affix_id": 2, - "count": 2, - "step": 1 - } - ], - "internal_uid": 1770, - "equip_avatar": 1408 - }, - { - "level": 15, - "relic_id": 61262, - "relic_set_id": 126, - "main_affix_id": 1, - "sub_affixes": [ { "sub_affix_id": 8, - "count": 1, - "step": 0 + "count": 3, + "step": 3 }, { "sub_affix_id": 9, - "count": 2, - "step": 0 + "count": 3, + "step": 6 }, - { - "sub_affix_id": 7, - "count": 2, - "step": 2 - }, - { - "sub_affix_id": 5, - "count": 2, - "step": 0 - } - ], - "internal_uid": 1771, - "equip_avatar": 1408 - }, - { - "level": 15, - "relic_id": 61263, - "relic_set_id": 126, - "main_affix_id": 4, - "sub_affixes": [ { "sub_affix_id": 11, "count": 1, "step": 2 - }, - { - "sub_affix_id": 9, - "count": 2, - "step": 0 - }, - { - "sub_affix_id": 7, - "count": 2, - "step": 2 - }, - { - "sub_affix_id": 5, - "count": 2, - "step": 0 } ], - "internal_uid": 1772, + "internal_uid": 1769, "equip_avatar": 0 }, { "level": 15, - "relic_id": 63215, - "relic_set_id": 321, - "main_affix_id": 4, + "relic_id": 63195, + "relic_set_id": 319, + "main_affix_id": 1, "sub_affixes": [ { - "sub_affix_id": 8, - "count": 3, - "step": 0 - }, - { - "sub_affix_id": 9, - "count": 2, - "step": 0 - }, - { - "sub_affix_id": 7, - "count": 2, + "sub_affix_id": 1, + "count": 1, "step": 2 }, { - "sub_affix_id": 5, - "count": 2, - "step": 0 + "sub_affix_id": 8, + "count": 3, + "step": 3 + }, + { + "sub_affix_id": 9, + "count": 3, + "step": 6 + }, + { + "sub_affix_id": 11, + "count": 1, + "step": 2 } ], - "internal_uid": 1773, - "equip_avatar": 1408 + "internal_uid": 1770, + "equip_avatar": 0 }, { "level": 15, - "relic_id": 63216, - "relic_set_id": 321, - "main_affix_id": 4, + "relic_id": 63196, + "relic_set_id": 319, + "main_affix_id": 2, "sub_affixes": [ + { + "sub_affix_id": 3, + "count": 2, + "step": 2 + }, { "sub_affix_id": 8, "count": 3, - "step": 0 + "step": 3 }, { "sub_affix_id": 9, - "count": 2, - "step": 0 + "count": 3, + "step": 6 }, { - "sub_affix_id": 7, - "count": 2, - "step": 2 - }, - { - "sub_affix_id": 6, - "count": 2, + "sub_affix_id": 11, + "count": 1, "step": 2 } ], - "internal_uid": 1774, - "equip_avatar": 1408 + "internal_uid": 1771, + "equip_avatar": 1409 + }, + { + "level": 15, + "relic_id": 63195, + "relic_set_id": 319, + "main_affix_id": 8, + "sub_affixes": [ + { + "sub_affix_id": 3, + "count": 2, + "step": 2 + }, + { + "sub_affix_id": 8, + "count": 3, + "step": 3 + }, + { + "sub_affix_id": 9, + "count": 3, + "step": 6 + }, + { + "sub_affix_id": 11, + "count": 1, + "step": 2 + } + ], + "internal_uid": 1772, + "equip_avatar": 1409 } ], "avatars": { @@ -54133,7 +54103,7 @@ "owner_uid": 0, "avatar_id": 1014, "data": { - "rank": 6, + "rank": 0, "skills": { "1014001": 6, "1014002": 10, @@ -54167,7 +54137,7 @@ "owner_uid": 0, "avatar_id": 1015, "data": { - "rank": 0, + "rank": 6, "skills": { "1015001": 6, "1015002": 10, @@ -54977,7 +54947,7 @@ "owner_uid": 0, "avatar_id": 1212, "data": { - "rank": 1, + "rank": 0, "skills": { "1212001": 6, "1212002": 10, @@ -55250,7 +55220,7 @@ "owner_uid": 0, "avatar_id": 1222, "data": { - "rank": 0, + "rank": 6, "skills": { "1222001": 6, "1222002": 10, @@ -55344,8 +55314,6 @@ "level": 80, "promotion": 6, "techniques": [ - 122401, - 122401, 122401, 122402 ], @@ -55356,7 +55324,7 @@ "owner_uid": 0, "avatar_id": 1225, "data": { - "rank": 0, + "rank": 6, "skills": { "1225001": 6, "1225002": 10, @@ -55456,7 +55424,7 @@ "owner_uid": 0, "avatar_id": 1303, "data": { - "rank": 1, + "rank": 6, "skills": { "1303001": 5, "1303002": 10, @@ -55561,7 +55529,7 @@ "owner_uid": 0, "avatar_id": 1306, "data": { - "rank": 0, + "rank": 6, "skills": { "1306001": 6, "1306002": 10, @@ -55697,7 +55665,7 @@ "owner_uid": 0, "avatar_id": 1310, "data": { - "rank": 0, + "rank": 6, "skills": { "1310001": 6, "1310002": 10, @@ -55860,8 +55828,6 @@ "promotion": 6, "techniques": [ 131501, - 131502, - 131502, 131502 ], "sp_value": 58, @@ -56150,10 +56116,10 @@ "data": { "rank": 0, "skills": { - "1408001": 6, - "1408002": 10, - "1408003": 10, - "1408004": 10, + "1408001": 1, + "1408002": 1, + "1408003": 1, + "1408004": 1, "1408007": 1, "1408101": 1, "1408102": 1, @@ -56182,7 +56148,7 @@ "owner_uid": 0, "avatar_id": 1409, "data": { - "rank": 6, + "rank": 0, "skills": { "1409001": 6, "1409002": 10, @@ -56227,21 +56193,11 @@ "8001007": 1, "8001101": 1, "8001102": 1, - "8001103": 1, - "8001201": 1, - "8001202": 1, - "8001203": 1, - "8001204": 1, - "8001205": 1, - "8001206": 1, - "8001207": 1, - "8001208": 1, - "8001209": 1, - "8001210": 1 + "8001103": 1 } }, - "level": 80, - "promotion": 6, + "level": 20, + "promotion": 0, "techniques": [], "sp_value": 0, "sp_max": 120 @@ -56482,26 +56438,44 @@ } }, "battle_config": { - "battle_type": "AS", - "blessings": [ - { - "level": 1, - "id": 3031001 - }, - { - "level": 1, - "id": 3111015 - } - ], + "battle_type": "DEFAULT", + "blessings": [], "custom_stats": [], "cycle_count": 30, - "stage_id": 420124, + "stage_id": 201012311, "path_resonance_id": 0, "monsters": [ [ { - "monster_id": 801501204, - "level": 90, + "monster_id": 101302009, + "level": 95, + "amount": 1 + }, + { + "monster_id": 101302009, + "level": 95, + "amount": 1 + }, + { + "monster_id": 101302009, + "level": 95, + "amount": 1 + } + ], + [ + { + "monster_id": 101302009, + "level": 95, + "amount": 1 + }, + { + "monster_id": 101302009, + "level": 95, + "amount": 1 + }, + { + "monster_id": 101302009, + "level": 95, "amount": 1 } ] diff --git a/app/src/main/res/raw/version_json.json b/app/src/main/res/raw/version_json.json index a75b63a..78e2966 100644 --- a/app/src/main/res/raw/version_json.json +++ b/app/src/main/res/raw/version_json.json @@ -11,6 +11,18 @@ "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_10479565_234d9d8dfe49_b0890465b5ae4f", "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_10489293_ba258955cec6_d8347bc2994eab" }, + "CNBETAAndroid3.3.53": { + "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_10553897_658616122c5e_1311a7ab7701f7", + "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_10564145_db8507c78423_dc92dd047d442d", + "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_10554126_56a3036b1f8c_6dab2038cb17c3", + "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_0_40d2ce0253_c61ba99f70b885" + }, + "CNBETAAndroid3.3.54": { + "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_10614355_acdef3b37542_7c05a0c7169b39", + "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_10643219_d0afbb4454ef_5ee89a3a8453cf", + "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_10614562_0a9931c21f8d_d14b4994f719ef", + "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_10620104_9313ee61e16d_574ea402695fa2" + }, "CNBETAWin3.3.51": { "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_10451237_a3aa836fce75_f560b891c0d21e", "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_10459782_ced8509d61c9_cdbde1049f2207", @@ -23,6 +35,18 @@ "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_10479565_234d9d8dfe49_b0890465b5ae4f", "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_10489293_ba258955cec6_d8347bc2994eab" }, + "CNBETAWin3.3.53": { + "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_10553897_658616122c5e_1311a7ab7701f7", + "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_10564145_db8507c78423_dc92dd047d442d", + "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_10554126_56a3036b1f8c_6dab2038cb17c3", + "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_0_40d2ce0253_c61ba99f70b885" + }, + "CNBETAWin3.3.54": { + "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_10614355_acdef3b37542_7c05a0c7169b39", + "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_10643219_d0afbb4454ef_5ee89a3a8453cf", + "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_10614562_0a9931c21f8d_d14b4994f719ef", + "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_10620104_9313ee61e16d_574ea402695fa2" + }, "CNBETAiOS3.3.51": { "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_10451237_a3aa836fce75_f560b891c0d21e", "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_10459782_ced8509d61c9_cdbde1049f2207", @@ -35,6 +59,39 @@ "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_10479565_234d9d8dfe49_b0890465b5ae4f", "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_10489293_ba258955cec6_d8347bc2994eab" }, + "CNBETAiOS3.3.53": { + "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_10553897_658616122c5e_1311a7ab7701f7", + "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_10564145_db8507c78423_dc92dd047d442d", + "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_10554126_56a3036b1f8c_6dab2038cb17c3", + "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_0_40d2ce0253_c61ba99f70b885" + }, + "CNBETAiOS3.3.54": { + "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_10614355_acdef3b37542_7c05a0c7169b39", + "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_10643219_d0afbb4454ef_5ee89a3a8453cf", + "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_10614562_0a9931c21f8d_d14b4994f719ef", + "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_10620104_9313ee61e16d_574ea402695fa2" + }, + "CNPRODAndroid3.2.0": { + "asset_bundle_url": "prod_official_asia", + "lua_url": "client version not match" + }, + "CNPRODAndroid3.3.0": { + "asset_bundle_url": "prod_official_asia" + }, + "CNPRODWin3.2.0": { + "asset_bundle_url": "prod_official_asia", + "lua_url": "client version not match" + }, + "CNPRODWin3.3.0": { + "asset_bundle_url": "prod_official_asia" + }, + "CNPRODiOS3.2.0": { + "asset_bundle_url": "prod_official_asia", + "lua_url": "client version not match" + }, + "CNPRODiOS3.3.0": { + "asset_bundle_url": "prod_official_asia" + }, "OSBETAAndroid3.3.51": { "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_10451237_a3aa836fce75_f560b891c0d21e", "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_10459782_ced8509d61c9_cdbde1049f2207", @@ -47,6 +104,18 @@ "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_10479565_234d9d8dfe49_b0890465b5ae4f", "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_10489293_ba258955cec6_d8347bc2994eab" }, + "OSBETAAndroid3.3.53": { + "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_10553897_658616122c5e_1311a7ab7701f7", + "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_10564145_db8507c78423_dc92dd047d442d", + "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_10554126_56a3036b1f8c_6dab2038cb17c3", + "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_0_40d2ce0253_c61ba99f70b885" + }, + "OSBETAAndroid3.3.54": { + "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_10614355_acdef3b37542_7c05a0c7169b39", + "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_10643219_d0afbb4454ef_5ee89a3a8453cf", + "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_10614562_0a9931c21f8d_d14b4994f719ef", + "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_10620104_9313ee61e16d_574ea402695fa2" + }, "OSBETAWin3.3.51": { "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_10451237_a3aa836fce75_f560b891c0d21e", "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_10459782_ced8509d61c9_cdbde1049f2207", @@ -59,6 +128,18 @@ "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_10479565_234d9d8dfe49_b0890465b5ae4f", "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_10489293_ba258955cec6_d8347bc2994eab" }, + "OSBETAWin3.3.53": { + "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_10553897_658616122c5e_1311a7ab7701f7", + "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_10564145_db8507c78423_dc92dd047d442d", + "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_10554126_56a3036b1f8c_6dab2038cb17c3", + "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_0_40d2ce0253_c61ba99f70b885" + }, + "OSBETAWin3.3.54": { + "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_10614355_acdef3b37542_7c05a0c7169b39", + "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_10643219_d0afbb4454ef_5ee89a3a8453cf", + "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_10614562_0a9931c21f8d_d14b4994f719ef", + "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_10620104_9313ee61e16d_574ea402695fa2" + }, "OSBETAiOS3.3.51": { "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_10451237_a3aa836fce75_f560b891c0d21e", "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_10459782_ced8509d61c9_cdbde1049f2207", @@ -70,5 +151,38 @@ "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_10494861_2ed49bac2846_b7f8d02fced269", "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_10479565_234d9d8dfe49_b0890465b5ae4f", "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_10489293_ba258955cec6_d8347bc2994eab" + }, + "OSBETAiOS3.3.53": { + "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_10553897_658616122c5e_1311a7ab7701f7", + "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_10564145_db8507c78423_dc92dd047d442d", + "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_10554126_56a3036b1f8c_6dab2038cb17c3", + "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_0_40d2ce0253_c61ba99f70b885" + }, + "OSBETAiOS3.3.54": { + "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_10614355_acdef3b37542_7c05a0c7169b39", + "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_10643219_d0afbb4454ef_5ee89a3a8453cf", + "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_10614562_0a9931c21f8d_d14b4994f719ef", + "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_10620104_9313ee61e16d_574ea402695fa2" + }, + "OSPRODAndroid3.2.0": { + "asset_bundle_url": "prod_official_asia", + "lua_url": "client version not match" + }, + "OSPRODAndroid3.3.0": { + "asset_bundle_url": "prod_official_asia" + }, + "OSPRODWin3.2.0": { + "asset_bundle_url": "prod_official_asia", + "lua_url": "client version not match" + }, + "OSPRODWin3.3.0": { + "asset_bundle_url": "prod_official_asia" + }, + "OSPRODiOS3.2.0": { + "asset_bundle_url": "prod_official_asia", + "lua_url": "client version not match" + }, + "OSPRODiOS3.3.0": { + "asset_bundle_url": "prod_official_asia" } } \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4536067..7db95fa 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,3 +1,3 @@ - FireflyPsAndroid-3.3.5X + FireflyGo-3.3.5X \ No newline at end of file diff --git a/library/firefly-go.aar b/library/firefly-go.aar index d77fb4d..6d79a7e 100644 --- a/library/firefly-go.aar +++ b/library/firefly-go.aar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7ba64ec9f762e6d5edd00d7b87ff743d9aabaadd1b88b4fb77436d9fdfbc3c90 -size 70766987 +oid sha256:34b7602e8ecc18b4a4a209357b1c358535226389ec88727ca7cae93f96ae74f7 +size 71508675