diff --git a/database/migrations/142_hunting_ground_info.sql b/database/migrations/142_hunting_ground_info.sql index 88cde6e..6109451 100644 --- a/database/migrations/142_hunting_ground_info.sql +++ b/database/migrations/142_hunting_ground_info.sql @@ -4,6 +4,5 @@ CREATE TABLE "HuntingGroundInfo" ( "IsAuto" INTEGER, "CurrentId" INTEGER, "HighestId" INTEGER, - "MonsterInfoIndex" INTEGER, -- References MonsterInfo.InvenIndex "PackId" INTEGER -); \ No newline at end of file +); diff --git a/database/migrations/159_map_active_info.sql b/database/migrations/159_map_active_info.sql index 508664c..f830a68 100644 --- a/database/migrations/159_map_active_info.sql +++ b/database/migrations/159_map_active_info.sql @@ -1,5 +1,6 @@ CREATE TABLE "MapActiveInfo" ( "Index" INTEGER PRIMARY KEY AUTOINCREMENT, "Uid" BIGINT NOT NULL, - "MapId" INTEGER -); \ No newline at end of file + "MapId" INTEGER, + "ActiveInfo" TEXT +); diff --git a/database/migrations/265_quest_level_info.sql b/database/migrations/265_quest_level_info.sql index a8be4a5..b4abccc 100644 --- a/database/migrations/265_quest_level_info.sql +++ b/database/migrations/265_quest_level_info.sql @@ -1,9 +1,10 @@ -CREATE TABLE "QuestLevelInfo" ( +CREATE TABLE QuestLevelInfo ( "Index" INTEGER PRIMARY KEY AUTOINCREMENT, "Uid" BIGINT NOT NULL, - "PackId" INTEGER, + "PackId" INTEGER NOT NULL DEFAULT 1, "QuestLevel" INTEGER, "ClearQuest" INTEGER, "QuestOpt" INTEGER, - "IsLevelComplete" INTEGER -); \ No newline at end of file + "IsLevelComplete" INTEGER, + UNIQUE("Uid", "PackId") +); diff --git a/database/migrations/266_quest_max_clear_info.sql b/database/migrations/266_quest_max_clear_info.sql index 0835cb4..8e02d7d 100644 --- a/database/migrations/266_quest_max_clear_info.sql +++ b/database/migrations/266_quest_max_clear_info.sql @@ -1,6 +1,7 @@ -CREATE TABLE "QuestMaxClearInfo" ( +CREATE TABLE QuestMaxClearInfo ( "Index" INTEGER PRIMARY KEY AUTOINCREMENT, "Uid" BIGINT NOT NULL, - "PackId" INTEGER, - "MaxClearId" INTEGER -); \ No newline at end of file + "PackId" INTEGER NOT NULL DEFAULT 1, + "MaxClearId" INTEGER, + UNIQUE("Uid", "PackId") +); diff --git a/database/migrations/316_hunting_ground_monster.sql b/database/migrations/316_hunting_ground_monster.sql new file mode 100644 index 0000000..f9a5147 --- /dev/null +++ b/database/migrations/316_hunting_ground_monster.sql @@ -0,0 +1,6 @@ +CREATE TABLE IF NOT EXISTS HuntingGroundMonster ( + "HuntingGroundIndex" INTEGER NOT NULL, + "MonsterIndex" INTEGER NOT NULL, + FOREIGN KEY("HuntingGroundIndex") REFERENCES HuntingGroundInfo("Index") ON DELETE CASCADE, + FOREIGN KEY("MonsterIndex") REFERENCES MonsterInfo("Index") ON DELETE CASCADE +); diff --git a/database/migrations/317_user_quest.sql b/database/migrations/317_user_quest.sql new file mode 100644 index 0000000..b531283 --- /dev/null +++ b/database/migrations/317_user_quest.sql @@ -0,0 +1,10 @@ +CREATE TABLE "UserQuest" ( + "Index" INTEGER PRIMARY KEY AUTOINCREMENT, + "Uid" BIGINT NOT NULL, + "QuestId" INTEGER NOT NULL, + "PackId" INTEGER, + "Status" INTEGER DEFAULT 0, -- 0 = not accepted, 1 = in progress, 2 = completed, 3 = reward claimed + "Progress" INTEGER DEFAULT 0, -- quest progress (from questValue[0]) + "RewardClaimed" INTEGER DEFAULT 0, -- 0 = false, 1 = true + "LastUpdate" BIGINT -- timestamp for daily resets, analytics, etc. +); diff --git a/database/src/db/achievement_clear_info.rs b/database/src/db/achievement/achievement_clear_info.rs similarity index 100% rename from database/src/db/achievement_clear_info.rs rename to database/src/db/achievement/achievement_clear_info.rs diff --git a/database/src/db/achievement_info.rs b/database/src/db/achievement/achievement_info.rs similarity index 100% rename from database/src/db/achievement_info.rs rename to database/src/db/achievement/achievement_info.rs diff --git a/database/src/db/achievement_update_info.rs b/database/src/db/achievement/achievement_update_info.rs similarity index 100% rename from database/src/db/achievement_update_info.rs rename to database/src/db/achievement/achievement_update_info.rs diff --git a/database/src/db/achievement/mod.rs b/database/src/db/achievement/mod.rs new file mode 100644 index 0000000..20cae6d --- /dev/null +++ b/database/src/db/achievement/mod.rs @@ -0,0 +1,3 @@ +pub mod achievement_clear_info; +pub mod achievement_info; +pub mod achievement_update_info; diff --git a/database/src/db/action_matching_client_info.rs b/database/src/db/action/action_matching_client_info.rs similarity index 100% rename from database/src/db/action_matching_client_info.rs rename to database/src/db/action/action_matching_client_info.rs diff --git a/database/src/db/action_monster_state_info.rs b/database/src/db/action/action_monster_state_info.rs similarity index 100% rename from database/src/db/action_monster_state_info.rs rename to database/src/db/action/action_monster_state_info.rs diff --git a/database/src/db/action_player_state_info.rs b/database/src/db/action/action_player_state_info.rs similarity index 100% rename from database/src/db/action_player_state_info.rs rename to database/src/db/action/action_player_state_info.rs diff --git a/database/src/db/action_relay_user_info.rs b/database/src/db/action/action_relay_user_info.rs similarity index 100% rename from database/src/db/action_relay_user_info.rs rename to database/src/db/action/action_relay_user_info.rs diff --git a/database/src/db/action_user_info.rs b/database/src/db/action/action_user_info.rs similarity index 100% rename from database/src/db/action_user_info.rs rename to database/src/db/action/action_user_info.rs diff --git a/database/src/db/action/mod.rs b/database/src/db/action/mod.rs new file mode 100644 index 0000000..9583abc --- /dev/null +++ b/database/src/db/action/mod.rs @@ -0,0 +1,5 @@ +pub mod action_matching_client_info; +pub mod action_monster_state_info; +pub mod action_player_state_info; +pub mod action_relay_user_info; +pub mod action_user_info; diff --git a/database/src/db/active_contents_info.rs b/database/src/db/active/active_contents_info.rs similarity index 100% rename from database/src/db/active_contents_info.rs rename to database/src/db/active/active_contents_info.rs diff --git a/database/src/db/active/mod.rs b/database/src/db/active/mod.rs new file mode 100644 index 0000000..c8c820c --- /dev/null +++ b/database/src/db/active/mod.rs @@ -0,0 +1 @@ +pub mod active_contents_info; diff --git a/database/src/db/attendance_always_info.rs b/database/src/db/attendance/attendance_always_info.rs similarity index 100% rename from database/src/db/attendance_always_info.rs rename to database/src/db/attendance/attendance_always_info.rs diff --git a/database/src/db/attendance_event_reward_obtain_info.rs b/database/src/db/attendance/attendance_event_reward_obtain_info.rs similarity index 100% rename from database/src/db/attendance_event_reward_obtain_info.rs rename to database/src/db/attendance/attendance_event_reward_obtain_info.rs diff --git a/database/src/db/attendance_info.rs b/database/src/db/attendance/attendance_info.rs similarity index 100% rename from database/src/db/attendance_info.rs rename to database/src/db/attendance/attendance_info.rs diff --git a/database/src/db/attendance_limit_info.rs b/database/src/db/attendance/attendance_limit_info.rs similarity index 100% rename from database/src/db/attendance_limit_info.rs rename to database/src/db/attendance/attendance_limit_info.rs diff --git a/database/src/db/attendance_package_info.rs b/database/src/db/attendance/attendance_package_info.rs similarity index 100% rename from database/src/db/attendance_package_info.rs rename to database/src/db/attendance/attendance_package_info.rs diff --git a/database/src/db/attendance/mod.rs b/database/src/db/attendance/mod.rs new file mode 100644 index 0000000..28f4294 --- /dev/null +++ b/database/src/db/attendance/mod.rs @@ -0,0 +1,5 @@ +pub mod attendance_always_info; +pub mod attendance_event_reward_obtain_info; +pub mod attendance_info; +pub mod attendance_limit_info; +pub mod attendance_package_info; diff --git a/database/src/db/battle_char_info.rs b/database/src/db/battle/battle_char_info.rs similarity index 100% rename from database/src/db/battle_char_info.rs rename to database/src/db/battle/battle_char_info.rs diff --git a/database/src/db/battle_damage_info.rs b/database/src/db/battle/battle_damage_info.rs similarity index 100% rename from database/src/db/battle_damage_info.rs rename to database/src/db/battle/battle_damage_info.rs diff --git a/database/src/db/battle_golem_info.rs b/database/src/db/battle/battle_golem_info.rs similarity index 100% rename from database/src/db/battle_golem_info.rs rename to database/src/db/battle/battle_golem_info.rs diff --git a/database/src/db/battle_grid_type_item_info.rs b/database/src/db/battle/battle_grid_type_item_info.rs similarity index 100% rename from database/src/db/battle_grid_type_item_info.rs rename to database/src/db/battle/battle_grid_type_item_info.rs diff --git a/database/src/db/battle_result_info.rs b/database/src/db/battle/battle_result_info.rs similarity index 100% rename from database/src/db/battle_result_info.rs rename to database/src/db/battle/battle_result_info.rs diff --git a/database/src/db/battle_statistics_info.rs b/database/src/db/battle/battle_statistics_info.rs similarity index 100% rename from database/src/db/battle_statistics_info.rs rename to database/src/db/battle/battle_statistics_info.rs diff --git a/database/src/db/battle/mod.rs b/database/src/db/battle/mod.rs new file mode 100644 index 0000000..bb5388a --- /dev/null +++ b/database/src/db/battle/mod.rs @@ -0,0 +1,6 @@ +pub mod battle_char_info; +pub mod battle_damage_info; +pub mod battle_golem_info; +pub mod battle_grid_type_item_info; +pub mod battle_result_info; +pub mod battle_statistics_info; diff --git a/database/src/db/buff_info.rs b/database/src/db/buff/buff_info.rs similarity index 100% rename from database/src/db/buff_info.rs rename to database/src/db/buff/buff_info.rs diff --git a/database/src/db/buff/mod.rs b/database/src/db/buff/mod.rs new file mode 100644 index 0000000..f82ba57 --- /dev/null +++ b/database/src/db/buff/mod.rs @@ -0,0 +1 @@ +pub mod buff_info; diff --git a/database/src/db/cafeteria_facility_info.rs b/database/src/db/cafeteria/cafeteria_facility_info.rs similarity index 100% rename from database/src/db/cafeteria_facility_info.rs rename to database/src/db/cafeteria/cafeteria_facility_info.rs diff --git a/database/src/db/cafeteria_info.rs b/database/src/db/cafeteria/cafeteria_info.rs similarity index 100% rename from database/src/db/cafeteria_info.rs rename to database/src/db/cafeteria/cafeteria_info.rs diff --git a/database/src/db/cafeteria_part_time_manager_info.rs b/database/src/db/cafeteria/cafeteria_part_time_manager_info.rs similarity index 100% rename from database/src/db/cafeteria_part_time_manager_info.rs rename to database/src/db/cafeteria/cafeteria_part_time_manager_info.rs diff --git a/database/src/db/cafeteria_regular_costume_note_info.rs b/database/src/db/cafeteria/cafeteria_regular_costume_note_info.rs similarity index 100% rename from database/src/db/cafeteria_regular_costume_note_info.rs rename to database/src/db/cafeteria/cafeteria_regular_costume_note_info.rs diff --git a/database/src/db/cafeteria/mod.rs b/database/src/db/cafeteria/mod.rs new file mode 100644 index 0000000..a76728b --- /dev/null +++ b/database/src/db/cafeteria/mod.rs @@ -0,0 +1,4 @@ +pub mod cafeteria_facility_info; +pub mod cafeteria_info; +pub mod cafeteria_part_time_manager_info; +pub mod cafeteria_regular_costume_note_info; diff --git a/database/src/db/cash_mail_info.rs b/database/src/db/cash/cash_mail_info.rs similarity index 100% rename from database/src/db/cash_mail_info.rs rename to database/src/db/cash/cash_mail_info.rs diff --git a/database/src/db/cash_product_info.rs b/database/src/db/cash/cash_product_info.rs similarity index 100% rename from database/src/db/cash_product_info.rs rename to database/src/db/cash/cash_product_info.rs diff --git a/database/src/db/cash_shop_info.rs b/database/src/db/cash/cash_shop_info.rs similarity index 100% rename from database/src/db/cash_shop_info.rs rename to database/src/db/cash/cash_shop_info.rs diff --git a/database/src/db/cash_shop_purchase_count_info.rs b/database/src/db/cash/cash_shop_purchase_count_info.rs similarity index 100% rename from database/src/db/cash_shop_purchase_count_info.rs rename to database/src/db/cash/cash_shop_purchase_count_info.rs diff --git a/database/src/db/cash/mod.rs b/database/src/db/cash/mod.rs new file mode 100644 index 0000000..9a2e273 --- /dev/null +++ b/database/src/db/cash/mod.rs @@ -0,0 +1,4 @@ +pub mod cash_mail_info; +pub mod cash_product_info; +pub mod cash_shop_info; +pub mod cash_shop_purchase_count_info; diff --git a/database/src/db/char_awake_info.rs b/database/src/db/char/char_awake_info.rs similarity index 100% rename from database/src/db/char_awake_info.rs rename to database/src/db/char/char_awake_info.rs diff --git a/database/src/db/char_info.rs b/database/src/db/char/char_info.rs similarity index 100% rename from database/src/db/char_info.rs rename to database/src/db/char/char_info.rs diff --git a/database/src/db/char_partner_info.rs b/database/src/db/char/char_partner_info.rs similarity index 100% rename from database/src/db/char_partner_info.rs rename to database/src/db/char/char_partner_info.rs diff --git a/database/src/db/char_scout_info.rs b/database/src/db/char/char_scout_info.rs similarity index 100% rename from database/src/db/char_scout_info.rs rename to database/src/db/char/char_scout_info.rs diff --git a/database/src/db/char/mod.rs b/database/src/db/char/mod.rs new file mode 100644 index 0000000..c05a18d --- /dev/null +++ b/database/src/db/char/mod.rs @@ -0,0 +1,4 @@ +pub mod char_awake_info; +pub mod char_info; +pub mod char_partner_info; +pub mod char_scout_info; diff --git a/database/src/db/charge_cost_event_schedule_info.rs b/database/src/db/charge/charge_cost_event_schedule_info.rs similarity index 100% rename from database/src/db/charge_cost_event_schedule_info.rs rename to database/src/db/charge/charge_cost_event_schedule_info.rs diff --git a/database/src/db/charge_cost_info.rs b/database/src/db/charge/charge_cost_info.rs similarity index 100% rename from database/src/db/charge_cost_info.rs rename to database/src/db/charge/charge_cost_info.rs diff --git a/database/src/db/charge/mod.rs b/database/src/db/charge/mod.rs new file mode 100644 index 0000000..ad27bba --- /dev/null +++ b/database/src/db/charge/mod.rs @@ -0,0 +1,2 @@ +pub mod charge_cost_event_schedule_info; +pub mod charge_cost_info; diff --git a/database/src/db/community_reward_info.rs b/database/src/db/community/community_reward_info.rs similarity index 100% rename from database/src/db/community_reward_info.rs rename to database/src/db/community/community_reward_info.rs diff --git a/database/src/db/community/mod.rs b/database/src/db/community/mod.rs new file mode 100644 index 0000000..5756835 --- /dev/null +++ b/database/src/db/community/mod.rs @@ -0,0 +1 @@ +pub mod community_reward_info; diff --git a/database/src/db/content_rank_statue_info.rs b/database/src/db/content/content_rank_statue_info.rs similarity index 100% rename from database/src/db/content_rank_statue_info.rs rename to database/src/db/content/content_rank_statue_info.rs diff --git a/database/src/db/content/mod.rs b/database/src/db/content/mod.rs new file mode 100644 index 0000000..e0aa035 --- /dev/null +++ b/database/src/db/content/mod.rs @@ -0,0 +1 @@ +pub mod content_rank_statue_info; diff --git a/database/src/db/contents_char_item_info.rs b/database/src/db/contents/contents_char_item_info.rs similarity index 100% rename from database/src/db/contents_char_item_info.rs rename to database/src/db/contents/contents_char_item_info.rs diff --git a/database/src/db/contents_equip_info.rs b/database/src/db/contents/contents_equip_info.rs similarity index 100% rename from database/src/db/contents_equip_info.rs rename to database/src/db/contents/contents_equip_info.rs diff --git a/database/src/db/contents/mod.rs b/database/src/db/contents/mod.rs new file mode 100644 index 0000000..72ec7e4 --- /dev/null +++ b/database/src/db/contents/mod.rs @@ -0,0 +1,2 @@ +pub mod contents_char_item_info; +pub mod contents_equip_info; diff --git a/database/src/db/cost_time_info.rs b/database/src/db/cost/cost_time_info.rs similarity index 100% rename from database/src/db/cost_time_info.rs rename to database/src/db/cost/cost_time_info.rs diff --git a/database/src/db/cost/mod.rs b/database/src/db/cost/mod.rs new file mode 100644 index 0000000..4325ef0 --- /dev/null +++ b/database/src/db/cost/mod.rs @@ -0,0 +1 @@ +pub mod cost_time_info; diff --git a/database/src/db/costume_base_info.rs b/database/src/db/costume/costume_base_info.rs similarity index 100% rename from database/src/db/costume_base_info.rs rename to database/src/db/costume/costume_base_info.rs diff --git a/database/src/db/costume_info.rs b/database/src/db/costume/costume_info.rs similarity index 100% rename from database/src/db/costume_info.rs rename to database/src/db/costume/costume_info.rs diff --git a/database/src/db/costume_potential_connect_info.rs b/database/src/db/costume/costume_potential_connect_info.rs similarity index 100% rename from database/src/db/costume_potential_connect_info.rs rename to database/src/db/costume/costume_potential_connect_info.rs diff --git a/database/src/db/costume_use_info.rs b/database/src/db/costume/costume_use_info.rs similarity index 100% rename from database/src/db/costume_use_info.rs rename to database/src/db/costume/costume_use_info.rs diff --git a/database/src/db/costume/mod.rs b/database/src/db/costume/mod.rs new file mode 100644 index 0000000..8a6d701 --- /dev/null +++ b/database/src/db/costume/mod.rs @@ -0,0 +1,4 @@ +pub mod costume_base_info; +pub mod costume_info; +pub mod costume_potential_connect_info; +pub mod costume_use_info; diff --git a/database/src/db/cs_mini_game_relay_server_info.rs b/database/src/db/cs/cs_mini_game_relay_server_info.rs similarity index 100% rename from database/src/db/cs_mini_game_relay_server_info.rs rename to database/src/db/cs/cs_mini_game_relay_server_info.rs diff --git a/database/src/db/cs/mod.rs b/database/src/db/cs/mod.rs new file mode 100644 index 0000000..bc35075 --- /dev/null +++ b/database/src/db/cs/mod.rs @@ -0,0 +1 @@ +pub mod cs_mini_game_relay_server_info; diff --git a/database/src/db/dating_episode_info.rs b/database/src/db/dating/dating_episode_info.rs similarity index 100% rename from database/src/db/dating_episode_info.rs rename to database/src/db/dating/dating_episode_info.rs diff --git a/database/src/db/dating_info.rs b/database/src/db/dating/dating_info.rs similarity index 100% rename from database/src/db/dating_info.rs rename to database/src/db/dating/dating_info.rs diff --git a/database/src/db/dating_message_choice_info.rs b/database/src/db/dating/dating_message_choice_info.rs similarity index 100% rename from database/src/db/dating_message_choice_info.rs rename to database/src/db/dating/dating_message_choice_info.rs diff --git a/database/src/db/dating/mod.rs b/database/src/db/dating/mod.rs new file mode 100644 index 0000000..eec9b85 --- /dev/null +++ b/database/src/db/dating/mod.rs @@ -0,0 +1,3 @@ +pub mod dating_episode_info; +pub mod dating_info; +pub mod dating_message_choice_info; diff --git a/database/src/db/deck_costume_setting_info.rs b/database/src/db/deck/deck_costume_setting_info.rs similarity index 100% rename from database/src/db/deck_costume_setting_info.rs rename to database/src/db/deck/deck_costume_setting_info.rs diff --git a/database/src/db/deck_info.rs b/database/src/db/deck/deck_info.rs similarity index 100% rename from database/src/db/deck_info.rs rename to database/src/db/deck/deck_info.rs diff --git a/database/src/db/deck_message_info.rs b/database/src/db/deck/deck_message_info.rs similarity index 100% rename from database/src/db/deck_message_info.rs rename to database/src/db/deck/deck_message_info.rs diff --git a/database/src/db/deck/mod.rs b/database/src/db/deck/mod.rs new file mode 100644 index 0000000..fe55153 --- /dev/null +++ b/database/src/db/deck/mod.rs @@ -0,0 +1,3 @@ +pub mod deck_costume_setting_info; +pub mod deck_info; +pub mod deck_message_info; diff --git a/database/src/db/defense_monster_info.rs b/database/src/db/defense/defense_monster_info.rs similarity index 100% rename from database/src/db/defense_monster_info.rs rename to database/src/db/defense/defense_monster_info.rs diff --git a/database/src/db/defense_unit_info.rs b/database/src/db/defense/defense_unit_info.rs similarity index 100% rename from database/src/db/defense_unit_info.rs rename to database/src/db/defense/defense_unit_info.rs diff --git a/database/src/db/defense_user_info.rs b/database/src/db/defense/defense_user_info.rs similarity index 100% rename from database/src/db/defense_user_info.rs rename to database/src/db/defense/defense_user_info.rs diff --git a/database/src/db/defense/mod.rs b/database/src/db/defense/mod.rs new file mode 100644 index 0000000..631ed32 --- /dev/null +++ b/database/src/db/defense/mod.rs @@ -0,0 +1,3 @@ +pub mod defense_monster_info; +pub mod defense_unit_info; +pub mod defense_user_info; diff --git a/database/src/db/delayed_visibility_schedule_info.rs b/database/src/db/delayed/delayed_visibility_schedule_info.rs similarity index 100% rename from database/src/db/delayed_visibility_schedule_info.rs rename to database/src/db/delayed/delayed_visibility_schedule_info.rs diff --git a/database/src/db/delayed/mod.rs b/database/src/db/delayed/mod.rs new file mode 100644 index 0000000..42ebcda --- /dev/null +++ b/database/src/db/delayed/mod.rs @@ -0,0 +1 @@ +pub mod delayed_visibility_schedule_info; diff --git a/database/src/db/dispatch_info.rs b/database/src/db/dispatch/dispatch_info.rs similarity index 100% rename from database/src/db/dispatch_info.rs rename to database/src/db/dispatch/dispatch_info.rs diff --git a/database/src/db/dispatch/mod.rs b/database/src/db/dispatch/mod.rs new file mode 100644 index 0000000..aa4c55b --- /dev/null +++ b/database/src/db/dispatch/mod.rs @@ -0,0 +1 @@ +pub mod dispatch_info; diff --git a/database/src/db/env_info.rs b/database/src/db/env/env_info.rs similarity index 100% rename from database/src/db/env_info.rs rename to database/src/db/env/env_info.rs diff --git a/database/src/db/env/mod.rs b/database/src/db/env/mod.rs new file mode 100644 index 0000000..4359e74 --- /dev/null +++ b/database/src/db/env/mod.rs @@ -0,0 +1 @@ +pub mod env_info; diff --git a/database/src/db/equip_base_info.rs b/database/src/db/equip/equip_base_info.rs similarity index 100% rename from database/src/db/equip_base_info.rs rename to database/src/db/equip/equip_base_info.rs diff --git a/database/src/db/equip_batch_use_info.rs b/database/src/db/equip/equip_batch_use_info.rs similarity index 100% rename from database/src/db/equip_batch_use_info.rs rename to database/src/db/equip/equip_batch_use_info.rs diff --git a/database/src/db/equip_clear_info.rs b/database/src/db/equip/equip_clear_info.rs similarity index 100% rename from database/src/db/equip_clear_info.rs rename to database/src/db/equip/equip_clear_info.rs diff --git a/database/src/db/equip_info.rs b/database/src/db/equip/equip_info.rs similarity index 100% rename from database/src/db/equip_info.rs rename to database/src/db/equip/equip_info.rs diff --git a/database/src/db/equip_option_info.rs b/database/src/db/equip/equip_option_info.rs similarity index 100% rename from database/src/db/equip_option_info.rs rename to database/src/db/equip/equip_option_info.rs diff --git a/database/src/db/equip_preset_char_info.rs b/database/src/db/equip/equip_preset_char_info.rs similarity index 100% rename from database/src/db/equip_preset_char_info.rs rename to database/src/db/equip/equip_preset_char_info.rs diff --git a/database/src/db/equip_preset_info.rs b/database/src/db/equip/equip_preset_info.rs similarity index 100% rename from database/src/db/equip_preset_info.rs rename to database/src/db/equip/equip_preset_info.rs diff --git a/database/src/db/equip_preset_item_info.rs b/database/src/db/equip/equip_preset_item_info.rs similarity index 100% rename from database/src/db/equip_preset_item_info.rs rename to database/src/db/equip/equip_preset_item_info.rs diff --git a/database/src/db/equip_storage_info.rs b/database/src/db/equip/equip_storage_info.rs similarity index 100% rename from database/src/db/equip_storage_info.rs rename to database/src/db/equip/equip_storage_info.rs diff --git a/database/src/db/equip/mod.rs b/database/src/db/equip/mod.rs new file mode 100644 index 0000000..ffde78e --- /dev/null +++ b/database/src/db/equip/mod.rs @@ -0,0 +1,9 @@ +pub mod equip_base_info; +pub mod equip_batch_use_info; +pub mod equip_clear_info; +pub mod equip_info; +pub mod equip_option_info; +pub mod equip_preset_char_info; +pub mod equip_preset_info; +pub mod equip_preset_item_info; +pub mod equip_storage_info; diff --git a/database/src/db/event_exchange_info.rs b/database/src/db/event/event_exchange_info.rs similarity index 100% rename from database/src/db/event_exchange_info.rs rename to database/src/db/event/event_exchange_info.rs diff --git a/database/src/db/event_exchange_reward_info.rs b/database/src/db/event/event_exchange_reward_info.rs similarity index 100% rename from database/src/db/event_exchange_reward_info.rs rename to database/src/db/event/event_exchange_reward_info.rs diff --git a/database/src/db/event_hub_info.rs b/database/src/db/event/event_hub_info.rs similarity index 100% rename from database/src/db/event_hub_info.rs rename to database/src/db/event/event_hub_info.rs diff --git a/database/src/db/event_hub_setting_info.rs b/database/src/db/event/event_hub_setting_info.rs similarity index 100% rename from database/src/db/event_hub_setting_info.rs rename to database/src/db/event/event_hub_setting_info.rs diff --git a/database/src/db/event_mission_info.rs b/database/src/db/event/event_mission_info.rs similarity index 100% rename from database/src/db/event_mission_info.rs rename to database/src/db/event/event_mission_info.rs diff --git a/database/src/db/event_reward_history_info.rs b/database/src/db/event/event_reward_history_info.rs similarity index 100% rename from database/src/db/event_reward_history_info.rs rename to database/src/db/event/event_reward_history_info.rs diff --git a/database/src/db/event_schedule_info.rs b/database/src/db/event/event_schedule_info.rs similarity index 100% rename from database/src/db/event_schedule_info.rs rename to database/src/db/event/event_schedule_info.rs diff --git a/database/src/db/event/mod.rs b/database/src/db/event/mod.rs new file mode 100644 index 0000000..97473f9 --- /dev/null +++ b/database/src/db/event/mod.rs @@ -0,0 +1,7 @@ +pub mod event_exchange_info; +pub mod event_exchange_reward_info; +pub mod event_hub_info; +pub mod event_hub_setting_info; +pub mod event_mission_info; +pub mod event_reward_history_info; +pub mod event_schedule_info; diff --git a/database/src/db/evil_castle_clear_reward_info.rs b/database/src/db/evil/evil_castle_clear_reward_info.rs similarity index 100% rename from database/src/db/evil_castle_clear_reward_info.rs rename to database/src/db/evil/evil_castle_clear_reward_info.rs diff --git a/database/src/db/evil_castle_end_season_info.rs b/database/src/db/evil/evil_castle_end_season_info.rs similarity index 100% rename from database/src/db/evil_castle_end_season_info.rs rename to database/src/db/evil/evil_castle_end_season_info.rs diff --git a/database/src/db/evil_castle_end_season_total_info.rs b/database/src/db/evil/evil_castle_end_season_total_info.rs similarity index 100% rename from database/src/db/evil_castle_end_season_total_info.rs rename to database/src/db/evil/evil_castle_end_season_total_info.rs diff --git a/database/src/db/evil_castle_info.rs b/database/src/db/evil/evil_castle_info.rs similarity index 100% rename from database/src/db/evil_castle_info.rs rename to database/src/db/evil/evil_castle_info.rs diff --git a/database/src/db/evil_castle_rank_user_info.rs b/database/src/db/evil/evil_castle_rank_user_info.rs similarity index 100% rename from database/src/db/evil_castle_rank_user_info.rs rename to database/src/db/evil/evil_castle_rank_user_info.rs diff --git a/database/src/db/evil_castle_ranking_info.rs b/database/src/db/evil/evil_castle_ranking_info.rs similarity index 100% rename from database/src/db/evil_castle_ranking_info.rs rename to database/src/db/evil/evil_castle_ranking_info.rs diff --git a/database/src/db/evil_castle_reward_info.rs b/database/src/db/evil/evil_castle_reward_info.rs similarity index 100% rename from database/src/db/evil_castle_reward_info.rs rename to database/src/db/evil/evil_castle_reward_info.rs diff --git a/database/src/db/evil_castle_rogue_like_all_user_score_info.rs b/database/src/db/evil/evil_castle_rogue_like_all_user_score_info.rs similarity index 100% rename from database/src/db/evil_castle_rogue_like_all_user_score_info.rs rename to database/src/db/evil/evil_castle_rogue_like_all_user_score_info.rs diff --git a/database/src/db/evil_castle_rogue_like_choice_info.rs b/database/src/db/evil/evil_castle_rogue_like_choice_info.rs similarity index 100% rename from database/src/db/evil_castle_rogue_like_choice_info.rs rename to database/src/db/evil/evil_castle_rogue_like_choice_info.rs diff --git a/database/src/db/evil_castle_rogue_like_event_info.rs b/database/src/db/evil/evil_castle_rogue_like_event_info.rs similarity index 100% rename from database/src/db/evil_castle_rogue_like_event_info.rs rename to database/src/db/evil/evil_castle_rogue_like_event_info.rs diff --git a/database/src/db/evil_castle_rogue_like_floor_info.rs b/database/src/db/evil/evil_castle_rogue_like_floor_info.rs similarity index 100% rename from database/src/db/evil_castle_rogue_like_floor_info.rs rename to database/src/db/evil/evil_castle_rogue_like_floor_info.rs diff --git a/database/src/db/evil_castle_rogue_like_give_up_info.rs b/database/src/db/evil/evil_castle_rogue_like_give_up_info.rs similarity index 100% rename from database/src/db/evil_castle_rogue_like_give_up_info.rs rename to database/src/db/evil/evil_castle_rogue_like_give_up_info.rs diff --git a/database/src/db/evil_castle_rogue_like_growth_info.rs b/database/src/db/evil/evil_castle_rogue_like_growth_info.rs similarity index 100% rename from database/src/db/evil_castle_rogue_like_growth_info.rs rename to database/src/db/evil/evil_castle_rogue_like_growth_info.rs diff --git a/database/src/db/evil_castle_rogue_like_info.rs b/database/src/db/evil/evil_castle_rogue_like_info.rs similarity index 100% rename from database/src/db/evil_castle_rogue_like_info.rs rename to database/src/db/evil/evil_castle_rogue_like_info.rs diff --git a/database/src/db/evil_castle_rogue_like_rank_info.rs b/database/src/db/evil/evil_castle_rogue_like_rank_info.rs similarity index 100% rename from database/src/db/evil_castle_rogue_like_rank_info.rs rename to database/src/db/evil/evil_castle_rogue_like_rank_info.rs diff --git a/database/src/db/evil_castle_rogue_like_rank_user_info.rs b/database/src/db/evil/evil_castle_rogue_like_rank_user_info.rs similarity index 100% rename from database/src/db/evil_castle_rogue_like_rank_user_info.rs rename to database/src/db/evil/evil_castle_rogue_like_rank_user_info.rs diff --git a/database/src/db/evil_castle_rogue_like_room_info.rs b/database/src/db/evil/evil_castle_rogue_like_room_info.rs similarity index 100% rename from database/src/db/evil_castle_rogue_like_room_info.rs rename to database/src/db/evil/evil_castle_rogue_like_room_info.rs diff --git a/database/src/db/evil_castle_rogue_like_score_info.rs b/database/src/db/evil/evil_castle_rogue_like_score_info.rs similarity index 100% rename from database/src/db/evil_castle_rogue_like_score_info.rs rename to database/src/db/evil/evil_castle_rogue_like_score_info.rs diff --git a/database/src/db/evil_castle_rogue_like_shop_info.rs b/database/src/db/evil/evil_castle_rogue_like_shop_info.rs similarity index 100% rename from database/src/db/evil_castle_rogue_like_shop_info.rs rename to database/src/db/evil/evil_castle_rogue_like_shop_info.rs diff --git a/database/src/db/evil_castle_rogue_like_shop_item_info.rs b/database/src/db/evil/evil_castle_rogue_like_shop_item_info.rs similarity index 100% rename from database/src/db/evil_castle_rogue_like_shop_item_info.rs rename to database/src/db/evil/evil_castle_rogue_like_shop_item_info.rs diff --git a/database/src/db/evil_castle_rogue_like_state_info.rs b/database/src/db/evil/evil_castle_rogue_like_state_info.rs similarity index 100% rename from database/src/db/evil_castle_rogue_like_state_info.rs rename to database/src/db/evil/evil_castle_rogue_like_state_info.rs diff --git a/database/src/db/evil_castle_stage_ranking_info.rs b/database/src/db/evil/evil_castle_stage_ranking_info.rs similarity index 100% rename from database/src/db/evil_castle_stage_ranking_info.rs rename to database/src/db/evil/evil_castle_stage_ranking_info.rs diff --git a/database/src/db/evil_castle_total_info.rs b/database/src/db/evil/evil_castle_total_info.rs similarity index 100% rename from database/src/db/evil_castle_total_info.rs rename to database/src/db/evil/evil_castle_total_info.rs diff --git a/database/src/db/evil_castle_tower_info.rs b/database/src/db/evil/evil_castle_tower_info.rs similarity index 100% rename from database/src/db/evil_castle_tower_info.rs rename to database/src/db/evil/evil_castle_tower_info.rs diff --git a/database/src/db/evil/mod.rs b/database/src/db/evil/mod.rs new file mode 100644 index 0000000..8948369 --- /dev/null +++ b/database/src/db/evil/mod.rs @@ -0,0 +1,24 @@ +pub mod evil_castle_clear_reward_info; +pub mod evil_castle_end_season_info; +pub mod evil_castle_end_season_total_info; +pub mod evil_castle_info; +pub mod evil_castle_rank_user_info; +pub mod evil_castle_ranking_info; +pub mod evil_castle_reward_info; +pub mod evil_castle_rogue_like_all_user_score_info; +pub mod evil_castle_rogue_like_choice_info; +pub mod evil_castle_rogue_like_event_info; +pub mod evil_castle_rogue_like_floor_info; +pub mod evil_castle_rogue_like_give_up_info; +pub mod evil_castle_rogue_like_growth_info; +pub mod evil_castle_rogue_like_info; +pub mod evil_castle_rogue_like_rank_info; +pub mod evil_castle_rogue_like_rank_user_info; +pub mod evil_castle_rogue_like_room_info; +pub mod evil_castle_rogue_like_score_info; +pub mod evil_castle_rogue_like_shop_info; +pub mod evil_castle_rogue_like_shop_item_info; +pub mod evil_castle_rogue_like_state_info; +pub mod evil_castle_stage_ranking_info; +pub mod evil_castle_total_info; +pub mod evil_castle_tower_info; diff --git a/database/src/db/field_buff_info.rs b/database/src/db/field/field_buff_info.rs similarity index 100% rename from database/src/db/field_buff_info.rs rename to database/src/db/field/field_buff_info.rs diff --git a/database/src/db/field_char_control_deck_type.rs b/database/src/db/field/field_char_control_deck_type.rs similarity index 100% rename from database/src/db/field_char_control_deck_type.rs rename to database/src/db/field/field_char_control_deck_type.rs diff --git a/database/src/db/field_deck_info.rs b/database/src/db/field/field_deck_info.rs similarity index 100% rename from database/src/db/field_deck_info.rs rename to database/src/db/field/field_deck_info.rs diff --git a/database/src/db/field_object_base_info.rs b/database/src/db/field/field_object_base_info.rs similarity index 100% rename from database/src/db/field_object_base_info.rs rename to database/src/db/field/field_object_base_info.rs diff --git a/database/src/db/field_object_info.rs b/database/src/db/field/field_object_info.rs similarity index 100% rename from database/src/db/field_object_info.rs rename to database/src/db/field/field_object_info.rs diff --git a/database/src/db/field_object_position_info.rs b/database/src/db/field/field_object_position_info.rs similarity index 100% rename from database/src/db/field_object_position_info.rs rename to database/src/db/field/field_object_position_info.rs diff --git a/database/src/db/field_object_respawn_info.rs b/database/src/db/field/field_object_respawn_info.rs similarity index 100% rename from database/src/db/field_object_respawn_info.rs rename to database/src/db/field/field_object_respawn_info.rs diff --git a/database/src/db/field_trap_info.rs b/database/src/db/field/field_trap_info.rs similarity index 100% rename from database/src/db/field_trap_info.rs rename to database/src/db/field/field_trap_info.rs diff --git a/database/src/db/field/mod.rs b/database/src/db/field/mod.rs new file mode 100644 index 0000000..1f6fb20 --- /dev/null +++ b/database/src/db/field/mod.rs @@ -0,0 +1,8 @@ +pub mod field_buff_info; +pub mod field_char_control_deck_type; +pub mod field_deck_info; +pub mod field_object_base_info; +pub mod field_object_info; +pub mod field_object_position_info; +pub mod field_object_respawn_info; +pub mod field_trap_info; diff --git a/database/src/db/food_use_info.rs b/database/src/db/food/food_use_info.rs similarity index 100% rename from database/src/db/food_use_info.rs rename to database/src/db/food/food_use_info.rs diff --git a/database/src/db/food/mod.rs b/database/src/db/food/mod.rs new file mode 100644 index 0000000..f2fb5ce --- /dev/null +++ b/database/src/db/food/mod.rs @@ -0,0 +1 @@ +pub mod food_use_info; diff --git a/database/src/db/friend_info.rs b/database/src/db/friend/friend_info.rs similarity index 100% rename from database/src/db/friend_info.rs rename to database/src/db/friend/friend_info.rs diff --git a/database/src/db/friend/mod.rs b/database/src/db/friend/mod.rs new file mode 100644 index 0000000..f9f8f8c --- /dev/null +++ b/database/src/db/friend/mod.rs @@ -0,0 +1 @@ +pub mod friend_info; diff --git a/database/src/db/gacha_fixed_info.rs b/database/src/db/gacha/gacha_fixed_info.rs similarity index 100% rename from database/src/db/gacha_fixed_info.rs rename to database/src/db/gacha/gacha_fixed_info.rs diff --git a/database/src/db/gacha_info.rs b/database/src/db/gacha/gacha_info.rs similarity index 100% rename from database/src/db/gacha_info.rs rename to database/src/db/gacha/gacha_info.rs diff --git a/database/src/db/gacha_log_info.rs b/database/src/db/gacha/gacha_log_info.rs similarity index 100% rename from database/src/db/gacha_log_info.rs rename to database/src/db/gacha/gacha_log_info.rs diff --git a/database/src/db/gacha_schedule_info.rs b/database/src/db/gacha/gacha_schedule_info.rs similarity index 100% rename from database/src/db/gacha_schedule_info.rs rename to database/src/db/gacha/gacha_schedule_info.rs diff --git a/database/src/db/gacha_selection_count_change_info.rs b/database/src/db/gacha/gacha_selection_count_change_info.rs similarity index 100% rename from database/src/db/gacha_selection_count_change_info.rs rename to database/src/db/gacha/gacha_selection_count_change_info.rs diff --git a/database/src/db/gacha_selection_info.rs b/database/src/db/gacha/gacha_selection_info.rs similarity index 100% rename from database/src/db/gacha_selection_info.rs rename to database/src/db/gacha/gacha_selection_info.rs diff --git a/database/src/db/gacha_step_up_schedule_info.rs b/database/src/db/gacha/gacha_step_up_schedule_info.rs similarity index 100% rename from database/src/db/gacha_step_up_schedule_info.rs rename to database/src/db/gacha/gacha_step_up_schedule_info.rs diff --git a/database/src/db/gacha_step_up_user_info.rs b/database/src/db/gacha/gacha_step_up_user_info.rs similarity index 100% rename from database/src/db/gacha_step_up_user_info.rs rename to database/src/db/gacha/gacha_step_up_user_info.rs diff --git a/database/src/db/gacha_total_count_info.rs b/database/src/db/gacha/gacha_total_count_info.rs similarity index 100% rename from database/src/db/gacha_total_count_info.rs rename to database/src/db/gacha/gacha_total_count_info.rs diff --git a/database/src/db/gacha_user_info.rs b/database/src/db/gacha/gacha_user_info.rs similarity index 100% rename from database/src/db/gacha_user_info.rs rename to database/src/db/gacha/gacha_user_info.rs diff --git a/database/src/db/gacha/mod.rs b/database/src/db/gacha/mod.rs new file mode 100644 index 0000000..b1c5c36 --- /dev/null +++ b/database/src/db/gacha/mod.rs @@ -0,0 +1,10 @@ +pub mod gacha_fixed_info; +pub mod gacha_info; +pub mod gacha_log_info; +pub mod gacha_schedule_info; +pub mod gacha_selection_count_change_info; +pub mod gacha_selection_info; +pub mod gacha_step_up_schedule_info; +pub mod gacha_step_up_user_info; +pub mod gacha_total_count_info; +pub mod gacha_user_info; diff --git a/database/src/db/guild_action_info.rs b/database/src/db/guild/guild_action_info.rs similarity index 100% rename from database/src/db/guild_action_info.rs rename to database/src/db/guild/guild_action_info.rs diff --git a/database/src/db/guild_base_info.rs b/database/src/db/guild/guild_base_info.rs similarity index 100% rename from database/src/db/guild_base_info.rs rename to database/src/db/guild/guild_base_info.rs diff --git a/database/src/db/guild_info.rs b/database/src/db/guild/guild_info.rs similarity index 100% rename from database/src/db/guild_info.rs rename to database/src/db/guild/guild_info.rs diff --git a/database/src/db/guild_init_info.rs b/database/src/db/guild/guild_init_info.rs similarity index 100% rename from database/src/db/guild_init_info.rs rename to database/src/db/guild/guild_init_info.rs diff --git a/database/src/db/guild_join_send_info.rs b/database/src/db/guild/guild_join_send_info.rs similarity index 100% rename from database/src/db/guild_join_send_info.rs rename to database/src/db/guild/guild_join_send_info.rs diff --git a/database/src/db/guild_member_info.rs b/database/src/db/guild/guild_member_info.rs similarity index 100% rename from database/src/db/guild_member_info.rs rename to database/src/db/guild/guild_member_info.rs diff --git a/database/src/db/guild_notice_info.rs b/database/src/db/guild/guild_notice_info.rs similarity index 100% rename from database/src/db/guild_notice_info.rs rename to database/src/db/guild/guild_notice_info.rs diff --git a/database/src/db/guild_raid_battle_golem_info.rs b/database/src/db/guild/guild_raid_battle_golem_info.rs similarity index 100% rename from database/src/db/guild_raid_battle_golem_info.rs rename to database/src/db/guild/guild_raid_battle_golem_info.rs diff --git a/database/src/db/guild_raid_battle_score_info.rs b/database/src/db/guild/guild_raid_battle_score_info.rs similarity index 100% rename from database/src/db/guild_raid_battle_score_info.rs rename to database/src/db/guild/guild_raid_battle_score_info.rs diff --git a/database/src/db/guild_raid_boss_battle_info.rs b/database/src/db/guild/guild_raid_boss_battle_info.rs similarity index 100% rename from database/src/db/guild_raid_boss_battle_info.rs rename to database/src/db/guild/guild_raid_boss_battle_info.rs diff --git a/database/src/db/guild_raid_deck_info.rs b/database/src/db/guild/guild_raid_deck_info.rs similarity index 100% rename from database/src/db/guild_raid_deck_info.rs rename to database/src/db/guild/guild_raid_deck_info.rs diff --git a/database/src/db/guild_raid_flag_grade_version_info.rs b/database/src/db/guild/guild_raid_flag_grade_version_info.rs similarity index 100% rename from database/src/db/guild_raid_flag_grade_version_info.rs rename to database/src/db/guild/guild_raid_flag_grade_version_info.rs diff --git a/database/src/db/guild_raid_main_info.rs b/database/src/db/guild/guild_raid_main_info.rs similarity index 100% rename from database/src/db/guild_raid_main_info.rs rename to database/src/db/guild/guild_raid_main_info.rs diff --git a/database/src/db/guild_raid_member_play_history_info.rs b/database/src/db/guild/guild_raid_member_play_history_info.rs similarity index 100% rename from database/src/db/guild_raid_member_play_history_info.rs rename to database/src/db/guild/guild_raid_member_play_history_info.rs diff --git a/database/src/db/guild_raid_member_rank_info.rs b/database/src/db/guild/guild_raid_member_rank_info.rs similarity index 100% rename from database/src/db/guild_raid_member_rank_info.rs rename to database/src/db/guild/guild_raid_member_rank_info.rs diff --git a/database/src/db/guild_raid_normal_battle_history_info.rs b/database/src/db/guild/guild_raid_normal_battle_history_info.rs similarity index 100% rename from database/src/db/guild_raid_normal_battle_history_info.rs rename to database/src/db/guild/guild_raid_normal_battle_history_info.rs diff --git a/database/src/db/guild_raid_normal_battle_info.rs b/database/src/db/guild/guild_raid_normal_battle_info.rs similarity index 100% rename from database/src/db/guild_raid_normal_battle_info.rs rename to database/src/db/guild/guild_raid_normal_battle_info.rs diff --git a/database/src/db/guild_raid_play_info.rs b/database/src/db/guild/guild_raid_play_info.rs similarity index 100% rename from database/src/db/guild_raid_play_info.rs rename to database/src/db/guild/guild_raid_play_info.rs diff --git a/database/src/db/guild_raid_preset_info.rs b/database/src/db/guild/guild_raid_preset_info.rs similarity index 100% rename from database/src/db/guild_raid_preset_info.rs rename to database/src/db/guild/guild_raid_preset_info.rs diff --git a/database/src/db/guild_raid_season_rank_info.rs b/database/src/db/guild/guild_raid_season_rank_info.rs similarity index 100% rename from database/src/db/guild_raid_season_rank_info.rs rename to database/src/db/guild/guild_raid_season_rank_info.rs diff --git a/database/src/db/guild_raid_supporter_deck_info.rs b/database/src/db/guild/guild_raid_supporter_deck_info.rs similarity index 100% rename from database/src/db/guild_raid_supporter_deck_info.rs rename to database/src/db/guild/guild_raid_supporter_deck_info.rs diff --git a/database/src/db/guild_supporter_battle_char_info.rs b/database/src/db/guild/guild_supporter_battle_char_info.rs similarity index 100% rename from database/src/db/guild_supporter_battle_char_info.rs rename to database/src/db/guild/guild_supporter_battle_char_info.rs diff --git a/database/src/db/guild_supporter_info.rs b/database/src/db/guild/guild_supporter_info.rs similarity index 100% rename from database/src/db/guild_supporter_info.rs rename to database/src/db/guild/guild_supporter_info.rs diff --git a/database/src/db/guild/mod.rs b/database/src/db/guild/mod.rs new file mode 100644 index 0000000..dfb72d0 --- /dev/null +++ b/database/src/db/guild/mod.rs @@ -0,0 +1,23 @@ +pub mod guild_action_info; +pub mod guild_base_info; +pub mod guild_info; +pub mod guild_init_info; +pub mod guild_join_send_info; +pub mod guild_member_info; +pub mod guild_notice_info; +pub mod guild_raid_battle_golem_info; +pub mod guild_raid_battle_score_info; +pub mod guild_raid_boss_battle_info; +pub mod guild_raid_deck_info; +pub mod guild_raid_flag_grade_version_info; +pub mod guild_raid_main_info; +pub mod guild_raid_member_play_history_info; +pub mod guild_raid_member_rank_info; +pub mod guild_raid_normal_battle_history_info; +pub mod guild_raid_normal_battle_info; +pub mod guild_raid_play_info; +pub mod guild_raid_preset_info; +pub mod guild_raid_season_rank_info; +pub mod guild_raid_supporter_deck_info; +pub mod guild_supporter_battle_char_info; +pub mod guild_supporter_info; diff --git a/database/src/db/hunt_dispatch_info.rs b/database/src/db/hunt/hunt_dispatch_info.rs similarity index 100% rename from database/src/db/hunt_dispatch_info.rs rename to database/src/db/hunt/hunt_dispatch_info.rs diff --git a/database/src/db/hunt/mod.rs b/database/src/db/hunt/mod.rs new file mode 100644 index 0000000..cba5027 --- /dev/null +++ b/database/src/db/hunt/mod.rs @@ -0,0 +1 @@ +pub mod hunt_dispatch_info; diff --git a/database/src/db/hunting_ground_info_list.rs b/database/src/db/hunting/hunting_ground_info.rs similarity index 94% rename from database/src/db/hunting_ground_info_list.rs rename to database/src/db/hunting/hunting_ground_info.rs index db4e678..81ec26e 100644 --- a/database/src/db/hunting_ground_info_list.rs +++ b/database/src/db/hunting/hunting_ground_info.rs @@ -13,14 +13,12 @@ INSERT INTO HuntingGroundInfo ( IsAuto, CurrentId, HighestId, - MonsterInfoIndex, PackId ) VALUES ( ?, ?, ?, ?, - ?, ? ) "#, @@ -29,7 +27,6 @@ INSERT INTO HuntingGroundInfo ( .bind(&data.is_auto) .bind(&data.current_id) .bind(&data.highest_id) - .bind(&data.monster_info_index) .bind(&data.pack_id) .execute(pool) .await?; diff --git a/database/src/db/hunting/hunting_ground_info_list.rs b/database/src/db/hunting/hunting_ground_info_list.rs new file mode 100644 index 0000000..b9a9792 --- /dev/null +++ b/database/src/db/hunting/hunting_ground_info_list.rs @@ -0,0 +1,74 @@ +use crate::models::game::hunting_ground_info::HuntingGroundInfo; +use sqlx::SqlitePool; + +/// Add a single HuntingGroundInfo record from a Rust struct. +pub async fn add_hunting_ground_info( + pool: &SqlitePool, + data: &HuntingGroundInfo, +) -> sqlx::Result<()> { + sqlx::query( + r#" +INSERT INTO HuntingGroundInfo ( + Uid, + IsAuto, + CurrentId, + HighestId, + PackId +) VALUES ( + ?, + ?, + ?, + ?, + ?, + ? +) +"#, + ) + .bind(&data.uid) + .bind(&data.is_auto) + .bind(&data.current_id) + .bind(&data.highest_id) + .bind(&data.pack_id) + .execute(pool) + .await?; + + Ok(()) +} + +/// Fetch all records for a given UID. +pub async fn get_hunting_ground_info( + pool: &SqlitePool, + uid: i64, +) -> sqlx::Result> { + sqlx::query_as::<_, HuntingGroundInfo>("SELECT * FROM HuntingGroundInfo WHERE Uid = ?") + .bind(uid) + .fetch_all(pool) + .await +} + +/// Delete all HuntingGroundInfo rows for a UID. +pub async fn delete_hunting_ground_info(pool: &SqlitePool, uid: i64) -> sqlx::Result<()> { + sqlx::query("DELETE FROM HuntingGroundInfo WHERE Uid = ?") + .bind(uid) + .execute(pool) + .await?; + Ok(()) +} + +pub async fn link_monster_to_hunting_ground( + pool: &SqlitePool, + hunting_ground_index: i64, + monster_index: i64, +) -> sqlx::Result<()> { + sqlx::query( + r#" +INSERT INTO HuntingGroundMonster (HuntingGroundIndex, MonsterIndex) +VALUES (?, ?) +"#, + ) + .bind(hunting_ground_index) + .bind(monster_index) + .execute(pool) + .await?; + Ok(()) +} diff --git a/database/src/db/hunting/hunting_ground_monster.rs b/database/src/db/hunting/hunting_ground_monster.rs new file mode 100644 index 0000000..ee318ad --- /dev/null +++ b/database/src/db/hunting/hunting_ground_monster.rs @@ -0,0 +1,20 @@ +use crate::models::game::monster_info::MonsterInfo; +use sqlx::SqlitePool; + +pub async fn get_monsters_for_hunting_ground( + pool: &SqlitePool, + hunting_ground_index: i64, +) -> sqlx::Result> { + sqlx::query_as::<_, MonsterInfo>( + r#" + SELECT m.* + FROM MonsterInfo m + INNER JOIN HuntingGroundMonster hgm + ON hgm.MonsterIndex = m."Index" + WHERE hgm.HuntingGroundIndex = ? + "#, + ) + .bind(hunting_ground_index) + .fetch_all(pool) + .await +} diff --git a/database/src/db/hunting/mod.rs b/database/src/db/hunting/mod.rs new file mode 100644 index 0000000..72c11d7 --- /dev/null +++ b/database/src/db/hunting/mod.rs @@ -0,0 +1,3 @@ +pub mod hunting_ground_info; +pub mod hunting_ground_info_list; +pub mod hunting_ground_monster; diff --git a/database/src/db/hunting_ground_info.rs b/database/src/db/hunting_ground_info.rs deleted file mode 100644 index 5bce1e2..0000000 --- a/database/src/db/hunting_ground_info.rs +++ /dev/null @@ -1,130 +0,0 @@ -use crate::models::game::hunting_ground_info::HuntingGroundInfo; -use sqlx::SqlitePool; - -/// Add a single HuntingGroundInfo record from a Rust struct. -pub async fn add_hunting_ground_info( - pool: &SqlitePool, - data: &HuntingGroundInfo, -) -> sqlx::Result<()> { - sqlx::query( - r#" -INSERT INTO HuntingGroundInfo ( - Uid, - IsAuto, - CurrentId, - HighestId, - MonsterInfoIndex, - PackId -) VALUES ( - ?, - ?, - ?, - ?, - ?, - ? -) -"#, - ) - .bind(&data.uid) - .bind(&data.is_auto) - .bind(&data.current_id) - .bind(&data.highest_id) - .bind(&data.monster_info_index) - .bind(&data.pack_id) - .execute(pool) - .await?; - - Ok(()) -} - -/// Fetch all records for a given UID. -pub async fn get_hunting_ground_info( - pool: &SqlitePool, - uid: i64, -) -> sqlx::Result> { - sqlx::query_as::<_, HuntingGroundInfo>("SELECT * FROM HuntingGroundInfo WHERE Uid = ?") - .bind(uid) - .fetch_all(pool) - .await -} - -/// Delete all HuntingGroundInfo rows for a UID. -pub async fn delete_hunting_ground_info(pool: &SqlitePool, uid: i64) -> sqlx::Result<()> { - sqlx::query("DELETE FROM HuntingGroundInfo WHERE Uid = ?") - .bind(uid) - .execute(pool) - .await?; - Ok(()) -} - -/// Get a single record by Index (rowid) -pub async fn get_by_index( - pool: &SqlitePool, - uid: i64, - index: i64, -) -> sqlx::Result { - sqlx::query_as::<_, HuntingGroundInfo>( - "SELECT * FROM HuntingGroundInfo WHERE Uid = ? AND Index = ?", - ) - .bind(uid) - .bind(index) - .fetch_one(pool) - .await -} - -/// Get multiple records by their Index (rowids) -pub async fn get_all_by_index( - pool: &SqlitePool, - uid: i64, - index: &[i64], -) -> sqlx::Result> { - if index.is_empty() { - return Ok(vec![]); - } - - let placeholders = index.iter().map(|_| "?").collect::>().join(","); - let query = format!( - "SELECT * FROM HuntingGroundInfo WHERE Uid = ? AND Index IN ({})", - placeholders - ); - - let mut query = sqlx::query_as::<_, HuntingGroundInfo>(&query).bind(uid); - for idx in index { - query = query.bind(idx); - } - - query.fetch_all(pool).await -} - -/// Insert and return the rowid (Index) -pub async fn insert(pool: &SqlitePool, data: &HuntingGroundInfo) -> sqlx::Result { - let result = sqlx::query( - r#" -INSERT INTO HuntingGroundInfo ( - Uid, - IsAuto, - CurrentId, - HighestId, - MonsterInfoIndex, - PackId -) VALUES ( - ?, - ?, - ?, - ?, - ?, - ? -) -"#, - ) - .bind(&data.uid) - .bind(&data.is_auto) - .bind(&data.current_id) - .bind(&data.highest_id) - .bind(&data.monster_info_index) - .bind(&data.pack_id) - .execute(pool) - .await?; - - Ok(result.last_insert_rowid()) -} diff --git a/database/src/db/id_card_info.rs b/database/src/db/id/id_card_info.rs similarity index 100% rename from database/src/db/id_card_info.rs rename to database/src/db/id/id_card_info.rs diff --git a/database/src/db/id_card_item_info.rs b/database/src/db/id/id_card_item_info.rs similarity index 100% rename from database/src/db/id_card_item_info.rs rename to database/src/db/id/id_card_item_info.rs diff --git a/database/src/db/id_card_preset_info.rs b/database/src/db/id/id_card_preset_info.rs similarity index 100% rename from database/src/db/id_card_preset_info.rs rename to database/src/db/id/id_card_preset_info.rs diff --git a/database/src/db/id_card_shop_info.rs b/database/src/db/id/id_card_shop_info.rs similarity index 100% rename from database/src/db/id_card_shop_info.rs rename to database/src/db/id/id_card_shop_info.rs diff --git a/database/src/db/id/mod.rs b/database/src/db/id/mod.rs new file mode 100644 index 0000000..5c3ec92 --- /dev/null +++ b/database/src/db/id/mod.rs @@ -0,0 +1,4 @@ +pub mod id_card_info; +pub mod id_card_item_info; +pub mod id_card_preset_info; +pub mod id_card_shop_info; diff --git a/database/src/db/item_auto_exchange_info.rs b/database/src/db/item/item_auto_exchange_info.rs similarity index 100% rename from database/src/db/item_auto_exchange_info.rs rename to database/src/db/item/item_auto_exchange_info.rs diff --git a/database/src/db/item_auto_upgrade_info.rs b/database/src/db/item/item_auto_upgrade_info.rs similarity index 100% rename from database/src/db/item_auto_upgrade_info.rs rename to database/src/db/item/item_auto_upgrade_info.rs diff --git a/database/src/db/item_info.rs b/database/src/db/item/item_info.rs similarity index 100% rename from database/src/db/item_info.rs rename to database/src/db/item/item_info.rs diff --git a/database/src/db/item_material_info.rs b/database/src/db/item/item_material_info.rs similarity index 100% rename from database/src/db/item_material_info.rs rename to database/src/db/item/item_material_info.rs diff --git a/database/src/db/item_storage_info.rs b/database/src/db/item/item_storage_info.rs similarity index 100% rename from database/src/db/item_storage_info.rs rename to database/src/db/item/item_storage_info.rs diff --git a/database/src/db/item/mod.rs b/database/src/db/item/mod.rs new file mode 100644 index 0000000..f77868c --- /dev/null +++ b/database/src/db/item/mod.rs @@ -0,0 +1,5 @@ +pub mod item_auto_exchange_info; +pub mod item_auto_upgrade_info; +pub mod item_info; +pub mod item_material_info; +pub mod item_storage_info; diff --git a/database/src/db/jp_user_info.rs b/database/src/db/jp/jp_user_info.rs similarity index 100% rename from database/src/db/jp_user_info.rs rename to database/src/db/jp/jp_user_info.rs diff --git a/database/src/db/jp/mod.rs b/database/src/db/jp/mod.rs new file mode 100644 index 0000000..aaa17de --- /dev/null +++ b/database/src/db/jp/mod.rs @@ -0,0 +1 @@ +pub mod jp_user_info; diff --git a/database/src/db/knockback_info.rs b/database/src/db/knockback/knockback_info.rs similarity index 100% rename from database/src/db/knockback_info.rs rename to database/src/db/knockback/knockback_info.rs diff --git a/database/src/db/knockback/mod.rs b/database/src/db/knockback/mod.rs new file mode 100644 index 0000000..f38d828 --- /dev/null +++ b/database/src/db/knockback/mod.rs @@ -0,0 +1 @@ +pub mod knockback_info; diff --git a/database/src/db/login_event_info.rs b/database/src/db/login/login_event_info.rs similarity index 100% rename from database/src/db/login_event_info.rs rename to database/src/db/login/login_event_info.rs diff --git a/database/src/db/login/mod.rs b/database/src/db/login/mod.rs new file mode 100644 index 0000000..fa34129 --- /dev/null +++ b/database/src/db/login/mod.rs @@ -0,0 +1 @@ +pub mod login_event_info; diff --git a/database/src/db/mail_history_info.rs b/database/src/db/mail/mail_history_info.rs similarity index 100% rename from database/src/db/mail_history_info.rs rename to database/src/db/mail/mail_history_info.rs diff --git a/database/src/db/mail_info.rs b/database/src/db/mail/mail_info.rs similarity index 100% rename from database/src/db/mail_info.rs rename to database/src/db/mail/mail_info.rs diff --git a/database/src/db/mail/mod.rs b/database/src/db/mail/mod.rs new file mode 100644 index 0000000..4bf6eed --- /dev/null +++ b/database/src/db/mail/mod.rs @@ -0,0 +1,2 @@ +pub mod mail_history_info; +pub mod mail_info; diff --git a/database/src/db/maintenance_info.rs b/database/src/db/maintenance/maintenance_info.rs similarity index 100% rename from database/src/db/maintenance_info.rs rename to database/src/db/maintenance/maintenance_info.rs diff --git a/database/src/db/maintenance/mod.rs b/database/src/db/maintenance/mod.rs new file mode 100644 index 0000000..30a83fb --- /dev/null +++ b/database/src/db/maintenance/mod.rs @@ -0,0 +1 @@ +pub mod maintenance_info; diff --git a/database/src/db/map_active_info.rs b/database/src/db/map/map_active_info.rs similarity index 94% rename from database/src/db/map_active_info.rs rename to database/src/db/map/map_active_info.rs index 4a35175..49bfc15 100644 --- a/database/src/db/map_active_info.rs +++ b/database/src/db/map/map_active_info.rs @@ -7,8 +7,10 @@ pub async fn add_map_active_info(pool: &SqlitePool, data: &MapActiveInfo) -> sql r#" INSERT INTO MapActiveInfo ( Uid, - MapId + MapId, + ActiveInfo ) VALUES ( + ?, ?, ? ) @@ -16,6 +18,7 @@ INSERT INTO MapActiveInfo ( ) .bind(&data.uid) .bind(&data.map_id) + .bind(&data.active_info) .execute(pool) .await?; @@ -78,8 +81,10 @@ pub async fn insert(pool: &SqlitePool, data: &MapActiveInfo) -> sqlx::Result sqlx::Result<()> { + sqlx::query( + r#" +INSERT INTO QuestLevelInfo ( + Uid, + PackId, + QuestLevel, + ClearQuest, + QuestOpt, + IsLevelComplete +) +VALUES (?, ?, 0, ?, 0, 0) +ON CONFLICT(Uid, PackId) +DO UPDATE SET + ClearQuest = excluded.ClearQuest +"#, + ) + .bind(uid) + .bind(pack_id) + .bind(clear_quest) + .execute(pool) + .await?; + + Ok(()) +} + /// Fetch all records for a given UID. pub async fn get_quest_level_info( pool: &SqlitePool, @@ -53,69 +85,3 @@ pub async fn delete_quest_level_info(pool: &SqlitePool, uid: i64) -> sqlx::Resul .await?; Ok(()) } - -/// Get a single record by Index (rowid) -pub async fn get_by_index(pool: &SqlitePool, uid: i64, index: i64) -> sqlx::Result { - sqlx::query_as::<_, QuestLevelInfo>("SELECT * FROM QuestLevelInfo WHERE Uid = ? AND Index = ?") - .bind(uid) - .bind(index) - .fetch_one(pool) - .await -} - -/// Get multiple records by their Index (rowids) -pub async fn get_all_by_index( - pool: &SqlitePool, - uid: i64, - index: &[i64], -) -> sqlx::Result> { - if index.is_empty() { - return Ok(vec![]); - } - - let placeholders = index.iter().map(|_| "?").collect::>().join(","); - let query = format!( - "SELECT * FROM QuestLevelInfo WHERE Uid = ? AND Index IN ({})", - placeholders - ); - - let mut query = sqlx::query_as::<_, QuestLevelInfo>(&query).bind(uid); - for idx in index { - query = query.bind(idx); - } - - query.fetch_all(pool).await -} - -/// Insert and return the rowid (Index) -pub async fn insert(pool: &SqlitePool, data: &QuestLevelInfo) -> sqlx::Result { - let result = sqlx::query( - r#" -INSERT INTO QuestLevelInfo ( - Uid, - PackId, - QuestLevel, - ClearQuest, - QuestOpt, - IsLevelComplete -) VALUES ( - ?, - ?, - ?, - ?, - ?, - ? -) -"#, - ) - .bind(&data.uid) - .bind(&data.pack_id) - .bind(&data.quest_level) - .bind(&data.clear_quest) - .bind(&data.quest_opt) - .bind(&data.is_level_complete) - .execute(pool) - .await?; - - Ok(result.last_insert_rowid()) -} diff --git a/database/src/db/quest/quest_max_clear_info.rs b/database/src/db/quest/quest_max_clear_info.rs new file mode 100644 index 0000000..9e83f37 --- /dev/null +++ b/database/src/db/quest/quest_max_clear_info.rs @@ -0,0 +1,71 @@ +use crate::models::game::quest_max_clear_info::QuestMaxClearInfo; +use sqlx::SqlitePool; + +/// Add a single QuestMaxClearInfo record from a Rust struct. +pub async fn add_quest_max_clear_info( + pool: &SqlitePool, + data: &QuestMaxClearInfo, +) -> sqlx::Result<()> { + sqlx::query( + r#" +INSERT INTO QuestMaxClearInfo ( + Uid, + PackId, + MaxClearId +) VALUES ( + ?, + ?, + ? +) +"#, + ) + .bind(&data.uid) + .bind(&data.pack_id) + .bind(&data.max_clear_id) + .execute(pool) + .await?; + + Ok(()) +} + +/// Fetch all records for a given UID. +pub async fn get_quest_max_clear_info( + pool: &SqlitePool, + uid: i64, +) -> sqlx::Result> { + sqlx::query_as::<_, QuestMaxClearInfo>("SELECT * FROM QuestMaxClearInfo WHERE Uid = ?") + .bind(uid) + .fetch_all(pool) + .await +} + +/// Delete all QuestMaxClearInfo rows for a UID. +pub async fn delete_quest_max_clear_info(pool: &SqlitePool, uid: i64) -> sqlx::Result<()> { + sqlx::query("DELETE FROM QuestMaxClearInfo WHERE Uid = ?") + .bind(uid) + .execute(pool) + .await?; + Ok(()) +} + +pub async fn upsert_quest_max_clear_info( + pool: &SqlitePool, + uid: i64, + pack_id: i32, + max_clear_id: i32, +) -> sqlx::Result<()> { + sqlx::query( + r#" + INSERT INTO QuestMaxClearInfo (Uid, PackId, MaxClearId) + VALUES (?, ?, ?) + ON CONFLICT(Uid, PackId) + DO UPDATE SET MaxClearId = excluded.MaxClearId + "#, + ) + .bind(uid) + .bind(pack_id) + .bind(max_clear_id) + .execute(pool) + .await?; + Ok(()) +} diff --git a/database/src/db/quest_title_info.rs b/database/src/db/quest/quest_title_info.rs similarity index 100% rename from database/src/db/quest_title_info.rs rename to database/src/db/quest/quest_title_info.rs diff --git a/database/src/db/quest_max_clear_info.rs b/database/src/db/quest_max_clear_info.rs deleted file mode 100644 index cfdd279..0000000 --- a/database/src/db/quest_max_clear_info.rs +++ /dev/null @@ -1,112 +0,0 @@ -use crate::models::game::quest_max_clear_info::QuestMaxClearInfo; -use sqlx::SqlitePool; - -/// Add a single QuestMaxClearInfo record from a Rust struct. -pub async fn add_quest_max_clear_info( - pool: &SqlitePool, - data: &QuestMaxClearInfo, -) -> sqlx::Result<()> { - sqlx::query( - r#" -INSERT INTO QuestMaxClearInfo ( - Uid, - PackId, - MaxClearId -) VALUES ( - ?, - ?, - ? -) -"#, - ) - .bind(&data.uid) - .bind(&data.pack_id) - .bind(&data.max_clear_id) - .execute(pool) - .await?; - - Ok(()) -} - -/// Fetch all records for a given UID. -pub async fn get_quest_max_clear_info( - pool: &SqlitePool, - uid: i64, -) -> sqlx::Result> { - sqlx::query_as::<_, QuestMaxClearInfo>("SELECT * FROM QuestMaxClearInfo WHERE Uid = ?") - .bind(uid) - .fetch_all(pool) - .await -} - -/// Delete all QuestMaxClearInfo rows for a UID. -pub async fn delete_quest_max_clear_info(pool: &SqlitePool, uid: i64) -> sqlx::Result<()> { - sqlx::query("DELETE FROM QuestMaxClearInfo WHERE Uid = ?") - .bind(uid) - .execute(pool) - .await?; - Ok(()) -} - -/// Get a single record by Index (rowid) -pub async fn get_by_index( - pool: &SqlitePool, - uid: i64, - index: i64, -) -> sqlx::Result { - sqlx::query_as::<_, QuestMaxClearInfo>( - "SELECT * FROM QuestMaxClearInfo WHERE Uid = ? AND Index = ?", - ) - .bind(uid) - .bind(index) - .fetch_one(pool) - .await -} - -/// Get multiple records by their Index (rowids) -pub async fn get_by_indices( - pool: &SqlitePool, - uid: i64, - indices: &[i64], -) -> sqlx::Result> { - if indices.is_empty() { - return Ok(vec![]); - } - - let placeholders = indices.iter().map(|_| "?").collect::>().join(","); - let query = format!( - "SELECT * FROM QuestMaxClearInfo WHERE Uid = ? AND Index IN ({})", - placeholders - ); - - let mut query = sqlx::query_as::<_, QuestMaxClearInfo>(&query).bind(uid); - for idx in indices { - query = query.bind(idx); - } - - query.fetch_all(pool).await -} - -/// Insert and return the rowid (Index) -pub async fn insert(pool: &SqlitePool, data: &QuestMaxClearInfo) -> sqlx::Result { - let result = sqlx::query( - r#" -INSERT INTO QuestMaxClearInfo ( - Uid, - PackId, - MaxClearId -) VALUES ( - ?, - ?, - ? -) -"#, - ) - .bind(&data.uid) - .bind(&data.pack_id) - .bind(&data.max_clear_id) - .execute(pool) - .await?; - - Ok(result.last_insert_rowid()) -} diff --git a/database/src/db/recipe/mod.rs b/database/src/db/recipe/mod.rs new file mode 100644 index 0000000..51f00d1 --- /dev/null +++ b/database/src/db/recipe/mod.rs @@ -0,0 +1 @@ +pub mod recipe_info; diff --git a/database/src/db/recipe_info.rs b/database/src/db/recipe/recipe_info.rs similarity index 100% rename from database/src/db/recipe_info.rs rename to database/src/db/recipe/recipe_info.rs diff --git a/database/src/db/recommend/mod.rs b/database/src/db/recommend/mod.rs new file mode 100644 index 0000000..2912c5b --- /dev/null +++ b/database/src/db/recommend/mod.rs @@ -0,0 +1,3 @@ +pub mod recommend_deck_base_info; +pub mod recommend_deck_info; +pub mod recommend_deck_user_option_info; diff --git a/database/src/db/recommend_deck_base_info.rs b/database/src/db/recommend/recommend_deck_base_info.rs similarity index 100% rename from database/src/db/recommend_deck_base_info.rs rename to database/src/db/recommend/recommend_deck_base_info.rs diff --git a/database/src/db/recommend_deck_info.rs b/database/src/db/recommend/recommend_deck_info.rs similarity index 100% rename from database/src/db/recommend_deck_info.rs rename to database/src/db/recommend/recommend_deck_info.rs diff --git a/database/src/db/recommend_deck_user_option_info.rs b/database/src/db/recommend/recommend_deck_user_option_info.rs similarity index 100% rename from database/src/db/recommend_deck_user_option_info.rs rename to database/src/db/recommend/recommend_deck_user_option_info.rs diff --git a/database/src/db/recovery/mod.rs b/database/src/db/recovery/mod.rs new file mode 100644 index 0000000..fae2d22 --- /dev/null +++ b/database/src/db/recovery/mod.rs @@ -0,0 +1 @@ +pub mod recovery_char_info; diff --git a/database/src/db/recovery_char_info.rs b/database/src/db/recovery/recovery_char_info.rs similarity index 100% rename from database/src/db/recovery_char_info.rs rename to database/src/db/recovery/recovery_char_info.rs diff --git a/database/src/db/relay/mod.rs b/database/src/db/relay/mod.rs new file mode 100644 index 0000000..9ef5fbf --- /dev/null +++ b/database/src/db/relay/mod.rs @@ -0,0 +1 @@ +pub mod relay_server_info; diff --git a/database/src/db/relay_server_info.rs b/database/src/db/relay/relay_server_info.rs similarity index 100% rename from database/src/db/relay_server_info.rs rename to database/src/db/relay/relay_server_info.rs diff --git a/database/src/db/relic/mod.rs b/database/src/db/relic/mod.rs new file mode 100644 index 0000000..3564398 --- /dev/null +++ b/database/src/db/relic/mod.rs @@ -0,0 +1 @@ +pub mod relic_info; diff --git a/database/src/db/relic_info.rs b/database/src/db/relic/relic_info.rs similarity index 100% rename from database/src/db/relic_info.rs rename to database/src/db/relic/relic_info.rs diff --git a/database/src/db/reputation/mod.rs b/database/src/db/reputation/mod.rs new file mode 100644 index 0000000..ba8257a --- /dev/null +++ b/database/src/db/reputation/mod.rs @@ -0,0 +1 @@ +pub mod reputation_info; diff --git a/database/src/db/reputation_info.rs b/database/src/db/reputation/reputation_info.rs similarity index 100% rename from database/src/db/reputation_info.rs rename to database/src/db/reputation/reputation_info.rs diff --git a/database/src/db/resemara/mod.rs b/database/src/db/resemara/mod.rs new file mode 100644 index 0000000..a07b76a --- /dev/null +++ b/database/src/db/resemara/mod.rs @@ -0,0 +1 @@ +pub mod resemara_gacha_info; diff --git a/database/src/db/resemara_gacha_info.rs b/database/src/db/resemara/resemara_gacha_info.rs similarity index 100% rename from database/src/db/resemara_gacha_info.rs rename to database/src/db/resemara/resemara_gacha_info.rs diff --git a/database/src/db/reward/mod.rs b/database/src/db/reward/mod.rs new file mode 100644 index 0000000..c9f821f --- /dev/null +++ b/database/src/db/reward/mod.rs @@ -0,0 +1 @@ +pub mod reward_info; diff --git a/database/src/db/reward_info.rs b/database/src/db/reward/reward_info.rs similarity index 100% rename from database/src/db/reward_info.rs rename to database/src/db/reward/reward_info.rs diff --git a/database/src/db/room/mod.rs b/database/src/db/room/mod.rs new file mode 100644 index 0000000..5bda0d1 --- /dev/null +++ b/database/src/db/room/mod.rs @@ -0,0 +1,2 @@ +pub mod room_client_info; +pub mod room_user_info; diff --git a/database/src/db/room_client_info.rs b/database/src/db/room/room_client_info.rs similarity index 100% rename from database/src/db/room_client_info.rs rename to database/src/db/room/room_client_info.rs diff --git a/database/src/db/room_user_info.rs b/database/src/db/room/room_user_info.rs similarity index 100% rename from database/src/db/room_user_info.rs rename to database/src/db/room/room_user_info.rs diff --git a/database/src/db/root/mod.rs b/database/src/db/root/mod.rs new file mode 100644 index 0000000..9ddd99e --- /dev/null +++ b/database/src/db/root/mod.rs @@ -0,0 +1 @@ +pub mod root_sort_id_info; diff --git a/database/src/db/root_sort_id_info.rs b/database/src/db/root/root_sort_id_info.rs similarity index 100% rename from database/src/db/root_sort_id_info.rs rename to database/src/db/root/root_sort_id_info.rs diff --git a/database/src/db/schedule/mod.rs b/database/src/db/schedule/mod.rs new file mode 100644 index 0000000..40fa316 --- /dev/null +++ b/database/src/db/schedule/mod.rs @@ -0,0 +1 @@ +pub mod schedule_info; diff --git a/database/src/db/schedule_info.rs b/database/src/db/schedule/schedule_info.rs similarity index 100% rename from database/src/db/schedule_info.rs rename to database/src/db/schedule/schedule_info.rs diff --git a/database/src/db/season/mod.rs b/database/src/db/season/mod.rs new file mode 100644 index 0000000..36be229 --- /dev/null +++ b/database/src/db/season/mod.rs @@ -0,0 +1,2 @@ +pub mod season_info; +pub mod season_reward_info; diff --git a/database/src/db/season_info.rs b/database/src/db/season/season_info.rs similarity index 100% rename from database/src/db/season_info.rs rename to database/src/db/season/season_info.rs diff --git a/database/src/db/season_reward_info.rs b/database/src/db/season/season_reward_info.rs similarity index 100% rename from database/src/db/season_reward_info.rs rename to database/src/db/season/season_reward_info.rs diff --git a/database/src/db/server/mod.rs b/database/src/db/server/mod.rs new file mode 100644 index 0000000..d31fe80 --- /dev/null +++ b/database/src/db/server/mod.rs @@ -0,0 +1,2 @@ +pub mod server_info; +pub mod server_ping_info; diff --git a/database/src/db/server_info.rs b/database/src/db/server/server_info.rs similarity index 100% rename from database/src/db/server_info.rs rename to database/src/db/server/server_info.rs diff --git a/database/src/db/server_ping_info.rs b/database/src/db/server/server_ping_info.rs similarity index 100% rename from database/src/db/server_ping_info.rs rename to database/src/db/server/server_ping_info.rs diff --git a/database/src/db/shop/mod.rs b/database/src/db/shop/mod.rs new file mode 100644 index 0000000..a961d98 --- /dev/null +++ b/database/src/db/shop/mod.rs @@ -0,0 +1,2 @@ +pub mod shop_info; +pub mod shop_item_info; diff --git a/database/src/db/shop_info.rs b/database/src/db/shop/shop_info.rs similarity index 100% rename from database/src/db/shop_info.rs rename to database/src/db/shop/shop_info.rs diff --git a/database/src/db/shop_item_info.rs b/database/src/db/shop/shop_item_info.rs similarity index 100% rename from database/src/db/shop_item_info.rs rename to database/src/db/shop/shop_item_info.rs diff --git a/database/src/db/sky/mod.rs b/database/src/db/sky/mod.rs new file mode 100644 index 0000000..969eb11 --- /dev/null +++ b/database/src/db/sky/mod.rs @@ -0,0 +1,2 @@ +pub mod sky_way_info; +pub mod sky_way_schedule_info; diff --git a/database/src/db/sky_way_info.rs b/database/src/db/sky/sky_way_info.rs similarity index 100% rename from database/src/db/sky_way_info.rs rename to database/src/db/sky/sky_way_info.rs diff --git a/database/src/db/sky_way_schedule_info.rs b/database/src/db/sky/sky_way_schedule_info.rs similarity index 100% rename from database/src/db/sky_way_schedule_info.rs rename to database/src/db/sky/sky_way_schedule_info.rs diff --git a/database/src/db/starter/mod.rs b/database/src/db/starter/mod.rs new file mode 100644 index 0000000..773dc5a --- /dev/null +++ b/database/src/db/starter/mod.rs @@ -0,0 +1 @@ +pub mod starter_data; diff --git a/database/src/db/starter_data.rs b/database/src/db/starter/starter_data.rs similarity index 94% rename from database/src/db/starter_data.rs rename to database/src/db/starter/starter_data.rs index 6372930..d54c825 100644 --- a/database/src/db/starter_data.rs +++ b/database/src/db/starter/starter_data.rs @@ -5,7 +5,7 @@ use tracing; /// Load CharInfo starter data from char_info.json pub async fn load_char_info(tx: &mut Transaction<'_, Sqlite>, uid: i64) -> sqlx::Result<()> { - let json_str = include_str!("../../../data/starter/char_info.json"); + let json_str = include_str!("../../../../data/starter/char_info.json"); let data: Value = match serde_json::from_str(json_str) { Ok(v) => v, Err(e) => { @@ -140,7 +140,7 @@ INSERT INTO CharInfo ( /// Load CostumeInfo starter data from costume_info.json pub async fn load_costume_info(tx: &mut Transaction<'_, Sqlite>, uid: i64) -> sqlx::Result<()> { - let json_str = include_str!("../../../data/starter/costume_info.json"); + let json_str = include_str!("../../../../data/starter/costume_info.json"); let data: Value = match serde_json::from_str(json_str) { Ok(v) => v, Err(e) => { @@ -182,7 +182,7 @@ pub async fn load_costume_info(tx: &mut Transaction<'_, Sqlite>, uid: i64) -> sq /// Load AchievementInfo starter data from achievement_info.json pub async fn load_achievement_info(tx: &mut Transaction<'_, Sqlite>, uid: i64) -> sqlx::Result<()> { - let json_str = include_str!("../../../data/starter/achievement_info.json"); + let json_str = include_str!("../../../../data/starter/achievement_info.json"); let data: Value = match serde_json::from_str(json_str) { Ok(v) => v, Err(e) => { @@ -220,7 +220,7 @@ pub async fn load_achievement_info(tx: &mut Transaction<'_, Sqlite>, uid: i64) - } async fn load_cost_time_info(tx: &mut Transaction<'_, Sqlite>, uid: i64) -> sqlx::Result<()> { - let json_str = include_str!("../../../data/starter/charge_cost_info.json"); + let json_str = include_str!("../../../../data/starter/charge_cost_info.json"); let data: Value = match serde_json::from_str(json_str) { Ok(v) => v, Err(e) => { @@ -386,12 +386,9 @@ pub async fn load_item_info_nested( Ok(first_id) } -// Apply similar changes to all other load functions... -// (MonsterInfo, PassInfo, ProductInfo, ScheduleInfo, etc.) - /// Load MonsterInfo starter data from monster_info.json pub async fn load_monster_info(tx: &mut Transaction<'_, Sqlite>, uid: i64) -> sqlx::Result<()> { - let json_str = include_str!("../../../data/starter/monster_info.json"); + let json_str = include_str!("../../../../data/starter/monster_info.json"); let data: Value = match serde_json::from_str(json_str) { Ok(v) => v, Err(e) => { @@ -464,7 +461,7 @@ INSERT INTO MonsterInfo ( /// Load PassInfo starter data from pass_info.json pub async fn load_pass_info(tx: &mut Transaction<'_, Sqlite>, uid: i64) -> sqlx::Result<()> { - let json_str = include_str!("../../../data/starter/pass_info.json"); + let json_str = include_str!("../../../../data/starter/pass_info.json"); let data: Value = match serde_json::from_str(json_str) { Ok(v) => v, Err(e) => { @@ -520,7 +517,7 @@ INSERT INTO PassInfo ( /// Load ProductInfo starter data from cash_shop_info.json pub async fn load_product_info(tx: &mut Transaction<'_, Sqlite>, uid: i64) -> sqlx::Result<()> { - let json_str = include_str!("../../../data/starter/cash_shop_info.json"); + let json_str = include_str!("../../../../data/starter/cash_shop_info.json"); let data: Value = match serde_json::from_str(json_str) { Ok(v) => v, Err(e) => { @@ -569,7 +566,7 @@ INSERT INTO ProductInfo ( /// Load ScheduleInfo starter data and related SeasonInfo entries. pub async fn load_schedule_info(tx: &mut Transaction<'_, Sqlite>, uid: i64) -> sqlx::Result<()> { - let json_str = include_str!("../../../data/starter/schedule_info.json"); + let json_str = include_str!("../../../../data/starter/schedule_info.json"); let data: Value = match serde_json::from_str(json_str) { Ok(v) => v, Err(e) => { @@ -682,7 +679,7 @@ pub async fn load_schedule_info(tx: &mut Transaction<'_, Sqlite>, uid: i64) -> s // Placeholder stubs for functions not shown in your code // You'll need to refactor these similarly pub async fn load_deck_info(tx: &mut Transaction<'_, Sqlite>, uid: i64) -> sqlx::Result<()> { - let json_str = include_str!("../../../data/starter/deck_info.json"); + let json_str = include_str!("../../../../data/starter/deck_info.json"); let data: Value = match serde_json::from_str(json_str) { Ok(v) => v, Err(e) => { @@ -718,7 +715,7 @@ pub async fn load_deck_info(tx: &mut Transaction<'_, Sqlite>, uid: i64) -> sqlx: } async fn load_event_schedule_info(tx: &mut Transaction<'_, Sqlite>, uid: i64) -> sqlx::Result<()> { - let json_str = include_str!("../../../data/starter/event_schedule_info.json"); + let json_str = include_str!("../../../../data/starter/event_schedule_info.json"); let data: Value = match serde_json::from_str(json_str) { Ok(v) => v, Err(e) => { @@ -801,7 +798,7 @@ INSERT INTO EventScheduleInfo ( } async fn load_field_deck_info(tx: &mut Transaction<'_, Sqlite>, uid: i64) -> sqlx::Result<()> { - let json_str = include_str!("../../../data/starter/field_deck_info.json"); + let json_str = include_str!("../../../../data/starter/field_deck_info.json"); let data: Value = match serde_json::from_str(json_str) { Ok(v) => v, Err(e) => { @@ -838,7 +835,7 @@ async fn load_field_deck_info(tx: &mut Transaction<'_, Sqlite>, uid: i64) -> sql } async fn load_hunting_ground_info(tx: &mut Transaction<'_, Sqlite>, uid: i64) -> sqlx::Result<()> { - let json_str = include_str!("../../../data/starter/hunting_ground_info.json"); + let json_str = include_str!("../../../../data/starter/hunting_ground_info.json"); let data: Value = match serde_json::from_str(json_str) { Ok(v) => v, Err(e) => { @@ -847,26 +844,24 @@ async fn load_hunting_ground_info(tx: &mut Transaction<'_, Sqlite>, uid: i64) -> } }; - // Extract array from nested field "huntingGroundInfo" - let array = match data.get("huntingGroundInfo").and_then(|v| v.as_array()) { - Some(a) => a, - None => { + let array = data + .get("huntingGroundInfo") + .and_then(|v| v.as_array()) + .ok_or_else(|| { eprintln!("load_hunting_ground_info: missing or invalid 'huntingGroundInfo' array"); - return Ok(()); - } - }; + sqlx::Error::Protocol("invalid JSON".into()) + })?; for entry in array { - // --- Insert nested MonsterInfo first --- - let mut first_monster_index: Option = None; + let mut monster_indices = Vec::new(); if let Some(monsters) = entry.get("monsterInfo").and_then(|v| v.as_array()) { for monster in monsters { let res = sqlx::query( r#" - INSERT INTO MonsterInfo ( - Uid, MonsterId, BattleDeck, RespawnTime, LifeEndTime, GroupId, ActiveFlag - ) VALUES (?, ?, ?, ?, ?, ?, ?) + INSERT INTO MonsterInfo + (Uid, MonsterId, BattleDeck, RespawnTime, LifeEndTime, GroupId, ActiveFlag) + VALUES (?, ?, ?, ?, ?, ?, ?) "#, ) .bind(uid) @@ -884,35 +879,51 @@ async fn load_hunting_ground_info(tx: &mut Transaction<'_, Sqlite>, uid: i64) -> .execute(&mut **tx) .await?; - if first_monster_index.is_none() { - first_monster_index = Some(res.last_insert_rowid()); - } + monster_indices.push(res.last_insert_rowid()); } } - // --- Insert HuntingGroundInfo referencing MonsterInfoIndex --- - sqlx::query( + let res = sqlx::query( r#" - INSERT INTO HuntingGroundInfo ( - Uid, IsAuto, CurrentId, HighestId, MonsterInfoIndex, PackId - ) VALUES (?, ?, ?, ?, ?, ?) + INSERT INTO HuntingGroundInfo + (Uid, IsAuto, CurrentId, HighestId, PackId) + VALUES (?, ?, ?, ?, ?) "#, ) .bind(uid) - .bind(entry.get("isAuto").and_then(|v| v.as_bool())) + .bind( + entry + .get("isAuto") + .and_then(|v| v.as_bool()) + .map(|b| b as i32), + ) .bind(entry.get("currentId").and_then(|v| v.as_i64())) .bind(entry.get("highestId").and_then(|v| v.as_i64())) - .bind(first_monster_index) .bind(entry.get("packId").and_then(|v| v.as_i64())) .execute(&mut **tx) .await?; + + let hunting_index = res.last_insert_rowid(); + + for monster_idx in monster_indices { + sqlx::query( + r#" + INSERT INTO HuntingGroundMonster (HuntingGroundIndex, MonsterIndex) + VALUES (?, ?) + "#, + ) + .bind(hunting_index) + .bind(monster_idx) + .execute(&mut **tx) + .await?; + } } Ok(()) } async fn load_item_info(tx: &mut Transaction<'_, Sqlite>, uid: i64) -> sqlx::Result<()> { - let json_str = include_str!("../../../data/starter/item_info.json"); + let json_str = include_str!("../../../../data/starter/item_info.json"); let data: Value = match serde_json::from_str(json_str) { Ok(v) => v, Err(e) => { @@ -1021,7 +1032,7 @@ pub async fn load_pictorial_book_info_nested( } async fn load_mail_info(tx: &mut Transaction<'_, Sqlite>, uid: i64) -> sqlx::Result<()> { - let json_str = include_str!("../../../data/starter/mail_info.json"); + let json_str = include_str!("../../../../data/starter/mail_info.json"); let data: Value = match serde_json::from_str(json_str) { Ok(v) => v, Err(e) => { @@ -1238,7 +1249,7 @@ async fn load_mail_info(tx: &mut Transaction<'_, Sqlite>, uid: i64) -> sqlx::Res } async fn load_mission_info(tx: &mut Transaction<'_, Sqlite>, uid: i64) -> sqlx::Result<()> { - let json_str = include_str!("../../../data/starter/event_mission_info.json"); + let json_str = include_str!("../../../../data/starter/event_mission_info.json"); let data: Value = match serde_json::from_str(json_str) { Ok(v) => v, Err(e) => { diff --git a/database/src/db/starter_data.rs.bak b/database/src/db/starter_data.rs.bak deleted file mode 100644 index 5f0328a..0000000 --- a/database/src/db/starter_data.rs.bak +++ /dev/null @@ -1,1107 +0,0 @@ -// Auto-generated starter data from proto schemas -use serde_json::Value; -use sqlx::{Executor, SqlitePool}; -use tracing; - -/// Load CharInfo starter data from char_info.json -pub async fn load_char_info(pool: &SqlitePool, uid: i64) -> sqlx::Result<()> { - let json_str = include_str!("../../../data/starter/char_info.json"); - let data: Value = match serde_json::from_str(json_str) { - Ok(v) => v, - Err(e) => { - eprintln!("load_char_info: failed to parse JSON: {e}"); - return Ok(()); - } - }; - - // Extract array from nested field "charInfo" - let array = match data.get("charInfo").and_then(|v| v.as_array()) { - Some(a) => a, - None => { - eprintln!("load_char_info: invalid or missing 'charInfo' array in char_info.json"); - return Ok(()); - } - }; - - for entry in array { - sqlx::query( - r#"INSERT INTO CharInfo ( - Uid, InvenIndex, Id, Hp, Level, CostumeId, Exp, UseCostume, TalentLevel, TalentExp, SolidarityReward, ExpiryTime, ConnectPotentialCostume ) VALUES ( - ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? )"# - ) - .bind(uid) - .bind(entry.get("invenIndex").and_then(|v| v.as_i64())) - .bind(entry.get("id").and_then(|v| v.as_i64())) - .bind(entry.get("hp").and_then(|v| v.as_i64())) - .bind(entry.get("level").and_then(|v| v.as_i64())) - .bind(entry.get("costumeId").and_then(|v| v.as_i64())) - .bind(entry.get("exp").and_then(|v| v.as_i64())) - .bind(entry.get("useCostume").and_then(|v| v.as_i64())) - .bind(entry.get("talentLevel").and_then(|v| v.as_i64())) - .bind(entry.get("talentExp").and_then(|v| v.as_i64())) - .bind(entry.get("solidarityReward").and_then(|v| v.as_i64())) - .bind(entry.get("expiryTime").and_then(|v| v.as_i64())) - .bind(entry.get("connectPotentialCostume").and_then(|v| v.as_i64())) - .execute(pool) - .await?; - } - - Ok(()) -} - -/// Load CostumeInfo starter data from costume_info.json -pub async fn load_costume_info(pool: &SqlitePool, uid: i64) -> sqlx::Result<()> { - let json_str = include_str!("../../../data/starter/costume_info.json"); - let data: Value = match serde_json::from_str(json_str) { - Ok(v) => v, - Err(e) => { - eprintln!("load_costume_info: failed to parse JSON: {e}"); - return Ok(()); - } - }; - - // Extract array from nested field "costumeInfo" - let array = match data.get("costumeInfo").and_then(|v| v.as_array()) { - Some(a) => a, - None => { - eprintln!( - "load_costume_info: invalid or missing 'costumeInfo' array in costume_info.json" - ); - return Ok(()); - } - }; - - for entry in array { - sqlx::query( - r#"INSERT INTO CostumeInfo ( - Uid, InvenIndex, Id, Level, UseChar, SortId, UseMyRoomCount, DesignId ) VALUES ( - ?, ?, ?, ?, ?, ?, ?, ? )"# - ) - .bind(uid) - .bind(entry.get("invenIndex").and_then(|v| v.as_i64())) - .bind(entry.get("id").and_then(|v| v.as_i64())) - .bind(entry.get("level").and_then(|v| v.as_i64())) - .bind(entry.get("useChar").and_then(|v| v.as_i64())) - .bind(entry.get("sortId").and_then(|v| v.as_i64())) - .bind(entry.get("useMyRoomCount").and_then(|v| v.as_i64())) - .bind(entry.get("designId").and_then(|v| v.as_i64())) - .execute(pool) - .await?; - } - - Ok(()) -} - -/// Load AchievementInfo starter data from achievement_info.json -pub async fn load_achievement_info(pool: &SqlitePool, uid: i64) -> sqlx::Result<()> { - let json_str = include_str!("../../../data/starter/achievement_info.json"); - let data: Value = match serde_json::from_str(json_str) { - Ok(v) => v, - Err(e) => { - eprintln!("load_achievement_info: failed to parse JSON: {e}"); - return Ok(()); - } - }; - - // Extract array from nested field "achievementInfo" - let array = match data.get("achievementInfo").and_then(|v| v.as_array()) { - Some(a) => a, - None => { - eprintln!( - "load_achievement_info: invalid or missing 'achievementInfo' array in achievement_info.json" - ); - return Ok(()); - } - }; - - for entry in array { - sqlx::query( - r#"INSERT INTO AchievementInfo ( - Uid, GroupId, Value, MaxClearId, ContentsGroup ) VALUES ( - ?, ?, ?, ?, ? )"#, - ) - .bind(uid) - .bind(entry.get("groupId").and_then(|v| v.as_i64())) - .bind(entry.get("value").and_then(|v| v.as_i64())) - .bind(entry.get("maxClearId").and_then(|v| v.as_i64())) - .bind(entry.get("contentsGroup").and_then(|v| v.as_i64())) - .execute(pool) - .await?; - } - - Ok(()) -} - -/// Load CostTimeInfo and link into ChargeCostInfo -pub async fn load_cost_time_info(pool: &SqlitePool, uid: i64) -> sqlx::Result<()> { - let json_str = include_str!("../../../data/starter/charge_cost_info.json"); - let data: Value = match serde_json::from_str(json_str) { - Ok(v) => v, - Err(e) => { - eprintln!("load_cost_time_info: failed to parse JSON: {e}"); - return Ok(()); - } - }; - - let array = match data.get("costTimeInfo").and_then(|v| v.as_array()) { - Some(a) => a, - None => { - eprintln!("load_cost_time_info: invalid or missing 'costTimeInfo' array"); - return Ok(()); - } - }; - - // Optional: run everything atomically - let mut tx = pool.begin().await?; - - for entry in array { - // Your helper should return the PK (or some stable key) of the nested item row. - // If it returns an Option, unwrap_or_default() is fine. - let cost_item_info_index: i64 = load_item_info_nested(pool, uid, entry, "costItemInfo") - .await? - .unwrap_or_default(); - - // Insert CostTimeInfo - let last_charge_time = entry - .get("lastChargeTime") - .and_then(|v| v.as_i64()) - .unwrap_or(0); // your JSON uses epoch millis; store as BIGINT - - let res = sqlx::query( - r#" - INSERT INTO CostTimeInfo (Uid, LastChargeTime, CostItemInfoIndex) - VALUES (?, ?, ?) - "#, - ) - .bind(uid) - .bind(last_charge_time) - .bind(cost_item_info_index) - .execute(&mut *tx) - .await?; - - let cost_time_info_pk = res.last_insert_rowid(); - - // Link into ChargeCostInfo - // If you want idempotency, add UNIQUE(Uid, CostTimeInfoIndex) on ChargeCostInfo - sqlx::query( - r#" - INSERT INTO ChargeCostInfo (Uid, CostTimeInfoIndex, EventScheduleInfoIndex) - VALUES (?, ?, NULL) - ON CONFLICT DO NOTHING - "#, - ) - .bind(uid) - .bind(cost_time_info_pk) - .execute(&mut *tx) - .await?; - } - - // (Optional) eventScheduleInfo loader goes here when you have data - - tx.commit().await?; - Ok(()) -} - -/// Load ItemInfo nested starter data (called by parent) -pub async fn load_item_info_nested( - pool: &SqlitePool, - uid: i64, - entry: &Value, - field_name: &str, -) -> sqlx::Result> { - let nested = match entry.get(field_name) { - Some(v) if !v.is_null() => v, - _ => return Ok(None), - }; - - // Handle both array and single object cases - let items: Vec<&Value> = if let Some(arr) = nested.as_array() { - arr.iter().collect() - } else if nested.is_object() { - vec![nested] - } else { - eprintln!("load_item_info_nested: {field_name} is neither array nor object"); - return Ok(None); - }; - - let mut first_id = None; - - for item in items { - let nested_obj = match item.as_object() { - Some(o) => o, - None => { - eprintln!("load_item_info_nested: item in {field_name} is not an object"); - continue; - } - }; - - let inven_index = nested_obj - .get("invenIndex") - .and_then(|v| v.as_i64()) - .unwrap_or_default(); - let id = nested_obj - .get("id") - .and_then(|v| v.as_i64()) - .unwrap_or_default(); - let r#type = nested_obj - .get("type") - .and_then(|v| v.as_i64()) - .unwrap_or_default(); - let count = nested_obj - .get("count") - .and_then(|v| v.as_i64()) - .unwrap_or_default(); - let keep_flag = nested_obj - .get("keepFlag") - .and_then(|v| v.as_i64()) - .unwrap_or_default(); - let time_value = nested_obj - .get("timeValue") - .and_then(|v| v.as_i64()) - .unwrap_or_default(); - let expiry_time = nested_obj - .get("expiryTime") - .and_then(|v| v.as_i64()) - .unwrap_or_default(); - let sort_id = nested_obj - .get("sortId") - .and_then(|v| v.as_i64()) - .unwrap_or_default(); - let use_count = nested_obj - .get("useCount") - .and_then(|v| v.as_i64()) - .unwrap_or_default(); - - let result = sqlx::query( - r#"INSERT INTO ItemInfo ( - Uid, InvenIndex, Id, Type, Count, KeepFlag, TimeValue, ExpiryTime, SortId, UseCount ) VALUES ( - ?, ?, ?, ?, ?, ?, ?, ?, ?, ? )"# - ) - .bind(uid) - .bind(inven_index) - .bind(id) - .bind(r#type) - .bind(count) - .bind(keep_flag) - .bind(time_value) - .bind(expiry_time) - .bind(sort_id) - .bind(use_count) - .execute(pool) - .await?; - - // Store the first inserted rowid - if first_id.is_none() { - first_id = Some(result.last_insert_rowid()); - } - } - - Ok(first_id) -} - -/// Load DeckInfo starter data from deck_info.json -pub async fn load_deck_info(pool: &SqlitePool, uid: i64) -> sqlx::Result<()> { - let json_str = include_str!("../../../data/starter/deck_info.json"); - let data: Value = match serde_json::from_str(json_str) { - Ok(v) => v, - Err(e) => { - eprintln!("load_deck_info: failed to parse JSON: {e}"); - return Ok(()); - } - }; - - // Extract array from nested field "deckInfo" - let array = match data.get("deckInfo").and_then(|v| v.as_array()) { - Some(a) => a, - None => { - eprintln!("load_deck_info: invalid or missing 'deckInfo' array in deck_info.json"); - return Ok(()); - } - }; - - for entry in array { - sqlx::query( - r#"INSERT INTO DeckInfo ( - Uid, CharInvenIndex, Position, Sequence ) VALUES ( - ?, ?, ?, ? )"#, - ) - .bind(uid) - .bind(entry.get("charInvenIndex").and_then(|v| v.as_i64())) - .bind(entry.get("position").and_then(|v| v.as_i64())) - .bind(entry.get("sequence").and_then(|v| v.as_i64())) - .execute(pool) - .await?; - } - - Ok(()) -} - -/// Load EventScheduleInfo starter data from event_schedule_info.json -pub async fn load_event_schedule_info(pool: &SqlitePool, uid: i64) -> sqlx::Result<()> { - let json_str = include_str!("../../../data/starter/event_schedule_info.json"); - let data: Value = match serde_json::from_str(json_str) { - Ok(v) => v, - Err(e) => { - eprintln!("load_event_schedule_info: failed to parse JSON: {e}"); - return Ok(()); - } - }; - - // Extract array from nested field "eventScheduleInfo" - let array = match data.get("eventScheduleInfo").and_then(|v| v.as_array()) { - Some(a) => a, - None => { - eprintln!( - "load_event_schedule_info: invalid or missing 'eventScheduleInfo' array in event_schedule_info.json" - ); - return Ok(()); - } - }; - - for entry in array { - sqlx::query( - r#"INSERT INTO EventScheduleInfo ( - Uid, Id, EventType, EventId, EventSubId, StartDate, EndDate, IsActive ) VALUES ( - ?, ?, ?, ?, ?, ?, ?, ? )"# - ) - .bind(uid) - .bind(entry.get("id").and_then(|v| v.as_i64())) - .bind(entry.get("eventType").and_then(|v| v.as_i64())) - .bind(entry.get("eventId").and_then(|v| v.as_i64())) - .bind(entry.get("eventSubId").and_then(|v| v.as_i64())) - .bind(entry.get("startDate").and_then(|v| v.as_i64())) - .bind(entry.get("endDate").and_then(|v| v.as_i64())) - .bind(entry.get("isActive").and_then(|v| v.as_bool())) - .execute(pool) - .await?; - } - - Ok(()) -} - -/// Load FieldDeckInfo starter data from field_deck_info.json -pub async fn load_field_deck_info(pool: &SqlitePool, uid: i64) -> sqlx::Result<()> { - let json_str = include_str!("../../../data/starter/field_deck_info.json"); - let data: Value = match serde_json::from_str(json_str) { - Ok(v) => v, - Err(e) => { - eprintln!("load_field_deck_info: failed to parse JSON: {e}"); - return Ok(()); - } - }; - - // Extract array from nested field "fieldDeckInfo" - let array = match data.get("fieldDeckInfo").and_then(|v| v.as_array()) { - Some(a) => a, - None => { - eprintln!( - "load_field_deck_info: invalid or missing 'fieldDeckInfo' array in field_deck_info.json" - ); - return Ok(()); - } - }; - - for entry in array { - sqlx::query( - r#"INSERT INTO FieldDeckInfo ( - Uid, Sequence, CharInvenIndex, CostumeInvenIndex ) VALUES ( - ?, ?, ?, ? )"#, - ) - .bind(uid) - .bind(entry.get("sequence").and_then(|v| v.as_i64())) - .bind(entry.get("charInvenIndex").and_then(|v| v.as_i64())) - .bind(entry.get("costumeInvenIndex").and_then(|v| v.as_i64())) - .execute(pool) - .await?; - } - - Ok(()) -} - -/// Load HuntingGroundInfo starter data from hunting_ground_info.json -pub async fn load_hunting_ground_info(pool: &SqlitePool, uid: i64) -> sqlx::Result<()> { - let json_str = include_str!("../../../data/starter/hunting_ground_info.json"); - let data: Value = match serde_json::from_str(json_str) { - Ok(v) => v, - Err(e) => { - eprintln!("load_hunting_ground_info: failed to parse JSON: {e}"); - return Ok(()); - } - }; - - // Extract array from nested field "huntingGroundInfo" - let array = match data.get("huntingGroundInfo").and_then(|v| v.as_array()) { - Some(a) => a, - None => { - eprintln!( - "load_hunting_ground_info: invalid or missing 'huntingGroundInfo' array in hunting_ground_info.json" - ); - return Ok(()); - } - }; - - for entry in array { - sqlx::query( - r#"INSERT INTO HuntingGroundInfo ( - Uid, IsAuto, CurrentId, HighestId, PackId ) VALUES ( - ?, ?, ?, ?, ? )"#, - ) - .bind(uid) - .bind(entry.get("isAuto").and_then(|v| v.as_bool())) - .bind(entry.get("currentId").and_then(|v| v.as_i64())) - .bind(entry.get("highestId").and_then(|v| v.as_i64())) - .bind(entry.get("packId").and_then(|v| v.as_i64())) - .execute(pool) - .await?; - } - - Ok(()) -} - -/// Load ItemInfo starter data from item_info.json -pub async fn load_item_info(pool: &SqlitePool, uid: i64) -> sqlx::Result<()> { - let json_str = include_str!("../../../data/starter/item_info.json"); - let data: Value = match serde_json::from_str(json_str) { - Ok(v) => v, - Err(e) => { - eprintln!("load_item_info: failed to parse JSON: {e}"); - return Ok(()); - } - }; - - // Extract array from nested field "itemInfo" - let array = match data.get("itemInfo").and_then(|v| v.as_array()) { - Some(a) => a, - None => { - eprintln!("load_item_info: invalid or missing 'itemInfo' array in item_info.json"); - return Ok(()); - } - }; - - for entry in array { - // handle nested PictorialBookInfo - let pictorialbook_info_index = - load_pictorial_book_info_nested(pool, uid, entry, "pictorialbookInfo") - .await? - .unwrap_or_default(); - - sqlx::query( - r#"INSERT INTO ItemInfo ( - Uid, InvenIndex, Id, Type, Count, KeepFlag, TimeValue, ExpiryTime, SortId, UseCount, PictorialbookInfoIndex ) VALUES ( - ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? )"# - ) - .bind(uid) - .bind(entry.get("invenIndex").and_then(|v| v.as_i64())) - .bind(entry.get("id").and_then(|v| v.as_i64())) - .bind(entry.get("type").and_then(|v| v.as_i64())) - .bind(entry.get("count").and_then(|v| v.as_i64())) - .bind(entry.get("keepFlag").and_then(|v| v.as_i64())) - .bind(entry.get("timeValue").and_then(|v| v.as_i64())) - .bind(entry.get("expiryTime").and_then(|v| v.as_i64())) - .bind(entry.get("sortId").and_then(|v| v.as_i64())) - .bind(entry.get("useCount").and_then(|v| v.as_i64())) - .bind(pictorialbook_info_index) - .execute(pool) - .await?; - } - - Ok(()) -} - -/// Load PictorialBookInfo nested starter data (called by parent) -pub async fn load_pictorial_book_info_nested( - pool: &SqlitePool, - uid: i64, - entry: &Value, - field_name: &str, -) -> sqlx::Result> { - let nested = match entry.get(field_name) { - Some(v) if !v.is_null() => v, - _ => return Ok(None), - }; - - // Handle both array and single object cases - let items: Vec<&Value> = if let Some(arr) = nested.as_array() { - arr.iter().collect() - } else if nested.is_object() { - vec![nested] - } else { - eprintln!("load_pictorial_book_info_nested: {field_name} is neither array nor object"); - return Ok(None); - }; - - let mut first_id = None; - - for item in items { - let nested_obj = match item.as_object() { - Some(o) => o, - None => { - eprintln!("load_pictorial_book_info_nested: item in {field_name} is not an object"); - continue; - } - }; - - let id = nested_obj - .get("id") - .and_then(|v| v.as_i64()) - .unwrap_or_default(); - let group_id = nested_obj - .get("groupId") - .and_then(|v| v.as_i64()) - .unwrap_or_default(); - - let result = sqlx::query( - r#"INSERT INTO PictorialBookInfo ( - Uid, Id, GroupId ) VALUES ( - ?, ?, ? )"#, - ) - .bind(uid) - .bind(id) - .bind(group_id) - .execute(pool) - .await?; - - // Store the first inserted rowid - if first_id.is_none() { - first_id = Some(result.last_insert_rowid()); - } - } - - Ok(first_id) -} - -/// Load MailInfo starter data from mail_info.json -pub async fn load_mail_info(pool: &SqlitePool, uid: i64) -> sqlx::Result<()> { - let json_str = include_str!("../../../data/starter/mail_info.json"); - let data: Value = match serde_json::from_str(json_str) { - Ok(v) => v, - Err(e) => { - eprintln!("load_mail_info: failed to parse JSON: {e}"); - return Ok(()); - } - }; - - // Extract array from nested field "mailInfo" - let arr = match data.get("mailInfo").and_then(|v| v.as_array()) { - Some(a) => a, - None => { - eprintln!("insert_mail_info: missing or invalid 'mailInfo' array"); - return Ok(()); - } - }; - - for entry in arr { - // Handle parallel repeated arrays - iterate all together - let inven_index = entry - .get("invenIndex") - .and_then(|v| v.as_i64()) - .unwrap_or_default(); - let r#type = entry - .get("type") - .and_then(|v| v.as_i64()) - .unwrap_or_default() as i32; - let mail_id = entry - .get("mailId") - .and_then(|v| v.as_i64()) - .unwrap_or_default() as i32; - let sender_text = entry - .get("senderText") - .and_then(|v| v.as_str()) - .map(|s| s.to_string()); - let title_text = entry - .get("titleText") - .and_then(|v| v.as_str()) - .map(|s| s.to_string()); - let message_text = entry - .get("messageText") - .and_then(|v| v.as_str()) - .map(|s| s.to_string()); - let reward_expire_time = entry - .get("rewardExpireTime") - .and_then(|v| v.as_i64()) - .unwrap_or_default(); - let is_open = entry - .get("isOpen") - .and_then(|v| v.as_i64()) - .unwrap_or_default() as i32; - let open_time = entry - .get("openTime") - .and_then(|v| v.as_i64()) - .unwrap_or_default(); - let create_time = entry - .get("createTime") - .and_then(|v| v.as_i64()) - .unwrap_or_default(); - let history_delete_time = entry - .get("historyDeleteTime") - .and_then(|v| v.as_i64()) - .unwrap_or_default(); - let is_cash = entry - .get("isCash") - .and_then(|v| v.as_i64()) - .unwrap_or_default() as i32; - - // Get all parallel arrays - let item_type_array = entry.get("itemType").and_then(|v| v.as_array()); - let item_id_array = entry.get("itemId").and_then(|v| v.as_array()); - let item_count_array = entry.get("itemCount").and_then(|v| v.as_array()); - - // Determine max length - let len = 0 - .max(item_type_array.map(|a| a.len()).unwrap_or(0)) - .max(item_id_array.map(|a| a.len()).unwrap_or(0)) - .max(item_count_array.map(|a| a.len()).unwrap_or(0)); - - if len > 0 { - // Insert one row per index (parallel iteration) - for i in 0..len { - let item_type = item_type_array - .and_then(|arr| arr.get(i)) - .and_then(|v| v.as_i64()) - .unwrap_or(0) as i32; - let item_id = item_id_array - .and_then(|arr| arr.get(i)) - .and_then(|v| v.as_i64()) - .unwrap_or(0) as i32; - let item_count = item_count_array - .and_then(|arr| arr.get(i)) - .and_then(|v| v.as_i64()) - .unwrap_or(0) as i32; - - sqlx::query( - r#" -INSERT INTO MailInfo ( - Uid, - InvenIndex, - Type, - MailId, - SenderText, - TitleText, - MessageText, - RewardExpireTime, - ItemType, - ItemId, - ItemCount, - IsOpen, - OpenTime, - CreateTime, - HistoryDeleteTime, - IsCash -) VALUES ( - ?, - ?, - ?, - ?, - ?, - ?, - ?, - ?, - ?, - ?, - ?, - ?, - ?, - ?, - ?, - ? -) -"#, - ) - .bind(uid) - .bind(&inven_index) - .bind(&r#type) - .bind(&mail_id) - .bind(&sender_text) - .bind(&title_text) - .bind(&message_text) - .bind(&reward_expire_time) - .bind(item_type) - .bind(item_id) - .bind(item_count) - .bind(&is_open) - .bind(&open_time) - .bind(&create_time) - .bind(&history_delete_time) - .bind(&is_cash) - .execute(pool) - .await?; - } - } else { - // No items, insert one row with NULLs for repeated fields - sqlx::query( - r#" -INSERT INTO MailInfo ( - Uid, - InvenIndex, - Type, - MailId, - SenderText, - TitleText, - MessageText, - RewardExpireTime, - ItemType, - ItemId, - ItemCount, - IsOpen, - OpenTime, - CreateTime, - HistoryDeleteTime, - IsCash -) VALUES ( - ?, - ?, - ?, - ?, - ?, - ?, - ?, - ?, - NULL, - NULL, - NULL, - ?, - ?, - ?, - ?, - ? -) -"#, - ) - .bind(uid) - .bind(&inven_index) - .bind(&r#type) - .bind(&mail_id) - .bind(&sender_text) - .bind(&title_text) - .bind(&message_text) - .bind(&reward_expire_time) - .bind(&is_open) - .bind(&open_time) - .bind(&create_time) - .bind(&history_delete_time) - .bind(&is_cash) - .execute(pool) - .await?; - } - } - - Ok(()) -} - -/// Load MissionInfo starter data from event_mission_info.json -pub async fn load_mission_info(pool: &SqlitePool, uid: i64) -> sqlx::Result<()> { - let json_str = include_str!("../../../data/starter/event_mission_info.json"); - let data: Value = match serde_json::from_str(json_str) { - Ok(v) => v, - Err(e) => { - eprintln!("load_mission_info: failed to parse JSON: {e}"); - return Ok(()); - } - }; - - // Extract array from nested field "missionInfo" - let arr = match data.get("missionInfo").and_then(|v| v.as_array()) { - Some(a) => a, - None => { - eprintln!("insert_mission_info: missing or invalid 'missionInfo' array"); - return Ok(()); - } - }; - - for entry in arr { - let group_id = entry - .get("groupId") - .and_then(|v| v.as_i64()) - .unwrap_or_default() as i32; - let id = entry.get("id").and_then(|v| v.as_i64()).unwrap_or_default() as i32; - let group_type = entry - .get("groupType") - .and_then(|v| v.as_i64()) - .unwrap_or_default() as i32; - let value = entry - .get("value") - .and_then(|v| v.as_i64()) - .unwrap_or_default() as i32; - let is_complete = entry - .get("isComplete") - .and_then(|v| v.as_i64()) - .unwrap_or_default() as i32; - - sqlx::query( - r#" -INSERT INTO MissionInfo ( - Uid, - GroupId, - Id, - GroupType, - Value, - IsComplete -) VALUES ( - ?, - ?, - ?, - ?, - ?, - ? -) -"#, - ) - .bind(uid) - .bind(&group_id) - .bind(&id) - .bind(&group_type) - .bind(&value) - .bind(&is_complete) - .execute(pool) - .await?; - } - - Ok(()) -} - -/// Load MonsterInfo starter data from monster_info.json -pub async fn load_monster_info(pool: &SqlitePool, uid: i64) -> sqlx::Result<()> { - let json_str = include_str!("../../../data/starter/monster_info.json"); - let data: Value = match serde_json::from_str(json_str) { - Ok(v) => v, - Err(e) => { - eprintln!("load_monster_info: failed to parse JSON: {e}"); - return Ok(()); - } - }; - - // Extract array from nested field "monsterInfo" - let arr = if let Some(a) = data.as_array() { - a - } else if let Some(a) = data.get("monsterInfo").and_then(|v| v.as_array()) { - a - } else { - eprintln!("insert_monster_info: missing or invalid 'monsterInfo' array"); - return Ok(()); - }; - - for entry in arr { - let monster_id = entry - .get("monsterId") - .and_then(|v| v.as_i64()) - .unwrap_or_default() as i32; - let battle_deck = entry - .get("battleDeck") - .and_then(|v| v.as_i64()) - .unwrap_or_default() as i32; - let respawn_time = entry - .get("respawnTime") - .and_then(|v| v.as_i64()) - .unwrap_or_default(); - let life_end_time = entry - .get("lifeEndTime") - .and_then(|v| v.as_i64()) - .unwrap_or_default(); - let group_id = entry - .get("groupId") - .and_then(|v| v.as_i64()) - .unwrap_or_default() as i32; - let active_flag = entry - .get("activeFlag") - .and_then(|v| v.as_bool()) - .unwrap_or(false) as i32; - - sqlx::query( - r#" -INSERT INTO MonsterInfo ( - Uid, - MonsterId, - BattleDeck, - RespawnTime, - LifeEndTime, - GroupId, - ActiveFlag -) VALUES (?, ?, ?, ?, ?, ?, ?) -"#, - ) - .bind(uid) - .bind(monster_id) - .bind(battle_deck) - .bind(respawn_time) - .bind(life_end_time) - .bind(group_id) - .bind(active_flag) - .execute(pool) - .await?; - } - - Ok(()) -} - -/// Load PassInfo starter data from pass_info.json -pub async fn load_pass_info(pool: &SqlitePool, uid: i64) -> sqlx::Result<()> { - let json_str = include_str!("../../../data/starter/pass_info.json"); - let data: Value = match serde_json::from_str(json_str) { - Ok(v) => v, - Err(e) => { - eprintln!("load_pass_info: failed to parse JSON: {e}"); - return Ok(()); - } - }; - - // Extract array from nested field "passInfo" - let array = match data.get("passInfo").and_then(|v| v.as_array()) { - Some(a) => a, - None => { - eprintln!("load_pass_info: invalid or missing 'passInfo' array in pass_info.json"); - return Ok(()); - } - }; - - for entry in array { - sqlx::query( - r#"INSERT INTO PassInfo ( - Uid, Id, Exp, ActivePremium1 ) VALUES ( - ?, ?, ?, ? )"#, - ) - .bind(uid) - .bind(entry.get("id").and_then(|v| v.as_i64())) - .bind(entry.get("exp").and_then(|v| v.as_i64())) - .bind(entry.get("activePremium1").and_then(|v| v.as_bool())) - .execute(pool) - .await?; - } - - Ok(()) -} - -/// Load ProductInfo starter data from cash_shop_info.json -pub async fn load_product_info(pool: &SqlitePool, uid: i64) -> sqlx::Result<()> { - let json_str = include_str!("../../../data/starter/cash_shop_info.json"); - let data: Value = match serde_json::from_str(json_str) { - Ok(v) => v, - Err(e) => { - eprintln!("load_product_info: failed to parse JSON: {e}"); - return Ok(()); - } - }; - - // Extract array from nested field "productInfo" - let arr = match data.get("productInfo").and_then(|v| v.as_array()) { - Some(a) => a, - None => { - eprintln!("insert_product_info: missing or invalid 'productInfo' array"); - return Ok(()); - } - }; - - for entry in arr { - let id = entry.get("id").and_then(|v| v.as_i64()).unwrap_or_default() as i32; - let buy_count = entry - .get("buyCount") - .and_then(|v| v.as_i64()) - .unwrap_or_default() as i32; - - sqlx::query( - r#" -INSERT INTO ProductInfo ( - Uid, - Id, - BuyCount -) VALUES ( - ?, - ?, - ? -) -"#, - ) - .bind(uid) - .bind(&id) - .bind(&buy_count) - .execute(pool) - .await?; - } - - Ok(()) -} - -/// Load ScheduleInfo starter data from schedule_info.json -pub async fn load_schedule_info(pool: &SqlitePool, uid: i64) -> sqlx::Result<()> { - let json_str = include_str!("../../../data/starter/schedule_info.json"); - let data: Value = match serde_json::from_str(json_str) { - Ok(v) => v, - Err(e) => { - eprintln!("load_schedule_info: failed to parse JSON: {e}"); - return Ok(()); - } - }; - - // Extract array from nested field "scheduleInfo" - let arr = match data.get("scheduleInfo").and_then(|v| v.as_array()) { - Some(a) => a, - None => { - eprintln!("insert_schedule_info: missing or invalid 'scheduleInfo' array"); - return Ok(()); - } - }; - - for entry in arr { - let content_id = entry - .get("contentId") - .and_then(|v| v.as_i64()) - .unwrap_or_default() as i32; - // Handle single nested SeasonInfo - extract InvenIndex - let current_season_index = entry - .get("currentSeason") - .and_then(|item| item.get("invenIndex")) - .and_then(|v| v.as_i64()); - // Handle single nested SeasonInfo - extract InvenIndex - let next_season_index = entry - .get("nextSeason") - .and_then(|item| item.get("invenIndex")) - .and_then(|v| v.as_i64()); - - sqlx::query( - r#" -INSERT INTO ScheduleInfo ( - Uid, - ContentId, - CurrentSeasonIndex, - NextSeasonIndex -) VALUES ( - ?, - ?, - ?, - ? -) -"#, - ) - .bind(uid) - .bind(&content_id) - .bind(¤t_season_index) - .bind(&next_season_index) - .execute(pool) - .await?; - } - - Ok(()) -} - -// ======================================== -// Master Loader for All Starter Tables -// ======================================== -pub async fn load_all_starter_data(pool: &SqlitePool, uid: i64) -> sqlx::Result<()> { - tracing::info!("Loading all starter data for uid {uid}"); - load_char_info(pool, uid).await?; - load_costume_info(pool, uid).await?; - load_achievement_info(pool, uid).await?; - load_cost_time_info(pool, uid).await?; - load_deck_info(pool, uid).await?; - load_event_schedule_info(pool, uid).await?; - load_field_deck_info(pool, uid).await?; - load_hunting_ground_info(pool, uid).await?; - load_item_info(pool, uid).await?; - load_mail_info(pool, uid).await?; - load_mission_info(pool, uid).await?; - load_monster_info(pool, uid).await?; - load_pass_info(pool, uid).await?; - load_product_info(pool, uid).await?; - load_schedule_info(pool, uid).await?; - tracing::info!("Finished loading all starter data for uid {uid}"); - Ok(()) -} diff --git a/database/src/db/statue/mod.rs b/database/src/db/statue/mod.rs new file mode 100644 index 0000000..5eded3a --- /dev/null +++ b/database/src/db/statue/mod.rs @@ -0,0 +1,2 @@ +pub mod statue_group_info; +pub mod statue_info; diff --git a/database/src/db/statue_group_info.rs b/database/src/db/statue/statue_group_info.rs similarity index 100% rename from database/src/db/statue_group_info.rs rename to database/src/db/statue/statue_group_info.rs diff --git a/database/src/db/statue_info.rs b/database/src/db/statue/statue_info.rs similarity index 100% rename from database/src/db/statue_info.rs rename to database/src/db/statue/statue_info.rs diff --git a/database/src/db/subscribe/mod.rs b/database/src/db/subscribe/mod.rs new file mode 100644 index 0000000..095558a --- /dev/null +++ b/database/src/db/subscribe/mod.rs @@ -0,0 +1 @@ +pub mod subscribe_attendance_info; diff --git a/database/src/db/subscribe_attendance_info.rs b/database/src/db/subscribe/subscribe_attendance_info.rs similarity index 100% rename from database/src/db/subscribe_attendance_info.rs rename to database/src/db/subscribe/subscribe_attendance_info.rs diff --git a/database/src/db/supporter/mod.rs b/database/src/db/supporter/mod.rs new file mode 100644 index 0000000..621515d --- /dev/null +++ b/database/src/db/supporter/mod.rs @@ -0,0 +1,5 @@ +pub mod supporter_battle_info; +pub mod supporter_deck_info; +pub mod supporter_info; +pub mod supporter_slot_info; +pub mod supporter_usage_info; diff --git a/database/src/db/supporter_battle_info.rs b/database/src/db/supporter/supporter_battle_info.rs similarity index 100% rename from database/src/db/supporter_battle_info.rs rename to database/src/db/supporter/supporter_battle_info.rs diff --git a/database/src/db/supporter_deck_info.rs b/database/src/db/supporter/supporter_deck_info.rs similarity index 100% rename from database/src/db/supporter_deck_info.rs rename to database/src/db/supporter/supporter_deck_info.rs diff --git a/database/src/db/supporter_info.rs b/database/src/db/supporter/supporter_info.rs similarity index 100% rename from database/src/db/supporter_info.rs rename to database/src/db/supporter/supporter_info.rs diff --git a/database/src/db/supporter_slot_info.rs b/database/src/db/supporter/supporter_slot_info.rs similarity index 100% rename from database/src/db/supporter_slot_info.rs rename to database/src/db/supporter/supporter_slot_info.rs diff --git a/database/src/db/supporter_usage_info.rs b/database/src/db/supporter/supporter_usage_info.rs similarity index 100% rename from database/src/db/supporter_usage_info.rs rename to database/src/db/supporter/supporter_usage_info.rs diff --git a/database/src/db/talent/mod.rs b/database/src/db/talent/mod.rs new file mode 100644 index 0000000..eb116de --- /dev/null +++ b/database/src/db/talent/mod.rs @@ -0,0 +1,3 @@ +pub mod talent_npc_info; +pub mod talent_object_info; +pub mod talent_skill_info; diff --git a/database/src/db/talent_npc_info.rs b/database/src/db/talent/talent_npc_info.rs similarity index 100% rename from database/src/db/talent_npc_info.rs rename to database/src/db/talent/talent_npc_info.rs diff --git a/database/src/db/talent_object_info.rs b/database/src/db/talent/talent_object_info.rs similarity index 100% rename from database/src/db/talent_object_info.rs rename to database/src/db/talent/talent_object_info.rs diff --git a/database/src/db/talent_skill_info.rs b/database/src/db/talent/talent_skill_info.rs similarity index 100% rename from database/src/db/talent_skill_info.rs rename to database/src/db/talent/talent_skill_info.rs diff --git a/database/src/db/today/mod.rs b/database/src/db/today/mod.rs new file mode 100644 index 0000000..4536971 --- /dev/null +++ b/database/src/db/today/mod.rs @@ -0,0 +1 @@ +pub mod today_quest_info; diff --git a/database/src/db/today_quest_info.rs b/database/src/db/today/today_quest_info.rs similarity index 100% rename from database/src/db/today_quest_info.rs rename to database/src/db/today/today_quest_info.rs diff --git a/database/src/db/total/mod.rs b/database/src/db/total/mod.rs new file mode 100644 index 0000000..70efcdf --- /dev/null +++ b/database/src/db/total/mod.rs @@ -0,0 +1,4 @@ +pub mod total_battle_power; +pub mod total_war_deck_info; +pub mod total_war_deck_preset_info; +pub mod total_war_info; diff --git a/database/src/db/total_battle_power.rs b/database/src/db/total/total_battle_power.rs similarity index 100% rename from database/src/db/total_battle_power.rs rename to database/src/db/total/total_battle_power.rs diff --git a/database/src/db/total_war_deck_info.rs b/database/src/db/total/total_war_deck_info.rs similarity index 100% rename from database/src/db/total_war_deck_info.rs rename to database/src/db/total/total_war_deck_info.rs diff --git a/database/src/db/total_war_deck_preset_info.rs b/database/src/db/total/total_war_deck_preset_info.rs similarity index 100% rename from database/src/db/total_war_deck_preset_info.rs rename to database/src/db/total/total_war_deck_preset_info.rs diff --git a/database/src/db/total_war_info.rs b/database/src/db/total/total_war_info.rs similarity index 100% rename from database/src/db/total_war_info.rs rename to database/src/db/total/total_war_info.rs diff --git a/database/src/db/trap/mod.rs b/database/src/db/trap/mod.rs new file mode 100644 index 0000000..fd5b519 --- /dev/null +++ b/database/src/db/trap/mod.rs @@ -0,0 +1 @@ +pub mod trap_info; diff --git a/database/src/db/trap_info.rs b/database/src/db/trap/trap_info.rs similarity index 100% rename from database/src/db/trap_info.rs rename to database/src/db/trap/trap_info.rs diff --git a/database/src/db/trophy/mod.rs b/database/src/db/trophy/mod.rs new file mode 100644 index 0000000..cc277ce --- /dev/null +++ b/database/src/db/trophy/mod.rs @@ -0,0 +1 @@ +pub mod trophy_info; diff --git a/database/src/db/trophy_info.rs b/database/src/db/trophy/trophy_info.rs similarity index 100% rename from database/src/db/trophy_info.rs rename to database/src/db/trophy/trophy_info.rs diff --git a/database/src/db/tutorial/mod.rs b/database/src/db/tutorial/mod.rs new file mode 100644 index 0000000..1bfa1ca --- /dev/null +++ b/database/src/db/tutorial/mod.rs @@ -0,0 +1 @@ +pub mod tutorial_info; diff --git a/database/src/db/tutorial_info.rs b/database/src/db/tutorial/tutorial_info.rs similarity index 100% rename from database/src/db/tutorial_info.rs rename to database/src/db/tutorial/tutorial_info.rs diff --git a/database/src/db/user/mod.rs b/database/src/db/user/mod.rs new file mode 100644 index 0000000..43a2e06 --- /dev/null +++ b/database/src/db/user/mod.rs @@ -0,0 +1,6 @@ +pub mod user; +pub mod user_base_info; +pub mod user_contents_info; +pub mod user_info; +pub mod user_position; +pub mod user_quest; diff --git a/database/src/db/user.rs b/database/src/db/user/user.rs similarity index 98% rename from database/src/db/user.rs rename to database/src/db/user/user.rs index 32cdf18..e35fa71 100644 --- a/database/src/db/user.rs +++ b/database/src/db/user/user.rs @@ -1,4 +1,4 @@ -use crate::db::starter_data::load_all_starter_data; +use crate::db::starter::starter_data::load_all_starter_data; use crate::models::game::user_info::UserInfo; use crate::models::user::account::Account; use sqlx::SqlitePool; diff --git a/database/src/db/user_base_info.rs b/database/src/db/user/user_base_info.rs similarity index 100% rename from database/src/db/user_base_info.rs rename to database/src/db/user/user_base_info.rs diff --git a/database/src/db/user_contents_info.rs b/database/src/db/user/user_contents_info.rs similarity index 100% rename from database/src/db/user_contents_info.rs rename to database/src/db/user/user_contents_info.rs diff --git a/database/src/db/user_info.rs b/database/src/db/user/user_info.rs similarity index 100% rename from database/src/db/user_info.rs rename to database/src/db/user/user_info.rs diff --git a/database/src/db/user_position.rs b/database/src/db/user/user_position.rs similarity index 100% rename from database/src/db/user_position.rs rename to database/src/db/user/user_position.rs diff --git a/database/src/db/user/user_quest.rs b/database/src/db/user/user_quest.rs new file mode 100644 index 0000000..6b2062f --- /dev/null +++ b/database/src/db/user/user_quest.rs @@ -0,0 +1,55 @@ +use crate::models::game::user_quest::UserQuest; +use sqlx::SqlitePool; + +pub async fn get_user_quest( + pool: &SqlitePool, + uid: i64, + quest_id: i32, +) -> sqlx::Result> { + sqlx::query_as::<_, UserQuest>("SELECT * FROM UserQuest WHERE Uid = ? AND QuestId = ? LIMIT 1") + .bind(uid) + .bind(quest_id) + .fetch_optional(pool) + .await +} + +pub async fn add_user_quest(pool: &SqlitePool, data: &UserQuest) -> sqlx::Result<()> { + sqlx::query( + r#" + INSERT INTO UserQuest (Uid, QuestId, PackId, Status, Progress, RewardClaimed, LastUpdate) + VALUES (?, ?, ?, ?, ?, ?, ?) + "#, + ) + .bind(data.uid) + .bind(data.quest_id) + .bind(data.pack_id) + .bind(data.status) + .bind(data.progress) + .bind(data.reward_claimed) + .bind( + data.last_update + .unwrap_or(chrono::Utc::now().timestamp_millis()), + ) + .execute(pool) + .await?; + Ok(()) +} + +pub async fn update_user_quest(pool: &SqlitePool, data: &UserQuest) -> sqlx::Result<()> { + sqlx::query( + r#" + UPDATE UserQuest + SET Status = ?, Progress = ?, RewardClaimed = ?, LastUpdate = ? + WHERE Uid = ? AND QuestId = ? + "#, + ) + .bind(data.status) + .bind(data.progress) + .bind(data.reward_claimed) + .bind(chrono::Utc::now().timestamp_millis()) + .bind(data.uid) + .bind(data.quest_id) + .execute(pool) + .await?; + Ok(()) +} diff --git a/database/src/db/waypoint/mod.rs b/database/src/db/waypoint/mod.rs new file mode 100644 index 0000000..cf137de --- /dev/null +++ b/database/src/db/waypoint/mod.rs @@ -0,0 +1 @@ +pub mod waypoint_info; diff --git a/database/src/db/waypoint_info.rs b/database/src/db/waypoint/waypoint_info.rs similarity index 100% rename from database/src/db/waypoint_info.rs rename to database/src/db/waypoint/waypoint_info.rs diff --git a/database/src/db/world/mod.rs b/database/src/db/world/mod.rs new file mode 100644 index 0000000..7e264f0 --- /dev/null +++ b/database/src/db/world/mod.rs @@ -0,0 +1 @@ +pub mod world_buff_info; diff --git a/database/src/db/world_buff_info.rs b/database/src/db/world/world_buff_info.rs similarity index 100% rename from database/src/db/world_buff_info.rs rename to database/src/db/world/world_buff_info.rs diff --git a/database/src/models/game/hunting_ground_info.rs b/database/src/models/game/hunting_ground_info.rs index 47b3136..a408038 100644 --- a/database/src/models/game/hunting_ground_info.rs +++ b/database/src/models/game/hunting_ground_info.rs @@ -15,8 +15,6 @@ pub struct HuntingGroundInfo { pub current_id: Option, #[sqlx(rename = "HighestId")] pub highest_id: Option, - #[sqlx(rename = "MonsterInfoIndex")] - pub monster_info_index: Option, #[sqlx(rename = "PackId")] pub pack_id: Option, } diff --git a/database/src/models/game/hunting_ground_monster.rs b/database/src/models/game/hunting_ground_monster.rs new file mode 100644 index 0000000..758a4b5 --- /dev/null +++ b/database/src/models/game/hunting_ground_monster.rs @@ -0,0 +1,12 @@ +use serde::{Deserialize, Serialize}; +use sqlx::FromRow; + +#[derive(Debug, Serialize, Deserialize, FromRow)] +#[serde(rename_all = "PascalCase")] +#[sqlx(rename_all = "PascalCase")] +pub struct HuntingGroundMonster { + #[sqlx(rename = "HuntingGroundIndex")] + pub hunting_ground_index: i32, + #[sqlx(rename = "MonsterIndex")] + pub monster_index: i32, +} diff --git a/database/src/models/game/map_active_info.rs b/database/src/models/game/map_active_info.rs index fe67e12..c6bf5ca 100644 --- a/database/src/models/game/map_active_info.rs +++ b/database/src/models/game/map_active_info.rs @@ -13,4 +13,4 @@ pub struct MapActiveInfo { pub map_id: Option, #[sqlx(rename = "ActiveInfo")] pub active_info: String, -} \ No newline at end of file +} diff --git a/database/src/models/game/mod.rs b/database/src/models/game/mod.rs index ef37ea8..2d6b2fe 100644 --- a/database/src/models/game/mod.rs +++ b/database/src/models/game/mod.rs @@ -1,3 +1,4 @@ +pub mod account; pub mod achievement_clear_info; pub mod achievement_info; pub mod achievement_update_info; @@ -259,13 +260,12 @@ pub mod user_base_info; pub mod user_info; pub mod user_position; pub mod world_buff_info; -pub mod account; pub mod attendance_info; pub mod cash_mail_info; pub mod cash_shop_purchase_count_info; -pub mod charge_cost_info; pub mod char_scout_info; +pub mod charge_cost_info; pub mod cs_mini_game_relay_server_info; pub mod dating_info; pub mod equip_storage_info; @@ -313,4 +313,5 @@ pub mod today_quest_info; pub mod total_war_info; pub mod tutorial_info; pub mod user_contents_info; -pub mod waypoint_info; \ No newline at end of file +pub mod user_quest; +pub mod waypoint_info; diff --git a/database/src/models/game/user_quest.rs b/database/src/models/game/user_quest.rs new file mode 100644 index 0000000..7bd2adf --- /dev/null +++ b/database/src/models/game/user_quest.rs @@ -0,0 +1,16 @@ +use serde::{Deserialize, Serialize}; +use sqlx::FromRow; + +#[derive(Debug, Serialize, Deserialize, FromRow)] +#[serde(rename_all = "PascalCase")] +#[sqlx(rename_all = "PascalCase")] +pub struct UserQuest { + pub index: i64, + pub uid: i64, + pub quest_id: i64, + pub pack_id: Option, + pub status: i32, + pub progress: i32, + pub reward_claimed: i32, + pub last_update: Option, +} diff --git a/gameserver/src/logic/field/mod.rs b/gameserver/src/logic/field/mod.rs index c8c857c..37eaee5 100644 --- a/gameserver/src/logic/field/mod.rs +++ b/gameserver/src/logic/field/mod.rs @@ -1 +1,2 @@ +pub mod quest_clear; pub mod reward_object; diff --git a/gameserver/src/logic/field/quest_clear.rs b/gameserver/src/logic/field/quest_clear.rs new file mode 100644 index 0000000..6a084f1 --- /dev/null +++ b/gameserver/src/logic/field/quest_clear.rs @@ -0,0 +1,216 @@ +use anyhow::{Result, anyhow}; +use bd2::proto::proto_net::{ItemDbInfo, QuestClearResponse, QuestDbInfo, RewardDbInfoBundle}; +use data::exceldb; +use sqlx::SqlitePool; + +#[derive(Debug, Clone, PartialEq)] +pub struct QuestReward { + pub item_id: i32, + pub item_type: i32, + pub count: i32, +} + +pub async fn handle_quest_clear( + pool: &SqlitePool, + uid: i64, + quest_id: i32, +) -> Result { + let game_data = exceldb::get(); + + // Step 1: Find quest entry + let quest = game_data + .questtable1 + .get(quest_id) + .ok_or_else(|| anyhow!("QuestTable1: quest {} not found", quest_id))?; + + // Step 2: Mark quest complete in DB + mark_quest_complete(pool, uid, quest_id).await?; + + // Step 3: Update clear info (quest level and max clear) + upsert_quest_level_info(pool, uid, quest_id).await?; + upsert_quest_max_clear_info(pool, uid, quest_id).await?; + + // Step 4: Roll rewards from quest definition + let rewards = extract_rewards(quest)?; + + // Step 5: Insert rewards into inventory + let item_db_infos = add_items_to_inventory(pool, uid, &rewards).await?; + + // Step 6: Build RewardDBInfoBundle + let reward_bundle = RewardDbInfoBundle { + item_info: item_db_infos.clone(), + view_item_info: item_db_infos.clone(), + original_item_info: item_db_infos.clone(), + char_info: vec![], + costume_info: vec![], + equip_info: vec![], + my_room_trophy_info: vec![], + item_auto_exchange_info: vec![], + item_auto_upgrade_info: vec![], + repaid_currency: vec![], + }; + + // Step 7: Build next quest info + let quest_info = quest.next_quest_id.map(|id| QuestDbInfo { + id: Some(id), + ..Default::default() + }); + + // Step 8: Build final response + Ok(QuestClearResponse { + reward_info_bundle: Some(reward_bundle), + quest_info, + clear_quest_id: Some(quest_id), + ..Default::default() + }) +} + +// -------------------- DB Operations -------------------- + +async fn mark_quest_complete(pool: &SqlitePool, uid: i64, quest_id: i32) -> Result<()> { + sqlx::query( + r#" + UPDATE UserQuest + SET Status = 3, RewardClaimed = 1 + WHERE Uid = ? AND QuestId = ? + "#, + ) + .bind(uid) + .bind(quest_id) + .execute(pool) + .await?; + Ok(()) +} + +async fn upsert_quest_level_info(pool: &SqlitePool, uid: i64, clear_quest: i32) -> Result<()> { + sqlx::query( + r#" + INSERT INTO QuestLevelInfo (Uid, PackId, QuestLevel, ClearQuest, QuestOpt, IsLevelComplete) + VALUES (?, 1, 0, ?, 0, 0) + ON CONFLICT(Uid, PackId) + DO UPDATE SET ClearQuest = excluded.ClearQuest + "#, + ) + .bind(uid) + .bind(clear_quest) + .execute(pool) + .await?; + Ok(()) +} + +async fn upsert_quest_max_clear_info(pool: &SqlitePool, uid: i64, clear_quest: i32) -> Result<()> { + sqlx::query( + r#" + INSERT INTO QuestMaxClearInfo (Uid, PackId, MaxClearId) + VALUES (?, 1, ?) + ON CONFLICT(Uid, PackId) + DO UPDATE SET MaxClearId = excluded.MaxClearId + "#, + ) + .bind(uid) + .bind(clear_quest) + .execute(pool) + .await?; + Ok(()) +} + +// -------------------- Reward Extraction -------------------- + +fn extract_rewards(quest: &data::exceldb::questtable1::Questtable1) -> Result> { + let types = quest + .reward_type + .as_ref() + .ok_or_else(|| anyhow!("Quest missing reward_type"))?; + let ids = quest + .reward_id + .as_ref() + .ok_or_else(|| anyhow!("Quest missing reward_id"))?; + let counts = quest + .reward_count + .as_ref() + .ok_or_else(|| anyhow!("Quest missing reward_count"))?; + + let len = types.len().min(ids.len()).min(counts.len()); + Ok((0..len) + .map(|i| QuestReward { + item_id: ids[i], + item_type: types[i], + count: counts[i], + }) + .collect()) +} + +// -------------------- Inventory -------------------- + +async fn add_items_to_inventory( + pool: &SqlitePool, + uid: i64, + items: &[QuestReward], +) -> Result> { + use sqlx::{Row, query}; + + let now = chrono::Utc::now().timestamp_millis(); + let row = query("SELECT COALESCE(MAX(InvenIndex), 0) as idx FROM ItemInfo WHERE Uid = ?") + .bind(uid) + .fetch_one(pool) + .await?; + let mut idx: i64 = row.get("idx"); + + let mut results = Vec::new(); + + for item in items { + idx += 1; + query( + "INSERT INTO ItemInfo (Uid, InvenIndex, Id, Type, Count, KeepFlag, TimeValue, SortId, UseCount) + VALUES (?, ?, ?, ?, ?, 0, ?, 0, 0)", + ) + .bind(uid) + .bind(idx) + .bind(item.item_id) + .bind(item.item_type) + .bind(item.count) + .bind(now) + .execute(pool) + .await?; + + results.push(ItemDbInfo { + inven_index: Some(idx), + id: Some(item.item_id), + r#type: Some(item.item_type), + count: Some(item.count), + keep_flag: Some(0), + time_value: Some(now), + pictorialbook_info: None, + expiry_time: None, + sort_id: Some(0), + use_count: Some(0), + }); + } + + Ok(results) +} + +// ============================================================================ +// Tests +// ============================================================================ + +#[cfg(test)] +mod tests { + use super::*; + use std::path::PathBuf; + + fn setup() { + use std::sync::Once; + static INIT: Once = Once::new(); + + INIT.call_once(|| { + let data_path = PathBuf::from(env!("CARGO_MANIFEST_DIR")) + .parent() + .unwrap() + .join("data") + .join("tables"); + + exceldb::init(data_path.to_str().unwrap()).expect("Failed to initialize game data"); + }); + } +} diff --git a/gameserver/src/logic/field/reward_object.rs b/gameserver/src/logic/field/reward_object.rs index dc7043e..2f50d06 100644 --- a/gameserver/src/logic/field/reward_object.rs +++ b/gameserver/src/logic/field/reward_object.rs @@ -1,5 +1,3 @@ -// gameserver/src/logic/field/reward_object.rs - use anyhow::{Result, anyhow}; use bd2::proto::proto_net::{ FieldObjectRewardRequest, FieldObjectRewardResponse, ItemDbInfo, MonsterDbInfo, @@ -8,10 +6,6 @@ use bd2::proto::proto_net::{ use data::exceldb; use sqlx::SqlitePool; -// ============================================================================ -// Internal Helper Structures -// ============================================================================ - #[derive(Debug, Clone, PartialEq)] struct ItemDrop { id: i32, @@ -19,10 +13,6 @@ struct ItemDrop { count: i32, } -// ============================================================================ -// Main Handler Function -// ============================================================================ - pub async fn collect_field_object( pool: &SqlitePool, user_id: i64, @@ -113,7 +103,7 @@ pub async fn collect_field_object( let response = FieldObjectRewardResponse { reward_info_bundle: Some(reward_bundle), monster_info: Some(MonsterDbInfo { - active_flag: Some(true), // ← Hardcoded like C# + active_flag: Some(true), // ← Hardcoded for now ..Default::default() }), field_buff_info: vec![], @@ -123,10 +113,6 @@ pub async fn collect_field_object( Ok(response) } -// ============================================================================ -// Helper Functions -// ============================================================================ - fn roll_rewards( reward_group: &data::exceldb::rewardgrouptable::Rewardgrouptable, ) -> Result> { diff --git a/gameserver/src/logic/game/account.rs b/gameserver/src/logic/game/account.rs index 473b30f..b4315b6 100644 --- a/gameserver/src/logic/game/account.rs +++ b/gameserver/src/logic/game/account.rs @@ -25,7 +25,7 @@ pub async fn get_or_create_user( uid: i64, ) -> Result<(Account, UserInfo), LoginError> { // Use the database layer's get_or_create_user which handles the mapping - let (account, user_info) = db::user::get_or_create_user(pool, uid).await?; + let (account, user_info) = db::user::user::get_or_create_user(pool, uid).await?; info!("User logged in: {}", account.user_name); Ok((account, user_info)) @@ -34,7 +34,7 @@ pub async fn get_or_create_user( /// Update user's return status timestamp pub async fn update_login_timestamp(pool: &SqlitePool, uid: i64) -> Result<(), LoginError> { let now_ms = chrono::Utc::now().timestamp_millis(); - db::user::update_return_status(pool, uid, now_ms).await?; + db::user::user::update_return_status(pool, uid, now_ms).await?; info!("Updated return status for UID {} to {}", uid, now_ms); Ok(()) } diff --git a/gameserver/src/logic/game/achievement_clear.rs b/gameserver/src/logic/game/achievement/achievement_clear.rs similarity index 100% rename from gameserver/src/logic/game/achievement_clear.rs rename to gameserver/src/logic/game/achievement/achievement_clear.rs diff --git a/gameserver/src/logic/game/achievement_info.rs b/gameserver/src/logic/game/achievement/achievement_info.rs similarity index 95% rename from gameserver/src/logic/game/achievement_info.rs rename to gameserver/src/logic/game/achievement/achievement_info.rs index 8385e7b..9fbd145 100644 --- a/gameserver/src/logic/game/achievement_info.rs +++ b/gameserver/src/logic/game/achievement/achievement_info.rs @@ -4,7 +4,7 @@ use bd2::proto::proto_net::{ }; use common::packet_code::PacketCodeType; use crypto::network::GameResponse; -use database::db::achievement_info::get_achievement_info; +use database::db::achievement::achievement_info::get_achievement_info; use sqlx::SqlitePool; use tracing::info; diff --git a/gameserver/src/logic/game/achievement_update.rs b/gameserver/src/logic/game/achievement/achievement_update.rs similarity index 100% rename from gameserver/src/logic/game/achievement_update.rs rename to gameserver/src/logic/game/achievement/achievement_update.rs diff --git a/gameserver/src/logic/game/achievement/mod.rs b/gameserver/src/logic/game/achievement/mod.rs new file mode 100644 index 0000000..8fd541b --- /dev/null +++ b/gameserver/src/logic/game/achievement/mod.rs @@ -0,0 +1,3 @@ +pub mod achievement_clear; +pub mod achievement_info; +pub mod achievement_update; diff --git a/gameserver/src/logic/game/active_map.rs b/gameserver/src/logic/game/active/active_map.rs similarity index 57% rename from gameserver/src/logic/game/active_map.rs rename to gameserver/src/logic/game/active/active_map.rs index c4e892c..28aca7a 100644 --- a/gameserver/src/logic/game/active_map.rs +++ b/gameserver/src/logic/game/active/active_map.rs @@ -2,21 +2,32 @@ use bd2::prost::Message; use bd2::proto::proto_net::{ActiveMapRequest, ActiveMapResponse, Notify}; use common::packet_code::PacketCodeType; use crypto::network::GameResponse; +use database::db::map::map_active_info::add_map_active_info; +use database::models::game::map_active_info::MapActiveInfo; +use serde_json::to_string; use sqlx::SqlitePool; use tracing::info; -pub async fn handle(_pool: &SqlitePool, _uid: i64, req: ActiveMapRequest) -> GameResponse { +pub async fn handle(pool: &SqlitePool, uid: i64, req: ActiveMapRequest) -> GameResponse { info!("Handling ActiveMapRequest: {:?}", req); - // TODO: Fetch data from database - // Example: - // let data = get_something(pool, uid).await.unwrap_or_default(); + let active_info_json = to_string(&req.active_info).unwrap_or_else(|_| "[]".to_string()); - // TODO: Transform to proto - // Example: - // let proto_data = data.into_iter() - // .map(|item| mapper::to_proto(item, pool).await) - // .collect(); + if let Some(id) = req.map_id { + let record = MapActiveInfo { + index: 0, // autoincrement + uid, + map_id: Some(id), + active_info: active_info_json, + }; + + if let Err(e) = add_map_active_info(pool, &record).await { + eprintln!( + "Failed to insert active_info {} for uid {}: {:?}", + id, uid, e + ); + } + } let response = ActiveMapResponse { // TODO: Fill in response fields diff --git a/gameserver/src/logic/game/active/mod.rs b/gameserver/src/logic/game/active/mod.rs new file mode 100644 index 0000000..aac0311 --- /dev/null +++ b/gameserver/src/logic/game/active/mod.rs @@ -0,0 +1 @@ +pub mod active_map; diff --git a/gameserver/src/logic/game/alchemy.rs b/gameserver/src/logic/game/alchemy/alchemy.rs similarity index 100% rename from gameserver/src/logic/game/alchemy.rs rename to gameserver/src/logic/game/alchemy/alchemy.rs diff --git a/gameserver/src/logic/game/alchemy_batch.rs b/gameserver/src/logic/game/alchemy/alchemy_batch.rs similarity index 100% rename from gameserver/src/logic/game/alchemy_batch.rs rename to gameserver/src/logic/game/alchemy/alchemy_batch.rs diff --git a/gameserver/src/logic/game/alchemy/mod.rs b/gameserver/src/logic/game/alchemy/mod.rs new file mode 100644 index 0000000..af1899f --- /dev/null +++ b/gameserver/src/logic/game/alchemy/mod.rs @@ -0,0 +1,2 @@ +pub mod alchemy; +pub mod alchemy_batch; diff --git a/gameserver/src/logic/game/all_char_refresh.rs b/gameserver/src/logic/game/all/all_char_refresh.rs similarity index 100% rename from gameserver/src/logic/game/all_char_refresh.rs rename to gameserver/src/logic/game/all/all_char_refresh.rs diff --git a/gameserver/src/logic/game/all/mod.rs b/gameserver/src/logic/game/all/mod.rs new file mode 100644 index 0000000..876b072 --- /dev/null +++ b/gameserver/src/logic/game/all/mod.rs @@ -0,0 +1 @@ +pub mod all_char_refresh; diff --git a/gameserver/src/logic/game/attendance.rs b/gameserver/src/logic/game/attendance.rs index 9f41148..5f3cdfa 100644 --- a/gameserver/src/logic/game/attendance.rs +++ b/gameserver/src/logic/game/attendance.rs @@ -5,8 +5,8 @@ use bd2::proto::proto_net::{ }; use common::packet_code::PacketCodeType; use crypto::network::GameResponse; -use database::db::attendance_always_info::get_attendance_always_info; -use database::db::attendance_event_reward_obtain_info::get_attendance_event_reward_obtain_info; +use database::db::attendance::attendance_always_info::get_attendance_always_info; +use database::db::attendance::attendance_event_reward_obtain_info::get_attendance_event_reward_obtain_info; use sqlx::SqlitePool; use tracing::info; diff --git a/gameserver/src/logic/game/balance_version_check.rs b/gameserver/src/logic/game/balance/balance_version_check.rs similarity index 100% rename from gameserver/src/logic/game/balance_version_check.rs rename to gameserver/src/logic/game/balance/balance_version_check.rs diff --git a/gameserver/src/logic/game/balance/mod.rs b/gameserver/src/logic/game/balance/mod.rs new file mode 100644 index 0000000..6cb48b2 --- /dev/null +++ b/gameserver/src/logic/game/balance/mod.rs @@ -0,0 +1 @@ +pub mod balance_version_check; diff --git a/gameserver/src/logic/game/batch_request.rs b/gameserver/src/logic/game/batch/batch_request.rs similarity index 100% rename from gameserver/src/logic/game/batch_request.rs rename to gameserver/src/logic/game/batch/batch_request.rs diff --git a/gameserver/src/logic/game/batch/mod.rs b/gameserver/src/logic/game/batch/mod.rs new file mode 100644 index 0000000..6b362f1 --- /dev/null +++ b/gameserver/src/logic/game/batch/mod.rs @@ -0,0 +1 @@ +pub mod batch_request; diff --git a/gameserver/src/logic/game/battle_end.rs b/gameserver/src/logic/game/battle/battle_end.rs similarity index 100% rename from gameserver/src/logic/game/battle_end.rs rename to gameserver/src/logic/game/battle/battle_end.rs diff --git a/gameserver/src/logic/game/battle_end_test.rs b/gameserver/src/logic/game/battle/battle_end_test.rs similarity index 100% rename from gameserver/src/logic/game/battle_end_test.rs rename to gameserver/src/logic/game/battle/battle_end_test.rs diff --git a/gameserver/src/logic/game/battle_enter.rs b/gameserver/src/logic/game/battle/battle_enter.rs similarity index 100% rename from gameserver/src/logic/game/battle_enter.rs rename to gameserver/src/logic/game/battle/battle_enter.rs diff --git a/gameserver/src/logic/game/battle_exit.rs b/gameserver/src/logic/game/battle/battle_exit.rs similarity index 100% rename from gameserver/src/logic/game/battle_exit.rs rename to gameserver/src/logic/game/battle/battle_exit.rs diff --git a/gameserver/src/logic/game/battle_give_up.rs b/gameserver/src/logic/game/battle/battle_give_up.rs similarity index 100% rename from gameserver/src/logic/game/battle_give_up.rs rename to gameserver/src/logic/game/battle/battle_give_up.rs diff --git a/gameserver/src/logic/game/battle_retry.rs b/gameserver/src/logic/game/battle/battle_retry.rs similarity index 100% rename from gameserver/src/logic/game/battle_retry.rs rename to gameserver/src/logic/game/battle/battle_retry.rs diff --git a/gameserver/src/logic/game/battle_retry_previous_turn.rs b/gameserver/src/logic/game/battle/battle_retry_previous_turn.rs similarity index 100% rename from gameserver/src/logic/game/battle_retry_previous_turn.rs rename to gameserver/src/logic/game/battle/battle_retry_previous_turn.rs diff --git a/gameserver/src/logic/game/battle_start.rs b/gameserver/src/logic/game/battle/battle_start.rs similarity index 100% rename from gameserver/src/logic/game/battle_start.rs rename to gameserver/src/logic/game/battle/battle_start.rs diff --git a/gameserver/src/logic/game/battle_verify_state.rs b/gameserver/src/logic/game/battle/battle_verify_state.rs similarity index 100% rename from gameserver/src/logic/game/battle_verify_state.rs rename to gameserver/src/logic/game/battle/battle_verify_state.rs diff --git a/gameserver/src/logic/game/battle/mod.rs b/gameserver/src/logic/game/battle/mod.rs new file mode 100644 index 0000000..b09d68b --- /dev/null +++ b/gameserver/src/logic/game/battle/mod.rs @@ -0,0 +1,9 @@ +pub mod battle_end; +pub mod battle_end_test; +pub mod battle_enter; +pub mod battle_exit; +pub mod battle_give_up; +pub mod battle_retry; +pub mod battle_retry_previous_turn; +pub mod battle_start; +pub mod battle_verify_state; diff --git a/gameserver/src/logic/game/cafeteria_cumulative_reward.rs b/gameserver/src/logic/game/cafeteria/cafeteria_cumulative_reward.rs similarity index 100% rename from gameserver/src/logic/game/cafeteria_cumulative_reward.rs rename to gameserver/src/logic/game/cafeteria/cafeteria_cumulative_reward.rs diff --git a/gameserver/src/logic/game/cafeteria_daily_connection_costume_refresh.rs b/gameserver/src/logic/game/cafeteria/cafeteria_daily_connection_costume_refresh.rs similarity index 100% rename from gameserver/src/logic/game/cafeteria_daily_connection_costume_refresh.rs rename to gameserver/src/logic/game/cafeteria/cafeteria_daily_connection_costume_refresh.rs diff --git a/gameserver/src/logic/game/cafeteria_event_npc_interaction_reward.rs b/gameserver/src/logic/game/cafeteria/cafeteria_event_npc_interaction_reward.rs similarity index 100% rename from gameserver/src/logic/game/cafeteria_event_npc_interaction_reward.rs rename to gameserver/src/logic/game/cafeteria/cafeteria_event_npc_interaction_reward.rs diff --git a/gameserver/src/logic/game/cafeteria_info.rs b/gameserver/src/logic/game/cafeteria/cafeteria_info.rs similarity index 100% rename from gameserver/src/logic/game/cafeteria_info.rs rename to gameserver/src/logic/game/cafeteria/cafeteria_info.rs diff --git a/gameserver/src/logic/game/cafeteria_introduction_story_reward.rs b/gameserver/src/logic/game/cafeteria/cafeteria_introduction_story_reward.rs similarity index 100% rename from gameserver/src/logic/game/cafeteria_introduction_story_reward.rs rename to gameserver/src/logic/game/cafeteria/cafeteria_introduction_story_reward.rs diff --git a/gameserver/src/logic/game/cafeteria_level_up.rs b/gameserver/src/logic/game/cafeteria/cafeteria_level_up.rs similarity index 100% rename from gameserver/src/logic/game/cafeteria_level_up.rs rename to gameserver/src/logic/game/cafeteria/cafeteria_level_up.rs diff --git a/gameserver/src/logic/game/cafeteria_manage_item_add.rs b/gameserver/src/logic/game/cafeteria/cafeteria_manage_item_add.rs similarity index 100% rename from gameserver/src/logic/game/cafeteria_manage_item_add.rs rename to gameserver/src/logic/game/cafeteria/cafeteria_manage_item_add.rs diff --git a/gameserver/src/logic/game/cafeteria_rare_npc_interaction_reward.rs b/gameserver/src/logic/game/cafeteria/cafeteria_rare_npc_interaction_reward.rs similarity index 100% rename from gameserver/src/logic/game/cafeteria_rare_npc_interaction_reward.rs rename to gameserver/src/logic/game/cafeteria/cafeteria_rare_npc_interaction_reward.rs diff --git a/gameserver/src/logic/game/cafeteria_regular_costume_interaction_all_reward.rs b/gameserver/src/logic/game/cafeteria/cafeteria_regular_costume_interaction_all_reward.rs similarity index 100% rename from gameserver/src/logic/game/cafeteria_regular_costume_interaction_all_reward.rs rename to gameserver/src/logic/game/cafeteria/cafeteria_regular_costume_interaction_all_reward.rs diff --git a/gameserver/src/logic/game/cafeteria_regular_costume_interaction_reward.rs b/gameserver/src/logic/game/cafeteria/cafeteria_regular_costume_interaction_reward.rs similarity index 100% rename from gameserver/src/logic/game/cafeteria_regular_costume_interaction_reward.rs rename to gameserver/src/logic/game/cafeteria/cafeteria_regular_costume_interaction_reward.rs diff --git a/gameserver/src/logic/game/cafeteria_regular_costume_note_all_reward.rs b/gameserver/src/logic/game/cafeteria/cafeteria_regular_costume_note_all_reward.rs similarity index 100% rename from gameserver/src/logic/game/cafeteria_regular_costume_note_all_reward.rs rename to gameserver/src/logic/game/cafeteria/cafeteria_regular_costume_note_all_reward.rs diff --git a/gameserver/src/logic/game/cafeteria_regular_costume_note_info.rs b/gameserver/src/logic/game/cafeteria/cafeteria_regular_costume_note_info.rs similarity index 100% rename from gameserver/src/logic/game/cafeteria_regular_costume_note_info.rs rename to gameserver/src/logic/game/cafeteria/cafeteria_regular_costume_note_info.rs diff --git a/gameserver/src/logic/game/cafeteria_regular_costume_note_reward.rs b/gameserver/src/logic/game/cafeteria/cafeteria_regular_costume_note_reward.rs similarity index 100% rename from gameserver/src/logic/game/cafeteria_regular_costume_note_reward.rs rename to gameserver/src/logic/game/cafeteria/cafeteria_regular_costume_note_reward.rs diff --git a/gameserver/src/logic/game/cafeteria_reward_receipt_time_update_using_cheat.rs b/gameserver/src/logic/game/cafeteria/cafeteria_reward_receipt_time_update_using_cheat.rs similarity index 100% rename from gameserver/src/logic/game/cafeteria_reward_receipt_time_update_using_cheat.rs rename to gameserver/src/logic/game/cafeteria/cafeteria_reward_receipt_time_update_using_cheat.rs diff --git a/gameserver/src/logic/game/cafeteria_spawn_reset.rs b/gameserver/src/logic/game/cafeteria/cafeteria_spawn_reset.rs similarity index 100% rename from gameserver/src/logic/game/cafeteria_spawn_reset.rs rename to gameserver/src/logic/game/cafeteria/cafeteria_spawn_reset.rs diff --git a/gameserver/src/logic/game/cafeteria_spawn_reset_cheat.rs b/gameserver/src/logic/game/cafeteria/cafeteria_spawn_reset_cheat.rs similarity index 100% rename from gameserver/src/logic/game/cafeteria_spawn_reset_cheat.rs rename to gameserver/src/logic/game/cafeteria/cafeteria_spawn_reset_cheat.rs diff --git a/gameserver/src/logic/game/cafeteria/mod.rs b/gameserver/src/logic/game/cafeteria/mod.rs new file mode 100644 index 0000000..8d53c7a --- /dev/null +++ b/gameserver/src/logic/game/cafeteria/mod.rs @@ -0,0 +1,16 @@ +pub mod cafeteria_cumulative_reward; +pub mod cafeteria_daily_connection_costume_refresh; +pub mod cafeteria_event_npc_interaction_reward; +pub mod cafeteria_info; +pub mod cafeteria_introduction_story_reward; +pub mod cafeteria_level_up; +pub mod cafeteria_manage_item_add; +pub mod cafeteria_rare_npc_interaction_reward; +pub mod cafeteria_regular_costume_interaction_all_reward; +pub mod cafeteria_regular_costume_interaction_reward; +pub mod cafeteria_regular_costume_note_all_reward; +pub mod cafeteria_regular_costume_note_info; +pub mod cafeteria_regular_costume_note_reward; +pub mod cafeteria_reward_receipt_time_update_using_cheat; +pub mod cafeteria_spawn_reset; +pub mod cafeteria_spawn_reset_cheat; diff --git a/gameserver/src/logic/game/cancel_leave_user.rs b/gameserver/src/logic/game/cancel/cancel_leave_user.rs similarity index 100% rename from gameserver/src/logic/game/cancel_leave_user.rs rename to gameserver/src/logic/game/cancel/cancel_leave_user.rs diff --git a/gameserver/src/logic/game/cancel/mod.rs b/gameserver/src/logic/game/cancel/mod.rs new file mode 100644 index 0000000..bf3d949 --- /dev/null +++ b/gameserver/src/logic/game/cancel/mod.rs @@ -0,0 +1 @@ +pub mod cancel_leave_user; diff --git a/gameserver/src/logic/game/cash_mail_info.rs b/gameserver/src/logic/game/cash/cash_mail_info.rs similarity index 100% rename from gameserver/src/logic/game/cash_mail_info.rs rename to gameserver/src/logic/game/cash/cash_mail_info.rs diff --git a/gameserver/src/logic/game/cash_shop_buy.rs b/gameserver/src/logic/game/cash/cash_shop_buy.rs similarity index 100% rename from gameserver/src/logic/game/cash_shop_buy.rs rename to gameserver/src/logic/game/cash/cash_shop_buy.rs diff --git a/gameserver/src/logic/game/cash_shop_info.rs b/gameserver/src/logic/game/cash/cash_shop_info.rs similarity index 93% rename from gameserver/src/logic/game/cash_shop_info.rs rename to gameserver/src/logic/game/cash/cash_shop_info.rs index ba5b48b..05b4b46 100644 --- a/gameserver/src/logic/game/cash_shop_info.rs +++ b/gameserver/src/logic/game/cash/cash_shop_info.rs @@ -13,9 +13,10 @@ pub async fn handle( info!("Handling CashShopInfoRequest"); // Load the JSON file from starter data - let data: Value = - serde_json::from_str(include_str!("../../../../data/starter/cash_shop_info.json")) - .expect("Failed to parse cash_shop_info.json"); + let data: Value = serde_json::from_str(include_str!( + "../../../../../data/starter/cash_shop_info.json" + )) + .expect("Failed to parse cash_shop_info.json"); let products = data .get("productInfo") diff --git a/gameserver/src/logic/game/cash_shop_purchase_count_info.rs b/gameserver/src/logic/game/cash/cash_shop_purchase_count_info.rs similarity index 100% rename from gameserver/src/logic/game/cash_shop_purchase_count_info.rs rename to gameserver/src/logic/game/cash/cash_shop_purchase_count_info.rs diff --git a/gameserver/src/logic/game/cash/mod.rs b/gameserver/src/logic/game/cash/mod.rs new file mode 100644 index 0000000..ed67036 --- /dev/null +++ b/gameserver/src/logic/game/cash/mod.rs @@ -0,0 +1,4 @@ +pub mod cash_mail_info; +pub mod cash_shop_buy; +pub mod cash_shop_info; +pub mod cash_shop_purchase_count_info; diff --git a/gameserver/src/logic/game/char_all_revival.rs b/gameserver/src/logic/game/char/char_all_revival.rs similarity index 100% rename from gameserver/src/logic/game/char_all_revival.rs rename to gameserver/src/logic/game/char/char_all_revival.rs diff --git a/gameserver/src/logic/game/char_auto_revive_set.rs b/gameserver/src/logic/game/char/char_auto_revive_set.rs similarity index 100% rename from gameserver/src/logic/game/char_auto_revive_set.rs rename to gameserver/src/logic/game/char/char_auto_revive_set.rs diff --git a/gameserver/src/logic/game/char_awake_active.rs b/gameserver/src/logic/game/char/char_awake_active.rs similarity index 100% rename from gameserver/src/logic/game/char_awake_active.rs rename to gameserver/src/logic/game/char/char_awake_active.rs diff --git a/gameserver/src/logic/game/char_awake_info.rs b/gameserver/src/logic/game/char/char_awake_info.rs similarity index 100% rename from gameserver/src/logic/game/char_awake_info.rs rename to gameserver/src/logic/game/char/char_awake_info.rs diff --git a/gameserver/src/logic/game/char_class_up.rs b/gameserver/src/logic/game/char/char_class_up.rs similarity index 100% rename from gameserver/src/logic/game/char_class_up.rs rename to gameserver/src/logic/game/char/char_class_up.rs diff --git a/gameserver/src/logic/game/char_expiry.rs b/gameserver/src/logic/game/char/char_expiry.rs similarity index 100% rename from gameserver/src/logic/game/char_expiry.rs rename to gameserver/src/logic/game/char/char_expiry.rs diff --git a/gameserver/src/logic/game/char_growth.rs b/gameserver/src/logic/game/char/char_growth.rs similarity index 100% rename from gameserver/src/logic/game/char_growth.rs rename to gameserver/src/logic/game/char/char_growth.rs diff --git a/gameserver/src/logic/game/char_healing.rs b/gameserver/src/logic/game/char/char_healing.rs similarity index 100% rename from gameserver/src/logic/game/char_healing.rs rename to gameserver/src/logic/game/char/char_healing.rs diff --git a/gameserver/src/logic/game/char_immortal.rs b/gameserver/src/logic/game/char/char_immortal.rs similarity index 100% rename from gameserver/src/logic/game/char_immortal.rs rename to gameserver/src/logic/game/char/char_immortal.rs diff --git a/gameserver/src/logic/game/char_imprint_level_up.rs b/gameserver/src/logic/game/char/char_imprint_level_up.rs similarity index 100% rename from gameserver/src/logic/game/char_imprint_level_up.rs rename to gameserver/src/logic/game/char/char_imprint_level_up.rs diff --git a/gameserver/src/logic/game/char_info.rs b/gameserver/src/logic/game/char/char_info.rs similarity index 97% rename from gameserver/src/logic/game/char_info.rs rename to gameserver/src/logic/game/char/char_info.rs index a8071c9..2f5fa06 100644 --- a/gameserver/src/logic/game/char_info.rs +++ b/gameserver/src/logic/game/char/char_info.rs @@ -2,7 +2,7 @@ use bd2::prost::Message; use bd2::proto::proto_net::{CharDbInfo, CharInfoRequest, CharInfoResponse, Notify}; use common::packet_code::PacketCodeType; use crypto::network::GameResponse; -use database::db::char_info::get_char_info; +use database::db::char::char_info::get_char_info; use sqlx::SqlitePool; use tracing::info; diff --git a/gameserver/src/logic/game/char_level_up.rs b/gameserver/src/logic/game/char/char_level_up.rs similarity index 100% rename from gameserver/src/logic/game/char_level_up.rs rename to gameserver/src/logic/game/char/char_level_up.rs diff --git a/gameserver/src/logic/game/char_partner_info.rs b/gameserver/src/logic/game/char/char_partner_info.rs similarity index 100% rename from gameserver/src/logic/game/char_partner_info.rs rename to gameserver/src/logic/game/char/char_partner_info.rs diff --git a/gameserver/src/logic/game/char_partner_reward.rs b/gameserver/src/logic/game/char/char_partner_reward.rs similarity index 100% rename from gameserver/src/logic/game/char_partner_reward.rs rename to gameserver/src/logic/game/char/char_partner_reward.rs diff --git a/gameserver/src/logic/game/char_partner_story_reward.rs b/gameserver/src/logic/game/char/char_partner_story_reward.rs similarity index 100% rename from gameserver/src/logic/game/char_partner_story_reward.rs rename to gameserver/src/logic/game/char/char_partner_story_reward.rs diff --git a/gameserver/src/logic/game/char_scout_info.rs b/gameserver/src/logic/game/char/char_scout_info.rs similarity index 100% rename from gameserver/src/logic/game/char_scout_info.rs rename to gameserver/src/logic/game/char/char_scout_info.rs diff --git a/gameserver/src/logic/game/char_special_scout_buy.rs b/gameserver/src/logic/game/char/char_special_scout_buy.rs similarity index 100% rename from gameserver/src/logic/game/char_special_scout_buy.rs rename to gameserver/src/logic/game/char/char_special_scout_buy.rs diff --git a/gameserver/src/logic/game/char_special_scout_reset.rs b/gameserver/src/logic/game/char/char_special_scout_reset.rs similarity index 100% rename from gameserver/src/logic/game/char_special_scout_reset.rs rename to gameserver/src/logic/game/char/char_special_scout_reset.rs diff --git a/gameserver/src/logic/game/char/mod.rs b/gameserver/src/logic/game/char/mod.rs new file mode 100644 index 0000000..e0edd35 --- /dev/null +++ b/gameserver/src/logic/game/char/mod.rs @@ -0,0 +1,18 @@ +pub mod char_all_revival; +pub mod char_auto_revive_set; +pub mod char_awake_active; +pub mod char_awake_info; +pub mod char_class_up; +pub mod char_expiry; +pub mod char_growth; +pub mod char_healing; +pub mod char_immortal; +pub mod char_imprint_level_up; +pub mod char_info; +pub mod char_level_up; +pub mod char_partner_info; +pub mod char_partner_reward; +pub mod char_partner_story_reward; +pub mod char_scout_info; +pub mod char_special_scout_buy; +pub mod char_special_scout_reset; diff --git a/gameserver/src/logic/game/charge_cost_info.rs b/gameserver/src/logic/game/charge/charge_cost_info.rs similarity index 98% rename from gameserver/src/logic/game/charge_cost_info.rs rename to gameserver/src/logic/game/charge/charge_cost_info.rs index 1353031..71b7749 100644 --- a/gameserver/src/logic/game/charge_cost_info.rs +++ b/gameserver/src/logic/game/charge/charge_cost_info.rs @@ -4,7 +4,7 @@ use bd2::proto::proto_net::{ }; use common::packet_code::PacketCodeType; use crypto::network::GameResponse; -use database::db::charge_cost_event_schedule_info::get_charge_cost_event_schedule_info; +use database::db::charge::charge_cost_event_schedule_info::get_charge_cost_event_schedule_info; use database::models::game::charge_cost_event_schedule_info::ChargeCostEventScheduleInfo; use prost::Message; use sqlx::SqlitePool; diff --git a/gameserver/src/logic/game/charge/mod.rs b/gameserver/src/logic/game/charge/mod.rs new file mode 100644 index 0000000..fd4c000 --- /dev/null +++ b/gameserver/src/logic/game/charge/mod.rs @@ -0,0 +1 @@ +pub mod charge_cost_info; diff --git a/gameserver/src/logic/game/clear_package_reward.rs b/gameserver/src/logic/game/clear/clear_package_reward.rs similarity index 100% rename from gameserver/src/logic/game/clear_package_reward.rs rename to gameserver/src/logic/game/clear/clear_package_reward.rs diff --git a/gameserver/src/logic/game/clear/mod.rs b/gameserver/src/logic/game/clear/mod.rs new file mode 100644 index 0000000..dea481c --- /dev/null +++ b/gameserver/src/logic/game/clear/mod.rs @@ -0,0 +1 @@ +pub mod clear_package_reward; diff --git a/gameserver/src/logic/game/client_custom_log.rs b/gameserver/src/logic/game/client/client_custom_log.rs similarity index 100% rename from gameserver/src/logic/game/client_custom_log.rs rename to gameserver/src/logic/game/client/client_custom_log.rs diff --git a/gameserver/src/logic/game/client/mod.rs b/gameserver/src/logic/game/client/mod.rs new file mode 100644 index 0000000..9685a04 --- /dev/null +++ b/gameserver/src/logic/game/client/mod.rs @@ -0,0 +1 @@ +pub mod client_custom_log; diff --git a/gameserver/src/logic/game/community_reward.rs b/gameserver/src/logic/game/community/community_reward.rs similarity index 100% rename from gameserver/src/logic/game/community_reward.rs rename to gameserver/src/logic/game/community/community_reward.rs diff --git a/gameserver/src/logic/game/community_reward_info.rs b/gameserver/src/logic/game/community/community_reward_info.rs similarity index 100% rename from gameserver/src/logic/game/community_reward_info.rs rename to gameserver/src/logic/game/community/community_reward_info.rs diff --git a/gameserver/src/logic/game/community/mod.rs b/gameserver/src/logic/game/community/mod.rs new file mode 100644 index 0000000..5a1d869 --- /dev/null +++ b/gameserver/src/logic/game/community/mod.rs @@ -0,0 +1,2 @@ +pub mod community_reward; +pub mod community_reward_info; diff --git a/gameserver/src/logic/game/cooking.rs b/gameserver/src/logic/game/cooking/cooking.rs similarity index 100% rename from gameserver/src/logic/game/cooking.rs rename to gameserver/src/logic/game/cooking/cooking.rs diff --git a/gameserver/src/logic/game/cooking_research.rs b/gameserver/src/logic/game/cooking/cooking_research.rs similarity index 100% rename from gameserver/src/logic/game/cooking_research.rs rename to gameserver/src/logic/game/cooking/cooking_research.rs diff --git a/gameserver/src/logic/game/cooking/mod.rs b/gameserver/src/logic/game/cooking/mod.rs new file mode 100644 index 0000000..c0b115e --- /dev/null +++ b/gameserver/src/logic/game/cooking/mod.rs @@ -0,0 +1,2 @@ +pub mod cooking; +pub mod cooking_research; diff --git a/gameserver/src/logic/game/costume_all_rounder_upgrade.rs b/gameserver/src/logic/game/costume/costume_all_rounder_upgrade.rs similarity index 100% rename from gameserver/src/logic/game/costume_all_rounder_upgrade.rs rename to gameserver/src/logic/game/costume/costume_all_rounder_upgrade.rs diff --git a/gameserver/src/logic/game/costume_clear.rs b/gameserver/src/logic/game/costume/costume_clear.rs similarity index 100% rename from gameserver/src/logic/game/costume_clear.rs rename to gameserver/src/logic/game/costume/costume_clear.rs diff --git a/gameserver/src/logic/game/costume_info.rs b/gameserver/src/logic/game/costume/costume_info.rs similarity index 97% rename from gameserver/src/logic/game/costume_info.rs rename to gameserver/src/logic/game/costume/costume_info.rs index d4c75ef..92b654a 100644 --- a/gameserver/src/logic/game/costume_info.rs +++ b/gameserver/src/logic/game/costume/costume_info.rs @@ -2,7 +2,7 @@ use bd2::prost::Message; use bd2::proto::proto_net::{CostumeDbInfo, CostumeInfoRequest, CostumeInfoResponse, Notify}; use common::packet_code::PacketCodeType; use crypto::network::GameResponse; -use database::db::costume_info::get_costume_info; +use database::db::costume::costume_info::get_costume_info; use serde_json; use sqlx::SqlitePool; use tracing::info; diff --git a/gameserver/src/logic/game/costume_node_activation.rs b/gameserver/src/logic/game/costume/costume_node_activation.rs similarity index 100% rename from gameserver/src/logic/game/costume_node_activation.rs rename to gameserver/src/logic/game/costume/costume_node_activation.rs diff --git a/gameserver/src/logic/game/costume_potential_connect.rs b/gameserver/src/logic/game/costume/costume_potential_connect.rs similarity index 100% rename from gameserver/src/logic/game/costume_potential_connect.rs rename to gameserver/src/logic/game/costume/costume_potential_connect.rs diff --git a/gameserver/src/logic/game/costume_upgrade.rs b/gameserver/src/logic/game/costume/costume_upgrade.rs similarity index 100% rename from gameserver/src/logic/game/costume_upgrade.rs rename to gameserver/src/logic/game/costume/costume_upgrade.rs diff --git a/gameserver/src/logic/game/costume_use.rs b/gameserver/src/logic/game/costume/costume_use.rs similarity index 100% rename from gameserver/src/logic/game/costume_use.rs rename to gameserver/src/logic/game/costume/costume_use.rs diff --git a/gameserver/src/logic/game/costume/mod.rs b/gameserver/src/logic/game/costume/mod.rs new file mode 100644 index 0000000..157bf3c --- /dev/null +++ b/gameserver/src/logic/game/costume/mod.rs @@ -0,0 +1,7 @@ +pub mod costume_all_rounder_upgrade; +pub mod costume_clear; +pub mod costume_info; +pub mod costume_node_activation; +pub mod costume_potential_connect; +pub mod costume_upgrade; +pub mod costume_use; diff --git a/gameserver/src/logic/game/dating_episode_clear.rs b/gameserver/src/logic/game/dating/dating_episode_clear.rs similarity index 100% rename from gameserver/src/logic/game/dating_episode_clear.rs rename to gameserver/src/logic/game/dating/dating_episode_clear.rs diff --git a/gameserver/src/logic/game/dating_info.rs b/gameserver/src/logic/game/dating/dating_info.rs similarity index 100% rename from gameserver/src/logic/game/dating_info.rs rename to gameserver/src/logic/game/dating/dating_info.rs diff --git a/gameserver/src/logic/game/dating_message_update.rs b/gameserver/src/logic/game/dating/dating_message_update.rs similarity index 100% rename from gameserver/src/logic/game/dating_message_update.rs rename to gameserver/src/logic/game/dating/dating_message_update.rs diff --git a/gameserver/src/logic/game/dating/mod.rs b/gameserver/src/logic/game/dating/mod.rs new file mode 100644 index 0000000..e33cb81 --- /dev/null +++ b/gameserver/src/logic/game/dating/mod.rs @@ -0,0 +1,3 @@ +pub mod dating_episode_clear; +pub mod dating_info; +pub mod dating_message_update; diff --git a/gameserver/src/logic/game/deck_char_auto_revive.rs b/gameserver/src/logic/game/deck/deck_char_auto_revive.rs similarity index 100% rename from gameserver/src/logic/game/deck_char_auto_revive.rs rename to gameserver/src/logic/game/deck/deck_char_auto_revive.rs diff --git a/gameserver/src/logic/game/deck_costume_setting_info.rs b/gameserver/src/logic/game/deck/deck_costume_setting_info.rs similarity index 100% rename from gameserver/src/logic/game/deck_costume_setting_info.rs rename to gameserver/src/logic/game/deck/deck_costume_setting_info.rs diff --git a/gameserver/src/logic/game/deck_costume_setting_save.rs b/gameserver/src/logic/game/deck/deck_costume_setting_save.rs similarity index 100% rename from gameserver/src/logic/game/deck_costume_setting_save.rs rename to gameserver/src/logic/game/deck/deck_costume_setting_save.rs diff --git a/gameserver/src/logic/game/deck_info.rs b/gameserver/src/logic/game/deck/deck_info.rs similarity index 97% rename from gameserver/src/logic/game/deck_info.rs rename to gameserver/src/logic/game/deck/deck_info.rs index 98ab966..bcd45de 100644 --- a/gameserver/src/logic/game/deck_info.rs +++ b/gameserver/src/logic/game/deck/deck_info.rs @@ -2,7 +2,7 @@ use bd2::prost::Message; use bd2::proto::proto_net::{DeckDbInfo, DeckInfoRequest, DeckInfoResponse, Notify}; use common::packet_code::PacketCodeType; use crypto::network::GameResponse; -use database::db::deck_info::get_deck_info; +use database::db::deck::deck_info::get_deck_info; use sqlx::SqlitePool; use tracing::info; diff --git a/gameserver/src/logic/game/deck_save.rs b/gameserver/src/logic/game/deck/deck_save.rs similarity index 100% rename from gameserver/src/logic/game/deck_save.rs rename to gameserver/src/logic/game/deck/deck_save.rs diff --git a/gameserver/src/logic/game/deck/mod.rs b/gameserver/src/logic/game/deck/mod.rs new file mode 100644 index 0000000..59f76b5 --- /dev/null +++ b/gameserver/src/logic/game/deck/mod.rs @@ -0,0 +1,5 @@ +pub mod deck_char_auto_revive; +pub mod deck_costume_setting_info; +pub mod deck_costume_setting_save; +pub mod deck_info; +pub mod deck_save; diff --git a/gameserver/src/logic/game/dispatch_info.rs b/gameserver/src/logic/game/dispatch/dispatch_info.rs similarity index 100% rename from gameserver/src/logic/game/dispatch_info.rs rename to gameserver/src/logic/game/dispatch/dispatch_info.rs diff --git a/gameserver/src/logic/game/dispatch_reward.rs b/gameserver/src/logic/game/dispatch/dispatch_reward.rs similarity index 100% rename from gameserver/src/logic/game/dispatch_reward.rs rename to gameserver/src/logic/game/dispatch/dispatch_reward.rs diff --git a/gameserver/src/logic/game/dispatch/mod.rs b/gameserver/src/logic/game/dispatch/mod.rs new file mode 100644 index 0000000..f5ddad5 --- /dev/null +++ b/gameserver/src/logic/game/dispatch/mod.rs @@ -0,0 +1,2 @@ +pub mod dispatch_info; +pub mod dispatch_reward; diff --git a/gameserver/src/logic/game/eat_food.rs b/gameserver/src/logic/game/eat/eat_food.rs similarity index 100% rename from gameserver/src/logic/game/eat_food.rs rename to gameserver/src/logic/game/eat/eat_food.rs diff --git a/gameserver/src/logic/game/eat_food_auto.rs b/gameserver/src/logic/game/eat/eat_food_auto.rs similarity index 100% rename from gameserver/src/logic/game/eat_food_auto.rs rename to gameserver/src/logic/game/eat/eat_food_auto.rs diff --git a/gameserver/src/logic/game/eat/mod.rs b/gameserver/src/logic/game/eat/mod.rs new file mode 100644 index 0000000..043d51e --- /dev/null +++ b/gameserver/src/logic/game/eat/mod.rs @@ -0,0 +1,2 @@ +pub mod eat_food; +pub mod eat_food_auto; diff --git a/gameserver/src/logic/game/equip_add_slot.rs b/gameserver/src/logic/game/equip/equip_add_slot.rs similarity index 100% rename from gameserver/src/logic/game/equip_add_slot.rs rename to gameserver/src/logic/game/equip/equip_add_slot.rs diff --git a/gameserver/src/logic/game/equip_batch_use.rs b/gameserver/src/logic/game/equip/equip_batch_use.rs similarity index 100% rename from gameserver/src/logic/game/equip_batch_use.rs rename to gameserver/src/logic/game/equip/equip_batch_use.rs diff --git a/gameserver/src/logic/game/equip_break.rs b/gameserver/src/logic/game/equip/equip_break.rs similarity index 100% rename from gameserver/src/logic/game/equip_break.rs rename to gameserver/src/logic/game/equip/equip_break.rs diff --git a/gameserver/src/logic/game/equip_change.rs b/gameserver/src/logic/game/equip/equip_change.rs similarity index 100% rename from gameserver/src/logic/game/equip_change.rs rename to gameserver/src/logic/game/equip/equip_change.rs diff --git a/gameserver/src/logic/game/equip_clear.rs b/gameserver/src/logic/game/equip/equip_clear.rs similarity index 100% rename from gameserver/src/logic/game/equip_clear.rs rename to gameserver/src/logic/game/equip/equip_clear.rs diff --git a/gameserver/src/logic/game/equip_from_making_to_break.rs b/gameserver/src/logic/game/equip/equip_from_making_to_break.rs similarity index 100% rename from gameserver/src/logic/game/equip_from_making_to_break.rs rename to gameserver/src/logic/game/equip/equip_from_making_to_break.rs diff --git a/gameserver/src/logic/game/equip_from_making_to_upgrade.rs b/gameserver/src/logic/game/equip/equip_from_making_to_upgrade.rs similarity index 100% rename from gameserver/src/logic/game/equip_from_making_to_upgrade.rs rename to gameserver/src/logic/game/equip/equip_from_making_to_upgrade.rs diff --git a/gameserver/src/logic/game/equip_from_upgrade_to_break.rs b/gameserver/src/logic/game/equip/equip_from_upgrade_to_break.rs similarity index 100% rename from gameserver/src/logic/game/equip_from_upgrade_to_break.rs rename to gameserver/src/logic/game/equip/equip_from_upgrade_to_break.rs diff --git a/gameserver/src/logic/game/equip_info.rs b/gameserver/src/logic/game/equip/equip_info.rs similarity index 100% rename from gameserver/src/logic/game/equip_info.rs rename to gameserver/src/logic/game/equip/equip_info.rs diff --git a/gameserver/src/logic/game/equip_lock.rs b/gameserver/src/logic/game/equip/equip_lock.rs similarity index 100% rename from gameserver/src/logic/game/equip_lock.rs rename to gameserver/src/logic/game/equip/equip_lock.rs diff --git a/gameserver/src/logic/game/equip_making.rs b/gameserver/src/logic/game/equip/equip_making.rs similarity index 100% rename from gameserver/src/logic/game/equip_making.rs rename to gameserver/src/logic/game/equip/equip_making.rs diff --git a/gameserver/src/logic/game/equip_mark_delete.rs b/gameserver/src/logic/game/equip/equip_mark_delete.rs similarity index 100% rename from gameserver/src/logic/game/equip_mark_delete.rs rename to gameserver/src/logic/game/equip/equip_mark_delete.rs diff --git a/gameserver/src/logic/game/equip_mark_set.rs b/gameserver/src/logic/game/equip/equip_mark_set.rs similarity index 100% rename from gameserver/src/logic/game/equip_mark_set.rs rename to gameserver/src/logic/game/equip/equip_mark_set.rs diff --git a/gameserver/src/logic/game/equip_option_re_roll.rs b/gameserver/src/logic/game/equip/equip_option_re_roll.rs similarity index 100% rename from gameserver/src/logic/game/equip_option_re_roll.rs rename to gameserver/src/logic/game/equip/equip_option_re_roll.rs diff --git a/gameserver/src/logic/game/equip_option_re_roll_confirm.rs b/gameserver/src/logic/game/equip/equip_option_re_roll_confirm.rs similarity index 100% rename from gameserver/src/logic/game/equip_option_re_roll_confirm.rs rename to gameserver/src/logic/game/equip/equip_option_re_roll_confirm.rs diff --git a/gameserver/src/logic/game/equip_preset_info.rs b/gameserver/src/logic/game/equip/equip_preset_info.rs similarity index 100% rename from gameserver/src/logic/game/equip_preset_info.rs rename to gameserver/src/logic/game/equip/equip_preset_info.rs diff --git a/gameserver/src/logic/game/equip_preset_name_change.rs b/gameserver/src/logic/game/equip/equip_preset_name_change.rs similarity index 100% rename from gameserver/src/logic/game/equip_preset_name_change.rs rename to gameserver/src/logic/game/equip/equip_preset_name_change.rs diff --git a/gameserver/src/logic/game/equip_preset_save.rs b/gameserver/src/logic/game/equip/equip_preset_save.rs similarity index 100% rename from gameserver/src/logic/game/equip_preset_save.rs rename to gameserver/src/logic/game/equip/equip_preset_save.rs diff --git a/gameserver/src/logic/game/equip_sequence_smelting.rs b/gameserver/src/logic/game/equip/equip_sequence_smelting.rs similarity index 100% rename from gameserver/src/logic/game/equip_sequence_smelting.rs rename to gameserver/src/logic/game/equip/equip_sequence_smelting.rs diff --git a/gameserver/src/logic/game/equip_sequence_upgrade.rs b/gameserver/src/logic/game/equip/equip_sequence_upgrade.rs similarity index 100% rename from gameserver/src/logic/game/equip_sequence_upgrade.rs rename to gameserver/src/logic/game/equip/equip_sequence_upgrade.rs diff --git a/gameserver/src/logic/game/equip_smelting.rs b/gameserver/src/logic/game/equip/equip_smelting.rs similarity index 100% rename from gameserver/src/logic/game/equip_smelting.rs rename to gameserver/src/logic/game/equip/equip_smelting.rs diff --git a/gameserver/src/logic/game/equip_storage_add_slot.rs b/gameserver/src/logic/game/equip/equip_storage_add_slot.rs similarity index 100% rename from gameserver/src/logic/game/equip_storage_add_slot.rs rename to gameserver/src/logic/game/equip/equip_storage_add_slot.rs diff --git a/gameserver/src/logic/game/equip_storage_info.rs b/gameserver/src/logic/game/equip/equip_storage_info.rs similarity index 100% rename from gameserver/src/logic/game/equip_storage_info.rs rename to gameserver/src/logic/game/equip/equip_storage_info.rs diff --git a/gameserver/src/logic/game/equip_storage_out.rs b/gameserver/src/logic/game/equip/equip_storage_out.rs similarity index 100% rename from gameserver/src/logic/game/equip_storage_out.rs rename to gameserver/src/logic/game/equip/equip_storage_out.rs diff --git a/gameserver/src/logic/game/equip_storage_put.rs b/gameserver/src/logic/game/equip/equip_storage_put.rs similarity index 100% rename from gameserver/src/logic/game/equip_storage_put.rs rename to gameserver/src/logic/game/equip/equip_storage_put.rs diff --git a/gameserver/src/logic/game/equip_upgrade.rs b/gameserver/src/logic/game/equip/equip_upgrade.rs similarity index 100% rename from gameserver/src/logic/game/equip_upgrade.rs rename to gameserver/src/logic/game/equip/equip_upgrade.rs diff --git a/gameserver/src/logic/game/equip_use.rs b/gameserver/src/logic/game/equip/equip_use.rs similarity index 100% rename from gameserver/src/logic/game/equip_use.rs rename to gameserver/src/logic/game/equip/equip_use.rs diff --git a/gameserver/src/logic/game/equip/mod.rs b/gameserver/src/logic/game/equip/mod.rs new file mode 100644 index 0000000..71c176d --- /dev/null +++ b/gameserver/src/logic/game/equip/mod.rs @@ -0,0 +1,27 @@ +pub mod equip_add_slot; +pub mod equip_batch_use; +pub mod equip_break; +pub mod equip_change; +pub mod equip_clear; +pub mod equip_from_making_to_break; +pub mod equip_from_making_to_upgrade; +pub mod equip_from_upgrade_to_break; +pub mod equip_info; +pub mod equip_lock; +pub mod equip_making; +pub mod equip_mark_delete; +pub mod equip_mark_set; +pub mod equip_option_re_roll; +pub mod equip_option_re_roll_confirm; +pub mod equip_preset_info; +pub mod equip_preset_name_change; +pub mod equip_preset_save; +pub mod equip_sequence_smelting; +pub mod equip_sequence_upgrade; +pub mod equip_smelting; +pub mod equip_storage_add_slot; +pub mod equip_storage_info; +pub mod equip_storage_out; +pub mod equip_storage_put; +pub mod equip_upgrade; +pub mod equip_use; diff --git a/gameserver/src/logic/game/equips_clear.rs b/gameserver/src/logic/game/equips/equips_clear.rs similarity index 100% rename from gameserver/src/logic/game/equips_clear.rs rename to gameserver/src/logic/game/equips/equips_clear.rs diff --git a/gameserver/src/logic/game/equips_use.rs b/gameserver/src/logic/game/equips/equips_use.rs similarity index 100% rename from gameserver/src/logic/game/equips_use.rs rename to gameserver/src/logic/game/equips/equips_use.rs diff --git a/gameserver/src/logic/game/equips/mod.rs b/gameserver/src/logic/game/equips/mod.rs new file mode 100644 index 0000000..f117d6d --- /dev/null +++ b/gameserver/src/logic/game/equips/mod.rs @@ -0,0 +1,2 @@ +pub mod equips_clear; +pub mod equips_use; diff --git a/gameserver/src/logic/game/event_exchange_info.rs b/gameserver/src/logic/game/event/event_exchange_info.rs similarity index 100% rename from gameserver/src/logic/game/event_exchange_info.rs rename to gameserver/src/logic/game/event/event_exchange_info.rs diff --git a/gameserver/src/logic/game/event_exchange_next_page_open.rs b/gameserver/src/logic/game/event/event_exchange_next_page_open.rs similarity index 100% rename from gameserver/src/logic/game/event_exchange_next_page_open.rs rename to gameserver/src/logic/game/event/event_exchange_next_page_open.rs diff --git a/gameserver/src/logic/game/event_exchange_reward.rs b/gameserver/src/logic/game/event/event_exchange_reward.rs similarity index 100% rename from gameserver/src/logic/game/event_exchange_reward.rs rename to gameserver/src/logic/game/event/event_exchange_reward.rs diff --git a/gameserver/src/logic/game/event_hub_info.rs b/gameserver/src/logic/game/event/event_hub_info.rs similarity index 100% rename from gameserver/src/logic/game/event_hub_info.rs rename to gameserver/src/logic/game/event/event_hub_info.rs diff --git a/gameserver/src/logic/game/event_mission_info.rs b/gameserver/src/logic/game/event/event_mission_info.rs similarity index 96% rename from gameserver/src/logic/game/event_mission_info.rs rename to gameserver/src/logic/game/event/event_mission_info.rs index b0f79c2..fde1002 100644 --- a/gameserver/src/logic/game/event_mission_info.rs +++ b/gameserver/src/logic/game/event/event_mission_info.rs @@ -5,7 +5,7 @@ use bd2::proto::proto_net::{ }; use common::packet_code::PacketCodeType; use crypto::network::GameResponse; -use database::db::event_mission_info::get_event_mission_info; +use database::db::event::event_mission_info::get_event_mission_info; use sqlx::SqlitePool; use tracing::info; diff --git a/gameserver/src/logic/game/event_reward.rs b/gameserver/src/logic/game/event/event_reward.rs similarity index 100% rename from gameserver/src/logic/game/event_reward.rs rename to gameserver/src/logic/game/event/event_reward.rs diff --git a/gameserver/src/logic/game/event_reward_history.rs b/gameserver/src/logic/game/event/event_reward_history.rs similarity index 100% rename from gameserver/src/logic/game/event_reward_history.rs rename to gameserver/src/logic/game/event/event_reward_history.rs diff --git a/gameserver/src/logic/game/event_schedule_info.rs b/gameserver/src/logic/game/event/event_schedule_info.rs similarity index 98% rename from gameserver/src/logic/game/event_schedule_info.rs rename to gameserver/src/logic/game/event/event_schedule_info.rs index a7cb7c9..1772a8e 100644 --- a/gameserver/src/logic/game/event_schedule_info.rs +++ b/gameserver/src/logic/game/event/event_schedule_info.rs @@ -13,7 +13,7 @@ pub async fn handle(_pool: &SqlitePool, _uid: i64, req: EventScheduleInfoRequest info!("Handling EventScheduleInfoRequest: {:?}", req); let data: Value = serde_json::from_str(include_str!( - "../../../../data/starter/event_schedule_info.json" + "../../../../../data/starter/event_schedule_info.json" )) .unwrap(); diff --git a/gameserver/src/logic/game/event/mod.rs b/gameserver/src/logic/game/event/mod.rs new file mode 100644 index 0000000..01de061 --- /dev/null +++ b/gameserver/src/logic/game/event/mod.rs @@ -0,0 +1,8 @@ +pub mod event_exchange_info; +pub mod event_exchange_next_page_open; +pub mod event_exchange_reward; +pub mod event_hub_info; +pub mod event_mission_info; +pub mod event_reward; +pub mod event_reward_history; +pub mod event_schedule_info; diff --git a/gameserver/src/logic/game/evil_castle_daily_reward.rs b/gameserver/src/logic/game/evil/evil_castle_daily_reward.rs similarity index 100% rename from gameserver/src/logic/game/evil_castle_daily_reward.rs rename to gameserver/src/logic/game/evil/evil_castle_daily_reward.rs diff --git a/gameserver/src/logic/game/evil_castle_daily_reward_state.rs b/gameserver/src/logic/game/evil/evil_castle_daily_reward_state.rs similarity index 100% rename from gameserver/src/logic/game/evil_castle_daily_reward_state.rs rename to gameserver/src/logic/game/evil/evil_castle_daily_reward_state.rs diff --git a/gameserver/src/logic/game/evil_castle_enter.rs b/gameserver/src/logic/game/evil/evil_castle_enter.rs similarity index 100% rename from gameserver/src/logic/game/evil_castle_enter.rs rename to gameserver/src/logic/game/evil/evil_castle_enter.rs diff --git a/gameserver/src/logic/game/evil_castle_info.rs b/gameserver/src/logic/game/evil/evil_castle_info.rs similarity index 100% rename from gameserver/src/logic/game/evil_castle_info.rs rename to gameserver/src/logic/game/evil/evil_castle_info.rs diff --git a/gameserver/src/logic/game/evil_castle_ping.rs b/gameserver/src/logic/game/evil/evil_castle_ping.rs similarity index 100% rename from gameserver/src/logic/game/evil_castle_ping.rs rename to gameserver/src/logic/game/evil/evil_castle_ping.rs diff --git a/gameserver/src/logic/game/evil_castle_ranking_info.rs b/gameserver/src/logic/game/evil/evil_castle_ranking_info.rs similarity index 100% rename from gameserver/src/logic/game/evil_castle_ranking_info.rs rename to gameserver/src/logic/game/evil/evil_castle_ranking_info.rs diff --git a/gameserver/src/logic/game/evil_castle_reward_info.rs b/gameserver/src/logic/game/evil/evil_castle_reward_info.rs similarity index 100% rename from gameserver/src/logic/game/evil_castle_reward_info.rs rename to gameserver/src/logic/game/evil/evil_castle_reward_info.rs diff --git a/gameserver/src/logic/game/evil_castle_rogue_like_all_user_score_info.rs b/gameserver/src/logic/game/evil/evil_castle_rogue_like_all_user_score_info.rs similarity index 100% rename from gameserver/src/logic/game/evil_castle_rogue_like_all_user_score_info.rs rename to gameserver/src/logic/game/evil/evil_castle_rogue_like_all_user_score_info.rs diff --git a/gameserver/src/logic/game/evil_castle_rogue_like_battle_char_change.rs b/gameserver/src/logic/game/evil/evil_castle_rogue_like_battle_char_change.rs similarity index 100% rename from gameserver/src/logic/game/evil_castle_rogue_like_battle_char_change.rs rename to gameserver/src/logic/game/evil/evil_castle_rogue_like_battle_char_change.rs diff --git a/gameserver/src/logic/game/evil_castle_rogue_like_battle_end_preview.rs b/gameserver/src/logic/game/evil/evil_castle_rogue_like_battle_end_preview.rs similarity index 100% rename from gameserver/src/logic/game/evil_castle_rogue_like_battle_end_preview.rs rename to gameserver/src/logic/game/evil/evil_castle_rogue_like_battle_end_preview.rs diff --git a/gameserver/src/logic/game/evil_castle_rogue_like_battle_skip.rs b/gameserver/src/logic/game/evil/evil_castle_rogue_like_battle_skip.rs similarity index 100% rename from gameserver/src/logic/game/evil_castle_rogue_like_battle_skip.rs rename to gameserver/src/logic/game/evil/evil_castle_rogue_like_battle_skip.rs diff --git a/gameserver/src/logic/game/evil_castle_rogue_like_char_revival.rs b/gameserver/src/logic/game/evil/evil_castle_rogue_like_char_revival.rs similarity index 100% rename from gameserver/src/logic/game/evil_castle_rogue_like_char_revival.rs rename to gameserver/src/logic/game/evil/evil_castle_rogue_like_char_revival.rs diff --git a/gameserver/src/logic/game/evil_castle_rogue_like_costume_upgrade.rs b/gameserver/src/logic/game/evil/evil_castle_rogue_like_costume_upgrade.rs similarity index 100% rename from gameserver/src/logic/game/evil_castle_rogue_like_costume_upgrade.rs rename to gameserver/src/logic/game/evil/evil_castle_rogue_like_costume_upgrade.rs diff --git a/gameserver/src/logic/game/evil_castle_rogue_like_deck_save.rs b/gameserver/src/logic/game/evil/evil_castle_rogue_like_deck_save.rs similarity index 100% rename from gameserver/src/logic/game/evil_castle_rogue_like_deck_save.rs rename to gameserver/src/logic/game/evil/evil_castle_rogue_like_deck_save.rs diff --git a/gameserver/src/logic/game/evil_castle_rogue_like_edit_event.rs b/gameserver/src/logic/game/evil/evil_castle_rogue_like_edit_event.rs similarity index 100% rename from gameserver/src/logic/game/evil_castle_rogue_like_edit_event.rs rename to gameserver/src/logic/game/evil/evil_castle_rogue_like_edit_event.rs diff --git a/gameserver/src/logic/game/evil_castle_rogue_like_enter.rs b/gameserver/src/logic/game/evil/evil_castle_rogue_like_enter.rs similarity index 100% rename from gameserver/src/logic/game/evil_castle_rogue_like_enter.rs rename to gameserver/src/logic/game/evil/evil_castle_rogue_like_enter.rs diff --git a/gameserver/src/logic/game/evil_castle_rogue_like_event_choice.rs b/gameserver/src/logic/game/evil/evil_castle_rogue_like_event_choice.rs similarity index 100% rename from gameserver/src/logic/game/evil_castle_rogue_like_event_choice.rs rename to gameserver/src/logic/game/evil/evil_castle_rogue_like_event_choice.rs diff --git a/gameserver/src/logic/game/evil_castle_rogue_like_event_select.rs b/gameserver/src/logic/game/evil/evil_castle_rogue_like_event_select.rs similarity index 100% rename from gameserver/src/logic/game/evil_castle_rogue_like_event_select.rs rename to gameserver/src/logic/game/evil/evil_castle_rogue_like_event_select.rs diff --git a/gameserver/src/logic/game/evil_castle_rogue_like_give_up.rs b/gameserver/src/logic/game/evil/evil_castle_rogue_like_give_up.rs similarity index 100% rename from gameserver/src/logic/game/evil_castle_rogue_like_give_up.rs rename to gameserver/src/logic/game/evil/evil_castle_rogue_like_give_up.rs diff --git a/gameserver/src/logic/game/evil_castle_rogue_like_give_up_info.rs b/gameserver/src/logic/game/evil/evil_castle_rogue_like_give_up_info.rs similarity index 100% rename from gameserver/src/logic/game/evil_castle_rogue_like_give_up_info.rs rename to gameserver/src/logic/game/evil/evil_castle_rogue_like_give_up_info.rs diff --git a/gameserver/src/logic/game/evil_castle_rogue_like_growth.rs b/gameserver/src/logic/game/evil/evil_castle_rogue_like_growth.rs similarity index 100% rename from gameserver/src/logic/game/evil_castle_rogue_like_growth.rs rename to gameserver/src/logic/game/evil/evil_castle_rogue_like_growth.rs diff --git a/gameserver/src/logic/game/evil_castle_rogue_like_info.rs b/gameserver/src/logic/game/evil/evil_castle_rogue_like_info.rs similarity index 100% rename from gameserver/src/logic/game/evil_castle_rogue_like_info.rs rename to gameserver/src/logic/game/evil/evil_castle_rogue_like_info.rs diff --git a/gameserver/src/logic/game/evil_castle_rogue_like_move_floor.rs b/gameserver/src/logic/game/evil/evil_castle_rogue_like_move_floor.rs similarity index 100% rename from gameserver/src/logic/game/evil_castle_rogue_like_move_floor.rs rename to gameserver/src/logic/game/evil/evil_castle_rogue_like_move_floor.rs diff --git a/gameserver/src/logic/game/evil_castle_rogue_like_quick_battle.rs b/gameserver/src/logic/game/evil/evil_castle_rogue_like_quick_battle.rs similarity index 100% rename from gameserver/src/logic/game/evil_castle_rogue_like_quick_battle.rs rename to gameserver/src/logic/game/evil/evil_castle_rogue_like_quick_battle.rs diff --git a/gameserver/src/logic/game/evil_castle_rogue_like_rank_info.rs b/gameserver/src/logic/game/evil/evil_castle_rogue_like_rank_info.rs similarity index 100% rename from gameserver/src/logic/game/evil_castle_rogue_like_rank_info.rs rename to gameserver/src/logic/game/evil/evil_castle_rogue_like_rank_info.rs diff --git a/gameserver/src/logic/game/evil_castle_rogue_like_relic_mix.rs b/gameserver/src/logic/game/evil/evil_castle_rogue_like_relic_mix.rs similarity index 100% rename from gameserver/src/logic/game/evil_castle_rogue_like_relic_mix.rs rename to gameserver/src/logic/game/evil/evil_castle_rogue_like_relic_mix.rs diff --git a/gameserver/src/logic/game/evil_castle_rogue_like_reward_re_roll.rs b/gameserver/src/logic/game/evil/evil_castle_rogue_like_reward_re_roll.rs similarity index 100% rename from gameserver/src/logic/game/evil_castle_rogue_like_reward_re_roll.rs rename to gameserver/src/logic/game/evil/evil_castle_rogue_like_reward_re_roll.rs diff --git a/gameserver/src/logic/game/evil_castle_rogue_like_room_enter.rs b/gameserver/src/logic/game/evil/evil_castle_rogue_like_room_enter.rs similarity index 100% rename from gameserver/src/logic/game/evil_castle_rogue_like_room_enter.rs rename to gameserver/src/logic/game/evil/evil_castle_rogue_like_room_enter.rs diff --git a/gameserver/src/logic/game/evil_castle_rogue_like_season_reward.rs b/gameserver/src/logic/game/evil/evil_castle_rogue_like_season_reward.rs similarity index 100% rename from gameserver/src/logic/game/evil_castle_rogue_like_season_reward.rs rename to gameserver/src/logic/game/evil/evil_castle_rogue_like_season_reward.rs diff --git a/gameserver/src/logic/game/evil_castle_rogue_like_select_reward.rs b/gameserver/src/logic/game/evil/evil_castle_rogue_like_select_reward.rs similarity index 100% rename from gameserver/src/logic/game/evil_castle_rogue_like_select_reward.rs rename to gameserver/src/logic/game/evil/evil_castle_rogue_like_select_reward.rs diff --git a/gameserver/src/logic/game/evil_castle_rogue_like_shop_buy.rs b/gameserver/src/logic/game/evil/evil_castle_rogue_like_shop_buy.rs similarity index 100% rename from gameserver/src/logic/game/evil_castle_rogue_like_shop_buy.rs rename to gameserver/src/logic/game/evil/evil_castle_rogue_like_shop_buy.rs diff --git a/gameserver/src/logic/game/evil_castle_rogue_like_shop_exit.rs b/gameserver/src/logic/game/evil/evil_castle_rogue_like_shop_exit.rs similarity index 100% rename from gameserver/src/logic/game/evil_castle_rogue_like_shop_exit.rs rename to gameserver/src/logic/game/evil/evil_castle_rogue_like_shop_exit.rs diff --git a/gameserver/src/logic/game/evil_castle_rogue_like_shop_re_roll.rs b/gameserver/src/logic/game/evil/evil_castle_rogue_like_shop_re_roll.rs similarity index 100% rename from gameserver/src/logic/game/evil_castle_rogue_like_shop_re_roll.rs rename to gameserver/src/logic/game/evil/evil_castle_rogue_like_shop_re_roll.rs diff --git a/gameserver/src/logic/game/evil_castle_stage_clear_reward.rs b/gameserver/src/logic/game/evil/evil_castle_stage_clear_reward.rs similarity index 100% rename from gameserver/src/logic/game/evil_castle_stage_clear_reward.rs rename to gameserver/src/logic/game/evil/evil_castle_stage_clear_reward.rs diff --git a/gameserver/src/logic/game/evil_castle_stage_ranking_info.rs b/gameserver/src/logic/game/evil/evil_castle_stage_ranking_info.rs similarity index 100% rename from gameserver/src/logic/game/evil_castle_stage_ranking_info.rs rename to gameserver/src/logic/game/evil/evil_castle_stage_ranking_info.rs diff --git a/gameserver/src/logic/game/evil_castle_tower_info.rs b/gameserver/src/logic/game/evil/evil_castle_tower_info.rs similarity index 100% rename from gameserver/src/logic/game/evil_castle_tower_info.rs rename to gameserver/src/logic/game/evil/evil_castle_tower_info.rs diff --git a/gameserver/src/logic/game/evil/mod.rs b/gameserver/src/logic/game/evil/mod.rs new file mode 100644 index 0000000..0a5c9d1 --- /dev/null +++ b/gameserver/src/logic/game/evil/mod.rs @@ -0,0 +1,36 @@ +pub mod evil_castle_daily_reward; +pub mod evil_castle_daily_reward_state; +pub mod evil_castle_enter; +pub mod evil_castle_info; +pub mod evil_castle_ping; +pub mod evil_castle_ranking_info; +pub mod evil_castle_reward_info; +pub mod evil_castle_rogue_like_all_user_score_info; +pub mod evil_castle_rogue_like_battle_char_change; +pub mod evil_castle_rogue_like_battle_end_preview; +pub mod evil_castle_rogue_like_battle_skip; +pub mod evil_castle_rogue_like_char_revival; +pub mod evil_castle_rogue_like_costume_upgrade; +pub mod evil_castle_rogue_like_deck_save; +pub mod evil_castle_rogue_like_edit_event; +pub mod evil_castle_rogue_like_enter; +pub mod evil_castle_rogue_like_event_choice; +pub mod evil_castle_rogue_like_event_select; +pub mod evil_castle_rogue_like_give_up; +pub mod evil_castle_rogue_like_give_up_info; +pub mod evil_castle_rogue_like_growth; +pub mod evil_castle_rogue_like_info; +pub mod evil_castle_rogue_like_move_floor; +pub mod evil_castle_rogue_like_quick_battle; +pub mod evil_castle_rogue_like_rank_info; +pub mod evil_castle_rogue_like_relic_mix; +pub mod evil_castle_rogue_like_reward_re_roll; +pub mod evil_castle_rogue_like_room_enter; +pub mod evil_castle_rogue_like_season_reward; +pub mod evil_castle_rogue_like_select_reward; +pub mod evil_castle_rogue_like_shop_buy; +pub mod evil_castle_rogue_like_shop_exit; +pub mod evil_castle_rogue_like_shop_re_roll; +pub mod evil_castle_stage_clear_reward; +pub mod evil_castle_stage_ranking_info; +pub mod evil_castle_tower_info; diff --git a/gameserver/src/logic/game/field_deck_info.rs b/gameserver/src/logic/game/field/field_deck_info.rs similarity index 77% rename from gameserver/src/logic/game/field_deck_info.rs rename to gameserver/src/logic/game/field/field_deck_info.rs index 9d8d0b8..aebd64d 100644 --- a/gameserver/src/logic/game/field_deck_info.rs +++ b/gameserver/src/logic/game/field/field_deck_info.rs @@ -2,7 +2,7 @@ use bd2::prost::Message; use bd2::proto::proto_net::{FieldDeckDbInfo, FieldDeckInfoRequest, FieldDeckInfoResponse, Notify}; use common::packet_code::PacketCodeType; use crypto::network::GameResponse; -use database::db::field_deck_info::get_field_deck_info; +use database::db::field::field_deck_info::get_field_deck_info; use sqlx::SqlitePool; use tracing::info; @@ -33,15 +33,9 @@ pub async fn handle(pool: &SqlitePool, uid: i64, _req: FieldDeckInfoRequest) -> let resp_bytes = response.encode_to_vec(); let notify = Notify { - achievement_update_info: vec![], - mission_update_info: vec![], - event_mission_update_info: vec![], - active_login_event: vec![1, 2, 625, 626, 627], - active_contents_info: vec![], - ll_type: Some("".to_string()), - is_purchasing_disabled: Some(false), maintenance_start_date: Some(1688646600000), - notice_last_seq: Some(8818), + notice_last_seq: Some(8916), + active_login_event: vec![1, 2], ..Default::default() }; diff --git a/gameserver/src/logic/game/field_deck_save.rs b/gameserver/src/logic/game/field/field_deck_save.rs similarity index 100% rename from gameserver/src/logic/game/field_deck_save.rs rename to gameserver/src/logic/game/field/field_deck_save.rs diff --git a/gameserver/src/logic/game/field_monster_damage.rs b/gameserver/src/logic/game/field/field_monster_damage.rs similarity index 100% rename from gameserver/src/logic/game/field_monster_damage.rs rename to gameserver/src/logic/game/field/field_monster_damage.rs diff --git a/gameserver/src/logic/game/field_monster_event.rs b/gameserver/src/logic/game/field/field_monster_event.rs similarity index 100% rename from gameserver/src/logic/game/field_monster_event.rs rename to gameserver/src/logic/game/field/field_monster_event.rs diff --git a/gameserver/src/logic/game/field_monster_regen.rs b/gameserver/src/logic/game/field/field_monster_regen.rs similarity index 100% rename from gameserver/src/logic/game/field_monster_regen.rs rename to gameserver/src/logic/game/field/field_monster_regen.rs diff --git a/gameserver/src/logic/game/field_monster_reward.rs b/gameserver/src/logic/game/field/field_monster_reward.rs similarity index 100% rename from gameserver/src/logic/game/field_monster_reward.rs rename to gameserver/src/logic/game/field/field_monster_reward.rs diff --git a/gameserver/src/logic/game/field_object_info.rs b/gameserver/src/logic/game/field/field_object_info.rs similarity index 100% rename from gameserver/src/logic/game/field_object_info.rs rename to gameserver/src/logic/game/field/field_object_info.rs diff --git a/gameserver/src/logic/game/field_object_position_update.rs b/gameserver/src/logic/game/field/field_object_position_update.rs similarity index 100% rename from gameserver/src/logic/game/field_object_position_update.rs rename to gameserver/src/logic/game/field/field_object_position_update.rs diff --git a/gameserver/src/logic/game/field_object_preview.rs b/gameserver/src/logic/game/field/field_object_preview.rs similarity index 100% rename from gameserver/src/logic/game/field_object_preview.rs rename to gameserver/src/logic/game/field/field_object_preview.rs diff --git a/gameserver/src/logic/game/field_object_research.rs b/gameserver/src/logic/game/field/field_object_research.rs similarity index 100% rename from gameserver/src/logic/game/field_object_research.rs rename to gameserver/src/logic/game/field/field_object_research.rs diff --git a/gameserver/src/logic/game/field_object_respawn.rs b/gameserver/src/logic/game/field/field_object_respawn.rs similarity index 100% rename from gameserver/src/logic/game/field_object_respawn.rs rename to gameserver/src/logic/game/field/field_object_respawn.rs diff --git a/gameserver/src/logic/game/field_object_reward.rs b/gameserver/src/logic/game/field/field_object_reward.rs similarity index 100% rename from gameserver/src/logic/game/field_object_reward.rs rename to gameserver/src/logic/game/field/field_object_reward.rs diff --git a/gameserver/src/logic/game/field_object_reward_list.rs b/gameserver/src/logic/game/field/field_object_reward_list.rs similarity index 100% rename from gameserver/src/logic/game/field_object_reward_list.rs rename to gameserver/src/logic/game/field/field_object_reward_list.rs diff --git a/gameserver/src/logic/game/field_trap_info.rs b/gameserver/src/logic/game/field/field_trap_info.rs similarity index 100% rename from gameserver/src/logic/game/field_trap_info.rs rename to gameserver/src/logic/game/field/field_trap_info.rs diff --git a/gameserver/src/logic/game/field/mod.rs b/gameserver/src/logic/game/field/mod.rs new file mode 100644 index 0000000..8c51d35 --- /dev/null +++ b/gameserver/src/logic/game/field/mod.rs @@ -0,0 +1,14 @@ +pub mod field_deck_info; +pub mod field_deck_save; +pub mod field_monster_damage; +pub mod field_monster_event; +pub mod field_monster_regen; +pub mod field_monster_reward; +pub mod field_object_info; +pub mod field_object_position_update; +pub mod field_object_preview; +pub mod field_object_research; +pub mod field_object_respawn; +pub mod field_object_reward; +pub mod field_object_reward_list; +pub mod field_trap_info; diff --git a/gameserver/src/logic/game/friend_accept.rs b/gameserver/src/logic/game/friend/friend_accept.rs similarity index 100% rename from gameserver/src/logic/game/friend_accept.rs rename to gameserver/src/logic/game/friend/friend_accept.rs diff --git a/gameserver/src/logic/game/friend_info_list.rs b/gameserver/src/logic/game/friend/friend_info_list.rs similarity index 100% rename from gameserver/src/logic/game/friend_info_list.rs rename to gameserver/src/logic/game/friend/friend_info_list.rs diff --git a/gameserver/src/logic/game/friend_receive_list.rs b/gameserver/src/logic/game/friend/friend_receive_list.rs similarity index 100% rename from gameserver/src/logic/game/friend_receive_list.rs rename to gameserver/src/logic/game/friend/friend_receive_list.rs diff --git a/gameserver/src/logic/game/friend_recommend.rs b/gameserver/src/logic/game/friend/friend_recommend.rs similarity index 100% rename from gameserver/src/logic/game/friend_recommend.rs rename to gameserver/src/logic/game/friend/friend_recommend.rs diff --git a/gameserver/src/logic/game/friend_refuse.rs b/gameserver/src/logic/game/friend/friend_refuse.rs similarity index 100% rename from gameserver/src/logic/game/friend_refuse.rs rename to gameserver/src/logic/game/friend/friend_refuse.rs diff --git a/gameserver/src/logic/game/friend_remove.rs b/gameserver/src/logic/game/friend/friend_remove.rs similarity index 100% rename from gameserver/src/logic/game/friend_remove.rs rename to gameserver/src/logic/game/friend/friend_remove.rs diff --git a/gameserver/src/logic/game/friend_search.rs b/gameserver/src/logic/game/friend/friend_search.rs similarity index 100% rename from gameserver/src/logic/game/friend_search.rs rename to gameserver/src/logic/game/friend/friend_search.rs diff --git a/gameserver/src/logic/game/friend_send.rs b/gameserver/src/logic/game/friend/friend_send.rs similarity index 100% rename from gameserver/src/logic/game/friend_send.rs rename to gameserver/src/logic/game/friend/friend_send.rs diff --git a/gameserver/src/logic/game/friend_send_list.rs b/gameserver/src/logic/game/friend/friend_send_list.rs similarity index 100% rename from gameserver/src/logic/game/friend_send_list.rs rename to gameserver/src/logic/game/friend/friend_send_list.rs diff --git a/gameserver/src/logic/game/friend_send_remove.rs b/gameserver/src/logic/game/friend/friend_send_remove.rs similarity index 100% rename from gameserver/src/logic/game/friend_send_remove.rs rename to gameserver/src/logic/game/friend/friend_send_remove.rs diff --git a/gameserver/src/logic/game/friend/mod.rs b/gameserver/src/logic/game/friend/mod.rs new file mode 100644 index 0000000..8570451 --- /dev/null +++ b/gameserver/src/logic/game/friend/mod.rs @@ -0,0 +1,10 @@ +pub mod friend_accept; +pub mod friend_info_list; +pub mod friend_receive_list; +pub mod friend_recommend; +pub mod friend_refuse; +pub mod friend_remove; +pub mod friend_search; +pub mod friend_send; +pub mod friend_send_list; +pub mod friend_send_remove; diff --git a/gameserver/src/logic/game/gacha_buy.rs b/gameserver/src/logic/game/gacha/gacha_buy.rs similarity index 100% rename from gameserver/src/logic/game/gacha_buy.rs rename to gameserver/src/logic/game/gacha/gacha_buy.rs diff --git a/gameserver/src/logic/game/gacha_buy_preview.rs b/gameserver/src/logic/game/gacha/gacha_buy_preview.rs similarity index 100% rename from gameserver/src/logic/game/gacha_buy_preview.rs rename to gameserver/src/logic/game/gacha/gacha_buy_preview.rs diff --git a/gameserver/src/logic/game/gacha_buy_preview_lock.rs b/gameserver/src/logic/game/gacha/gacha_buy_preview_lock.rs similarity index 100% rename from gameserver/src/logic/game/gacha_buy_preview_lock.rs rename to gameserver/src/logic/game/gacha/gacha_buy_preview_lock.rs diff --git a/gameserver/src/logic/game/gacha_info.rs b/gameserver/src/logic/game/gacha/gacha_info.rs similarity index 100% rename from gameserver/src/logic/game/gacha_info.rs rename to gameserver/src/logic/game/gacha/gacha_info.rs diff --git a/gameserver/src/logic/game/gacha_log.rs b/gameserver/src/logic/game/gacha/gacha_log.rs similarity index 100% rename from gameserver/src/logic/game/gacha_log.rs rename to gameserver/src/logic/game/gacha/gacha_log.rs diff --git a/gameserver/src/logic/game/gacha_point_exchange.rs b/gameserver/src/logic/game/gacha/gacha_point_exchange.rs similarity index 100% rename from gameserver/src/logic/game/gacha_point_exchange.rs rename to gameserver/src/logic/game/gacha/gacha_point_exchange.rs diff --git a/gameserver/src/logic/game/gacha_point_manual_exchange.rs b/gameserver/src/logic/game/gacha/gacha_point_manual_exchange.rs similarity index 100% rename from gameserver/src/logic/game/gacha_point_manual_exchange.rs rename to gameserver/src/logic/game/gacha/gacha_point_manual_exchange.rs diff --git a/gameserver/src/logic/game/gacha_selection_save.rs b/gameserver/src/logic/game/gacha/gacha_selection_save.rs similarity index 100% rename from gameserver/src/logic/game/gacha_selection_save.rs rename to gameserver/src/logic/game/gacha/gacha_selection_save.rs diff --git a/gameserver/src/logic/game/gacha/mod.rs b/gameserver/src/logic/game/gacha/mod.rs new file mode 100644 index 0000000..caf9da3 --- /dev/null +++ b/gameserver/src/logic/game/gacha/mod.rs @@ -0,0 +1,8 @@ +pub mod gacha_buy; +pub mod gacha_buy_preview; +pub mod gacha_buy_preview_lock; +pub mod gacha_info; +pub mod gacha_log; +pub mod gacha_point_exchange; +pub mod gacha_point_manual_exchange; +pub mod gacha_selection_save; diff --git a/gameserver/src/logic/game/guild_accept.rs b/gameserver/src/logic/game/guild/guild_accept.rs similarity index 100% rename from gameserver/src/logic/game/guild_accept.rs rename to gameserver/src/logic/game/guild/guild_accept.rs diff --git a/gameserver/src/logic/game/guild_create.rs b/gameserver/src/logic/game/guild/guild_create.rs similarity index 100% rename from gameserver/src/logic/game/guild_create.rs rename to gameserver/src/logic/game/guild/guild_create.rs diff --git a/gameserver/src/logic/game/guild_delete_cancel.rs b/gameserver/src/logic/game/guild/guild_delete_cancel.rs similarity index 100% rename from gameserver/src/logic/game/guild_delete_cancel.rs rename to gameserver/src/logic/game/guild/guild_delete_cancel.rs diff --git a/gameserver/src/logic/game/guild_info.rs b/gameserver/src/logic/game/guild/guild_info.rs similarity index 100% rename from gameserver/src/logic/game/guild_info.rs rename to gameserver/src/logic/game/guild/guild_info.rs diff --git a/gameserver/src/logic/game/guild_info_edit.rs b/gameserver/src/logic/game/guild/guild_info_edit.rs similarity index 100% rename from gameserver/src/logic/game/guild_info_edit.rs rename to gameserver/src/logic/game/guild/guild_info_edit.rs diff --git a/gameserver/src/logic/game/guild_init_info.rs b/gameserver/src/logic/game/guild/guild_init_info.rs similarity index 100% rename from gameserver/src/logic/game/guild_init_info.rs rename to gameserver/src/logic/game/guild/guild_init_info.rs diff --git a/gameserver/src/logic/game/guild_join.rs b/gameserver/src/logic/game/guild/guild_join.rs similarity index 100% rename from gameserver/src/logic/game/guild_join.rs rename to gameserver/src/logic/game/guild/guild_join.rs diff --git a/gameserver/src/logic/game/guild_join_refuse.rs b/gameserver/src/logic/game/guild/guild_join_refuse.rs similarity index 100% rename from gameserver/src/logic/game/guild_join_refuse.rs rename to gameserver/src/logic/game/guild/guild_join_refuse.rs diff --git a/gameserver/src/logic/game/guild_join_send_cancel.rs b/gameserver/src/logic/game/guild/guild_join_send_cancel.rs similarity index 100% rename from gameserver/src/logic/game/guild_join_send_cancel.rs rename to gameserver/src/logic/game/guild/guild_join_send_cancel.rs diff --git a/gameserver/src/logic/game/guild_join_send_info.rs b/gameserver/src/logic/game/guild/guild_join_send_info.rs similarity index 100% rename from gameserver/src/logic/game/guild_join_send_info.rs rename to gameserver/src/logic/game/guild/guild_join_send_info.rs diff --git a/gameserver/src/logic/game/guild_leave.rs b/gameserver/src/logic/game/guild/guild_leave.rs similarity index 100% rename from gameserver/src/logic/game/guild_leave.rs rename to gameserver/src/logic/game/guild/guild_leave.rs diff --git a/gameserver/src/logic/game/guild_member_ban.rs b/gameserver/src/logic/game/guild/guild_member_ban.rs similarity index 100% rename from gameserver/src/logic/game/guild_member_ban.rs rename to gameserver/src/logic/game/guild/guild_member_ban.rs diff --git a/gameserver/src/logic/game/guild_member_role_edit.rs b/gameserver/src/logic/game/guild/guild_member_role_edit.rs similarity index 100% rename from gameserver/src/logic/game/guild_member_role_edit.rs rename to gameserver/src/logic/game/guild/guild_member_role_edit.rs diff --git a/gameserver/src/logic/game/guild_notice_info.rs b/gameserver/src/logic/game/guild/guild_notice_info.rs similarity index 100% rename from gameserver/src/logic/game/guild_notice_info.rs rename to gameserver/src/logic/game/guild/guild_notice_info.rs diff --git a/gameserver/src/logic/game/guild_notice_update.rs b/gameserver/src/logic/game/guild/guild_notice_update.rs similarity index 100% rename from gameserver/src/logic/game/guild_notice_update.rs rename to gameserver/src/logic/game/guild/guild_notice_update.rs diff --git a/gameserver/src/logic/game/guild_raid_boss_battle_enter.rs b/gameserver/src/logic/game/guild/guild_raid_boss_battle_enter.rs similarity index 100% rename from gameserver/src/logic/game/guild_raid_boss_battle_enter.rs rename to gameserver/src/logic/game/guild/guild_raid_boss_battle_enter.rs diff --git a/gameserver/src/logic/game/guild_raid_boss_battle_history.rs b/gameserver/src/logic/game/guild/guild_raid_boss_battle_history.rs similarity index 100% rename from gameserver/src/logic/game/guild_raid_boss_battle_history.rs rename to gameserver/src/logic/game/guild/guild_raid_boss_battle_history.rs diff --git a/gameserver/src/logic/game/guild_raid_boss_battle_info.rs b/gameserver/src/logic/game/guild/guild_raid_boss_battle_info.rs similarity index 100% rename from gameserver/src/logic/game/guild_raid_boss_battle_info.rs rename to gameserver/src/logic/game/guild/guild_raid_boss_battle_info.rs diff --git a/gameserver/src/logic/game/guild_raid_boss_practice_battle_enter.rs b/gameserver/src/logic/game/guild/guild_raid_boss_practice_battle_enter.rs similarity index 100% rename from gameserver/src/logic/game/guild_raid_boss_practice_battle_enter.rs rename to gameserver/src/logic/game/guild/guild_raid_boss_practice_battle_enter.rs diff --git a/gameserver/src/logic/game/guild_raid_boss_quick_battle.rs b/gameserver/src/logic/game/guild/guild_raid_boss_quick_battle.rs similarity index 100% rename from gameserver/src/logic/game/guild_raid_boss_quick_battle.rs rename to gameserver/src/logic/game/guild/guild_raid_boss_quick_battle.rs diff --git a/gameserver/src/logic/game/guild_raid_deck_info.rs b/gameserver/src/logic/game/guild/guild_raid_deck_info.rs similarity index 100% rename from gameserver/src/logic/game/guild_raid_deck_info.rs rename to gameserver/src/logic/game/guild/guild_raid_deck_info.rs diff --git a/gameserver/src/logic/game/guild_raid_deck_save.rs b/gameserver/src/logic/game/guild/guild_raid_deck_save.rs similarity index 100% rename from gameserver/src/logic/game/guild_raid_deck_save.rs rename to gameserver/src/logic/game/guild/guild_raid_deck_save.rs diff --git a/gameserver/src/logic/game/guild_raid_main_info.rs b/gameserver/src/logic/game/guild/guild_raid_main_info.rs similarity index 100% rename from gameserver/src/logic/game/guild_raid_main_info.rs rename to gameserver/src/logic/game/guild/guild_raid_main_info.rs diff --git a/gameserver/src/logic/game/guild_raid_member_play_history_info.rs b/gameserver/src/logic/game/guild/guild_raid_member_play_history_info.rs similarity index 100% rename from gameserver/src/logic/game/guild_raid_member_play_history_info.rs rename to gameserver/src/logic/game/guild/guild_raid_member_play_history_info.rs diff --git a/gameserver/src/logic/game/guild_raid_member_ranking.rs b/gameserver/src/logic/game/guild/guild_raid_member_ranking.rs similarity index 100% rename from gameserver/src/logic/game/guild_raid_member_ranking.rs rename to gameserver/src/logic/game/guild/guild_raid_member_ranking.rs diff --git a/gameserver/src/logic/game/guild_raid_normal_battle_history_info.rs b/gameserver/src/logic/game/guild/guild_raid_normal_battle_history_info.rs similarity index 100% rename from gameserver/src/logic/game/guild_raid_normal_battle_history_info.rs rename to gameserver/src/logic/game/guild/guild_raid_normal_battle_history_info.rs diff --git a/gameserver/src/logic/game/guild_raid_normal_battle_info.rs b/gameserver/src/logic/game/guild/guild_raid_normal_battle_info.rs similarity index 100% rename from gameserver/src/logic/game/guild_raid_normal_battle_info.rs rename to gameserver/src/logic/game/guild/guild_raid_normal_battle_info.rs diff --git a/gameserver/src/logic/game/guild_raid_preset_delete.rs b/gameserver/src/logic/game/guild/guild_raid_preset_delete.rs similarity index 100% rename from gameserver/src/logic/game/guild_raid_preset_delete.rs rename to gameserver/src/logic/game/guild/guild_raid_preset_delete.rs diff --git a/gameserver/src/logic/game/guild_raid_preset_info.rs b/gameserver/src/logic/game/guild/guild_raid_preset_info.rs similarity index 100% rename from gameserver/src/logic/game/guild_raid_preset_info.rs rename to gameserver/src/logic/game/guild/guild_raid_preset_info.rs diff --git a/gameserver/src/logic/game/guild_raid_preset_info_change.rs b/gameserver/src/logic/game/guild/guild_raid_preset_info_change.rs similarity index 100% rename from gameserver/src/logic/game/guild_raid_preset_info_change.rs rename to gameserver/src/logic/game/guild/guild_raid_preset_info_change.rs diff --git a/gameserver/src/logic/game/guild_raid_preset_save.rs b/gameserver/src/logic/game/guild/guild_raid_preset_save.rs similarity index 100% rename from gameserver/src/logic/game/guild_raid_preset_save.rs rename to gameserver/src/logic/game/guild/guild_raid_preset_save.rs diff --git a/gameserver/src/logic/game/guild_raid_preset_slot_add.rs b/gameserver/src/logic/game/guild/guild_raid_preset_slot_add.rs similarity index 100% rename from gameserver/src/logic/game/guild_raid_preset_slot_add.rs rename to gameserver/src/logic/game/guild/guild_raid_preset_slot_add.rs diff --git a/gameserver/src/logic/game/guild_raid_preset_use.rs b/gameserver/src/logic/game/guild/guild_raid_preset_use.rs similarity index 100% rename from gameserver/src/logic/game/guild_raid_preset_use.rs rename to gameserver/src/logic/game/guild/guild_raid_preset_use.rs diff --git a/gameserver/src/logic/game/guild_raid_season_ranking.rs b/gameserver/src/logic/game/guild/guild_raid_season_ranking.rs similarity index 100% rename from gameserver/src/logic/game/guild_raid_season_ranking.rs rename to gameserver/src/logic/game/guild/guild_raid_season_ranking.rs diff --git a/gameserver/src/logic/game/guild_raid_season_reward.rs b/gameserver/src/logic/game/guild/guild_raid_season_reward.rs similarity index 100% rename from gameserver/src/logic/game/guild_raid_season_reward.rs rename to gameserver/src/logic/game/guild/guild_raid_season_reward.rs diff --git a/gameserver/src/logic/game/guild_recommend.rs b/gameserver/src/logic/game/guild/guild_recommend.rs similarity index 100% rename from gameserver/src/logic/game/guild_recommend.rs rename to gameserver/src/logic/game/guild/guild_recommend.rs diff --git a/gameserver/src/logic/game/guild_search.rs b/gameserver/src/logic/game/guild/guild_search.rs similarity index 100% rename from gameserver/src/logic/game/guild_search.rs rename to gameserver/src/logic/game/guild/guild_search.rs diff --git a/gameserver/src/logic/game/guild_supporter_add.rs b/gameserver/src/logic/game/guild/guild_supporter_add.rs similarity index 100% rename from gameserver/src/logic/game/guild_supporter_add.rs rename to gameserver/src/logic/game/guild/guild_supporter_add.rs diff --git a/gameserver/src/logic/game/guild_supporter_delete.rs b/gameserver/src/logic/game/guild/guild_supporter_delete.rs similarity index 100% rename from gameserver/src/logic/game/guild_supporter_delete.rs rename to gameserver/src/logic/game/guild/guild_supporter_delete.rs diff --git a/gameserver/src/logic/game/guild_supporter_info.rs b/gameserver/src/logic/game/guild/guild_supporter_info.rs similarity index 100% rename from gameserver/src/logic/game/guild_supporter_info.rs rename to gameserver/src/logic/game/guild/guild_supporter_info.rs diff --git a/gameserver/src/logic/game/guild_supporter_info_list.rs b/gameserver/src/logic/game/guild/guild_supporter_info_list.rs similarity index 100% rename from gameserver/src/logic/game/guild_supporter_info_list.rs rename to gameserver/src/logic/game/guild/guild_supporter_info_list.rs diff --git a/gameserver/src/logic/game/guild_update_action_info.rs b/gameserver/src/logic/game/guild/guild_update_action_info.rs similarity index 100% rename from gameserver/src/logic/game/guild_update_action_info.rs rename to gameserver/src/logic/game/guild/guild_update_action_info.rs diff --git a/gameserver/src/logic/game/guild/mod.rs b/gameserver/src/logic/game/guild/mod.rs new file mode 100644 index 0000000..f02f993 --- /dev/null +++ b/gameserver/src/logic/game/guild/mod.rs @@ -0,0 +1,42 @@ +pub mod guild_accept; +pub mod guild_create; +pub mod guild_delete_cancel; +pub mod guild_info; +pub mod guild_info_edit; +pub mod guild_init_info; +pub mod guild_join; +pub mod guild_join_refuse; +pub mod guild_join_send_cancel; +pub mod guild_join_send_info; +pub mod guild_leave; +pub mod guild_member_ban; +pub mod guild_member_role_edit; +pub mod guild_notice_info; +pub mod guild_notice_update; +pub mod guild_raid_boss_battle_enter; +pub mod guild_raid_boss_battle_history; +pub mod guild_raid_boss_battle_info; +pub mod guild_raid_boss_practice_battle_enter; +pub mod guild_raid_boss_quick_battle; +pub mod guild_raid_deck_info; +pub mod guild_raid_deck_save; +pub mod guild_raid_main_info; +pub mod guild_raid_member_play_history_info; +pub mod guild_raid_member_ranking; +pub mod guild_raid_normal_battle_history_info; +pub mod guild_raid_normal_battle_info; +pub mod guild_raid_preset_delete; +pub mod guild_raid_preset_info; +pub mod guild_raid_preset_info_change; +pub mod guild_raid_preset_save; +pub mod guild_raid_preset_slot_add; +pub mod guild_raid_preset_use; +pub mod guild_raid_season_ranking; +pub mod guild_raid_season_reward; +pub mod guild_recommend; +pub mod guild_search; +pub mod guild_supporter_add; +pub mod guild_supporter_delete; +pub mod guild_supporter_info; +pub mod guild_supporter_info_list; +pub mod guild_update_action_info; diff --git a/gameserver/src/logic/game/hunt_dispatch.rs b/gameserver/src/logic/game/hunt/hunt_dispatch.rs similarity index 100% rename from gameserver/src/logic/game/hunt_dispatch.rs rename to gameserver/src/logic/game/hunt/hunt_dispatch.rs diff --git a/gameserver/src/logic/game/hunt_dispatch_end.rs b/gameserver/src/logic/game/hunt/hunt_dispatch_end.rs similarity index 100% rename from gameserver/src/logic/game/hunt_dispatch_end.rs rename to gameserver/src/logic/game/hunt/hunt_dispatch_end.rs diff --git a/gameserver/src/logic/game/hunt_dispatch_info.rs b/gameserver/src/logic/game/hunt/hunt_dispatch_info.rs similarity index 100% rename from gameserver/src/logic/game/hunt_dispatch_info.rs rename to gameserver/src/logic/game/hunt/hunt_dispatch_info.rs diff --git a/gameserver/src/logic/game/hunt_dispatch_reward_preview.rs b/gameserver/src/logic/game/hunt/hunt_dispatch_reward_preview.rs similarity index 100% rename from gameserver/src/logic/game/hunt_dispatch_reward_preview.rs rename to gameserver/src/logic/game/hunt/hunt_dispatch_reward_preview.rs diff --git a/gameserver/src/logic/game/hunt_dispatch_start.rs b/gameserver/src/logic/game/hunt/hunt_dispatch_start.rs similarity index 100% rename from gameserver/src/logic/game/hunt_dispatch_start.rs rename to gameserver/src/logic/game/hunt/hunt_dispatch_start.rs diff --git a/gameserver/src/logic/game/hunt/mod.rs b/gameserver/src/logic/game/hunt/mod.rs new file mode 100644 index 0000000..483c4b4 --- /dev/null +++ b/gameserver/src/logic/game/hunt/mod.rs @@ -0,0 +1,5 @@ +pub mod hunt_dispatch; +pub mod hunt_dispatch_end; +pub mod hunt_dispatch_info; +pub mod hunt_dispatch_reward_preview; +pub mod hunt_dispatch_start; diff --git a/gameserver/src/logic/game/hunting_ground_enter.rs b/gameserver/src/logic/game/hunting/hunting_ground_enter.rs similarity index 100% rename from gameserver/src/logic/game/hunting_ground_enter.rs rename to gameserver/src/logic/game/hunting/hunting_ground_enter.rs diff --git a/gameserver/src/logic/game/hunting_ground_info.rs b/gameserver/src/logic/game/hunting/hunting_ground_info.rs similarity index 80% rename from gameserver/src/logic/game/hunting_ground_info.rs rename to gameserver/src/logic/game/hunting/hunting_ground_info.rs index ee96df8..df78bb7 100644 --- a/gameserver/src/logic/game/hunting_ground_info.rs +++ b/gameserver/src/logic/game/hunting/hunting_ground_info.rs @@ -4,7 +4,10 @@ use bd2::proto::proto_net::{ }; use common::packet_code::PacketCodeType; use crypto::network::GameResponse; -use database::db::{hunting_ground_info::get_hunting_ground_info, monster_info::get_monster_info}; +use database::db::{ + hunting::hunting_ground_info::get_hunting_ground_info, + hunting::hunting_ground_monster::get_monsters_for_hunting_ground, +}; use sqlx::SqlitePool; use tracing::info; @@ -13,17 +16,17 @@ pub async fn handle(pool: &SqlitePool, uid: i64, req: HuntingGroundInfoRequest) let pack_id = req.pack_id.unwrap_or_default(); - // Fetch hunting ground info (filter later) let grounds = get_hunting_ground_info(pool, uid).await.unwrap_or_default(); - let monsters = get_monster_info(pool, uid).await.unwrap_or_default(); - // Find only the record matching the requested pack_id let ground_opt = grounds.into_iter().find(|g| g.pack_id == Some(pack_id)); - // Build response only if we found it - let hunting_ground_info = ground_opt.map(|g| { + let hunting_ground_info = if let Some(g) = ground_opt { + let monsters = get_monsters_for_hunting_ground(pool, g.index) + .await + .unwrap_or_default(); + let monster_info = monsters - .iter() + .into_iter() .map(|m| MonsterDbInfo { monster_id: m.monster_id, battle_deck: m.battle_deck, @@ -34,16 +37,17 @@ pub async fn handle(pool: &SqlitePool, uid: i64, req: HuntingGroundInfoRequest) }) .collect::>(); - HuntingGroundDbInfo { + Some(HuntingGroundDbInfo { is_auto: g.is_auto, current_id: g.current_id, highest_id: g.highest_id, monster_info, pack_id: g.pack_id, - } - }); + }) + } else { + None + }; - // Build protobuf response let response = HuntingGroundInfoResponse { hunting_ground_info, ..Default::default() @@ -51,7 +55,6 @@ pub async fn handle(pool: &SqlitePool, uid: i64, req: HuntingGroundInfoRequest) let resp_bytes = response.encode_to_vec(); - // Notify let notify = Notify { achievement_update_info: vec![], mission_update_info: vec![], diff --git a/gameserver/src/logic/game/hunting_ground_info_list.rs b/gameserver/src/logic/game/hunting/hunting_ground_info_list.rs similarity index 81% rename from gameserver/src/logic/game/hunting_ground_info_list.rs rename to gameserver/src/logic/game/hunting/hunting_ground_info_list.rs index c315329..14ece02 100644 --- a/gameserver/src/logic/game/hunting_ground_info_list.rs +++ b/gameserver/src/logic/game/hunting/hunting_ground_info_list.rs @@ -6,7 +6,8 @@ use bd2::proto::proto_net::{ use common::packet_code::PacketCodeType; use crypto::network::GameResponse; use database::db::{ - hunting_ground_info_list::get_hunting_ground_info, monster_info::get_monster_info, + hunting::hunting_ground_info_list::get_hunting_ground_info, + monster::monster_info::get_monster_info, }; use sqlx::SqlitePool; use tracing::info; @@ -55,15 +56,9 @@ pub async fn handle( let resp_bytes = response.encode_to_vec(); let notify = Notify { - achievement_update_info: vec![], - mission_update_info: vec![], - event_mission_update_info: vec![], - active_login_event: vec![1, 2, 625, 626, 627], - active_contents_info: vec![], - ll_type: Some("".to_string()), - is_purchasing_disabled: Some(false), maintenance_start_date: Some(1688646600000), - notice_last_seq: Some(8818), + notice_last_seq: Some(8916), + active_login_event: vec![1, 2], ..Default::default() }; diff --git a/gameserver/src/logic/game/hunting/mod.rs b/gameserver/src/logic/game/hunting/mod.rs new file mode 100644 index 0000000..40556c9 --- /dev/null +++ b/gameserver/src/logic/game/hunting/mod.rs @@ -0,0 +1,3 @@ +pub mod hunting_ground_enter; +pub mod hunting_ground_info; +pub mod hunting_ground_info_list; diff --git a/gameserver/src/logic/game/id_card_preset_delete.rs b/gameserver/src/logic/game/id/id_card_preset_delete.rs similarity index 100% rename from gameserver/src/logic/game/id_card_preset_delete.rs rename to gameserver/src/logic/game/id/id_card_preset_delete.rs diff --git a/gameserver/src/logic/game/id_card_preset_info.rs b/gameserver/src/logic/game/id/id_card_preset_info.rs similarity index 100% rename from gameserver/src/logic/game/id_card_preset_info.rs rename to gameserver/src/logic/game/id/id_card_preset_info.rs diff --git a/gameserver/src/logic/game/id_card_preset_save.rs b/gameserver/src/logic/game/id/id_card_preset_save.rs similarity index 100% rename from gameserver/src/logic/game/id_card_preset_save.rs rename to gameserver/src/logic/game/id/id_card_preset_save.rs diff --git a/gameserver/src/logic/game/id_card_recovery.rs b/gameserver/src/logic/game/id/id_card_recovery.rs similarity index 100% rename from gameserver/src/logic/game/id_card_recovery.rs rename to gameserver/src/logic/game/id/id_card_recovery.rs diff --git a/gameserver/src/logic/game/id_card_save.rs b/gameserver/src/logic/game/id/id_card_save.rs similarity index 100% rename from gameserver/src/logic/game/id_card_save.rs rename to gameserver/src/logic/game/id/id_card_save.rs diff --git a/gameserver/src/logic/game/id_card_shop_buy.rs b/gameserver/src/logic/game/id/id_card_shop_buy.rs similarity index 100% rename from gameserver/src/logic/game/id_card_shop_buy.rs rename to gameserver/src/logic/game/id/id_card_shop_buy.rs diff --git a/gameserver/src/logic/game/id_card_shop_info.rs b/gameserver/src/logic/game/id/id_card_shop_info.rs similarity index 100% rename from gameserver/src/logic/game/id_card_shop_info.rs rename to gameserver/src/logic/game/id/id_card_shop_info.rs diff --git a/gameserver/src/logic/game/id/mod.rs b/gameserver/src/logic/game/id/mod.rs new file mode 100644 index 0000000..e04f865 --- /dev/null +++ b/gameserver/src/logic/game/id/mod.rs @@ -0,0 +1,7 @@ +pub mod id_card_preset_delete; +pub mod id_card_preset_info; +pub mod id_card_preset_save; +pub mod id_card_recovery; +pub mod id_card_save; +pub mod id_card_shop_buy; +pub mod id_card_shop_info; diff --git a/gameserver/src/logic/game/inn_open.rs b/gameserver/src/logic/game/inn/inn_open.rs similarity index 100% rename from gameserver/src/logic/game/inn_open.rs rename to gameserver/src/logic/game/inn/inn_open.rs diff --git a/gameserver/src/logic/game/inn/mod.rs b/gameserver/src/logic/game/inn/mod.rs new file mode 100644 index 0000000..e449d78 --- /dev/null +++ b/gameserver/src/logic/game/inn/mod.rs @@ -0,0 +1 @@ +pub mod inn_open; diff --git a/gameserver/src/logic/game/interaction_trigger.rs b/gameserver/src/logic/game/interaction/interaction_trigger.rs similarity index 100% rename from gameserver/src/logic/game/interaction_trigger.rs rename to gameserver/src/logic/game/interaction/interaction_trigger.rs diff --git a/gameserver/src/logic/game/interaction/mod.rs b/gameserver/src/logic/game/interaction/mod.rs new file mode 100644 index 0000000..e357548 --- /dev/null +++ b/gameserver/src/logic/game/interaction/mod.rs @@ -0,0 +1 @@ +pub mod interaction_trigger; diff --git a/gameserver/src/logic/game/inven_add_slot.rs b/gameserver/src/logic/game/inven/inven_add_slot.rs similarity index 100% rename from gameserver/src/logic/game/inven_add_slot.rs rename to gameserver/src/logic/game/inven/inven_add_slot.rs diff --git a/gameserver/src/logic/game/inven/mod.rs b/gameserver/src/logic/game/inven/mod.rs new file mode 100644 index 0000000..474f05d --- /dev/null +++ b/gameserver/src/logic/game/inven/mod.rs @@ -0,0 +1 @@ +pub mod inven_add_slot; diff --git a/gameserver/src/logic/game/item_dump.rs b/gameserver/src/logic/game/item/item_dump.rs similarity index 100% rename from gameserver/src/logic/game/item_dump.rs rename to gameserver/src/logic/game/item/item_dump.rs diff --git a/gameserver/src/logic/game/item_info.rs b/gameserver/src/logic/game/item/item_info.rs similarity index 97% rename from gameserver/src/logic/game/item_info.rs rename to gameserver/src/logic/game/item/item_info.rs index 4293d6f..c6847b0 100644 --- a/gameserver/src/logic/game/item_info.rs +++ b/gameserver/src/logic/game/item/item_info.rs @@ -2,7 +2,7 @@ use bd2::prost::Message; use bd2::proto::proto_net::{ItemDbInfo, ItemInfoRequest, ItemInfoResponse, Notify}; use common::packet_code::PacketCodeType; use crypto::network::GameResponse; -use database::db::item_info::get_item_info; +use database::db::item::item_info::get_item_info; use database::models::game::item_info::ItemInfo; use sqlx::SqlitePool; use tracing::info; diff --git a/gameserver/src/logic/game/item_storage_info.rs b/gameserver/src/logic/game/item/item_storage_info.rs similarity index 100% rename from gameserver/src/logic/game/item_storage_info.rs rename to gameserver/src/logic/game/item/item_storage_info.rs diff --git a/gameserver/src/logic/game/item_storage_out.rs b/gameserver/src/logic/game/item/item_storage_out.rs similarity index 100% rename from gameserver/src/logic/game/item_storage_out.rs rename to gameserver/src/logic/game/item/item_storage_out.rs diff --git a/gameserver/src/logic/game/item_storage_put.rs b/gameserver/src/logic/game/item/item_storage_put.rs similarity index 100% rename from gameserver/src/logic/game/item_storage_put.rs rename to gameserver/src/logic/game/item/item_storage_put.rs diff --git a/gameserver/src/logic/game/item_storage_update.rs b/gameserver/src/logic/game/item/item_storage_update.rs similarity index 100% rename from gameserver/src/logic/game/item_storage_update.rs rename to gameserver/src/logic/game/item/item_storage_update.rs diff --git a/gameserver/src/logic/game/item/mod.rs b/gameserver/src/logic/game/item/mod.rs new file mode 100644 index 0000000..39f6170 --- /dev/null +++ b/gameserver/src/logic/game/item/mod.rs @@ -0,0 +1,6 @@ +pub mod item_dump; +pub mod item_info; +pub mod item_storage_info; +pub mod item_storage_out; +pub mod item_storage_put; +pub mod item_storage_update; diff --git a/gameserver/src/logic/game/join_user.rs b/gameserver/src/logic/game/join/join_user.rs similarity index 100% rename from gameserver/src/logic/game/join_user.rs rename to gameserver/src/logic/game/join/join_user.rs diff --git a/gameserver/src/logic/game/join/mod.rs b/gameserver/src/logic/game/join/mod.rs new file mode 100644 index 0000000..bb42fcf --- /dev/null +++ b/gameserver/src/logic/game/join/mod.rs @@ -0,0 +1 @@ +pub mod join_user; diff --git a/gameserver/src/logic/game/jp_user.rs b/gameserver/src/logic/game/jp/jp_user.rs similarity index 100% rename from gameserver/src/logic/game/jp_user.rs rename to gameserver/src/logic/game/jp/jp_user.rs diff --git a/gameserver/src/logic/game/jp_user_info.rs b/gameserver/src/logic/game/jp/jp_user_info.rs similarity index 100% rename from gameserver/src/logic/game/jp_user_info.rs rename to gameserver/src/logic/game/jp/jp_user_info.rs diff --git a/gameserver/src/logic/game/jp/mod.rs b/gameserver/src/logic/game/jp/mod.rs new file mode 100644 index 0000000..a2ce17f --- /dev/null +++ b/gameserver/src/logic/game/jp/mod.rs @@ -0,0 +1,2 @@ +pub mod jp_user; +pub mod jp_user_info; diff --git a/gameserver/src/logic/game/leave_user.rs b/gameserver/src/logic/game/leave/leave_user.rs similarity index 100% rename from gameserver/src/logic/game/leave_user.rs rename to gameserver/src/logic/game/leave/leave_user.rs diff --git a/gameserver/src/logic/game/leave/mod.rs b/gameserver/src/logic/game/leave/mod.rs new file mode 100644 index 0000000..c22be00 --- /dev/null +++ b/gameserver/src/logic/game/leave/mod.rs @@ -0,0 +1 @@ +pub mod leave_user; diff --git a/gameserver/src/logic/game/like_user.rs b/gameserver/src/logic/game/like/like_user.rs similarity index 100% rename from gameserver/src/logic/game/like_user.rs rename to gameserver/src/logic/game/like/like_user.rs diff --git a/gameserver/src/logic/game/like/mod.rs b/gameserver/src/logic/game/like/mod.rs new file mode 100644 index 0000000..60ffb6c --- /dev/null +++ b/gameserver/src/logic/game/like/mod.rs @@ -0,0 +1 @@ +pub mod like_user; diff --git a/gameserver/src/logic/game/login_event.rs b/gameserver/src/logic/game/login/login_event.rs similarity index 100% rename from gameserver/src/logic/game/login_event.rs rename to gameserver/src/logic/game/login/login_event.rs diff --git a/gameserver/src/logic/game/login_user.rs b/gameserver/src/logic/game/login/login_user.rs similarity index 100% rename from gameserver/src/logic/game/login_user.rs rename to gameserver/src/logic/game/login/login_user.rs diff --git a/gameserver/src/logic/game/login/mod.rs b/gameserver/src/logic/game/login/mod.rs new file mode 100644 index 0000000..43cc70a --- /dev/null +++ b/gameserver/src/logic/game/login/mod.rs @@ -0,0 +1,2 @@ +pub mod login_event; +pub mod login_user; diff --git a/gameserver/src/logic/game/logout_user.rs b/gameserver/src/logic/game/logout/logout_user.rs similarity index 100% rename from gameserver/src/logic/game/logout_user.rs rename to gameserver/src/logic/game/logout/logout_user.rs diff --git a/gameserver/src/logic/game/logout/mod.rs b/gameserver/src/logic/game/logout/mod.rs new file mode 100644 index 0000000..12ac54e --- /dev/null +++ b/gameserver/src/logic/game/logout/mod.rs @@ -0,0 +1 @@ +pub mod logout_user; diff --git a/gameserver/src/logic/game/mail_history_info.rs b/gameserver/src/logic/game/mail/mail_history_info.rs similarity index 100% rename from gameserver/src/logic/game/mail_history_info.rs rename to gameserver/src/logic/game/mail/mail_history_info.rs diff --git a/gameserver/src/logic/game/mail_info.rs b/gameserver/src/logic/game/mail/mail_info.rs similarity index 98% rename from gameserver/src/logic/game/mail_info.rs rename to gameserver/src/logic/game/mail/mail_info.rs index d8ff64e..fd5f300 100644 --- a/gameserver/src/logic/game/mail_info.rs +++ b/gameserver/src/logic/game/mail/mail_info.rs @@ -2,7 +2,7 @@ use bd2::prost::Message; use bd2::proto::proto_net::{MailDbInfo, MailInfoRequest, MailInfoResponse, Notify}; use common::packet_code::PacketCodeType; use crypto::network::GameResponse; -use database::db::mail_info::get_mail_info; +use database::db::mail::mail_info::get_mail_info; use sqlx::SqlitePool; use std::collections::HashMap; use tracing::info; diff --git a/gameserver/src/logic/game/mail_open.rs b/gameserver/src/logic/game/mail/mail_open.rs similarity index 100% rename from gameserver/src/logic/game/mail_open.rs rename to gameserver/src/logic/game/mail/mail_open.rs diff --git a/gameserver/src/logic/game/mail/mod.rs b/gameserver/src/logic/game/mail/mod.rs new file mode 100644 index 0000000..a055dc2 --- /dev/null +++ b/gameserver/src/logic/game/mail/mod.rs @@ -0,0 +1,3 @@ +pub mod mail_history_info; +pub mod mail_info; +pub mod mail_open; diff --git a/gameserver/src/logic/game/maintenace_info.rs b/gameserver/src/logic/game/maintenace/maintenace_info.rs similarity index 100% rename from gameserver/src/logic/game/maintenace_info.rs rename to gameserver/src/logic/game/maintenace/maintenace_info.rs diff --git a/gameserver/src/logic/game/maintenace/mod.rs b/gameserver/src/logic/game/maintenace/mod.rs new file mode 100644 index 0000000..f76be7d --- /dev/null +++ b/gameserver/src/logic/game/maintenace/mod.rs @@ -0,0 +1 @@ +pub mod maintenace_info; diff --git a/gameserver/src/logic/game/maintenance_info.rs b/gameserver/src/logic/game/maintenance/maintenance_info.rs similarity index 100% rename from gameserver/src/logic/game/maintenance_info.rs rename to gameserver/src/logic/game/maintenance/maintenance_info.rs diff --git a/gameserver/src/logic/game/maintenance/mod.rs b/gameserver/src/logic/game/maintenance/mod.rs new file mode 100644 index 0000000..30a83fb --- /dev/null +++ b/gameserver/src/logic/game/maintenance/mod.rs @@ -0,0 +1 @@ +pub mod maintenance_info; diff --git a/gameserver/src/logic/game/mercenary_scout.rs b/gameserver/src/logic/game/mercenary/mercenary_scout.rs similarity index 100% rename from gameserver/src/logic/game/mercenary_scout.rs rename to gameserver/src/logic/game/mercenary/mercenary_scout.rs diff --git a/gameserver/src/logic/game/mercenary/mod.rs b/gameserver/src/logic/game/mercenary/mod.rs new file mode 100644 index 0000000..d2ce762 --- /dev/null +++ b/gameserver/src/logic/game/mercenary/mod.rs @@ -0,0 +1 @@ +pub mod mercenary_scout; diff --git a/gameserver/src/logic/game/mini_game_action_end.rs b/gameserver/src/logic/game/mini/mini_game_action_end.rs similarity index 100% rename from gameserver/src/logic/game/mini_game_action_end.rs rename to gameserver/src/logic/game/mini/mini_game_action_end.rs diff --git a/gameserver/src/logic/game/mini_game_action_info.rs b/gameserver/src/logic/game/mini/mini_game_action_info.rs similarity index 100% rename from gameserver/src/logic/game/mini_game_action_info.rs rename to gameserver/src/logic/game/mini/mini_game_action_info.rs diff --git a/gameserver/src/logic/game/mini_game_action_ranking.rs b/gameserver/src/logic/game/mini/mini_game_action_ranking.rs similarity index 100% rename from gameserver/src/logic/game/mini_game_action_ranking.rs rename to gameserver/src/logic/game/mini/mini_game_action_ranking.rs diff --git a/gameserver/src/logic/game/mini_game_action_start.rs b/gameserver/src/logic/game/mini/mini_game_action_start.rs similarity index 100% rename from gameserver/src/logic/game/mini_game_action_start.rs rename to gameserver/src/logic/game/mini/mini_game_action_start.rs diff --git a/gameserver/src/logic/game/mini_game_bingo_info.rs b/gameserver/src/logic/game/mini/mini_game_bingo_info.rs similarity index 100% rename from gameserver/src/logic/game/mini_game_bingo_info.rs rename to gameserver/src/logic/game/mini/mini_game_bingo_info.rs diff --git a/gameserver/src/logic/game/mini_game_bingo_play.rs b/gameserver/src/logic/game/mini/mini_game_bingo_play.rs similarity index 100% rename from gameserver/src/logic/game/mini_game_bingo_play.rs rename to gameserver/src/logic/game/mini/mini_game_bingo_play.rs diff --git a/gameserver/src/logic/game/mini_game_board_info.rs b/gameserver/src/logic/game/mini/mini_game_board_info.rs similarity index 100% rename from gameserver/src/logic/game/mini_game_board_info.rs rename to gameserver/src/logic/game/mini/mini_game_board_info.rs diff --git a/gameserver/src/logic/game/mini_game_board_play.rs b/gameserver/src/logic/game/mini/mini_game_board_play.rs similarity index 100% rename from gameserver/src/logic/game/mini_game_board_play.rs rename to gameserver/src/logic/game/mini/mini_game_board_play.rs diff --git a/gameserver/src/logic/game/mini_game_defense_end.rs b/gameserver/src/logic/game/mini/mini_game_defense_end.rs similarity index 100% rename from gameserver/src/logic/game/mini_game_defense_end.rs rename to gameserver/src/logic/game/mini/mini_game_defense_end.rs diff --git a/gameserver/src/logic/game/mini_game_defense_info.rs b/gameserver/src/logic/game/mini/mini_game_defense_info.rs similarity index 100% rename from gameserver/src/logic/game/mini_game_defense_info.rs rename to gameserver/src/logic/game/mini/mini_game_defense_info.rs diff --git a/gameserver/src/logic/game/mini_game_defense_matching.rs b/gameserver/src/logic/game/mini/mini_game_defense_matching.rs similarity index 100% rename from gameserver/src/logic/game/mini_game_defense_matching.rs rename to gameserver/src/logic/game/mini/mini_game_defense_matching.rs diff --git a/gameserver/src/logic/game/mini_game_defense_start.rs b/gameserver/src/logic/game/mini/mini_game_defense_start.rs similarity index 100% rename from gameserver/src/logic/game/mini_game_defense_start.rs rename to gameserver/src/logic/game/mini/mini_game_defense_start.rs diff --git a/gameserver/src/logic/game/mini_game_field_end.rs b/gameserver/src/logic/game/mini/mini_game_field_end.rs similarity index 100% rename from gameserver/src/logic/game/mini_game_field_end.rs rename to gameserver/src/logic/game/mini/mini_game_field_end.rs diff --git a/gameserver/src/logic/game/mini_game_field_info.rs b/gameserver/src/logic/game/mini/mini_game_field_info.rs similarity index 100% rename from gameserver/src/logic/game/mini_game_field_info.rs rename to gameserver/src/logic/game/mini/mini_game_field_info.rs diff --git a/gameserver/src/logic/game/mini_game_field_quick_reward.rs b/gameserver/src/logic/game/mini/mini_game_field_quick_reward.rs similarity index 100% rename from gameserver/src/logic/game/mini_game_field_quick_reward.rs rename to gameserver/src/logic/game/mini/mini_game_field_quick_reward.rs diff --git a/gameserver/src/logic/game/mini_game_field_reward.rs b/gameserver/src/logic/game/mini/mini_game_field_reward.rs similarity index 100% rename from gameserver/src/logic/game/mini_game_field_reward.rs rename to gameserver/src/logic/game/mini/mini_game_field_reward.rs diff --git a/gameserver/src/logic/game/mini_game_field_score.rs b/gameserver/src/logic/game/mini/mini_game_field_score.rs similarity index 100% rename from gameserver/src/logic/game/mini_game_field_score.rs rename to gameserver/src/logic/game/mini/mini_game_field_score.rs diff --git a/gameserver/src/logic/game/mini_game_field_start.rs b/gameserver/src/logic/game/mini/mini_game_field_start.rs similarity index 100% rename from gameserver/src/logic/game/mini_game_field_start.rs rename to gameserver/src/logic/game/mini/mini_game_field_start.rs diff --git a/gameserver/src/logic/game/mini_game_hub_info.rs b/gameserver/src/logic/game/mini/mini_game_hub_info.rs similarity index 100% rename from gameserver/src/logic/game/mini_game_hub_info.rs rename to gameserver/src/logic/game/mini/mini_game_hub_info.rs diff --git a/gameserver/src/logic/game/mini_game_relay_server_info.rs b/gameserver/src/logic/game/mini/mini_game_relay_server_info.rs similarity index 100% rename from gameserver/src/logic/game/mini_game_relay_server_info.rs rename to gameserver/src/logic/game/mini/mini_game_relay_server_info.rs diff --git a/gameserver/src/logic/game/mini_game_rhythm_info.rs b/gameserver/src/logic/game/mini/mini_game_rhythm_info.rs similarity index 100% rename from gameserver/src/logic/game/mini_game_rhythm_info.rs rename to gameserver/src/logic/game/mini/mini_game_rhythm_info.rs diff --git a/gameserver/src/logic/game/mini_game_rhythm_play_end.rs b/gameserver/src/logic/game/mini/mini_game_rhythm_play_end.rs similarity index 100% rename from gameserver/src/logic/game/mini_game_rhythm_play_end.rs rename to gameserver/src/logic/game/mini/mini_game_rhythm_play_end.rs diff --git a/gameserver/src/logic/game/mini_game_rhythm_play_start.rs b/gameserver/src/logic/game/mini/mini_game_rhythm_play_start.rs similarity index 100% rename from gameserver/src/logic/game/mini_game_rhythm_play_start.rs rename to gameserver/src/logic/game/mini/mini_game_rhythm_play_start.rs diff --git a/gameserver/src/logic/game/mini_game_rhythm_ranking.rs b/gameserver/src/logic/game/mini/mini_game_rhythm_ranking.rs similarity index 100% rename from gameserver/src/logic/game/mini_game_rhythm_ranking.rs rename to gameserver/src/logic/game/mini/mini_game_rhythm_ranking.rs diff --git a/gameserver/src/logic/game/mini_game_roulette_draw.rs b/gameserver/src/logic/game/mini/mini_game_roulette_draw.rs similarity index 100% rename from gameserver/src/logic/game/mini_game_roulette_draw.rs rename to gameserver/src/logic/game/mini/mini_game_roulette_draw.rs diff --git a/gameserver/src/logic/game/mini_game_roulette_info.rs b/gameserver/src/logic/game/mini/mini_game_roulette_info.rs similarity index 100% rename from gameserver/src/logic/game/mini_game_roulette_info.rs rename to gameserver/src/logic/game/mini/mini_game_roulette_info.rs diff --git a/gameserver/src/logic/game/mini_game_run_end.rs b/gameserver/src/logic/game/mini/mini_game_run_end.rs similarity index 100% rename from gameserver/src/logic/game/mini_game_run_end.rs rename to gameserver/src/logic/game/mini/mini_game_run_end.rs diff --git a/gameserver/src/logic/game/mini_game_run_info.rs b/gameserver/src/logic/game/mini/mini_game_run_info.rs similarity index 100% rename from gameserver/src/logic/game/mini_game_run_info.rs rename to gameserver/src/logic/game/mini/mini_game_run_info.rs diff --git a/gameserver/src/logic/game/mini_game_run_quick_reward.rs b/gameserver/src/logic/game/mini/mini_game_run_quick_reward.rs similarity index 100% rename from gameserver/src/logic/game/mini_game_run_quick_reward.rs rename to gameserver/src/logic/game/mini/mini_game_run_quick_reward.rs diff --git a/gameserver/src/logic/game/mini_game_run_start.rs b/gameserver/src/logic/game/mini/mini_game_run_start.rs similarity index 100% rename from gameserver/src/logic/game/mini_game_run_start.rs rename to gameserver/src/logic/game/mini/mini_game_run_start.rs diff --git a/gameserver/src/logic/game/mini_game_sichuan_end.rs b/gameserver/src/logic/game/mini/mini_game_sichuan_end.rs similarity index 100% rename from gameserver/src/logic/game/mini_game_sichuan_end.rs rename to gameserver/src/logic/game/mini/mini_game_sichuan_end.rs diff --git a/gameserver/src/logic/game/mini_game_sichuan_info.rs b/gameserver/src/logic/game/mini/mini_game_sichuan_info.rs similarity index 100% rename from gameserver/src/logic/game/mini_game_sichuan_info.rs rename to gameserver/src/logic/game/mini/mini_game_sichuan_info.rs diff --git a/gameserver/src/logic/game/mini_game_sichuan_ranking.rs b/gameserver/src/logic/game/mini/mini_game_sichuan_ranking.rs similarity index 100% rename from gameserver/src/logic/game/mini_game_sichuan_ranking.rs rename to gameserver/src/logic/game/mini/mini_game_sichuan_ranking.rs diff --git a/gameserver/src/logic/game/mini_game_sichuan_start.rs b/gameserver/src/logic/game/mini/mini_game_sichuan_start.rs similarity index 100% rename from gameserver/src/logic/game/mini_game_sichuan_start.rs rename to gameserver/src/logic/game/mini/mini_game_sichuan_start.rs diff --git a/gameserver/src/logic/game/mini_game_survival_char_upgrade.rs b/gameserver/src/logic/game/mini/mini_game_survival_char_upgrade.rs similarity index 100% rename from gameserver/src/logic/game/mini_game_survival_char_upgrade.rs rename to gameserver/src/logic/game/mini/mini_game_survival_char_upgrade.rs diff --git a/gameserver/src/logic/game/mini_game_survival_char_upgrade_reset.rs b/gameserver/src/logic/game/mini/mini_game_survival_char_upgrade_reset.rs similarity index 100% rename from gameserver/src/logic/game/mini_game_survival_char_upgrade_reset.rs rename to gameserver/src/logic/game/mini/mini_game_survival_char_upgrade_reset.rs diff --git a/gameserver/src/logic/game/mini_game_survival_end.rs b/gameserver/src/logic/game/mini/mini_game_survival_end.rs similarity index 100% rename from gameserver/src/logic/game/mini_game_survival_end.rs rename to gameserver/src/logic/game/mini/mini_game_survival_end.rs diff --git a/gameserver/src/logic/game/mini_game_survival_info.rs b/gameserver/src/logic/game/mini/mini_game_survival_info.rs similarity index 100% rename from gameserver/src/logic/game/mini_game_survival_info.rs rename to gameserver/src/logic/game/mini/mini_game_survival_info.rs diff --git a/gameserver/src/logic/game/mini_game_survival_play.rs b/gameserver/src/logic/game/mini/mini_game_survival_play.rs similarity index 100% rename from gameserver/src/logic/game/mini_game_survival_play.rs rename to gameserver/src/logic/game/mini/mini_game_survival_play.rs diff --git a/gameserver/src/logic/game/mini_game_survival_ranking.rs b/gameserver/src/logic/game/mini/mini_game_survival_ranking.rs similarity index 100% rename from gameserver/src/logic/game/mini_game_survival_ranking.rs rename to gameserver/src/logic/game/mini/mini_game_survival_ranking.rs diff --git a/gameserver/src/logic/game/mini_game_survival_skill_select_list.rs b/gameserver/src/logic/game/mini/mini_game_survival_skill_select_list.rs similarity index 100% rename from gameserver/src/logic/game/mini_game_survival_skill_select_list.rs rename to gameserver/src/logic/game/mini/mini_game_survival_skill_select_list.rs diff --git a/gameserver/src/logic/game/mini_game_survival_skill_up.rs b/gameserver/src/logic/game/mini/mini_game_survival_skill_up.rs similarity index 100% rename from gameserver/src/logic/game/mini_game_survival_skill_up.rs rename to gameserver/src/logic/game/mini/mini_game_survival_skill_up.rs diff --git a/gameserver/src/logic/game/mini_game_survival_start.rs b/gameserver/src/logic/game/mini/mini_game_survival_start.rs similarity index 100% rename from gameserver/src/logic/game/mini_game_survival_start.rs rename to gameserver/src/logic/game/mini/mini_game_survival_start.rs diff --git a/gameserver/src/logic/game/mini_puzzle_all_open.rs b/gameserver/src/logic/game/mini/mini_puzzle_all_open.rs similarity index 100% rename from gameserver/src/logic/game/mini_puzzle_all_open.rs rename to gameserver/src/logic/game/mini/mini_puzzle_all_open.rs diff --git a/gameserver/src/logic/game/mini_puzzle_info.rs b/gameserver/src/logic/game/mini/mini_puzzle_info.rs similarity index 100% rename from gameserver/src/logic/game/mini_puzzle_info.rs rename to gameserver/src/logic/game/mini/mini_puzzle_info.rs diff --git a/gameserver/src/logic/game/mini_puzzle_open.rs b/gameserver/src/logic/game/mini/mini_puzzle_open.rs similarity index 100% rename from gameserver/src/logic/game/mini_puzzle_open.rs rename to gameserver/src/logic/game/mini/mini_puzzle_open.rs diff --git a/gameserver/src/logic/game/mini_puzzle_renew.rs b/gameserver/src/logic/game/mini/mini_puzzle_renew.rs similarity index 100% rename from gameserver/src/logic/game/mini_puzzle_renew.rs rename to gameserver/src/logic/game/mini/mini_puzzle_renew.rs diff --git a/gameserver/src/logic/game/mini/mod.rs b/gameserver/src/logic/game/mini/mod.rs new file mode 100644 index 0000000..97329a3 --- /dev/null +++ b/gameserver/src/logic/game/mini/mod.rs @@ -0,0 +1,47 @@ +pub mod mini_game_action_end; +pub mod mini_game_action_info; +pub mod mini_game_action_ranking; +pub mod mini_game_action_start; +pub mod mini_game_bingo_info; +pub mod mini_game_bingo_play; +pub mod mini_game_board_info; +pub mod mini_game_board_play; +pub mod mini_game_defense_end; +pub mod mini_game_defense_info; +pub mod mini_game_defense_matching; +pub mod mini_game_defense_start; +pub mod mini_game_field_end; +pub mod mini_game_field_info; +pub mod mini_game_field_quick_reward; +pub mod mini_game_field_reward; +pub mod mini_game_field_score; +pub mod mini_game_field_start; +pub mod mini_game_hub_info; +pub mod mini_game_relay_server_info; +pub mod mini_game_rhythm_info; +pub mod mini_game_rhythm_play_end; +pub mod mini_game_rhythm_play_start; +pub mod mini_game_rhythm_ranking; +pub mod mini_game_roulette_draw; +pub mod mini_game_roulette_info; +pub mod mini_game_run_end; +pub mod mini_game_run_info; +pub mod mini_game_run_quick_reward; +pub mod mini_game_run_start; +pub mod mini_game_sichuan_end; +pub mod mini_game_sichuan_info; +pub mod mini_game_sichuan_ranking; +pub mod mini_game_sichuan_start; +pub mod mini_game_survival_char_upgrade; +pub mod mini_game_survival_char_upgrade_reset; +pub mod mini_game_survival_end; +pub mod mini_game_survival_info; +pub mod mini_game_survival_play; +pub mod mini_game_survival_ranking; +pub mod mini_game_survival_skill_select_list; +pub mod mini_game_survival_skill_up; +pub mod mini_game_survival_start; +pub mod mini_puzzle_all_open; +pub mod mini_puzzle_info; +pub mod mini_puzzle_open; +pub mod mini_puzzle_renew; diff --git a/gameserver/src/logic/game/mission_clear.rs b/gameserver/src/logic/game/mission/mission_clear.rs similarity index 100% rename from gameserver/src/logic/game/mission_clear.rs rename to gameserver/src/logic/game/mission/mission_clear.rs diff --git a/gameserver/src/logic/game/mission_info.rs b/gameserver/src/logic/game/mission/mission_info.rs similarity index 93% rename from gameserver/src/logic/game/mission_info.rs rename to gameserver/src/logic/game/mission/mission_info.rs index 03cc270..2c2dae3 100644 --- a/gameserver/src/logic/game/mission_info.rs +++ b/gameserver/src/logic/game/mission/mission_info.rs @@ -4,8 +4,8 @@ use bd2::proto::proto_net::{ }; use common::packet_code::PacketCodeType; use crypto::network::GameResponse; -use database::db::mission_info::get_mission_info; -use database::db::mission_section_reward_info::get_mission_section_reward_info; +use database::db::mission::mission_info::get_mission_info; +use database::db::mission::mission_section_reward_info::get_mission_section_reward_info; use sqlx::SqlitePool; use tracing::info; diff --git a/gameserver/src/logic/game/mission_section_reward.rs b/gameserver/src/logic/game/mission/mission_section_reward.rs similarity index 100% rename from gameserver/src/logic/game/mission_section_reward.rs rename to gameserver/src/logic/game/mission/mission_section_reward.rs diff --git a/gameserver/src/logic/game/mission_update.rs b/gameserver/src/logic/game/mission/mission_update.rs similarity index 100% rename from gameserver/src/logic/game/mission_update.rs rename to gameserver/src/logic/game/mission/mission_update.rs diff --git a/gameserver/src/logic/game/mission/mod.rs b/gameserver/src/logic/game/mission/mod.rs new file mode 100644 index 0000000..30b7388 --- /dev/null +++ b/gameserver/src/logic/game/mission/mod.rs @@ -0,0 +1,4 @@ +pub mod mission_clear; +pub mod mission_info; +pub mod mission_section_reward; +pub mod mission_update; diff --git a/gameserver/src/logic/game/mod.rs b/gameserver/src/logic/game/mod.rs index 677b5e5..9cf8930 100644 --- a/gameserver/src/logic/game/mod.rs +++ b/gameserver/src/logic/game/mod.rs @@ -1,478 +1,95 @@ -pub mod achievement_clear; -pub mod achievement_info; -pub mod achievement_update; -pub mod active_map; +pub mod account; +pub mod achievement; +pub mod active; pub mod alchemy; -pub mod alchemy_batch; -pub mod all_char_refresh; +pub mod all; pub mod attendance; -pub mod balance_version_check; -pub mod batch_request; -pub mod battle_end; -pub mod battle_end_test; -pub mod battle_enter; -pub mod battle_exit; -pub mod battle_give_up; -pub mod battle_retry; -pub mod battle_retry_previous_turn; -pub mod battle_start; -pub mod battle_verify_state; -pub mod cafeteria_cumulative_reward; -pub mod cafeteria_daily_connection_costume_refresh; -pub mod cafeteria_event_npc_interaction_reward; -pub mod cafeteria_info; -pub mod cafeteria_introduction_story_reward; -pub mod cafeteria_level_up; -pub mod cafeteria_manage_item_add; -pub mod cafeteria_rare_npc_interaction_reward; -pub mod cafeteria_regular_costume_interaction_all_reward; -pub mod cafeteria_regular_costume_interaction_reward; -pub mod cafeteria_regular_costume_note_all_reward; -pub mod cafeteria_regular_costume_note_info; -pub mod cafeteria_regular_costume_note_reward; -pub mod cafeteria_reward_receipt_time_update_using_cheat; -pub mod cafeteria_spawn_reset; -pub mod cafeteria_spawn_reset_cheat; -pub mod cancel_leave_user; -pub mod cash_mail_info; -pub mod cash_shop_buy; -pub mod cash_shop_info; -pub mod cash_shop_purchase_count_info; -pub mod char_all_revival; -pub mod char_auto_revive_set; -pub mod char_awake_active; -pub mod char_awake_info; -pub mod char_class_up; -pub mod char_expiry; -pub mod char_growth; -pub mod char_healing; -pub mod char_immortal; -pub mod char_imprint_level_up; -pub mod char_info; -pub mod char_level_up; -pub mod char_partner_info; -pub mod char_partner_reward; -pub mod char_partner_story_reward; -pub mod char_scout_info; -pub mod char_special_scout_buy; -pub mod char_special_scout_reset; -pub mod charge_cost_info; -pub mod clear_package_reward; -pub mod client_custom_log; -pub mod community_reward; -pub mod community_reward_info; +pub mod balance; +pub mod batch; +pub mod battle; +pub mod cafeteria; +pub mod cancel; +pub mod cash; +pub mod char; +pub mod charge; +pub mod clear; +pub mod client; +pub mod community; pub mod cooking; -pub mod cooking_research; -pub mod costume_all_rounder_upgrade; -pub mod costume_clear; -pub mod costume_info; -pub mod costume_node_activation; -pub mod costume_potential_connect; -pub mod costume_upgrade; -pub mod costume_use; -pub mod dating_episode_clear; -pub mod dating_info; -pub mod dating_message_update; -pub mod deck_char_auto_revive; -pub mod deck_costume_setting_info; -pub mod deck_costume_setting_save; -pub mod deck_info; -pub mod deck_save; -pub mod dispatch_info; -pub mod dispatch_reward; -pub mod eat_food; -pub mod eat_food_auto; -pub mod equip_add_slot; -pub mod equip_batch_use; -pub mod equip_break; -pub mod equip_change; -pub mod equip_clear; -pub mod equip_from_making_to_break; -pub mod equip_from_making_to_upgrade; -pub mod equip_from_upgrade_to_break; -pub mod equip_info; -pub mod equip_lock; -pub mod equip_making; -pub mod equip_mark_delete; -pub mod equip_mark_set; -pub mod equip_option_re_roll; -pub mod equip_option_re_roll_confirm; -pub mod equip_preset_info; -pub mod equip_preset_name_change; -pub mod equip_preset_save; -pub mod equip_sequence_smelting; -pub mod equip_sequence_upgrade; -pub mod equip_smelting; -pub mod equip_storage_add_slot; -pub mod equip_storage_info; -pub mod equip_storage_out; -pub mod equip_storage_put; -pub mod equip_upgrade; -pub mod equip_use; -pub mod equips_clear; -pub mod equips_use; -pub mod event_exchange_info; -pub mod event_exchange_next_page_open; -pub mod event_exchange_reward; -pub mod event_hub_info; -pub mod event_mission_info; -pub mod event_reward; -pub mod event_reward_history; -pub mod event_schedule_info; -pub mod evil_castle_daily_reward; -pub mod evil_castle_daily_reward_state; -pub mod evil_castle_enter; -pub mod evil_castle_info; -pub mod evil_castle_ping; -pub mod evil_castle_ranking_info; -pub mod evil_castle_reward_info; -pub mod evil_castle_rogue_like_all_user_score_info; -pub mod evil_castle_rogue_like_battle_char_change; -pub mod evil_castle_rogue_like_battle_end_preview; -pub mod evil_castle_rogue_like_battle_skip; -pub mod evil_castle_rogue_like_char_revival; -pub mod evil_castle_rogue_like_costume_upgrade; -pub mod evil_castle_rogue_like_deck_save; -pub mod evil_castle_rogue_like_edit_event; -pub mod evil_castle_rogue_like_enter; -pub mod evil_castle_rogue_like_event_choice; -pub mod evil_castle_rogue_like_event_select; -pub mod evil_castle_rogue_like_give_up; -pub mod evil_castle_rogue_like_give_up_info; -pub mod evil_castle_rogue_like_growth; -pub mod evil_castle_rogue_like_info; -pub mod evil_castle_rogue_like_move_floor; -pub mod evil_castle_rogue_like_quick_battle; -pub mod evil_castle_rogue_like_rank_info; -pub mod evil_castle_rogue_like_relic_mix; -pub mod evil_castle_rogue_like_reward_re_roll; -pub mod evil_castle_rogue_like_room_enter; -pub mod evil_castle_rogue_like_season_reward; -pub mod evil_castle_rogue_like_select_reward; -pub mod evil_castle_rogue_like_shop_buy; -pub mod evil_castle_rogue_like_shop_exit; -pub mod evil_castle_rogue_like_shop_re_roll; -pub mod evil_castle_stage_clear_reward; -pub mod evil_castle_stage_ranking_info; -pub mod evil_castle_tower_info; -pub mod field_deck_info; -pub mod field_deck_save; -pub mod field_monster_damage; -pub mod field_monster_event; -pub mod field_monster_regen; -pub mod field_monster_reward; -pub mod field_object_info; -pub mod field_object_position_update; -pub mod field_object_preview; -pub mod field_object_research; -pub mod field_object_respawn; -pub mod field_object_reward; -pub mod field_object_reward_list; -pub mod field_trap_info; -pub mod friend_accept; -pub mod friend_info_list; -pub mod friend_receive_list; -pub mod friend_recommend; -pub mod friend_refuse; -pub mod friend_remove; -pub mod friend_search; -pub mod friend_send; -pub mod friend_send_list; -pub mod friend_send_remove; -pub mod gacha_buy; -pub mod gacha_buy_preview; -pub mod gacha_buy_preview_lock; -pub mod gacha_info; -pub mod gacha_log; -pub mod gacha_point_exchange; -pub mod gacha_point_manual_exchange; -pub mod gacha_selection_save; -pub mod guild_accept; -pub mod guild_create; -pub mod guild_delete_cancel; -pub mod guild_info; -pub mod guild_info_edit; -pub mod guild_init_info; -pub mod guild_join; -pub mod guild_join_refuse; -pub mod guild_join_send_cancel; -pub mod guild_join_send_info; -pub mod guild_leave; -pub mod guild_member_ban; -pub mod guild_member_role_edit; -pub mod guild_notice_info; -pub mod guild_notice_update; -pub mod guild_raid_boss_battle_enter; -pub mod guild_raid_boss_battle_history; -pub mod guild_raid_boss_battle_info; -pub mod guild_raid_boss_practice_battle_enter; -pub mod guild_raid_boss_quick_battle; -pub mod guild_raid_deck_info; -pub mod guild_raid_deck_save; -pub mod guild_raid_main_info; -pub mod guild_raid_member_play_history_info; -pub mod guild_raid_member_ranking; -pub mod guild_raid_normal_battle_history_info; -pub mod guild_raid_normal_battle_info; -pub mod guild_raid_preset_delete; -pub mod guild_raid_preset_info; -pub mod guild_raid_preset_info_change; -pub mod guild_raid_preset_save; -pub mod guild_raid_preset_slot_add; -pub mod guild_raid_preset_use; -pub mod guild_raid_season_ranking; -pub mod guild_raid_season_reward; -pub mod guild_recommend; -pub mod guild_search; -pub mod guild_supporter_add; -pub mod guild_supporter_delete; -pub mod guild_supporter_info; -pub mod guild_supporter_info_list; -pub mod guild_update_action_info; -pub mod hunt_dispatch; -pub mod hunt_dispatch_end; -pub mod hunt_dispatch_info; -pub mod hunt_dispatch_reward_preview; -pub mod hunt_dispatch_start; -pub mod hunting_ground_enter; -pub mod hunting_ground_info; -pub mod hunting_ground_info_list; -pub mod id_card_preset_delete; -pub mod id_card_preset_info; -pub mod id_card_preset_save; -pub mod id_card_recovery; -pub mod id_card_save; -pub mod id_card_shop_buy; -pub mod id_card_shop_info; -pub mod inn_open; -pub mod interaction_trigger; -pub mod inven_add_slot; -pub mod item_dump; -pub mod item_info; -pub mod item_storage_info; -pub mod item_storage_out; -pub mod item_storage_put; -pub mod item_storage_update; -pub mod join_user; -pub mod jp_user; -pub mod jp_user_info; -pub mod leave_user; -pub mod like_user; -pub mod login_event; -pub mod login_user; -pub mod logout_user; -pub mod mail_history_info; -pub mod mail_info; -pub mod mail_open; -pub mod maintenance_info; -pub mod mercenary_scout; -pub mod mini_game_action_end; -pub mod mini_game_action_info; -pub mod mini_game_action_ranking; -pub mod mini_game_action_start; -pub mod mini_game_bingo_info; -pub mod mini_game_bingo_play; -pub mod mini_game_board_info; -pub mod mini_game_board_play; -pub mod mini_game_defense_end; -pub mod mini_game_defense_info; -pub mod mini_game_defense_matching; -pub mod mini_game_defense_start; -pub mod mini_game_field_end; -pub mod mini_game_field_info; -pub mod mini_game_field_quick_reward; -pub mod mini_game_field_reward; -pub mod mini_game_field_score; -pub mod mini_game_field_start; -pub mod mini_game_hub_info; -pub mod mini_game_relay_server_info; -pub mod mini_game_rhythm_info; -pub mod mini_game_rhythm_play_end; -pub mod mini_game_rhythm_play_start; -pub mod mini_game_rhythm_ranking; -pub mod mini_game_roulette_draw; -pub mod mini_game_roulette_info; -pub mod mini_game_run_end; -pub mod mini_game_run_info; -pub mod mini_game_run_quick_reward; -pub mod mini_game_run_start; -pub mod mini_game_sichuan_end; -pub mod mini_game_sichuan_info; -pub mod mini_game_sichuan_ranking; -pub mod mini_game_sichuan_start; -pub mod mini_game_survival_char_upgrade; -pub mod mini_game_survival_char_upgrade_reset; -pub mod mini_game_survival_end; -pub mod mini_game_survival_info; -pub mod mini_game_survival_play; -pub mod mini_game_survival_ranking; -pub mod mini_game_survival_skill_select_list; -pub mod mini_game_survival_skill_up; -pub mod mini_game_survival_start; -pub mod mini_puzzle_all_open; -pub mod mini_puzzle_info; -pub mod mini_puzzle_open; -pub mod mini_puzzle_renew; -pub mod mission_clear; -pub mod mission_info; -pub mod mission_section_reward; -pub mod mission_update; -pub mod monster_hunt_change_team; -pub mod monster_hunt_deck_info; -pub mod monster_hunt_deck_save; -pub mod monster_hunt_preset_delete; -pub mod monster_hunt_preset_info; -pub mod monster_hunt_preset_info_change; -pub mod monster_hunt_preset_save; -pub mod monster_hunt_preset_slot_add; -pub mod monster_hunt_preset_use; -pub mod monster_hunt_quick_battle; -pub mod monster_hunt_rank_info; -pub mod monster_hunt_schedule_info; -pub mod monster_hunt_season_reward; -pub mod monster_hunt_user_info; -pub mod monster_info; -pub mod my_like_info; -pub mod my_room_expand; -pub mod my_room_hide; -pub mod my_room_item_info; -pub mod my_room_like; -pub mod my_room_move; -pub mod my_room_name_change; -pub mod my_room_primary_change; -pub mod my_room_save; -pub mod my_room_search_friend; -pub mod my_room_search_guild; -pub mod my_room_search_recommend; -pub mod my_room_shop_buy; -pub mod my_room_shop_info; -pub mod my_room_user_info; -pub mod notice_detail_info; -pub mod notice_info; -pub mod npc_reputation_info; -pub mod npc_reputation_recovery; +pub mod costume; +pub mod dating; +pub mod deck; +pub mod dispatch; +pub mod eat; +pub mod equip; +pub mod equips; +pub mod event; +pub mod evil; +pub mod field; +pub mod friend; +pub mod gacha; +pub mod guild; +pub mod hunt; +pub mod hunting; +pub mod id; +pub mod inn; +pub mod interaction; +pub mod inven; +pub mod item; +pub mod join; +pub mod jp; +pub mod leave; +pub mod like; +pub mod login; +pub mod logout; +pub mod mail; +pub mod maintenace; +pub mod maintenance; +pub mod mercenary; +pub mod mini; +pub mod mission; +pub mod monster; +pub mod my; +pub mod notice; +pub mod npc; pub mod overwhelm; -pub mod pack_buy; -pub mod pack_detail; -pub mod pack_event_battle_info; -pub mod pack_event_story_clear; -pub mod pack_event_story_info; -pub mod pack_event_story_replay_clear; -pub mod pack_in_game_info; -pub mod pack_info; -pub mod pack_jam_event; -pub mod pack_preview_info; -pub mod pack_reward_object_count; -pub mod pack_sub_quest_clear_info; -pub mod pass_buy; -pub mod pass_info; -pub mod pass_reward; -pub mod personal_info; -pub mod pictorial_book_info; -pub mod ping_check; -pub mod platform_login; -pub mod popular_costume_info; -pub mod popular_equip_info; -pub mod preset_add_slot; -pub mod preset_delete; -pub mod preset_info; -pub mod preset_info_change; -pub mod preset_save; -pub mod preset_use; -pub mod prestige_skin_info; -pub mod prestige_skin_set; -pub mod price_localization; -pub mod pvp_battle_deck_info; -pub mod pvp_battle_deck_save; -pub mod pvp_battle_end; -pub mod pvp_battle_history; -pub mod pvp_battle_history_deck_info; -pub mod pvp_battle_matching; -pub mod pvp_battle_once_reward_info; -pub mod pvp_battle_rank_user_detail; -pub mod pvp_battle_ranking; -pub mod pvp_battle_replay_info; -pub mod pvp_battle_reset; -pub mod pvp_battle_reward; -pub mod pvp_battle_start; -pub mod pvp_battle_user_info; -pub mod pvp_contents_item_renew; -pub mod pvp_season_reward; -pub mod quest_accept; -pub mod quest_clear; -pub mod quest_give_up; -pub mod quest_immortal_reset; -pub mod quest_info; -pub mod quest_max_clear_info; -pub mod quest_update; -pub mod quick_battle; -pub mod recipe_info; -pub mod recommend_deck_info; -pub mod recommend_deck_user_option_save; -pub mod refresh_token; -pub mod report_user; -pub mod reputation_info; -pub mod root_sort_id_info; -pub mod save_field_char_control_deck_type; -pub mod save_total_battle_power; -pub mod save_user_position; -pub mod schedule_info; -pub mod season_reward_info; -pub mod select_platform_other_data; -pub mod send_log; -pub mod server_info; -pub mod server_now_time; -pub mod shop_buy; -pub mod shop_info; -pub mod shop_open; -pub mod shop_sell; -pub mod sky_way_enter; -pub mod sky_way_info; -pub mod sky_way_schedule_info; -pub mod statue_object_reward; -pub mod storage_add_slot; -pub mod supporter_battle_info; -pub mod supporter_borrow; -pub mod supporter_detail; -pub mod supporter_info; -pub mod supporter_register; -pub mod supporter_remove; -pub mod supporter_reward; -pub mod supporter_status; -pub mod talent_skill_upgrade; -pub mod talent_skill_use; -pub mod talent_slot_save; -pub mod time_pause; -pub mod today_quest_info; -pub mod total_war_battle_end; -pub mod total_war_battle_start; -pub mod total_war_contents_item_renew; -pub mod total_war_deck_info; -pub mod total_war_deck_preset_info; -pub mod total_war_deck_preset_save; -pub mod total_war_deck_preset_slot_add; -pub mod total_war_deck_save; -pub mod total_war_info; -pub mod total_war_preset_delete; -pub mod total_war_preset_info_change; -pub mod total_war_reward; -pub mod total_war_reward_state; -pub mod trap_damage; -pub mod tutorial_clear; -pub mod tutorial_info; -pub mod update_user_contents_info_option; -pub mod use_random_box; -pub mod use_resource_item; -pub mod user_contents_info; -pub mod user_contents_info_option; -pub mod user_greeting_change; -pub mod user_level_reward; -pub mod user_nickname_change; -pub mod user_portrait_change; -pub mod user_title_change; -pub mod waypoint_info; -pub mod waypoint_save; -pub mod waypoint_use; - -pub mod maintenace_info; -pub mod account; \ No newline at end of file +pub mod pack; +pub mod pass; +pub mod personal; +pub mod pictorial; +pub mod ping; +pub mod platform; +pub mod popular; +pub mod preset; +pub mod prestige; +pub mod price; +pub mod pvp; +pub mod quest; +pub mod quick; +pub mod recipe; +pub mod recommend; +pub mod refresh; +pub mod report; +pub mod reputation; +pub mod root; +pub mod save; +pub mod schedule; +pub mod season; +pub mod select; +pub mod send; +pub mod server; +pub mod shop; +pub mod sky; +pub mod statue; +pub mod storage; +pub mod supporter; +pub mod talent; +pub mod time; +pub mod today; +pub mod total; +pub mod trap; +pub mod tutorial; +pub mod update; +pub mod use2; +pub mod user; +pub mod waypoint; diff --git a/gameserver/src/logic/game/monster/mod.rs b/gameserver/src/logic/game/monster/mod.rs new file mode 100644 index 0000000..1998b8e --- /dev/null +++ b/gameserver/src/logic/game/monster/mod.rs @@ -0,0 +1,15 @@ +pub mod monster_hunt_change_team; +pub mod monster_hunt_deck_info; +pub mod monster_hunt_deck_save; +pub mod monster_hunt_preset_delete; +pub mod monster_hunt_preset_info; +pub mod monster_hunt_preset_info_change; +pub mod monster_hunt_preset_save; +pub mod monster_hunt_preset_slot_add; +pub mod monster_hunt_preset_use; +pub mod monster_hunt_quick_battle; +pub mod monster_hunt_rank_info; +pub mod monster_hunt_schedule_info; +pub mod monster_hunt_season_reward; +pub mod monster_hunt_user_info; +pub mod monster_info; diff --git a/gameserver/src/logic/game/monster_hunt_change_team.rs b/gameserver/src/logic/game/monster/monster_hunt_change_team.rs similarity index 100% rename from gameserver/src/logic/game/monster_hunt_change_team.rs rename to gameserver/src/logic/game/monster/monster_hunt_change_team.rs diff --git a/gameserver/src/logic/game/monster_hunt_deck_info.rs b/gameserver/src/logic/game/monster/monster_hunt_deck_info.rs similarity index 100% rename from gameserver/src/logic/game/monster_hunt_deck_info.rs rename to gameserver/src/logic/game/monster/monster_hunt_deck_info.rs diff --git a/gameserver/src/logic/game/monster_hunt_deck_save.rs b/gameserver/src/logic/game/monster/monster_hunt_deck_save.rs similarity index 100% rename from gameserver/src/logic/game/monster_hunt_deck_save.rs rename to gameserver/src/logic/game/monster/monster_hunt_deck_save.rs diff --git a/gameserver/src/logic/game/monster_hunt_preset_delete.rs b/gameserver/src/logic/game/monster/monster_hunt_preset_delete.rs similarity index 100% rename from gameserver/src/logic/game/monster_hunt_preset_delete.rs rename to gameserver/src/logic/game/monster/monster_hunt_preset_delete.rs diff --git a/gameserver/src/logic/game/monster_hunt_preset_info.rs b/gameserver/src/logic/game/monster/monster_hunt_preset_info.rs similarity index 100% rename from gameserver/src/logic/game/monster_hunt_preset_info.rs rename to gameserver/src/logic/game/monster/monster_hunt_preset_info.rs diff --git a/gameserver/src/logic/game/monster_hunt_preset_info_change.rs b/gameserver/src/logic/game/monster/monster_hunt_preset_info_change.rs similarity index 100% rename from gameserver/src/logic/game/monster_hunt_preset_info_change.rs rename to gameserver/src/logic/game/monster/monster_hunt_preset_info_change.rs diff --git a/gameserver/src/logic/game/monster_hunt_preset_save.rs b/gameserver/src/logic/game/monster/monster_hunt_preset_save.rs similarity index 100% rename from gameserver/src/logic/game/monster_hunt_preset_save.rs rename to gameserver/src/logic/game/monster/monster_hunt_preset_save.rs diff --git a/gameserver/src/logic/game/monster_hunt_preset_slot_add.rs b/gameserver/src/logic/game/monster/monster_hunt_preset_slot_add.rs similarity index 100% rename from gameserver/src/logic/game/monster_hunt_preset_slot_add.rs rename to gameserver/src/logic/game/monster/monster_hunt_preset_slot_add.rs diff --git a/gameserver/src/logic/game/monster_hunt_preset_use.rs b/gameserver/src/logic/game/monster/monster_hunt_preset_use.rs similarity index 100% rename from gameserver/src/logic/game/monster_hunt_preset_use.rs rename to gameserver/src/logic/game/monster/monster_hunt_preset_use.rs diff --git a/gameserver/src/logic/game/monster_hunt_quick_battle.rs b/gameserver/src/logic/game/monster/monster_hunt_quick_battle.rs similarity index 100% rename from gameserver/src/logic/game/monster_hunt_quick_battle.rs rename to gameserver/src/logic/game/monster/monster_hunt_quick_battle.rs diff --git a/gameserver/src/logic/game/monster_hunt_rank_info.rs b/gameserver/src/logic/game/monster/monster_hunt_rank_info.rs similarity index 100% rename from gameserver/src/logic/game/monster_hunt_rank_info.rs rename to gameserver/src/logic/game/monster/monster_hunt_rank_info.rs diff --git a/gameserver/src/logic/game/monster_hunt_schedule_info.rs b/gameserver/src/logic/game/monster/monster_hunt_schedule_info.rs similarity index 98% rename from gameserver/src/logic/game/monster_hunt_schedule_info.rs rename to gameserver/src/logic/game/monster/monster_hunt_schedule_info.rs index fe8391b..5b58db6 100644 --- a/gameserver/src/logic/game/monster_hunt_schedule_info.rs +++ b/gameserver/src/logic/game/monster/monster_hunt_schedule_info.rs @@ -17,7 +17,7 @@ pub async fn handle( info!("Handling MonsterHuntScheduleInfoRequest: {:?}", req); let data: Value = serde_json::from_str(include_str!( - "../../../../data/starter/monster_hunt_schedule_info.json" + "../../../../../data/starter/monster_hunt_schedule_info.json" )) .unwrap(); diff --git a/gameserver/src/logic/game/monster_hunt_season_reward.rs b/gameserver/src/logic/game/monster/monster_hunt_season_reward.rs similarity index 100% rename from gameserver/src/logic/game/monster_hunt_season_reward.rs rename to gameserver/src/logic/game/monster/monster_hunt_season_reward.rs diff --git a/gameserver/src/logic/game/monster_hunt_user_info.rs b/gameserver/src/logic/game/monster/monster_hunt_user_info.rs similarity index 100% rename from gameserver/src/logic/game/monster_hunt_user_info.rs rename to gameserver/src/logic/game/monster/monster_hunt_user_info.rs diff --git a/gameserver/src/logic/game/monster_info.rs b/gameserver/src/logic/game/monster/monster_info.rs similarity index 78% rename from gameserver/src/logic/game/monster_info.rs rename to gameserver/src/logic/game/monster/monster_info.rs index 5b48afe..8a5c6ce 100644 --- a/gameserver/src/logic/game/monster_info.rs +++ b/gameserver/src/logic/game/monster/monster_info.rs @@ -2,7 +2,7 @@ use bd2::prost::Message; use bd2::proto::proto_net::{MonsterDbInfo, MonsterInfoRequest, MonsterInfoResponse, Notify}; use common::packet_code::PacketCodeType; use crypto::network::GameResponse; -use database::db::monster_info::get_monster_info; +use database::db::monster::monster_info::get_monster_info; use sqlx::SqlitePool; use tracing::info; @@ -37,15 +37,9 @@ pub async fn handle(pool: &SqlitePool, uid: i64, _req: MonsterInfoRequest) -> Ga let resp_bytes = response.encode_to_vec(); let notify = Notify { - achievement_update_info: vec![], - mission_update_info: vec![], - event_mission_update_info: vec![], - active_login_event: vec![1, 2, 625, 626, 627], - active_contents_info: vec![], - ll_type: Some("".to_string()), - is_purchasing_disabled: Some(false), + active_login_event: vec![1, 2], maintenance_start_date: Some(1688646600000), - notice_last_seq: Some(8818), + notice_last_seq: Some(8916), ..Default::default() }; diff --git a/gameserver/src/logic/game/my/mod.rs b/gameserver/src/logic/game/my/mod.rs new file mode 100644 index 0000000..69d331e --- /dev/null +++ b/gameserver/src/logic/game/my/mod.rs @@ -0,0 +1,15 @@ +pub mod my_like_info; +pub mod my_room_expand; +pub mod my_room_hide; +pub mod my_room_item_info; +pub mod my_room_like; +pub mod my_room_move; +pub mod my_room_name_change; +pub mod my_room_primary_change; +pub mod my_room_save; +pub mod my_room_search_friend; +pub mod my_room_search_guild; +pub mod my_room_search_recommend; +pub mod my_room_shop_buy; +pub mod my_room_shop_info; +pub mod my_room_user_info; diff --git a/gameserver/src/logic/game/my_like_info.rs b/gameserver/src/logic/game/my/my_like_info.rs similarity index 100% rename from gameserver/src/logic/game/my_like_info.rs rename to gameserver/src/logic/game/my/my_like_info.rs diff --git a/gameserver/src/logic/game/my_room_expand.rs b/gameserver/src/logic/game/my/my_room_expand.rs similarity index 100% rename from gameserver/src/logic/game/my_room_expand.rs rename to gameserver/src/logic/game/my/my_room_expand.rs diff --git a/gameserver/src/logic/game/my_room_hide.rs b/gameserver/src/logic/game/my/my_room_hide.rs similarity index 100% rename from gameserver/src/logic/game/my_room_hide.rs rename to gameserver/src/logic/game/my/my_room_hide.rs diff --git a/gameserver/src/logic/game/my_room_item_info.rs b/gameserver/src/logic/game/my/my_room_item_info.rs similarity index 100% rename from gameserver/src/logic/game/my_room_item_info.rs rename to gameserver/src/logic/game/my/my_room_item_info.rs diff --git a/gameserver/src/logic/game/my_room_like.rs b/gameserver/src/logic/game/my/my_room_like.rs similarity index 100% rename from gameserver/src/logic/game/my_room_like.rs rename to gameserver/src/logic/game/my/my_room_like.rs diff --git a/gameserver/src/logic/game/my_room_move.rs b/gameserver/src/logic/game/my/my_room_move.rs similarity index 100% rename from gameserver/src/logic/game/my_room_move.rs rename to gameserver/src/logic/game/my/my_room_move.rs diff --git a/gameserver/src/logic/game/my_room_name_change.rs b/gameserver/src/logic/game/my/my_room_name_change.rs similarity index 100% rename from gameserver/src/logic/game/my_room_name_change.rs rename to gameserver/src/logic/game/my/my_room_name_change.rs diff --git a/gameserver/src/logic/game/my_room_primary_change.rs b/gameserver/src/logic/game/my/my_room_primary_change.rs similarity index 100% rename from gameserver/src/logic/game/my_room_primary_change.rs rename to gameserver/src/logic/game/my/my_room_primary_change.rs diff --git a/gameserver/src/logic/game/my_room_save.rs b/gameserver/src/logic/game/my/my_room_save.rs similarity index 100% rename from gameserver/src/logic/game/my_room_save.rs rename to gameserver/src/logic/game/my/my_room_save.rs diff --git a/gameserver/src/logic/game/my_room_search_friend.rs b/gameserver/src/logic/game/my/my_room_search_friend.rs similarity index 100% rename from gameserver/src/logic/game/my_room_search_friend.rs rename to gameserver/src/logic/game/my/my_room_search_friend.rs diff --git a/gameserver/src/logic/game/my_room_search_guild.rs b/gameserver/src/logic/game/my/my_room_search_guild.rs similarity index 100% rename from gameserver/src/logic/game/my_room_search_guild.rs rename to gameserver/src/logic/game/my/my_room_search_guild.rs diff --git a/gameserver/src/logic/game/my_room_search_recommend.rs b/gameserver/src/logic/game/my/my_room_search_recommend.rs similarity index 100% rename from gameserver/src/logic/game/my_room_search_recommend.rs rename to gameserver/src/logic/game/my/my_room_search_recommend.rs diff --git a/gameserver/src/logic/game/my_room_shop_buy.rs b/gameserver/src/logic/game/my/my_room_shop_buy.rs similarity index 100% rename from gameserver/src/logic/game/my_room_shop_buy.rs rename to gameserver/src/logic/game/my/my_room_shop_buy.rs diff --git a/gameserver/src/logic/game/my_room_shop_info.rs b/gameserver/src/logic/game/my/my_room_shop_info.rs similarity index 100% rename from gameserver/src/logic/game/my_room_shop_info.rs rename to gameserver/src/logic/game/my/my_room_shop_info.rs diff --git a/gameserver/src/logic/game/my_room_user_info.rs b/gameserver/src/logic/game/my/my_room_user_info.rs similarity index 100% rename from gameserver/src/logic/game/my_room_user_info.rs rename to gameserver/src/logic/game/my/my_room_user_info.rs diff --git a/gameserver/src/logic/game/notice/mod.rs b/gameserver/src/logic/game/notice/mod.rs new file mode 100644 index 0000000..7619593 --- /dev/null +++ b/gameserver/src/logic/game/notice/mod.rs @@ -0,0 +1,2 @@ +pub mod notice_detail_info; +pub mod notice_info; diff --git a/gameserver/src/logic/game/notice_detail_info.rs b/gameserver/src/logic/game/notice/notice_detail_info.rs similarity index 89% rename from gameserver/src/logic/game/notice_detail_info.rs rename to gameserver/src/logic/game/notice/notice_detail_info.rs index be62de4..c9ce433 100644 --- a/gameserver/src/logic/game/notice_detail_info.rs +++ b/gameserver/src/logic/game/notice/notice_detail_info.rs @@ -5,7 +5,7 @@ use bd2::proto::proto_net::{ }; use common::packet_code::PacketCodeType; use crypto::network::GameResponse; -use database::db::notice_info::get_notice_info; +use database::db::notice::notice_info::get_notice_info; use serde_json::Value; use sqlx::SqlitePool; use tracing::info; @@ -16,7 +16,7 @@ pub async fn handle(pool: &SqlitePool, uid: i64, req: NoticeDetailInfoRequest) - uid, req ); - // --- Fetch all notices for the UID (you could optimize this later with a WHERE clause) --- + let notice_rows = match get_notice_info(pool, uid).await { Ok(rows) => rows, Err(err) => { @@ -25,14 +25,13 @@ pub async fn handle(pool: &SqlitePool, uid: i64, req: NoticeDetailInfoRequest) - } }; - // --- Find the one with matching id --- let selected = req .notice_id .and_then(|id| notice_rows.into_iter().find(|row| row.id == Some(id))); - // --- Convert DB model to Protobuf NoticeDbInfo --- + let notice_info = selected.map(|row| { - // Parse JSON string (notice_contents_info_index) → Vec + let contents: Vec = row .notice_contents_info_index .as_ref() @@ -81,14 +80,13 @@ pub async fn handle(pool: &SqlitePool, uid: i64, req: NoticeDetailInfoRequest) - } }); - // --- Build the protobuf response --- + let response = NoticeDetailInfoResponse { notice_info, // optional }; let resp_bytes = response.encode_to_vec(); - // --- Notify (common payload) --- let notify = Notify { achievement_update_info: vec![], mission_update_info: vec![], diff --git a/gameserver/src/logic/game/notice_info.rs b/gameserver/src/logic/game/notice/notice_info.rs similarity index 100% rename from gameserver/src/logic/game/notice_info.rs rename to gameserver/src/logic/game/notice/notice_info.rs diff --git a/gameserver/src/logic/game/npc/mod.rs b/gameserver/src/logic/game/npc/mod.rs new file mode 100644 index 0000000..60d8271 --- /dev/null +++ b/gameserver/src/logic/game/npc/mod.rs @@ -0,0 +1,2 @@ +pub mod npc_reputation_info; +pub mod npc_reputation_recovery; diff --git a/gameserver/src/logic/game/npc_reputation_info.rs b/gameserver/src/logic/game/npc/npc_reputation_info.rs similarity index 100% rename from gameserver/src/logic/game/npc_reputation_info.rs rename to gameserver/src/logic/game/npc/npc_reputation_info.rs diff --git a/gameserver/src/logic/game/npc_reputation_recovery.rs b/gameserver/src/logic/game/npc/npc_reputation_recovery.rs similarity index 100% rename from gameserver/src/logic/game/npc_reputation_recovery.rs rename to gameserver/src/logic/game/npc/npc_reputation_recovery.rs diff --git a/gameserver/src/logic/game/pack/mod.rs b/gameserver/src/logic/game/pack/mod.rs new file mode 100644 index 0000000..586c5fc --- /dev/null +++ b/gameserver/src/logic/game/pack/mod.rs @@ -0,0 +1,12 @@ +pub mod pack_buy; +pub mod pack_detail; +pub mod pack_event_battle_info; +pub mod pack_event_story_clear; +pub mod pack_event_story_info; +pub mod pack_event_story_replay_clear; +pub mod pack_in_game_info; +pub mod pack_info; +pub mod pack_jam_event; +pub mod pack_preview_info; +pub mod pack_reward_object_count; +pub mod pack_sub_quest_clear_info; diff --git a/gameserver/src/logic/game/pack_buy.rs b/gameserver/src/logic/game/pack/pack_buy.rs similarity index 100% rename from gameserver/src/logic/game/pack_buy.rs rename to gameserver/src/logic/game/pack/pack_buy.rs diff --git a/gameserver/src/logic/game/pack_detail.rs b/gameserver/src/logic/game/pack/pack_detail.rs similarity index 100% rename from gameserver/src/logic/game/pack_detail.rs rename to gameserver/src/logic/game/pack/pack_detail.rs diff --git a/gameserver/src/logic/game/pack_event_battle_info.rs b/gameserver/src/logic/game/pack/pack_event_battle_info.rs similarity index 100% rename from gameserver/src/logic/game/pack_event_battle_info.rs rename to gameserver/src/logic/game/pack/pack_event_battle_info.rs diff --git a/gameserver/src/logic/game/pack_event_story_clear.rs b/gameserver/src/logic/game/pack/pack_event_story_clear.rs similarity index 100% rename from gameserver/src/logic/game/pack_event_story_clear.rs rename to gameserver/src/logic/game/pack/pack_event_story_clear.rs diff --git a/gameserver/src/logic/game/pack_event_story_info.rs b/gameserver/src/logic/game/pack/pack_event_story_info.rs similarity index 100% rename from gameserver/src/logic/game/pack_event_story_info.rs rename to gameserver/src/logic/game/pack/pack_event_story_info.rs diff --git a/gameserver/src/logic/game/pack_event_story_replay_clear.rs b/gameserver/src/logic/game/pack/pack_event_story_replay_clear.rs similarity index 100% rename from gameserver/src/logic/game/pack_event_story_replay_clear.rs rename to gameserver/src/logic/game/pack/pack_event_story_replay_clear.rs diff --git a/gameserver/src/logic/game/pack_in_game_info.rs b/gameserver/src/logic/game/pack/pack_in_game_info.rs similarity index 76% rename from gameserver/src/logic/game/pack_in_game_info.rs rename to gameserver/src/logic/game/pack/pack_in_game_info.rs index 01a174d..ff76014 100644 --- a/gameserver/src/logic/game/pack_in_game_info.rs +++ b/gameserver/src/logic/game/pack/pack_in_game_info.rs @@ -7,10 +7,12 @@ use bd2::proto::proto_net::{ use common::packet_code::PacketCodeType; use crypto::network::GameResponse; use database::db::{ - content_rank_statue_info::get_content_rank_statue_info, - hunting_ground_info::get_hunting_ground_info, map_active_info::get_map_active_info, - monster_info::get_monster_info, quest_info::get_quest_info, - reputation_info::get_reputation_info, talent_skill_info::get_talent_skill_info, + content::content_rank_statue_info::get_content_rank_statue_info, + hunting::hunting_ground_info::get_hunting_ground_info, + hunting::hunting_ground_monster::get_monsters_for_hunting_ground, + map::map_active_info::get_map_active_info, quest::quest_info::get_quest_info, + reputation::reputation_info::get_reputation_info, + talent::talent_skill_info::get_talent_skill_info, }; use sqlx::SqlitePool; use tracing::info; @@ -21,8 +23,15 @@ pub async fn handle(pool: &SqlitePool, uid: i64, req: PackInGameInfoRequest) -> // --- 1. Fetch all user data safely --- let quest_rows = get_quest_info(pool, uid).await.unwrap_or_default(); let rep_rows = get_reputation_info(pool, uid).await.unwrap_or_default(); - let map_rows = get_map_active_info(pool, uid).await.unwrap_or_default(); - let monster_rows = get_monster_info(pool, uid).await.unwrap_or_default(); + + let map_rows = match get_map_active_info(pool, uid).await { + Ok(rows) => rows, + Err(err) => { + eprintln!("get_map_active_info error: {:?}", err); + vec![] + } + }; + let hunting_rows = get_hunting_ground_info(pool, uid).await.unwrap_or_default(); let talent_skill_rows = get_talent_skill_info(pool, uid).await.unwrap_or_default(); let statue_rows = get_content_rank_statue_info(pool, uid) @@ -31,7 +40,7 @@ pub async fn handle(pool: &SqlitePool, uid: i64, req: PackInGameInfoRequest) -> // Fetch last saved user position, or fallback to default let position = sqlx::query_scalar::<_, Option>( - "SELECT Position FROM UserPosition WHERE Uid = ?", + "SELECT PackPosition FROM UserPosition WHERE Uid = ?", ) .bind(uid) .fetch_optional(pool) @@ -88,7 +97,21 @@ pub async fn handle(pool: &SqlitePool, uid: i64, req: PackInGameInfoRequest) -> }; // 2.4 map_active_info — should default to two maps w/ 8×"ff" - let map_active_info = if map_rows.is_empty() { + let map_active_info = map_rows + .into_iter() + .map(|row| { + let active_info = serde_json::from_str::>(&row.active_info) + .unwrap_or_else(|_| vec!["ff".to_string(); 8]); + + MapActiveInfo { + map_id: row.map_id, + active_info, + } + }) + .collect::>(); + + // fallback default if no records exist + let map_active_info = if map_active_info.is_empty() { vec![ MapActiveInfo { map_id: Some(1), @@ -100,49 +123,48 @@ pub async fn handle(pool: &SqlitePool, uid: i64, req: PackInGameInfoRequest) -> }, ] } else { - map_rows - .into_iter() - .map(|m| MapActiveInfo { - map_id: m.map_id, - active_info: serde_json::from_str::>(&m.active_info) - .unwrap_or_else(|_| vec!["ff".to_string(); 8]), - }) - .collect() + map_active_info }; // 2.5 monster_info — should be empty here let monster_info = vec![]; // 2.6 hunting_ground_info — use monsters here instead - let hunting_monsters = monster_rows + let ground_opt = hunting_rows .into_iter() - .map(|m| MonsterDbInfo { - monster_id: m.monster_id, - battle_deck: m.battle_deck, - respawn_time: m.respawn_time, - life_end_time: m.life_end_time, - group_id: m.group_id, - active_flag: m.active_flag, - }) - .collect::>(); + .find(|h| req.pack_id.map_or(true, |pid| h.pack_id == Some(pid))); - let hunting_ground_info = hunting_rows - .into_iter() - .find(|h| req.pack_id.map_or(true, |pid| h.pack_id == Some(pid))) - .map(|h| HuntingGroundDbInfo { - is_auto: Some(h.is_auto.unwrap_or_default()), + let hunting_ground_info = if let Some(h) = ground_opt { + let monsters = get_monsters_for_hunting_ground(pool, h.index) + .await + .unwrap_or_default(); + + let hunting_monsters = monsters + .into_iter() + .map(|m| MonsterDbInfo { + monster_id: m.monster_id, + battle_deck: m.battle_deck, + active_flag: m.active_flag, + ..Default::default() + }) + .collect::>(); + + Some(HuntingGroundDbInfo { current_id: h.current_id.or(Some(1)), - highest_id: h.highest_id.or(Some(0)), - monster_info: hunting_monsters.clone(), + monster_info: hunting_monsters, pack_id: h.pack_id.or(Some(1)), + ..Default::default() }) - .or(Some(HuntingGroundDbInfo { + } else { + // fallback + Some(HuntingGroundDbInfo { is_auto: Some(false), current_id: Some(1), highest_id: Some(0), - monster_info: hunting_monsters, + monster_info: vec![], pack_id: Some(1), - })); + }) + }; // 2.7 talent_skill_info — safe to pass empty let talent_skill_info = talent_skill_rows diff --git a/gameserver/src/logic/game/pack_info.rs b/gameserver/src/logic/game/pack/pack_info.rs similarity index 100% rename from gameserver/src/logic/game/pack_info.rs rename to gameserver/src/logic/game/pack/pack_info.rs diff --git a/gameserver/src/logic/game/pack_jam_event.rs b/gameserver/src/logic/game/pack/pack_jam_event.rs similarity index 100% rename from gameserver/src/logic/game/pack_jam_event.rs rename to gameserver/src/logic/game/pack/pack_jam_event.rs diff --git a/gameserver/src/logic/game/pack_preview_info.rs b/gameserver/src/logic/game/pack/pack_preview_info.rs similarity index 100% rename from gameserver/src/logic/game/pack_preview_info.rs rename to gameserver/src/logic/game/pack/pack_preview_info.rs diff --git a/gameserver/src/logic/game/pack_reward_object_count.rs b/gameserver/src/logic/game/pack/pack_reward_object_count.rs similarity index 100% rename from gameserver/src/logic/game/pack_reward_object_count.rs rename to gameserver/src/logic/game/pack/pack_reward_object_count.rs diff --git a/gameserver/src/logic/game/pack_sub_quest_clear_info.rs b/gameserver/src/logic/game/pack/pack_sub_quest_clear_info.rs similarity index 100% rename from gameserver/src/logic/game/pack_sub_quest_clear_info.rs rename to gameserver/src/logic/game/pack/pack_sub_quest_clear_info.rs diff --git a/gameserver/src/logic/game/pass/mod.rs b/gameserver/src/logic/game/pass/mod.rs new file mode 100644 index 0000000..7f6d22c --- /dev/null +++ b/gameserver/src/logic/game/pass/mod.rs @@ -0,0 +1,3 @@ +pub mod pass_buy; +pub mod pass_info; +pub mod pass_reward; diff --git a/gameserver/src/logic/game/pass_buy.rs b/gameserver/src/logic/game/pass/pass_buy.rs similarity index 100% rename from gameserver/src/logic/game/pass_buy.rs rename to gameserver/src/logic/game/pass/pass_buy.rs diff --git a/gameserver/src/logic/game/pass_info.rs b/gameserver/src/logic/game/pass/pass_info.rs similarity index 92% rename from gameserver/src/logic/game/pass_info.rs rename to gameserver/src/logic/game/pass/pass_info.rs index cbbd04c..c7b4b37 100644 --- a/gameserver/src/logic/game/pass_info.rs +++ b/gameserver/src/logic/game/pass/pass_info.rs @@ -11,10 +11,10 @@ pub async fn handle(_pool: &sqlx::SqlitePool, _uid: i64, _req: PassInfoRequest) info!("Handling PassInfoRequest"); // Load and parse JSON file - let data: Value = serde_json::from_str(include_str!("../../../../data/starter/pass_info.json")) - .expect("Failed to parse pass_info.json"); + let data: Value = + serde_json::from_str(include_str!("../../../../../data/starter/pass_info.json")) + .expect("Failed to parse pass_info.json"); - // --- Parse passInfo array --- let passes = data .get("passInfo") .and_then(|v| v.as_array()) diff --git a/gameserver/src/logic/game/pass_reward.rs b/gameserver/src/logic/game/pass/pass_reward.rs similarity index 100% rename from gameserver/src/logic/game/pass_reward.rs rename to gameserver/src/logic/game/pass/pass_reward.rs diff --git a/gameserver/src/logic/game/personal/mod.rs b/gameserver/src/logic/game/personal/mod.rs new file mode 100644 index 0000000..2eac6ff --- /dev/null +++ b/gameserver/src/logic/game/personal/mod.rs @@ -0,0 +1 @@ +pub mod personal_info; diff --git a/gameserver/src/logic/game/personal_info.rs b/gameserver/src/logic/game/personal/personal_info.rs similarity index 100% rename from gameserver/src/logic/game/personal_info.rs rename to gameserver/src/logic/game/personal/personal_info.rs diff --git a/gameserver/src/logic/game/pictorial/mod.rs b/gameserver/src/logic/game/pictorial/mod.rs new file mode 100644 index 0000000..cd56a5d --- /dev/null +++ b/gameserver/src/logic/game/pictorial/mod.rs @@ -0,0 +1 @@ +pub mod pictorial_book_info; diff --git a/gameserver/src/logic/game/pictorial_book_info.rs b/gameserver/src/logic/game/pictorial/pictorial_book_info.rs similarity index 95% rename from gameserver/src/logic/game/pictorial_book_info.rs rename to gameserver/src/logic/game/pictorial/pictorial_book_info.rs index 18deda4..5922185 100644 --- a/gameserver/src/logic/game/pictorial_book_info.rs +++ b/gameserver/src/logic/game/pictorial/pictorial_book_info.rs @@ -4,7 +4,7 @@ use bd2::proto::proto_net::{ }; use common::packet_code::PacketCodeType; use crypto::network::GameResponse; -use database::db::pictorial_book_info::get_pictorial_book_info; +use database::db::pictorial::pictorial_book_info::get_pictorial_book_info; use sqlx::SqlitePool; use tracing::info; diff --git a/gameserver/src/logic/game/ping/mod.rs b/gameserver/src/logic/game/ping/mod.rs new file mode 100644 index 0000000..538849c --- /dev/null +++ b/gameserver/src/logic/game/ping/mod.rs @@ -0,0 +1 @@ +pub mod ping_check; diff --git a/gameserver/src/logic/game/ping_check.rs b/gameserver/src/logic/game/ping/ping_check.rs similarity index 100% rename from gameserver/src/logic/game/ping_check.rs rename to gameserver/src/logic/game/ping/ping_check.rs diff --git a/gameserver/src/logic/game/platform/mod.rs b/gameserver/src/logic/game/platform/mod.rs new file mode 100644 index 0000000..b6e13b0 --- /dev/null +++ b/gameserver/src/logic/game/platform/mod.rs @@ -0,0 +1 @@ +pub mod platform_login; diff --git a/gameserver/src/logic/game/platform_login.rs b/gameserver/src/logic/game/platform/platform_login.rs similarity index 100% rename from gameserver/src/logic/game/platform_login.rs rename to gameserver/src/logic/game/platform/platform_login.rs diff --git a/gameserver/src/logic/game/popular/mod.rs b/gameserver/src/logic/game/popular/mod.rs new file mode 100644 index 0000000..43392d1 --- /dev/null +++ b/gameserver/src/logic/game/popular/mod.rs @@ -0,0 +1,2 @@ +pub mod popular_costume_info; +pub mod popular_equip_info; diff --git a/gameserver/src/logic/game/popular_costume_info.rs b/gameserver/src/logic/game/popular/popular_costume_info.rs similarity index 100% rename from gameserver/src/logic/game/popular_costume_info.rs rename to gameserver/src/logic/game/popular/popular_costume_info.rs diff --git a/gameserver/src/logic/game/popular_equip_info.rs b/gameserver/src/logic/game/popular/popular_equip_info.rs similarity index 100% rename from gameserver/src/logic/game/popular_equip_info.rs rename to gameserver/src/logic/game/popular/popular_equip_info.rs diff --git a/gameserver/src/logic/game/preset/mod.rs b/gameserver/src/logic/game/preset/mod.rs new file mode 100644 index 0000000..2d250e9 --- /dev/null +++ b/gameserver/src/logic/game/preset/mod.rs @@ -0,0 +1,6 @@ +pub mod preset_add_slot; +pub mod preset_delete; +pub mod preset_info; +pub mod preset_info_change; +pub mod preset_save; +pub mod preset_use; diff --git a/gameserver/src/logic/game/preset_add_slot.rs b/gameserver/src/logic/game/preset/preset_add_slot.rs similarity index 100% rename from gameserver/src/logic/game/preset_add_slot.rs rename to gameserver/src/logic/game/preset/preset_add_slot.rs diff --git a/gameserver/src/logic/game/preset_delete.rs b/gameserver/src/logic/game/preset/preset_delete.rs similarity index 100% rename from gameserver/src/logic/game/preset_delete.rs rename to gameserver/src/logic/game/preset/preset_delete.rs diff --git a/gameserver/src/logic/game/preset_info.rs b/gameserver/src/logic/game/preset/preset_info.rs similarity index 100% rename from gameserver/src/logic/game/preset_info.rs rename to gameserver/src/logic/game/preset/preset_info.rs diff --git a/gameserver/src/logic/game/preset_info_change.rs b/gameserver/src/logic/game/preset/preset_info_change.rs similarity index 100% rename from gameserver/src/logic/game/preset_info_change.rs rename to gameserver/src/logic/game/preset/preset_info_change.rs diff --git a/gameserver/src/logic/game/preset_save.rs b/gameserver/src/logic/game/preset/preset_save.rs similarity index 100% rename from gameserver/src/logic/game/preset_save.rs rename to gameserver/src/logic/game/preset/preset_save.rs diff --git a/gameserver/src/logic/game/preset_use.rs b/gameserver/src/logic/game/preset/preset_use.rs similarity index 100% rename from gameserver/src/logic/game/preset_use.rs rename to gameserver/src/logic/game/preset/preset_use.rs diff --git a/gameserver/src/logic/game/prestige/mod.rs b/gameserver/src/logic/game/prestige/mod.rs new file mode 100644 index 0000000..fe8a7ab --- /dev/null +++ b/gameserver/src/logic/game/prestige/mod.rs @@ -0,0 +1,2 @@ +pub mod prestige_skin_info; +pub mod prestige_skin_set; diff --git a/gameserver/src/logic/game/prestige_skin_info.rs b/gameserver/src/logic/game/prestige/prestige_skin_info.rs similarity index 100% rename from gameserver/src/logic/game/prestige_skin_info.rs rename to gameserver/src/logic/game/prestige/prestige_skin_info.rs diff --git a/gameserver/src/logic/game/prestige_skin_set.rs b/gameserver/src/logic/game/prestige/prestige_skin_set.rs similarity index 100% rename from gameserver/src/logic/game/prestige_skin_set.rs rename to gameserver/src/logic/game/prestige/prestige_skin_set.rs diff --git a/gameserver/src/logic/game/price/mod.rs b/gameserver/src/logic/game/price/mod.rs new file mode 100644 index 0000000..5798e87 --- /dev/null +++ b/gameserver/src/logic/game/price/mod.rs @@ -0,0 +1 @@ +pub mod price_localization; diff --git a/gameserver/src/logic/game/price_localization.rs b/gameserver/src/logic/game/price/price_localization.rs similarity index 100% rename from gameserver/src/logic/game/price_localization.rs rename to gameserver/src/logic/game/price/price_localization.rs diff --git a/gameserver/src/logic/game/pvp/mod.rs b/gameserver/src/logic/game/pvp/mod.rs new file mode 100644 index 0000000..749b8c5 --- /dev/null +++ b/gameserver/src/logic/game/pvp/mod.rs @@ -0,0 +1,16 @@ +pub mod pvp_battle_deck_info; +pub mod pvp_battle_deck_save; +pub mod pvp_battle_end; +pub mod pvp_battle_history; +pub mod pvp_battle_history_deck_info; +pub mod pvp_battle_matching; +pub mod pvp_battle_once_reward_info; +pub mod pvp_battle_rank_user_detail; +pub mod pvp_battle_ranking; +pub mod pvp_battle_replay_info; +pub mod pvp_battle_reset; +pub mod pvp_battle_reward; +pub mod pvp_battle_start; +pub mod pvp_battle_user_info; +pub mod pvp_contents_item_renew; +pub mod pvp_season_reward; diff --git a/gameserver/src/logic/game/pvp_battle_deck_info.rs b/gameserver/src/logic/game/pvp/pvp_battle_deck_info.rs similarity index 100% rename from gameserver/src/logic/game/pvp_battle_deck_info.rs rename to gameserver/src/logic/game/pvp/pvp_battle_deck_info.rs diff --git a/gameserver/src/logic/game/pvp_battle_deck_save.rs b/gameserver/src/logic/game/pvp/pvp_battle_deck_save.rs similarity index 100% rename from gameserver/src/logic/game/pvp_battle_deck_save.rs rename to gameserver/src/logic/game/pvp/pvp_battle_deck_save.rs diff --git a/gameserver/src/logic/game/pvp_battle_end.rs b/gameserver/src/logic/game/pvp/pvp_battle_end.rs similarity index 100% rename from gameserver/src/logic/game/pvp_battle_end.rs rename to gameserver/src/logic/game/pvp/pvp_battle_end.rs diff --git a/gameserver/src/logic/game/pvp_battle_history.rs b/gameserver/src/logic/game/pvp/pvp_battle_history.rs similarity index 100% rename from gameserver/src/logic/game/pvp_battle_history.rs rename to gameserver/src/logic/game/pvp/pvp_battle_history.rs diff --git a/gameserver/src/logic/game/pvp_battle_history_deck_info.rs b/gameserver/src/logic/game/pvp/pvp_battle_history_deck_info.rs similarity index 100% rename from gameserver/src/logic/game/pvp_battle_history_deck_info.rs rename to gameserver/src/logic/game/pvp/pvp_battle_history_deck_info.rs diff --git a/gameserver/src/logic/game/pvp_battle_matching.rs b/gameserver/src/logic/game/pvp/pvp_battle_matching.rs similarity index 100% rename from gameserver/src/logic/game/pvp_battle_matching.rs rename to gameserver/src/logic/game/pvp/pvp_battle_matching.rs diff --git a/gameserver/src/logic/game/pvp_battle_once_reward_info.rs b/gameserver/src/logic/game/pvp/pvp_battle_once_reward_info.rs similarity index 100% rename from gameserver/src/logic/game/pvp_battle_once_reward_info.rs rename to gameserver/src/logic/game/pvp/pvp_battle_once_reward_info.rs diff --git a/gameserver/src/logic/game/pvp_battle_rank_user_detail.rs b/gameserver/src/logic/game/pvp/pvp_battle_rank_user_detail.rs similarity index 100% rename from gameserver/src/logic/game/pvp_battle_rank_user_detail.rs rename to gameserver/src/logic/game/pvp/pvp_battle_rank_user_detail.rs diff --git a/gameserver/src/logic/game/pvp_battle_ranking.rs b/gameserver/src/logic/game/pvp/pvp_battle_ranking.rs similarity index 100% rename from gameserver/src/logic/game/pvp_battle_ranking.rs rename to gameserver/src/logic/game/pvp/pvp_battle_ranking.rs diff --git a/gameserver/src/logic/game/pvp_battle_replay_info.rs b/gameserver/src/logic/game/pvp/pvp_battle_replay_info.rs similarity index 100% rename from gameserver/src/logic/game/pvp_battle_replay_info.rs rename to gameserver/src/logic/game/pvp/pvp_battle_replay_info.rs diff --git a/gameserver/src/logic/game/pvp_battle_reset.rs b/gameserver/src/logic/game/pvp/pvp_battle_reset.rs similarity index 100% rename from gameserver/src/logic/game/pvp_battle_reset.rs rename to gameserver/src/logic/game/pvp/pvp_battle_reset.rs diff --git a/gameserver/src/logic/game/pvp_battle_reward.rs b/gameserver/src/logic/game/pvp/pvp_battle_reward.rs similarity index 100% rename from gameserver/src/logic/game/pvp_battle_reward.rs rename to gameserver/src/logic/game/pvp/pvp_battle_reward.rs diff --git a/gameserver/src/logic/game/pvp_battle_start.rs b/gameserver/src/logic/game/pvp/pvp_battle_start.rs similarity index 100% rename from gameserver/src/logic/game/pvp_battle_start.rs rename to gameserver/src/logic/game/pvp/pvp_battle_start.rs diff --git a/gameserver/src/logic/game/pvp_battle_user_info.rs b/gameserver/src/logic/game/pvp/pvp_battle_user_info.rs similarity index 100% rename from gameserver/src/logic/game/pvp_battle_user_info.rs rename to gameserver/src/logic/game/pvp/pvp_battle_user_info.rs diff --git a/gameserver/src/logic/game/pvp_contents_item_renew.rs b/gameserver/src/logic/game/pvp/pvp_contents_item_renew.rs similarity index 100% rename from gameserver/src/logic/game/pvp_contents_item_renew.rs rename to gameserver/src/logic/game/pvp/pvp_contents_item_renew.rs diff --git a/gameserver/src/logic/game/pvp_season_reward.rs b/gameserver/src/logic/game/pvp/pvp_season_reward.rs similarity index 100% rename from gameserver/src/logic/game/pvp_season_reward.rs rename to gameserver/src/logic/game/pvp/pvp_season_reward.rs diff --git a/gameserver/src/logic/game/quest/mod.rs b/gameserver/src/logic/game/quest/mod.rs new file mode 100644 index 0000000..3d527ad --- /dev/null +++ b/gameserver/src/logic/game/quest/mod.rs @@ -0,0 +1,7 @@ +pub mod quest_accept; +pub mod quest_clear; +pub mod quest_give_up; +pub mod quest_immortal_reset; +pub mod quest_info; +pub mod quest_max_clear_info; +pub mod quest_update; diff --git a/gameserver/src/logic/game/quest_accept.rs b/gameserver/src/logic/game/quest/quest_accept.rs similarity index 100% rename from gameserver/src/logic/game/quest_accept.rs rename to gameserver/src/logic/game/quest/quest_accept.rs diff --git a/gameserver/src/logic/game/quest_clear.rs b/gameserver/src/logic/game/quest/quest_clear.rs similarity index 57% rename from gameserver/src/logic/game/quest_clear.rs rename to gameserver/src/logic/game/quest/quest_clear.rs index 2617e54..bd544c9 100644 --- a/gameserver/src/logic/game/quest_clear.rs +++ b/gameserver/src/logic/game/quest/quest_clear.rs @@ -1,30 +1,28 @@ +use crate::logic::field::quest_clear::handle_quest_clear; use bd2::prost::Message; -use bd2::proto::proto_net::{QuestClearRequest, QuestClearResponse, Notify }; +use bd2::proto::proto_net::{Notify, QuestClearRequest}; use common::packet_code::PacketCodeType; use crypto::network::GameResponse; use sqlx::SqlitePool; use tracing::info; -pub async fn handle(_pool: &SqlitePool, _uid: i64, req: QuestClearRequest) -> GameResponse { +pub async fn handle(pool: &SqlitePool, uid: i64, req: QuestClearRequest) -> GameResponse { info!("Handling QuestClearRequest: {:?}", req); - - // TODO: Fetch data from database - // Example: - // let data = get_something(pool, uid).await.unwrap_or_default(); - - // TODO: Transform to proto - // Example: - // let proto_data = data.into_iter() - // .map(|item| mapper::to_proto(item, pool).await) - // .collect(); - - let response = QuestClearResponse { - // TODO: Fill in response fields - ..Default::default() + + let quest_id = req.quest_id.unwrap_or_default(); + + let result = handle_quest_clear(pool, uid, quest_id).await; + + let response = match result { + Ok(resp) => resp, + Err(err) => { + tracing::error!("QuestClear failed: {:?}", err); + return GameResponse::error(404); + } }; - + let resp_bytes = response.encode_to_vec(); - + let notify = Notify { achievement_update_info: vec![], mission_update_info: vec![], @@ -37,7 +35,7 @@ pub async fn handle(_pool: &SqlitePool, _uid: i64, req: QuestClearRequest) -> Ga notice_last_seq: Some(8818), ..Default::default() }; - + let (route, code) = PacketCodeType::QuestClear.info(); GameResponse::success(route, &resp_bytes, code).with_notify(¬ify) -} \ No newline at end of file +} diff --git a/gameserver/src/logic/game/quest_give_up.rs b/gameserver/src/logic/game/quest/quest_give_up.rs similarity index 100% rename from gameserver/src/logic/game/quest_give_up.rs rename to gameserver/src/logic/game/quest/quest_give_up.rs diff --git a/gameserver/src/logic/game/quest_immortal_reset.rs b/gameserver/src/logic/game/quest/quest_immortal_reset.rs similarity index 100% rename from gameserver/src/logic/game/quest_immortal_reset.rs rename to gameserver/src/logic/game/quest/quest_immortal_reset.rs diff --git a/gameserver/src/logic/game/quest_info.rs b/gameserver/src/logic/game/quest/quest_info.rs similarity index 100% rename from gameserver/src/logic/game/quest_info.rs rename to gameserver/src/logic/game/quest/quest_info.rs diff --git a/gameserver/src/logic/game/quest/quest_max_clear_info.rs b/gameserver/src/logic/game/quest/quest_max_clear_info.rs new file mode 100644 index 0000000..b901a97 --- /dev/null +++ b/gameserver/src/logic/game/quest/quest_max_clear_info.rs @@ -0,0 +1,63 @@ +use bd2::prost::Message; +use bd2::proto::proto_net::{ + Notify, QuestMaxClearDbInfo, QuestMaxClearInfoRequest, QuestMaxClearInfoResponse, +}; +use common::packet_code::PacketCodeType; +use crypto::network::GameResponse; +use database::db::quest::quest_max_clear_info::{ + get_quest_max_clear_info, upsert_quest_max_clear_info, +}; +use sqlx::SqlitePool; +use tracing::info; + +pub async fn handle(pool: &SqlitePool, uid: i64, req: QuestMaxClearInfoRequest) -> GameResponse { + info!("Handling QuestMaxClearInfoRequest: {:?}", req); + + let rows = get_quest_max_clear_info(pool, uid) + .await + .unwrap_or_default(); + + let max_clear_info = if rows.is_empty() { + info!( + "No QuestMaxClearInfo for UID {}, initializing default...", + uid + ); + + let is_new_user = true; + + if is_new_user { + // insert a default starter record + upsert_quest_max_clear_info(pool, uid, 1, 1).await.ok(); + vec![QuestMaxClearDbInfo { + pack_id: Some(1), + max_clear_id: Some(1), + }] + } else { + vec![] + } + } else { + rows.into_iter() + .map(|r| QuestMaxClearDbInfo { + pack_id: r.pack_id, + max_clear_id: r.max_clear_id, + }) + .collect() + }; + + let response = QuestMaxClearInfoResponse { + max_clear_info, + ..Default::default() + }; + + let resp_bytes = response.encode_to_vec(); + + let notify = Notify { + maintenance_start_date: Some(1688646600000), + notice_last_seq: Some(8916), + active_login_event: vec![1, 2], + ..Default::default() + }; + + let (route, code) = PacketCodeType::QuestMaxClearInfo.info(); + GameResponse::success(route, &resp_bytes, code).with_notify(¬ify) +} diff --git a/gameserver/src/logic/game/quest/quest_update.rs b/gameserver/src/logic/game/quest/quest_update.rs new file mode 100644 index 0000000..b345860 --- /dev/null +++ b/gameserver/src/logic/game/quest/quest_update.rs @@ -0,0 +1,70 @@ +use bd2::prost::Message; +use bd2::proto::proto_net::{Notify, QuestUpdateRequest, QuestUpdateResponse}; +use chrono::Utc; +use common::packet_code::PacketCodeType; +use crypto::network::GameResponse; +use database::models::game::user_quest::UserQuest; +use sqlx::SqlitePool; +use tracing::info; + +use data::exceldb::get as get_exceldb; +use database::db::user::user_quest::{add_user_quest, get_user_quest, update_user_quest}; + +pub async fn handle(pool: &SqlitePool, uid: i64, req: QuestUpdateRequest) -> GameResponse { + let quest_id = req.quest_id.unwrap_or_default(); + let pack_id = req.pack_id.unwrap_or_default(); + let progress = req.quest_value.get(0).copied().unwrap_or(0); + + info!( + "QuestUpdateRequest: uid={} quest_id={} pack_id={} progress={}", + uid, quest_id, pack_id, progress + ); + + let db = get_exceldb(); + let quest_def = match db.questtable1.get(quest_id) { + Some(q) => q, + None => return GameResponse::error(404), + }; + + let mut record = match get_user_quest(pool, uid, quest_id).await { + Ok(Some(q)) => q, + _ => { + let q = UserQuest { + index: 0, + uid, + quest_id: quest_id as i64, + pack_id: Some(pack_id), + status: 1, + progress: 0, + reward_claimed: 0, + last_update: Some(Utc::now().timestamp_millis()), + }; + add_user_quest(pool, &q).await.ok(); + q + } + }; + + record.progress = progress; + let target = quest_def.condition_count; + if progress >= target { + record.status = 2; // Mark as ready-to-clear + } + update_user_quest(pool, &record).await.ok(); + + let response = QuestUpdateResponse { + update_quest_id: Some(quest_id), + reward_info_bundle: None, // client doesn't expect any reward info bundle here + ..Default::default() + }; + let resp_bytes = response.encode_to_vec(); + + let notify = Notify { + maintenance_start_date: Some(1688646600000), + notice_last_seq: Some(8916), + active_login_event: vec![1, 2], + ..Default::default() + }; + + let (route, code) = PacketCodeType::QuestUpdate.info(); + GameResponse::success(route, &resp_bytes, code).with_notify(¬ify) +} diff --git a/gameserver/src/logic/game/quest_max_clear_info.rs b/gameserver/src/logic/game/quest_max_clear_info.rs deleted file mode 100644 index f15cf45..0000000 --- a/gameserver/src/logic/game/quest_max_clear_info.rs +++ /dev/null @@ -1,37 +0,0 @@ -use bd2::prost::Message; -use bd2::proto::proto_net::{ - Notify, QuestMaxClearDbInfo, QuestMaxClearInfoRequest, QuestMaxClearInfoResponse, -}; -use common::packet_code::PacketCodeType; -use crypto::network::GameResponse; -use sqlx::SqlitePool; -use tracing::info; - -pub async fn handle(_pool: &SqlitePool, _uid: i64, req: QuestMaxClearInfoRequest) -> GameResponse { - info!("Handling QuestMaxClearInfoRequest: {:?}", req); - - let max_clear_info = vec![QuestMaxClearDbInfo { - pack_id: Some(1), - max_clear_id: Some(1), - }]; - - let response = QuestMaxClearInfoResponse { max_clear_info }; - - let resp_bytes = response.encode_to_vec(); - - let notify = Notify { - achievement_update_info: vec![], - mission_update_info: vec![], - event_mission_update_info: vec![], - active_login_event: vec![1, 2, 628, 629], - active_contents_info: vec![], - ll_type: Some("".to_string()), - is_purchasing_disabled: Some(false), - maintenance_start_date: Some(1688646600000), - notice_last_seq: Some(8909), - ..Default::default() - }; - - let (route, code) = PacketCodeType::QuestMaxClearInfo.info(); - GameResponse::success(route, &resp_bytes, code).with_notify(¬ify) -} diff --git a/gameserver/src/logic/game/quest_update.rs b/gameserver/src/logic/game/quest_update.rs deleted file mode 100644 index 79e46da..0000000 --- a/gameserver/src/logic/game/quest_update.rs +++ /dev/null @@ -1,43 +0,0 @@ -use bd2::prost::Message; -use bd2::proto::proto_net::{QuestUpdateRequest, QuestUpdateResponse, Notify }; -use common::packet_code::PacketCodeType; -use crypto::network::GameResponse; -use sqlx::SqlitePool; -use tracing::info; - -pub async fn handle(_pool: &SqlitePool, _uid: i64, req: QuestUpdateRequest) -> GameResponse { - info!("Handling QuestUpdateRequest: {:?}", req); - - // TODO: Fetch data from database - // Example: - // let data = get_something(pool, uid).await.unwrap_or_default(); - - // TODO: Transform to proto - // Example: - // let proto_data = data.into_iter() - // .map(|item| mapper::to_proto(item, pool).await) - // .collect(); - - let response = QuestUpdateResponse { - // TODO: Fill in response fields - ..Default::default() - }; - - let resp_bytes = response.encode_to_vec(); - - let notify = Notify { - achievement_update_info: vec![], - mission_update_info: vec![], - event_mission_update_info: vec![], - active_login_event: vec![1, 2, 625, 626, 627], - active_contents_info: vec![], - ll_type: Some("".to_string()), - is_purchasing_disabled: Some(false), - maintenance_start_date: Some(1688646600000), - notice_last_seq: Some(8818), - ..Default::default() - }; - - let (route, code) = PacketCodeType::QuestUpdate.info(); - GameResponse::success(route, &resp_bytes, code).with_notify(¬ify) -} \ No newline at end of file diff --git a/gameserver/src/logic/game/quick/mod.rs b/gameserver/src/logic/game/quick/mod.rs new file mode 100644 index 0000000..fba6fcf --- /dev/null +++ b/gameserver/src/logic/game/quick/mod.rs @@ -0,0 +1 @@ +pub mod quick_battle; diff --git a/gameserver/src/logic/game/quick_battle.rs b/gameserver/src/logic/game/quick/quick_battle.rs similarity index 100% rename from gameserver/src/logic/game/quick_battle.rs rename to gameserver/src/logic/game/quick/quick_battle.rs diff --git a/gameserver/src/logic/game/recipe/mod.rs b/gameserver/src/logic/game/recipe/mod.rs new file mode 100644 index 0000000..51f00d1 --- /dev/null +++ b/gameserver/src/logic/game/recipe/mod.rs @@ -0,0 +1 @@ +pub mod recipe_info; diff --git a/gameserver/src/logic/game/recipe_info.rs b/gameserver/src/logic/game/recipe/recipe_info.rs similarity index 100% rename from gameserver/src/logic/game/recipe_info.rs rename to gameserver/src/logic/game/recipe/recipe_info.rs diff --git a/gameserver/src/logic/game/recommend/mod.rs b/gameserver/src/logic/game/recommend/mod.rs new file mode 100644 index 0000000..929f9d8 --- /dev/null +++ b/gameserver/src/logic/game/recommend/mod.rs @@ -0,0 +1,2 @@ +pub mod recommend_deck_info; +pub mod recommend_deck_user_option_save; diff --git a/gameserver/src/logic/game/recommend_deck_info.rs b/gameserver/src/logic/game/recommend/recommend_deck_info.rs similarity index 100% rename from gameserver/src/logic/game/recommend_deck_info.rs rename to gameserver/src/logic/game/recommend/recommend_deck_info.rs diff --git a/gameserver/src/logic/game/recommend_deck_user_option_save.rs b/gameserver/src/logic/game/recommend/recommend_deck_user_option_save.rs similarity index 100% rename from gameserver/src/logic/game/recommend_deck_user_option_save.rs rename to gameserver/src/logic/game/recommend/recommend_deck_user_option_save.rs diff --git a/gameserver/src/logic/game/refresh/mod.rs b/gameserver/src/logic/game/refresh/mod.rs new file mode 100644 index 0000000..8646d34 --- /dev/null +++ b/gameserver/src/logic/game/refresh/mod.rs @@ -0,0 +1 @@ +pub mod refresh_token; diff --git a/gameserver/src/logic/game/refresh_token.rs b/gameserver/src/logic/game/refresh/refresh_token.rs similarity index 100% rename from gameserver/src/logic/game/refresh_token.rs rename to gameserver/src/logic/game/refresh/refresh_token.rs diff --git a/gameserver/src/logic/game/report/mod.rs b/gameserver/src/logic/game/report/mod.rs new file mode 100644 index 0000000..77e5f30 --- /dev/null +++ b/gameserver/src/logic/game/report/mod.rs @@ -0,0 +1 @@ +pub mod report_user; diff --git a/gameserver/src/logic/game/report_user.rs b/gameserver/src/logic/game/report/report_user.rs similarity index 100% rename from gameserver/src/logic/game/report_user.rs rename to gameserver/src/logic/game/report/report_user.rs diff --git a/gameserver/src/logic/game/reputation/mod.rs b/gameserver/src/logic/game/reputation/mod.rs new file mode 100644 index 0000000..ba8257a --- /dev/null +++ b/gameserver/src/logic/game/reputation/mod.rs @@ -0,0 +1 @@ +pub mod reputation_info; diff --git a/gameserver/src/logic/game/reputation_info.rs b/gameserver/src/logic/game/reputation/reputation_info.rs similarity index 100% rename from gameserver/src/logic/game/reputation_info.rs rename to gameserver/src/logic/game/reputation/reputation_info.rs diff --git a/gameserver/src/logic/game/root/mod.rs b/gameserver/src/logic/game/root/mod.rs new file mode 100644 index 0000000..9ddd99e --- /dev/null +++ b/gameserver/src/logic/game/root/mod.rs @@ -0,0 +1 @@ +pub mod root_sort_id_info; diff --git a/gameserver/src/logic/game/root_sort_id_info.rs b/gameserver/src/logic/game/root/root_sort_id_info.rs similarity index 100% rename from gameserver/src/logic/game/root_sort_id_info.rs rename to gameserver/src/logic/game/root/root_sort_id_info.rs diff --git a/gameserver/src/logic/game/save/mod.rs b/gameserver/src/logic/game/save/mod.rs new file mode 100644 index 0000000..610f615 --- /dev/null +++ b/gameserver/src/logic/game/save/mod.rs @@ -0,0 +1,3 @@ +pub mod save_field_char_control_deck_type; +pub mod save_total_battle_power; +pub mod save_user_position; diff --git a/gameserver/src/logic/game/save_field_char_control_deck_type.rs b/gameserver/src/logic/game/save/save_field_char_control_deck_type.rs similarity index 100% rename from gameserver/src/logic/game/save_field_char_control_deck_type.rs rename to gameserver/src/logic/game/save/save_field_char_control_deck_type.rs diff --git a/gameserver/src/logic/game/save_total_battle_power.rs b/gameserver/src/logic/game/save/save_total_battle_power.rs similarity index 100% rename from gameserver/src/logic/game/save_total_battle_power.rs rename to gameserver/src/logic/game/save/save_total_battle_power.rs diff --git a/gameserver/src/logic/game/save_user_position.rs b/gameserver/src/logic/game/save/save_user_position.rs similarity index 100% rename from gameserver/src/logic/game/save_user_position.rs rename to gameserver/src/logic/game/save/save_user_position.rs diff --git a/gameserver/src/logic/game/schedule/mod.rs b/gameserver/src/logic/game/schedule/mod.rs new file mode 100644 index 0000000..40fa316 --- /dev/null +++ b/gameserver/src/logic/game/schedule/mod.rs @@ -0,0 +1 @@ +pub mod schedule_info; diff --git a/gameserver/src/logic/game/schedule_info.rs b/gameserver/src/logic/game/schedule/schedule_info.rs similarity index 100% rename from gameserver/src/logic/game/schedule_info.rs rename to gameserver/src/logic/game/schedule/schedule_info.rs diff --git a/gameserver/src/logic/game/season/mod.rs b/gameserver/src/logic/game/season/mod.rs new file mode 100644 index 0000000..ef2de72 --- /dev/null +++ b/gameserver/src/logic/game/season/mod.rs @@ -0,0 +1 @@ +pub mod season_reward_info; diff --git a/gameserver/src/logic/game/season_reward_info.rs b/gameserver/src/logic/game/season/season_reward_info.rs similarity index 100% rename from gameserver/src/logic/game/season_reward_info.rs rename to gameserver/src/logic/game/season/season_reward_info.rs diff --git a/gameserver/src/logic/game/select/mod.rs b/gameserver/src/logic/game/select/mod.rs new file mode 100644 index 0000000..c996f6d --- /dev/null +++ b/gameserver/src/logic/game/select/mod.rs @@ -0,0 +1 @@ +pub mod select_platform_other_data; diff --git a/gameserver/src/logic/game/select_platform_other_data.rs b/gameserver/src/logic/game/select/select_platform_other_data.rs similarity index 100% rename from gameserver/src/logic/game/select_platform_other_data.rs rename to gameserver/src/logic/game/select/select_platform_other_data.rs diff --git a/gameserver/src/logic/game/send/mod.rs b/gameserver/src/logic/game/send/mod.rs new file mode 100644 index 0000000..5d509ba --- /dev/null +++ b/gameserver/src/logic/game/send/mod.rs @@ -0,0 +1 @@ +pub mod send_log; diff --git a/gameserver/src/logic/game/send_log.rs b/gameserver/src/logic/game/send/send_log.rs similarity index 100% rename from gameserver/src/logic/game/send_log.rs rename to gameserver/src/logic/game/send/send_log.rs diff --git a/gameserver/src/logic/game/server/mod.rs b/gameserver/src/logic/game/server/mod.rs new file mode 100644 index 0000000..dd4fb26 --- /dev/null +++ b/gameserver/src/logic/game/server/mod.rs @@ -0,0 +1,2 @@ +pub mod server_info; +pub mod server_now_time; diff --git a/gameserver/src/logic/game/server_info.rs b/gameserver/src/logic/game/server/server_info.rs similarity index 100% rename from gameserver/src/logic/game/server_info.rs rename to gameserver/src/logic/game/server/server_info.rs diff --git a/gameserver/src/logic/game/server_now_time.rs b/gameserver/src/logic/game/server/server_now_time.rs similarity index 100% rename from gameserver/src/logic/game/server_now_time.rs rename to gameserver/src/logic/game/server/server_now_time.rs diff --git a/gameserver/src/logic/game/shop/mod.rs b/gameserver/src/logic/game/shop/mod.rs new file mode 100644 index 0000000..80d0754 --- /dev/null +++ b/gameserver/src/logic/game/shop/mod.rs @@ -0,0 +1,4 @@ +pub mod shop_buy; +pub mod shop_info; +pub mod shop_open; +pub mod shop_sell; diff --git a/gameserver/src/logic/game/shop_buy.rs b/gameserver/src/logic/game/shop/shop_buy.rs similarity index 100% rename from gameserver/src/logic/game/shop_buy.rs rename to gameserver/src/logic/game/shop/shop_buy.rs diff --git a/gameserver/src/logic/game/shop_info.rs b/gameserver/src/logic/game/shop/shop_info.rs similarity index 100% rename from gameserver/src/logic/game/shop_info.rs rename to gameserver/src/logic/game/shop/shop_info.rs diff --git a/gameserver/src/logic/game/shop_open.rs b/gameserver/src/logic/game/shop/shop_open.rs similarity index 100% rename from gameserver/src/logic/game/shop_open.rs rename to gameserver/src/logic/game/shop/shop_open.rs diff --git a/gameserver/src/logic/game/shop_sell.rs b/gameserver/src/logic/game/shop/shop_sell.rs similarity index 100% rename from gameserver/src/logic/game/shop_sell.rs rename to gameserver/src/logic/game/shop/shop_sell.rs diff --git a/gameserver/src/logic/game/sky/mod.rs b/gameserver/src/logic/game/sky/mod.rs new file mode 100644 index 0000000..078f9d7 --- /dev/null +++ b/gameserver/src/logic/game/sky/mod.rs @@ -0,0 +1,3 @@ +pub mod sky_way_enter; +pub mod sky_way_info; +pub mod sky_way_schedule_info; diff --git a/gameserver/src/logic/game/sky_way_enter.rs b/gameserver/src/logic/game/sky/sky_way_enter.rs similarity index 100% rename from gameserver/src/logic/game/sky_way_enter.rs rename to gameserver/src/logic/game/sky/sky_way_enter.rs diff --git a/gameserver/src/logic/game/sky_way_info.rs b/gameserver/src/logic/game/sky/sky_way_info.rs similarity index 100% rename from gameserver/src/logic/game/sky_way_info.rs rename to gameserver/src/logic/game/sky/sky_way_info.rs diff --git a/gameserver/src/logic/game/sky_way_schedule_info.rs b/gameserver/src/logic/game/sky/sky_way_schedule_info.rs similarity index 100% rename from gameserver/src/logic/game/sky_way_schedule_info.rs rename to gameserver/src/logic/game/sky/sky_way_schedule_info.rs diff --git a/gameserver/src/logic/game/statue/mod.rs b/gameserver/src/logic/game/statue/mod.rs new file mode 100644 index 0000000..75e7f3b --- /dev/null +++ b/gameserver/src/logic/game/statue/mod.rs @@ -0,0 +1 @@ +pub mod statue_object_reward; diff --git a/gameserver/src/logic/game/statue_object_reward.rs b/gameserver/src/logic/game/statue/statue_object_reward.rs similarity index 100% rename from gameserver/src/logic/game/statue_object_reward.rs rename to gameserver/src/logic/game/statue/statue_object_reward.rs diff --git a/gameserver/src/logic/game/storage/mod.rs b/gameserver/src/logic/game/storage/mod.rs new file mode 100644 index 0000000..5164ca0 --- /dev/null +++ b/gameserver/src/logic/game/storage/mod.rs @@ -0,0 +1 @@ +pub mod storage_add_slot; diff --git a/gameserver/src/logic/game/storage_add_slot.rs b/gameserver/src/logic/game/storage/storage_add_slot.rs similarity index 100% rename from gameserver/src/logic/game/storage_add_slot.rs rename to gameserver/src/logic/game/storage/storage_add_slot.rs diff --git a/gameserver/src/logic/game/supporter/mod.rs b/gameserver/src/logic/game/supporter/mod.rs new file mode 100644 index 0000000..c4029ee --- /dev/null +++ b/gameserver/src/logic/game/supporter/mod.rs @@ -0,0 +1,8 @@ +pub mod supporter_battle_info; +pub mod supporter_borrow; +pub mod supporter_detail; +pub mod supporter_info; +pub mod supporter_register; +pub mod supporter_remove; +pub mod supporter_reward; +pub mod supporter_status; diff --git a/gameserver/src/logic/game/supporter_battle_info.rs b/gameserver/src/logic/game/supporter/supporter_battle_info.rs similarity index 100% rename from gameserver/src/logic/game/supporter_battle_info.rs rename to gameserver/src/logic/game/supporter/supporter_battle_info.rs diff --git a/gameserver/src/logic/game/supporter_borrow.rs b/gameserver/src/logic/game/supporter/supporter_borrow.rs similarity index 100% rename from gameserver/src/logic/game/supporter_borrow.rs rename to gameserver/src/logic/game/supporter/supporter_borrow.rs diff --git a/gameserver/src/logic/game/supporter_detail.rs b/gameserver/src/logic/game/supporter/supporter_detail.rs similarity index 100% rename from gameserver/src/logic/game/supporter_detail.rs rename to gameserver/src/logic/game/supporter/supporter_detail.rs diff --git a/gameserver/src/logic/game/supporter_info.rs b/gameserver/src/logic/game/supporter/supporter_info.rs similarity index 100% rename from gameserver/src/logic/game/supporter_info.rs rename to gameserver/src/logic/game/supporter/supporter_info.rs diff --git a/gameserver/src/logic/game/supporter_register.rs b/gameserver/src/logic/game/supporter/supporter_register.rs similarity index 100% rename from gameserver/src/logic/game/supporter_register.rs rename to gameserver/src/logic/game/supporter/supporter_register.rs diff --git a/gameserver/src/logic/game/supporter_remove.rs b/gameserver/src/logic/game/supporter/supporter_remove.rs similarity index 100% rename from gameserver/src/logic/game/supporter_remove.rs rename to gameserver/src/logic/game/supporter/supporter_remove.rs diff --git a/gameserver/src/logic/game/supporter_reward.rs b/gameserver/src/logic/game/supporter/supporter_reward.rs similarity index 100% rename from gameserver/src/logic/game/supporter_reward.rs rename to gameserver/src/logic/game/supporter/supporter_reward.rs diff --git a/gameserver/src/logic/game/supporter_status.rs b/gameserver/src/logic/game/supporter/supporter_status.rs similarity index 100% rename from gameserver/src/logic/game/supporter_status.rs rename to gameserver/src/logic/game/supporter/supporter_status.rs diff --git a/gameserver/src/logic/game/talent/mod.rs b/gameserver/src/logic/game/talent/mod.rs new file mode 100644 index 0000000..294e19d --- /dev/null +++ b/gameserver/src/logic/game/talent/mod.rs @@ -0,0 +1,3 @@ +pub mod talent_skill_upgrade; +pub mod talent_skill_use; +pub mod talent_slot_save; diff --git a/gameserver/src/logic/game/talent_skill_upgrade.rs b/gameserver/src/logic/game/talent/talent_skill_upgrade.rs similarity index 100% rename from gameserver/src/logic/game/talent_skill_upgrade.rs rename to gameserver/src/logic/game/talent/talent_skill_upgrade.rs diff --git a/gameserver/src/logic/game/talent_skill_use.rs b/gameserver/src/logic/game/talent/talent_skill_use.rs similarity index 100% rename from gameserver/src/logic/game/talent_skill_use.rs rename to gameserver/src/logic/game/talent/talent_skill_use.rs diff --git a/gameserver/src/logic/game/talent_slot_save.rs b/gameserver/src/logic/game/talent/talent_slot_save.rs similarity index 100% rename from gameserver/src/logic/game/talent_slot_save.rs rename to gameserver/src/logic/game/talent/talent_slot_save.rs diff --git a/gameserver/src/logic/game/time/mod.rs b/gameserver/src/logic/game/time/mod.rs new file mode 100644 index 0000000..5e56d21 --- /dev/null +++ b/gameserver/src/logic/game/time/mod.rs @@ -0,0 +1 @@ +pub mod time_pause; diff --git a/gameserver/src/logic/game/time_pause.rs b/gameserver/src/logic/game/time/time_pause.rs similarity index 100% rename from gameserver/src/logic/game/time_pause.rs rename to gameserver/src/logic/game/time/time_pause.rs diff --git a/gameserver/src/logic/game/today/mod.rs b/gameserver/src/logic/game/today/mod.rs new file mode 100644 index 0000000..4536971 --- /dev/null +++ b/gameserver/src/logic/game/today/mod.rs @@ -0,0 +1 @@ +pub mod today_quest_info; diff --git a/gameserver/src/logic/game/today_quest_info.rs b/gameserver/src/logic/game/today/today_quest_info.rs similarity index 84% rename from gameserver/src/logic/game/today_quest_info.rs rename to gameserver/src/logic/game/today/today_quest_info.rs index fe79a40..7c1bc60 100644 --- a/gameserver/src/logic/game/today_quest_info.rs +++ b/gameserver/src/logic/game/today/today_quest_info.rs @@ -2,15 +2,14 @@ use bd2::prost::Message; use bd2::proto::proto_net::{Notify, QuestDbInfo, TodayQuestInfoRequest, TodayQuestInfoResponse}; use common::packet_code::PacketCodeType; use crypto::network::GameResponse; -use database::db::quest_info::get_quest_info; -use database::db::today_quest_info::get_today_quest_info; +use database::db::quest::quest_info::get_quest_info; +use database::db::today::today_quest_info::get_today_quest_info; use sqlx::SqlitePool; use tracing::info; pub async fn handle(pool: &SqlitePool, uid: i64, _req: TodayQuestInfoRequest) -> GameResponse { info!("Handling TodayQuestInfoRequest for uid: {}", uid); - // --- Fetch data --- let quest_rows = match get_today_quest_info(pool, uid).await { Ok(rows) => rows, Err(err) => { @@ -27,27 +26,22 @@ pub async fn handle(pool: &SqlitePool, uid: i64, _req: TodayQuestInfoRequest) -> } }; - // --- Collect IDs & end time --- let mut clear_quest_ids: Vec = Vec::new(); let mut today_quest_ids: Vec = Vec::new(); let mut today_end_time: i64 = 0; for row in &quest_rows { - // today_quest_id is a plain i32 → push directly today_quest_ids.push(row.today_quest_id); - // clear_quest_ids is Option → only push real values if let Some(id) = row.clear_quest_ids { clear_quest_ids.push(id); } - // unwrap optional end time if let Some(end_time) = row.today_end_time { today_end_time = end_time; } } - // --- Map QuestInfo table to protobuf --- let quest_info = quest_infos .into_iter() .map(|q| QuestDbInfo { @@ -59,7 +53,6 @@ pub async fn handle(pool: &SqlitePool, uid: i64, _req: TodayQuestInfoRequest) -> }) .collect::>(); - // --- Assemble protobuf response --- let response = TodayQuestInfoResponse { quest_info, clear_quest_ids, @@ -69,7 +62,6 @@ pub async fn handle(pool: &SqlitePool, uid: i64, _req: TodayQuestInfoRequest) -> let resp_bytes = response.encode_to_vec(); - // --- Notify block --- let notify = Notify { achievement_update_info: vec![], mission_update_info: vec![], diff --git a/gameserver/src/logic/game/total/mod.rs b/gameserver/src/logic/game/total/mod.rs new file mode 100644 index 0000000..82121b2 --- /dev/null +++ b/gameserver/src/logic/game/total/mod.rs @@ -0,0 +1,13 @@ +pub mod total_war_battle_end; +pub mod total_war_battle_start; +pub mod total_war_contents_item_renew; +pub mod total_war_deck_info; +pub mod total_war_deck_preset_info; +pub mod total_war_deck_preset_save; +pub mod total_war_deck_preset_slot_add; +pub mod total_war_deck_save; +pub mod total_war_info; +pub mod total_war_preset_delete; +pub mod total_war_preset_info_change; +pub mod total_war_reward; +pub mod total_war_reward_state; diff --git a/gameserver/src/logic/game/total_war_battle_end.rs b/gameserver/src/logic/game/total/total_war_battle_end.rs similarity index 100% rename from gameserver/src/logic/game/total_war_battle_end.rs rename to gameserver/src/logic/game/total/total_war_battle_end.rs diff --git a/gameserver/src/logic/game/total_war_battle_start.rs b/gameserver/src/logic/game/total/total_war_battle_start.rs similarity index 100% rename from gameserver/src/logic/game/total_war_battle_start.rs rename to gameserver/src/logic/game/total/total_war_battle_start.rs diff --git a/gameserver/src/logic/game/total_war_contents_item_renew.rs b/gameserver/src/logic/game/total/total_war_contents_item_renew.rs similarity index 100% rename from gameserver/src/logic/game/total_war_contents_item_renew.rs rename to gameserver/src/logic/game/total/total_war_contents_item_renew.rs diff --git a/gameserver/src/logic/game/total_war_deck_info.rs b/gameserver/src/logic/game/total/total_war_deck_info.rs similarity index 100% rename from gameserver/src/logic/game/total_war_deck_info.rs rename to gameserver/src/logic/game/total/total_war_deck_info.rs diff --git a/gameserver/src/logic/game/total_war_deck_preset_info.rs b/gameserver/src/logic/game/total/total_war_deck_preset_info.rs similarity index 100% rename from gameserver/src/logic/game/total_war_deck_preset_info.rs rename to gameserver/src/logic/game/total/total_war_deck_preset_info.rs diff --git a/gameserver/src/logic/game/total_war_deck_preset_save.rs b/gameserver/src/logic/game/total/total_war_deck_preset_save.rs similarity index 100% rename from gameserver/src/logic/game/total_war_deck_preset_save.rs rename to gameserver/src/logic/game/total/total_war_deck_preset_save.rs diff --git a/gameserver/src/logic/game/total_war_deck_preset_slot_add.rs b/gameserver/src/logic/game/total/total_war_deck_preset_slot_add.rs similarity index 100% rename from gameserver/src/logic/game/total_war_deck_preset_slot_add.rs rename to gameserver/src/logic/game/total/total_war_deck_preset_slot_add.rs diff --git a/gameserver/src/logic/game/total_war_deck_save.rs b/gameserver/src/logic/game/total/total_war_deck_save.rs similarity index 100% rename from gameserver/src/logic/game/total_war_deck_save.rs rename to gameserver/src/logic/game/total/total_war_deck_save.rs diff --git a/gameserver/src/logic/game/total_war_info.rs b/gameserver/src/logic/game/total/total_war_info.rs similarity index 100% rename from gameserver/src/logic/game/total_war_info.rs rename to gameserver/src/logic/game/total/total_war_info.rs diff --git a/gameserver/src/logic/game/total_war_preset_delete.rs b/gameserver/src/logic/game/total/total_war_preset_delete.rs similarity index 100% rename from gameserver/src/logic/game/total_war_preset_delete.rs rename to gameserver/src/logic/game/total/total_war_preset_delete.rs diff --git a/gameserver/src/logic/game/total_war_preset_info_change.rs b/gameserver/src/logic/game/total/total_war_preset_info_change.rs similarity index 100% rename from gameserver/src/logic/game/total_war_preset_info_change.rs rename to gameserver/src/logic/game/total/total_war_preset_info_change.rs diff --git a/gameserver/src/logic/game/total_war_reward.rs b/gameserver/src/logic/game/total/total_war_reward.rs similarity index 100% rename from gameserver/src/logic/game/total_war_reward.rs rename to gameserver/src/logic/game/total/total_war_reward.rs diff --git a/gameserver/src/logic/game/total_war_reward_state.rs b/gameserver/src/logic/game/total/total_war_reward_state.rs similarity index 100% rename from gameserver/src/logic/game/total_war_reward_state.rs rename to gameserver/src/logic/game/total/total_war_reward_state.rs diff --git a/gameserver/src/logic/game/trap/mod.rs b/gameserver/src/logic/game/trap/mod.rs new file mode 100644 index 0000000..da3808a --- /dev/null +++ b/gameserver/src/logic/game/trap/mod.rs @@ -0,0 +1 @@ +pub mod trap_damage; diff --git a/gameserver/src/logic/game/trap_damage.rs b/gameserver/src/logic/game/trap/trap_damage.rs similarity index 100% rename from gameserver/src/logic/game/trap_damage.rs rename to gameserver/src/logic/game/trap/trap_damage.rs diff --git a/gameserver/src/logic/game/tutorial/mod.rs b/gameserver/src/logic/game/tutorial/mod.rs new file mode 100644 index 0000000..32a8d1f --- /dev/null +++ b/gameserver/src/logic/game/tutorial/mod.rs @@ -0,0 +1,2 @@ +pub mod tutorial_clear; +pub mod tutorial_info; diff --git a/gameserver/src/logic/game/tutorial_clear.rs b/gameserver/src/logic/game/tutorial/tutorial_clear.rs similarity index 89% rename from gameserver/src/logic/game/tutorial_clear.rs rename to gameserver/src/logic/game/tutorial/tutorial_clear.rs index f376199..082c1ac 100644 --- a/gameserver/src/logic/game/tutorial_clear.rs +++ b/gameserver/src/logic/game/tutorial/tutorial_clear.rs @@ -2,7 +2,7 @@ use bd2::prost::Message; use bd2::proto::proto_net::{Notify, TutorialClearRequest, TutorialClearResponse}; use common::packet_code::PacketCodeType; use crypto::network::GameResponse; -use database::db::tutorial_info::add_tutorial_info; +use database::db::tutorial::tutorial_info::add_tutorial_info; use database::models::game::tutorial_info::TutorialInfo; use sqlx::SqlitePool; use tracing::info; @@ -13,7 +13,6 @@ pub async fn handle(pool: &SqlitePool, uid: i64, req: TutorialClearRequest) -> G uid, req.clear_tutorial_id ); - // --- Insert the cleared tutorial(s) into DB --- if let Some(id) = req.clear_tutorial_id { let record = TutorialInfo { index: 0, // autoincrement @@ -29,14 +28,12 @@ pub async fn handle(pool: &SqlitePool, uid: i64, req: TutorialClearRequest) -> G } } - // --- Build protobuf response (empty) --- let response = TutorialClearResponse { ..Default::default() }; let resp_bytes = response.encode_to_vec(); - // --- Notify for sync --- let notify = Notify { achievement_update_info: vec![], mission_update_info: vec![], diff --git a/gameserver/src/logic/game/tutorial_info.rs b/gameserver/src/logic/game/tutorial/tutorial_info.rs similarity index 89% rename from gameserver/src/logic/game/tutorial_info.rs rename to gameserver/src/logic/game/tutorial/tutorial_info.rs index b3d7772..85c8554 100644 --- a/gameserver/src/logic/game/tutorial_info.rs +++ b/gameserver/src/logic/game/tutorial/tutorial_info.rs @@ -2,14 +2,13 @@ use bd2::prost::Message; use bd2::proto::proto_net::{Notify, TutorialInfoRequest, TutorialInfoResponse}; use common::packet_code::PacketCodeType; use crypto::network::GameResponse; -use database::db::tutorial_info::get_tutorial_info; +use database::db::tutorial::tutorial_info::get_tutorial_info; use sqlx::SqlitePool; use tracing::info; pub async fn handle(pool: &SqlitePool, uid: i64, req: TutorialInfoRequest) -> GameResponse { info!("Handling TutorialInfoRequest for uid {}: {:?}", uid, req); - // --- Fetch tutorial clear IDs from DB --- let tutorial_rows = match get_tutorial_info(pool, uid).await { Ok(rows) => rows, Err(err) => { @@ -23,12 +22,10 @@ pub async fn handle(pool: &SqlitePool, uid: i64, req: TutorialInfoRequest) -> Ga .map(|row| row.tutorial_clear_id) .collect(); - // --- Build protobuf response --- let response = TutorialInfoResponse { tutorial_clear_id }; let resp_bytes = response.encode_to_vec(); - // --- Notify for sync --- let notify = Notify { achievement_update_info: vec![], mission_update_info: vec![], diff --git a/gameserver/src/logic/game/update/mod.rs b/gameserver/src/logic/game/update/mod.rs new file mode 100644 index 0000000..e58416b --- /dev/null +++ b/gameserver/src/logic/game/update/mod.rs @@ -0,0 +1 @@ +pub mod update_user_contents_info_option; diff --git a/gameserver/src/logic/game/update_user_contents_info_option.rs b/gameserver/src/logic/game/update/update_user_contents_info_option.rs similarity index 100% rename from gameserver/src/logic/game/update_user_contents_info_option.rs rename to gameserver/src/logic/game/update/update_user_contents_info_option.rs diff --git a/gameserver/src/logic/game/use2/mod.rs b/gameserver/src/logic/game/use2/mod.rs new file mode 100644 index 0000000..681fa75 --- /dev/null +++ b/gameserver/src/logic/game/use2/mod.rs @@ -0,0 +1,2 @@ +pub mod use_random_box; +pub mod use_resource_item; diff --git a/gameserver/src/logic/game/use_random_box.rs b/gameserver/src/logic/game/use2/use_random_box.rs similarity index 100% rename from gameserver/src/logic/game/use_random_box.rs rename to gameserver/src/logic/game/use2/use_random_box.rs diff --git a/gameserver/src/logic/game/use_resource_item.rs b/gameserver/src/logic/game/use2/use_resource_item.rs similarity index 100% rename from gameserver/src/logic/game/use_resource_item.rs rename to gameserver/src/logic/game/use2/use_resource_item.rs diff --git a/gameserver/src/logic/game/user/mod.rs b/gameserver/src/logic/game/user/mod.rs new file mode 100644 index 0000000..48757a1 --- /dev/null +++ b/gameserver/src/logic/game/user/mod.rs @@ -0,0 +1,7 @@ +pub mod user_contents_info; +pub mod user_contents_info_option; +pub mod user_greeting_change; +pub mod user_level_reward; +pub mod user_nickname_change; +pub mod user_portrait_change; +pub mod user_title_change; diff --git a/gameserver/src/logic/game/user_contents_info.rs b/gameserver/src/logic/game/user/user_contents_info.rs similarity index 100% rename from gameserver/src/logic/game/user_contents_info.rs rename to gameserver/src/logic/game/user/user_contents_info.rs diff --git a/gameserver/src/logic/game/user_contents_info_option.rs b/gameserver/src/logic/game/user/user_contents_info_option.rs similarity index 100% rename from gameserver/src/logic/game/user_contents_info_option.rs rename to gameserver/src/logic/game/user/user_contents_info_option.rs diff --git a/gameserver/src/logic/game/user_greeting_change.rs b/gameserver/src/logic/game/user/user_greeting_change.rs similarity index 100% rename from gameserver/src/logic/game/user_greeting_change.rs rename to gameserver/src/logic/game/user/user_greeting_change.rs diff --git a/gameserver/src/logic/game/user_level_reward.rs b/gameserver/src/logic/game/user/user_level_reward.rs similarity index 100% rename from gameserver/src/logic/game/user_level_reward.rs rename to gameserver/src/logic/game/user/user_level_reward.rs diff --git a/gameserver/src/logic/game/user_nickname_change.rs b/gameserver/src/logic/game/user/user_nickname_change.rs similarity index 100% rename from gameserver/src/logic/game/user_nickname_change.rs rename to gameserver/src/logic/game/user/user_nickname_change.rs diff --git a/gameserver/src/logic/game/user_portrait_change.rs b/gameserver/src/logic/game/user/user_portrait_change.rs similarity index 100% rename from gameserver/src/logic/game/user_portrait_change.rs rename to gameserver/src/logic/game/user/user_portrait_change.rs diff --git a/gameserver/src/logic/game/user_title_change.rs b/gameserver/src/logic/game/user/user_title_change.rs similarity index 100% rename from gameserver/src/logic/game/user_title_change.rs rename to gameserver/src/logic/game/user/user_title_change.rs diff --git a/gameserver/src/logic/game/waypoint/mod.rs b/gameserver/src/logic/game/waypoint/mod.rs new file mode 100644 index 0000000..0846d27 --- /dev/null +++ b/gameserver/src/logic/game/waypoint/mod.rs @@ -0,0 +1,3 @@ +pub mod waypoint_info; +pub mod waypoint_save; +pub mod waypoint_use; diff --git a/gameserver/src/logic/game/waypoint_info.rs b/gameserver/src/logic/game/waypoint/waypoint_info.rs similarity index 85% rename from gameserver/src/logic/game/waypoint_info.rs rename to gameserver/src/logic/game/waypoint/waypoint_info.rs index 455100e..fa94ca8 100644 --- a/gameserver/src/logic/game/waypoint_info.rs +++ b/gameserver/src/logic/game/waypoint/waypoint_info.rs @@ -2,14 +2,13 @@ use bd2::prost::Message; use bd2::proto::proto_net::{Notify, WaypointInfoRequest, WaypointInfoResponse}; use common::packet_code::PacketCodeType; use crypto::network::GameResponse; -use database::db::waypoint_info::get_waypoint_info; +use database::db::waypoint::waypoint_info::get_waypoint_info; use sqlx::SqlitePool; use tracing::info; pub async fn handle(pool: &SqlitePool, uid: i64, _req: WaypointInfoRequest) -> GameResponse { info!("Handling WaypointInfoRequest for uid: {}", uid); - // --- Fetch data from DB --- let waypoint_rows = match get_waypoint_info(pool, uid).await { Ok(rows) => rows, Err(err) => { @@ -18,8 +17,6 @@ pub async fn handle(pool: &SqlitePool, uid: i64, _req: WaypointInfoRequest) -> G } }; - // --- Map to protobuf --- - // repeated int32 waypoint_id let waypoint_ids: Vec = waypoint_rows .into_iter() .map(|row| row.waypoint_id) @@ -30,10 +27,8 @@ pub async fn handle(pool: &SqlitePool, uid: i64, _req: WaypointInfoRequest) -> G ..Default::default() }; - // --- Encode to bytes --- let resp_bytes = response.encode_to_vec(); - // --- Build notify block --- let notify = Notify { achievement_update_info: vec![], mission_update_info: vec![], @@ -47,7 +42,6 @@ pub async fn handle(pool: &SqlitePool, uid: i64, _req: WaypointInfoRequest) -> G ..Default::default() }; - // --- Wrap in GameResponse --- let (route, code) = PacketCodeType::WaypointInfo.info(); GameResponse::success(route, &resp_bytes, code).with_notify(¬ify) } diff --git a/gameserver/src/logic/game/waypoint_save.rs b/gameserver/src/logic/game/waypoint/waypoint_save.rs similarity index 100% rename from gameserver/src/logic/game/waypoint_save.rs rename to gameserver/src/logic/game/waypoint/waypoint_save.rs diff --git a/gameserver/src/logic/game/waypoint_use.rs b/gameserver/src/logic/game/waypoint/waypoint_use.rs similarity index 100% rename from gameserver/src/logic/game/waypoint_use.rs rename to gameserver/src/logic/game/waypoint/waypoint_use.rs diff --git a/httpserver/src/main.rs b/httpserver/src/main.rs index 71bb8de..29ce7fc 100644 --- a/httpserver/src/main.rs +++ b/httpserver/src/main.rs @@ -3,6 +3,7 @@ use actix_web::{App, HttpServer}; use common::{CERT_FILE_PATH, GAME_SERVER_ADDRESS, KEY_FILE_PATH, init_tracing}; use database::{DatabaseSettings, connect_to, run_migrations}; use middleware::{auth::auth_middleware, logger::Logger}; +use std::path::PathBuf; use tracing::{error, info}; use actix_web::web::Data; @@ -36,6 +37,7 @@ async fn main() -> anyhow::Result<()> { std::io::Error::new(std::io::ErrorKind::Other, e) })?; + //excel db loader info!("Loading game data..."); data::exceldb::init(data_path.to_str().unwrap()).map_err(|e| { error!("Failed to load game data: {:#}", e); @@ -90,33 +92,36 @@ async fn main() -> anyhow::Result<()> { .service(routes::default::batch::batch::mission_info_handler) .service(routes::default::batch::batch::char_info_handler) .service(routes::default::batch::batch::recipe_info_handler) - .service(routes::game::login_event::login_event_handler) - .service(routes::game::schedule_info::schedule_info_handler) - .service(routes::game::event_mission_info::event_mission_info_handler) - .service(routes::game::event_reward_history::event_reward_history_handler) - .service(routes::game::pack_event_story_info::pack_event_story_info_handler) - .service(routes::game::pack_event_battle_info::pack_event_battle_info_handler) - .service(routes::game::pictorial_book_info::pictorial_book_info_handler) - .service(routes::game::attendance::attendance_info_handler) - .service(routes::game::all_char_refresh::all_char_refresh_info_handler) - .service(routes::game::save_total_battle_power::save_total_battle_power_handler) - .service(routes::game::charge_cost_info::charge_cost_info_handler) + .service(routes::game::login::login_event::login_event_handler) + .service(routes::game::schedule::schedule_info::schedule_info_handler) + .service(routes::game::event::event_mission_info::event_mission_info_handler) + .service(routes::game::event::event_reward_history::event_reward_history_handler) + .service(routes::game::pack::pack_event_story_info::pack_event_story_info_handler) + .service(routes::game::pack::pack_event_battle_info::pack_event_battle_info_handler) + .service(routes::game::pictorial::pictorial_book_info::pictorial_book_info_handler) + .service(routes::game::attendance::attendance::attendance_info_handler) + .service(routes::game::all::all_char_refresh::all_char_refresh_info_handler) + .service(routes::game::save::save_total_battle_power::save_total_battle_power_handler) + .service(routes::game::charge::charge_cost_info::charge_cost_info_handler) .service(routes::basic::localization::localization_handler) .service(routes::basic::loki::loki_handler) - .service(routes::game::equip_info::equip_info_handler) - .service(routes::game::pack_preview_info::pack_preview_info_handler) - .service(routes::game::monster_info::monster_info_handler) - .service(routes::game::today_quest_info::today_quest_info_handler) - .service(routes::game::waypoint_info::waypoint_info_handler) - .service(routes::game::field_deck_info::field_deck_info_handler) - .service(routes::game::hunting_ground_info_list::hunting_ground_info_list_handler) - .service(routes::game::hunting_ground_info::hunting_ground_info_handler) - .service(routes::game::tutorial_clear::tutorial_clear_handler) - .service(routes::game::notice_detail_info::notice_detail_info_handler) - .service(routes::game::save_user_position::save_user_position_handler) - .service(routes::game::waypoint_save::waypoint_save_handler) - .service(routes::game::server_now_time::server_now_time_handler) - .service(routes::game::field_object_reward::field_object_reward_handler) + .service(routes::game::equip::equip_info::equip_info_handler) + .service(routes::game::pack::pack_preview_info::pack_preview_info_handler) + .service(routes::game::monster::monster_info::monster_info_handler) + .service(routes::game::today::today_quest_info::today_quest_info_handler) + .service(routes::game::waypoint::waypoint_info::waypoint_info_handler) + .service(routes::game::field::field_deck_info::field_deck_info_handler) + .service(routes::game::hunting::hunting_ground_info_list::hunting_ground_info_list_handler) + .service(routes::game::hunting::hunting_ground_info::hunting_ground_info_handler) + .service(routes::game::tutorial::tutorial_clear::tutorial_clear_handler) + .service(routes::game::notice::notice_detail_info::notice_detail_info_handler) + .service(routes::game::save::save_user_position::save_user_position_handler) + .service(routes::game::waypoint::waypoint_save::waypoint_save_handler) + .service(routes::game::server::server_now_time::server_now_time_handler) + .service(routes::game::field::field_object_reward::field_object_reward_handler) + .service(routes::game::active::active_map::active_map_handler) + .service(routes::game::quest::quest_update::quest_update_handler) + .service(routes::game::quest::quest_clear::quest_clear_handler) }; info!("Starting server on {}", &GAME_SERVER_ADDRESS); @@ -131,14 +136,10 @@ async fn main() -> anyhow::Result<()> { } } -use std::path::PathBuf; - fn get_data_path() -> anyhow::Result { - // Always use CARGO_MANIFEST_DIR in development let base_dir = if let Ok(manifest_dir) = std::env::var("CARGO_MANIFEST_DIR") { PathBuf::from(manifest_dir) } else { - // Fallback: try to find project root by looking for Cargo.toml let mut current = std::env::current_dir()?; loop { if current.join("Cargo.toml").exists() { diff --git a/httpserver/src/routes/basic/maintenace_info.rs b/httpserver/src/routes/basic/maintenace_info.rs index ebb5c32..9dd3a59 100644 --- a/httpserver/src/routes/basic/maintenace_info.rs +++ b/httpserver/src/routes/basic/maintenace_info.rs @@ -1,7 +1,7 @@ use actix_web::{HttpResponse, Result, put}; use bd2::proto::proto_net::MaintenanceInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::maintenace_info; +use gameserver::logic::game::maintenace::maintenace_info; #[put("MaintenanceInfo")] async fn maintenance_info_handler(body: String) -> Result { diff --git a/httpserver/src/routes/basic/notice_info.rs b/httpserver/src/routes/basic/notice_info.rs index c2cb98e..302d2a4 100644 --- a/httpserver/src/routes/basic/notice_info.rs +++ b/httpserver/src/routes/basic/notice_info.rs @@ -1,7 +1,7 @@ use actix_web::{HttpResponse, Result, put}; use bd2::proto::proto_net::NoticeInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::notice_info; +use gameserver::logic::game::notice::notice_info; #[put("NoticeInfo")] async fn notice_info_handler(body: String) -> Result { diff --git a/httpserver/src/routes/basic/server_info.rs b/httpserver/src/routes/basic/server_info.rs index 2cf7356..e17d867 100644 --- a/httpserver/src/routes/basic/server_info.rs +++ b/httpserver/src/routes/basic/server_info.rs @@ -1,7 +1,7 @@ use actix_web::{HttpResponse, Result, put}; use bd2::proto::proto_net::ServerInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::server_info; +use gameserver::logic::game::server::server_info; #[put("ServerInfo")] async fn server_info_handler(body: String) -> Result { diff --git a/httpserver/src/routes/default/balance_version_check.rs b/httpserver/src/routes/default/balance_version_check.rs index 63f0e46..4c98abe 100644 --- a/httpserver/src/routes/default/balance_version_check.rs +++ b/httpserver/src/routes/default/balance_version_check.rs @@ -1,7 +1,7 @@ use actix_web::{HttpResponse, Result, put}; use bd2::proto::proto_net::BalanceVersionCheckRequest; use crypto::network::parse_packet; -use gameserver::logic::game::balance_version_check; +use gameserver::logic::game::balance::balance_version_check; #[put("BalanceVersionCheck")] async fn balance_check_version_handler(body: String) -> Result { diff --git a/httpserver/src/routes/default/batch/batch.rs b/httpserver/src/routes/default/batch/batch.rs index 79b3b0d..fec16c6 100644 --- a/httpserver/src/routes/default/batch/batch.rs +++ b/httpserver/src/routes/default/batch/batch.rs @@ -69,7 +69,9 @@ pub async fn batch_request_handler( let game_response = match method_name { "MailInfo" => { match parse_packet::("MailInfo", &request.request_data) { - Ok(req) => gameserver::logic::game::mail_info::handle(&pool, uid, req).await, + Ok(req) => { + gameserver::logic::game::mail::mail_info::handle(&pool, uid, req).await + } Err(e) => { error!("Failed to parse MailInfo: {}", e); GameResponse::error(400) @@ -79,7 +81,7 @@ pub async fn batch_request_handler( "CashMailInfo" => { match parse_packet::("CashMailInfo", &request.request_data) { Ok(req) => { - gameserver::logic::game::cash_mail_info::handle(&pool, uid, req).await + gameserver::logic::game::cash::cash_mail_info::handle(&pool, uid, req).await } Err(e) => { error!("Failed to parse CashMailInfo: {}", e); @@ -89,7 +91,9 @@ pub async fn batch_request_handler( } "PackInfo" => { match parse_packet::("PackInfo", &request.request_data) { - Ok(req) => gameserver::logic::game::pack_info::handle(&pool, uid, req).await, + Ok(req) => { + gameserver::logic::game::pack::pack_info::handle(&pool, uid, req).await + } Err(e) => { error!("Failed to parse PackInfo: {}", e); GameResponse::error(400) @@ -102,7 +106,10 @@ pub async fn batch_request_handler( &request.request_data, ) { Ok(req) => { - gameserver::logic::game::quest_max_clear_info::handle(&pool, uid, req).await + gameserver::logic::game::quest::quest_max_clear_info::handle( + &pool, uid, req, + ) + .await } Err(e) => { error!("Failed to parse QuestMaxClearInfo: {}", e); @@ -112,7 +119,9 @@ pub async fn batch_request_handler( } "PassInfo" => { match parse_packet::("PassInfo", &request.request_data) { - Ok(req) => gameserver::logic::game::pass_info::handle(&pool, uid, req).await, + Ok(req) => { + gameserver::logic::game::pass::pass_info::handle(&pool, uid, req).await + } Err(e) => { error!("Failed to parse PassInfo: {}", e); GameResponse::error(400) @@ -125,7 +134,8 @@ pub async fn batch_request_handler( &request.request_data, ) { Ok(req) => { - gameserver::logic::game::pvp_battle_user_info::handle(&pool, uid, req).await + gameserver::logic::game::pvp::pvp_battle_user_info::handle(&pool, uid, req) + .await } Err(e) => { error!("Failed to parse PvpBattleUserInfo: {}", e); @@ -135,7 +145,9 @@ pub async fn batch_request_handler( } "ItemInfo" => { match parse_packet::("ItemInfo", &request.request_data) { - Ok(req) => gameserver::logic::game::item_info::handle(&pool, uid, req).await, + Ok(req) => { + gameserver::logic::game::item::item_info::handle(&pool, uid, req).await + } Err(e) => { error!("Failed to parse ItemInfo: {}", e); GameResponse::error(400) @@ -144,7 +156,10 @@ pub async fn batch_request_handler( } "CostumeInfo" => { match parse_packet::("CostumeInfo", &request.request_data) { - Ok(req) => gameserver::logic::game::costume_info::handle(&pool, uid, req).await, + Ok(req) => { + gameserver::logic::game::costume::costume_info::handle(&pool, uid, req) + .await + } Err(e) => { error!("Failed to parse CostumeInfo: {}", e); GameResponse::error(400) @@ -153,7 +168,9 @@ pub async fn batch_request_handler( } "RecipeInfo" => { match parse_packet::("RecipeInfo", &request.request_data) { - Ok(req) => gameserver::logic::game::recipe_info::handle(&pool, uid, req).await, + Ok(req) => { + gameserver::logic::game::recipe::recipe_info::handle(&pool, uid, req).await + } Err(e) => { error!("Failed to parse RecipeInfo: {}", e); GameResponse::error(400) @@ -163,7 +180,7 @@ pub async fn batch_request_handler( "CashShopInfo" => { match parse_packet::("CashShopInfo", &request.request_data) { Ok(req) => { - gameserver::logic::game::cash_shop_info::handle(&pool, uid, req).await + gameserver::logic::game::cash::cash_shop_info::handle(&pool, uid, req).await } Err(e) => { error!("Failed to parse CashShopInfo: {}", e); @@ -174,7 +191,8 @@ pub async fn batch_request_handler( "TutorialInfo" => { match parse_packet::("TutorialInfo", &request.request_data) { Ok(req) => { - gameserver::logic::game::tutorial_info::handle(&pool, uid, req).await + gameserver::logic::game::tutorial::tutorial_info::handle(&pool, uid, req) + .await } Err(e) => { error!("Failed to parse TutorialInfo: {}", e); @@ -184,7 +202,9 @@ pub async fn batch_request_handler( } "CharInfo" => { match parse_packet::("CharInfo", &request.request_data) { - Ok(req) => gameserver::logic::game::char_info::handle(&pool, uid, req).await, + Ok(req) => { + gameserver::logic::game::char::char_info::handle(&pool, uid, req).await + } Err(e) => { error!("Failed to parse CharInfo: {}", e); GameResponse::error(400) @@ -194,7 +214,8 @@ pub async fn batch_request_handler( "DispatchInfo" => { match parse_packet::("DispatchInfo", &request.request_data) { Ok(req) => { - gameserver::logic::game::dispatch_info::handle(&pool, uid, req).await + gameserver::logic::game::dispatch::dispatch_info::handle(&pool, uid, req) + .await } Err(e) => { error!("Failed to parse DispatchInfo: {}", e); @@ -208,8 +229,10 @@ pub async fn batch_request_handler( &request.request_data, ) { Ok(req) => { - gameserver::logic::game::total_war_reward_state::handle(&pool, uid, req) - .await + gameserver::logic::game::total::total_war_reward_state::handle( + &pool, uid, req, + ) + .await } Err(e) => { error!("Failed to parse TotalWarRewardState: {}", e); @@ -223,8 +246,10 @@ pub async fn batch_request_handler( &request.request_data, ) { Ok(req) => { - gameserver::logic::game::community_reward_info::handle(&pool, uid, req) - .await + gameserver::logic::game::community::community_reward_info::handle( + &pool, uid, req, + ) + .await } Err(e) => { error!("Failed to parse CommunityRewardInfo: {}", e); @@ -238,7 +263,8 @@ pub async fn batch_request_handler( &request.request_data, ) { Ok(req) => { - gameserver::logic::game::event_schedule_info::handle(&pool, uid, req).await + gameserver::logic::game::event::event_schedule_info::handle(&pool, uid, req) + .await } Err(e) => { error!("Failed to parse EventScheduleInfo: {}", e); @@ -252,7 +278,8 @@ pub async fn batch_request_handler( &request.request_data, ) { Ok(req) => { - gameserver::logic::game::event_exchange_info::handle(&pool, uid, req).await + gameserver::logic::game::event::event_exchange_info::handle(&pool, uid, req) + .await } Err(e) => { error!("Failed to parse EventExchangeInfo: {}", e); @@ -266,8 +293,10 @@ pub async fn batch_request_handler( &request.request_data, ) { Ok(req) => { - gameserver::logic::game::monster_hunt_schedule_info::handle(&pool, uid, req) - .await + gameserver::logic::game::monster::monster_hunt_schedule_info::handle( + &pool, uid, req, + ) + .await } Err(e) => { error!("Failed to parse MonsterHuntScheduleInfo: {}", e); @@ -281,8 +310,10 @@ pub async fn batch_request_handler( &request.request_data, ) { Ok(req) => { - gameserver::logic::game::monster_hunt_deck_info::handle(&pool, uid, req) - .await + gameserver::logic::game::monster::monster_hunt_deck_info::handle( + &pool, uid, req, + ) + .await } Err(e) => { error!("Failed to parse MonsterHuntDeckInfo: {}", e); @@ -293,7 +324,8 @@ pub async fn batch_request_handler( "CharScoutInfo" => { match parse_packet::("CharScoutInfo", &request.request_data) { Ok(req) => { - gameserver::logic::game::char_scout_info::handle(&pool, uid, req).await + gameserver::logic::game::char::char_scout_info::handle(&pool, uid, req) + .await } Err(e) => { error!("Failed to parse CharScoutInfo: {}", e); @@ -307,7 +339,10 @@ pub async fn batch_request_handler( &request.request_data, ) { Ok(req) => { - gameserver::logic::game::achievement_info::handle(&pool, uid, req).await + gameserver::logic::game::achievement::achievement_info::handle( + &pool, uid, req, + ) + .await } Err(e) => { error!("Failed to parse AchievementInfo: {}", e); @@ -321,7 +356,8 @@ pub async fn batch_request_handler( &request.request_data, ) { Ok(req) => { - gameserver::logic::game::char_partner_info::handle(&pool, uid, req).await + gameserver::logic::game::char::char_partner_info::handle(&pool, uid, req) + .await } Err(e) => { error!("Failed to parse CharPartnerInfo: {}", e); @@ -331,7 +367,9 @@ pub async fn batch_request_handler( } "PresetInfo" => { match parse_packet::("PresetInfo", &request.request_data) { - Ok(req) => gameserver::logic::game::preset_info::handle(&pool, uid, req).await, + Ok(req) => { + gameserver::logic::game::preset::preset_info::handle(&pool, uid, req).await + } Err(e) => { error!("Failed to parse PresetInfo: {}", e); GameResponse::error(400) @@ -344,7 +382,8 @@ pub async fn batch_request_handler( &request.request_data, ) { Ok(req) => { - gameserver::logic::game::hunt_dispatch_info::handle(&pool, uid, req).await + gameserver::logic::game::hunt::hunt_dispatch_info::handle(&pool, uid, req) + .await } Err(e) => { error!("Failed to parse HuntDispatchInfo: {}", e); @@ -358,8 +397,10 @@ pub async fn batch_request_handler( &request.request_data, ) { Ok(req) => { - gameserver::logic::game::monster_hunt_user_info::handle(&pool, uid, req) - .await + gameserver::logic::game::monster::monster_hunt_user_info::handle( + &pool, uid, req, + ) + .await } Err(e) => { error!("Failed to parse MonsterHuntUserInfo: {}", e); @@ -370,7 +411,8 @@ pub async fn batch_request_handler( "PersonalInfo" => { match parse_packet::("PersonalInfo", &request.request_data) { Ok(req) => { - gameserver::logic::game::personal_info::handle(&pool, uid, req).await + gameserver::logic::game::personal::personal_info::handle(&pool, uid, req) + .await } Err(e) => { error!("Failed to parse PersonalInfo: {}", e); @@ -380,7 +422,9 @@ pub async fn batch_request_handler( } "MyLikeInfo" => { match parse_packet::("MyLikeInfo", &request.request_data) { - Ok(req) => gameserver::logic::game::my_like_info::handle(&pool, uid, req).await, + Ok(req) => { + gameserver::logic::game::my::my_like_info::handle(&pool, uid, req).await + } Err(e) => { error!("Failed to parse MyLikeInfo: {}", e); GameResponse::error(400) @@ -391,7 +435,8 @@ pub async fn batch_request_handler( match parse_packet::("FriendInfoList", &request.request_data) { Ok(req) => { - gameserver::logic::game::friend_info_list::handle(&pool, uid, req).await + gameserver::logic::game::friend::friend_info_list::handle(&pool, uid, req) + .await } Err(e) => { error!("Failed to parse FriendInfoList: {}", e); @@ -402,7 +447,8 @@ pub async fn batch_request_handler( "EventHubInfo" => { match parse_packet::("EventHubInfo", &request.request_data) { Ok(req) => { - gameserver::logic::game::event_hub_info::handle(&pool, uid, req).await + gameserver::logic::game::event::event_hub_info::handle(&pool, uid, req) + .await } Err(e) => { error!("Failed to parse EventHubInfo: {}", e); @@ -416,7 +462,8 @@ pub async fn batch_request_handler( &request.request_data, ) { Ok(req) => { - gameserver::logic::game::mini_game_hub_info::handle(&pool, uid, req).await + gameserver::logic::game::mini::mini_game_hub_info::handle(&pool, uid, req) + .await } Err(e) => { error!("Failed to parse MiniGameHubInfo: {}", e); @@ -430,7 +477,8 @@ pub async fn batch_request_handler( &request.request_data, ) { Ok(req) => { - gameserver::logic::game::equip_preset_info::handle(&pool, uid, req).await + gameserver::logic::game::equip::equip_preset_info::handle(&pool, uid, req) + .await } Err(e) => { error!("Failed to parse EquipPresetInfo: {}", e); @@ -442,7 +490,8 @@ pub async fn batch_request_handler( match parse_packet::("MyRoomItemInfo", &request.request_data) { Ok(req) => { - gameserver::logic::game::my_room_item_info::handle(&pool, uid, req).await + gameserver::logic::game::my::my_room_item_info::handle(&pool, uid, req) + .await } Err(e) => { error!("Failed to parse MyRoomItemInfo: {}", e); @@ -456,7 +505,8 @@ pub async fn batch_request_handler( &request.request_data, ) { Ok(req) => { - gameserver::logic::game::season_reward_info::handle(&pool, uid, req).await + gameserver::logic::game::season::season_reward_info::handle(&pool, uid, req) + .await } Err(e) => { error!("Failed to parse SeasonRewardInfo: {}", e); @@ -467,7 +517,8 @@ pub async fn batch_request_handler( "GuildInitInfo" => { match parse_packet::("GuildInitInfo", &request.request_data) { Ok(req) => { - gameserver::logic::game::guild_init_info::handle(&pool, uid, req).await + gameserver::logic::game::guild::guild_init_info::handle(&pool, uid, req) + .await } Err(e) => { error!("Failed to parse GuildInitInfo: {}", e); @@ -478,7 +529,8 @@ pub async fn batch_request_handler( "CharAwakeInfo" => { match parse_packet::("CharAwakeInfo", &request.request_data) { Ok(req) => { - gameserver::logic::game::char_awake_info::handle(&pool, uid, req).await + gameserver::logic::game::char::char_awake_info::handle(&pool, uid, req) + .await } Err(e) => { error!("Failed to parse CharAwakeInfo: {}", e); @@ -490,7 +542,8 @@ pub async fn batch_request_handler( match parse_packet::("RootSortIdInfo", &request.request_data) { Ok(req) => { - gameserver::logic::game::root_sort_id_info::handle(&pool, uid, req).await + gameserver::logic::game::root::root_sort_id_info::handle(&pool, uid, req) + .await } Err(e) => { error!("Failed to parse RootSortIdInfo: {}", e); @@ -500,7 +553,9 @@ pub async fn batch_request_handler( } "DatingInfo" => { match parse_packet::("DatingInfo", &request.request_data) { - Ok(req) => gameserver::logic::game::dating_info::handle(&pool, uid, req).await, + Ok(req) => { + gameserver::logic::game::dating::dating_info::handle(&pool, uid, req).await + } Err(e) => { error!("Failed to parse DatingInfo: {}", e); GameResponse::error(400) @@ -513,8 +568,10 @@ pub async fn batch_request_handler( &request.request_data, ) { Ok(req) => { - gameserver::logic::game::guild_raid_season_reward::handle(&pool, uid, req) - .await + gameserver::logic::game::guild::guild_raid_season_reward::handle( + &pool, uid, req, + ) + .await } Err(e) => { error!("Failed to parse GuildRaidSeasonReward: {}", e); @@ -528,8 +585,10 @@ pub async fn batch_request_handler( &request.request_data, ) { Ok(req) => { - gameserver::logic::game::evil_castle_tower_info::handle(&pool, uid, req) - .await + gameserver::logic::game::evil::evil_castle_tower_info::handle( + &pool, uid, req, + ) + .await } Err(e) => { error!("Failed to parse EvilCastleTowerInfo: {}", e); @@ -540,7 +599,8 @@ pub async fn batch_request_handler( "CafeteriaInfo" => { match parse_packet::("CafeteriaInfo", &request.request_data) { Ok(req) => { - gameserver::logic::game::cafeteria_info::handle(&pool, uid, req).await + gameserver::logic::game::cafeteria::cafeteria_info::handle(&pool, uid, req) + .await } Err(e) => { error!("Failed to parse CafeteriaInfo: {}", e); @@ -554,8 +614,10 @@ pub async fn batch_request_handler( &request.request_data, ) { Ok(req) => { - gameserver::logic::game::mini_game_defense_info::handle(&pool, uid, req) - .await + gameserver::logic::game::mini::mini_game_defense_info::handle( + &pool, uid, req, + ) + .await } Err(e) => { error!("Failed to parse MiniGameDefenseInfo: {}", e); @@ -569,8 +631,10 @@ pub async fn batch_request_handler( &request.request_data, ) { Ok(req) => { - gameserver::logic::game::deck_costume_setting_info::handle(&pool, uid, req) - .await + gameserver::logic::game::deck::deck_costume_setting_info::handle( + &pool, uid, req, + ) + .await } Err(e) => { error!("Failed to parse DeckCostumeSettingInfo: {}", e); @@ -584,7 +648,10 @@ pub async fn batch_request_handler( &request.request_data, ) { Ok(req) => { - gameserver::logic::game::prestige_skin_info::handle(&pool, uid, req).await + gameserver::logic::game::prestige::prestige_skin_info::handle( + &pool, uid, req, + ) + .await } Err(e) => { error!("Failed to parse PrestigeSkinInfo: {}", e); @@ -598,7 +665,7 @@ pub async fn batch_request_handler( &request.request_data, ) { Ok(req) => { - gameserver::logic::game::evil_castle_daily_reward_state::handle( + gameserver::logic::game::evil::evil_castle_daily_reward_state::handle( &pool, uid, req, ) .await @@ -615,7 +682,8 @@ pub async fn batch_request_handler( &request.request_data, ) { Ok(req) => { - gameserver::logic::game::id_card_preset_info::handle(&pool, uid, req).await + gameserver::logic::game::id::id_card_preset_info::handle(&pool, uid, req) + .await } Err(e) => { error!("Failed to parse IdCardPresetInfo: {}", e); @@ -629,7 +697,7 @@ pub async fn batch_request_handler( &request.request_data, ) { Ok(req) => { - gameserver::logic::game::sky_way_schedule_info::handle(&pool, uid, req) + gameserver::logic::game::sky::sky_way_schedule_info::handle(&pool, uid, req) .await } Err(e) => { @@ -641,7 +709,8 @@ pub async fn batch_request_handler( "FieldTrapInfo" => { match parse_packet::("FieldTrapInfo", &request.request_data) { Ok(req) => { - gameserver::logic::game::field_trap_info::handle(&pool, uid, req).await + gameserver::logic::game::field::field_trap_info::handle(&pool, uid, req) + .await } Err(e) => { error!("Failed to parse FieldTrapInfo: {}", e); @@ -651,7 +720,9 @@ pub async fn batch_request_handler( } "DeckInfo" => { match parse_packet::("DeckInfo", &request.request_data) { - Ok(req) => gameserver::logic::game::deck_info::handle(&pool, uid, req).await, + Ok(req) => { + gameserver::logic::game::deck::deck_info::handle(&pool, uid, req).await + } Err(e) => { error!("Failed to parse DeckInfo: {}", e); GameResponse::error(400) @@ -664,7 +735,8 @@ pub async fn batch_request_handler( &request.request_data, ) { Ok(req) => { - gameserver::logic::game::field_object_info::handle(&pool, uid, req).await + gameserver::logic::game::field::field_object_info::handle(&pool, uid, req) + .await } Err(e) => { error!("Failed to parse FieldObjectInfo: {}", e); @@ -676,7 +748,8 @@ pub async fn batch_request_handler( match parse_packet::("PackInGameInfo", &request.request_data) { Ok(req) => { - gameserver::logic::game::pack_in_game_info::handle(&pool, uid, req).await + gameserver::logic::game::pack::pack_in_game_info::handle(&pool, uid, req) + .await } Err(e) => { error!("Failed to parse PackInGameInfo: {}", e); @@ -686,7 +759,9 @@ pub async fn batch_request_handler( } "LoginEvent" => { match parse_packet::("LoginEvent", &request.request_data) { - Ok(req) => gameserver::logic::game::login_event::handle(&pool, uid, req).await, + Ok(req) => { + gameserver::logic::game::login::login_event::handle(&pool, uid, req).await + } Err(e) => { error!("Failed to parse LoginEvent: {}", e); GameResponse::error(400) @@ -732,7 +807,7 @@ pub async fn mission_info_handler( } }; - let response = gameserver::logic::game::mission_info::handle(&pool, uid, req).await; + let response = gameserver::logic::game::mission::mission_info::handle(&pool, uid, req).await; Ok(HttpResponse::Ok().json(response)) } @@ -752,7 +827,7 @@ pub async fn char_info_handler( } }; - let response = gameserver::logic::game::char_info::handle(&pool, uid, req).await; + let response = gameserver::logic::game::char::char_info::handle(&pool, uid, req).await; Ok(HttpResponse::Ok().json(response)) } @@ -772,7 +847,7 @@ pub async fn recipe_info_handler( } }; - let response = gameserver::logic::game::recipe_info::handle(&pool, uid, req).await; + let response = gameserver::logic::game::recipe::recipe_info::handle(&pool, uid, req).await; Ok(HttpResponse::Ok().json(response)) } diff --git a/httpserver/src/routes/game/achievement_clear.rs b/httpserver/src/routes/game/achievement/achievement_clear.rs similarity index 85% rename from httpserver/src/routes/game/achievement_clear.rs rename to httpserver/src/routes/game/achievement/achievement_clear.rs index 57f5aad..29a6848 100644 --- a/httpserver/src/routes/game/achievement_clear.rs +++ b/httpserver/src/routes/game/achievement/achievement_clear.rs @@ -1,7 +1,7 @@ -use actix_web::{put, web, HttpResponse, Result }; +use actix_web::{HttpResponse, Result, put, web}; use bd2::proto::proto_net::AchievementClearRequest; use crypto::network::parse_packet; -use gameserver::logic::game::achievement_clear; +use gameserver::logic::game::achievement::achievement_clear; use sqlx::SqlitePool; #[put("AchievementClear")] @@ -17,4 +17,4 @@ async fn achievement_clear_handler( })?; let response = achievement_clear::handle(&pool, uid, req).await; Ok(HttpResponse::Ok().json(response)) -} \ No newline at end of file +} diff --git a/httpserver/src/routes/game/achievement_info.rs b/httpserver/src/routes/game/achievement/achievement_info.rs similarity index 85% rename from httpserver/src/routes/game/achievement_info.rs rename to httpserver/src/routes/game/achievement/achievement_info.rs index 670f710..b322209 100644 --- a/httpserver/src/routes/game/achievement_info.rs +++ b/httpserver/src/routes/game/achievement/achievement_info.rs @@ -1,7 +1,7 @@ -use actix_web::{put, web, HttpResponse, Result}; +use actix_web::{HttpResponse, Result, put, web}; use bd2::proto::proto_net::AchievementInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::achievement_info; +use gameserver::logic::game::achievement::achievement_info; use sqlx::SqlitePool; #[put("AchievementInfo")] diff --git a/httpserver/src/routes/game/achievement_update.rs b/httpserver/src/routes/game/achievement/achievement_update.rs similarity index 85% rename from httpserver/src/routes/game/achievement_update.rs rename to httpserver/src/routes/game/achievement/achievement_update.rs index 6a941f4..33789ce 100644 --- a/httpserver/src/routes/game/achievement_update.rs +++ b/httpserver/src/routes/game/achievement/achievement_update.rs @@ -1,7 +1,7 @@ -use actix_web::{put, web, HttpResponse, Result}; +use actix_web::{HttpResponse, Result, put, web}; use bd2::proto::proto_net::AchievementUpdateRequest; use crypto::network::parse_packet; -use gameserver::logic::game::achievement_update; +use gameserver::logic::game::achievement::achievement_update; use sqlx::SqlitePool; #[put("AchievementUpdate")] diff --git a/httpserver/src/routes/game/achievement/mod.rs b/httpserver/src/routes/game/achievement/mod.rs new file mode 100644 index 0000000..8fd541b --- /dev/null +++ b/httpserver/src/routes/game/achievement/mod.rs @@ -0,0 +1,3 @@ +pub mod achievement_clear; +pub mod achievement_info; +pub mod achievement_update; diff --git a/httpserver/src/routes/game/active_map.rs b/httpserver/src/routes/game/active/active_map.rs similarity index 86% rename from httpserver/src/routes/game/active_map.rs rename to httpserver/src/routes/game/active/active_map.rs index b958737..22c69e4 100644 --- a/httpserver/src/routes/game/active_map.rs +++ b/httpserver/src/routes/game/active/active_map.rs @@ -1,7 +1,7 @@ -use actix_web::{put, web, HttpResponse, Result}; +use actix_web::{HttpResponse, Result, put, web}; use bd2::proto::proto_net::ActiveMapRequest; use crypto::network::parse_packet; -use gameserver::logic::game::active_map; +use gameserver::logic::game::active::active_map; use sqlx::SqlitePool; #[put("ActiveMap")] diff --git a/httpserver/src/routes/game/active/mod.rs b/httpserver/src/routes/game/active/mod.rs new file mode 100644 index 0000000..aac0311 --- /dev/null +++ b/httpserver/src/routes/game/active/mod.rs @@ -0,0 +1 @@ +pub mod active_map; diff --git a/httpserver/src/routes/game/alchemy.rs b/httpserver/src/routes/game/alchemy/alchemy.rs similarity index 85% rename from httpserver/src/routes/game/alchemy.rs rename to httpserver/src/routes/game/alchemy/alchemy.rs index 835c66e..de1a060 100644 --- a/httpserver/src/routes/game/alchemy.rs +++ b/httpserver/src/routes/game/alchemy/alchemy.rs @@ -1,7 +1,7 @@ -use actix_web::{put, web, HttpResponse, Result}; +use actix_web::{HttpResponse, Result, put, web}; use bd2::proto::proto_net::AlchemyRequest; use crypto::network::parse_packet; -use gameserver::logic::game::alchemy; +use gameserver::logic::game::alchemy::alchemy; use sqlx::SqlitePool; #[put("Alchemy")] diff --git a/httpserver/src/routes/game/alchemy_batch.rs b/httpserver/src/routes/game/alchemy/alchemy_batch.rs similarity index 92% rename from httpserver/src/routes/game/alchemy_batch.rs rename to httpserver/src/routes/game/alchemy/alchemy_batch.rs index 939aa5d..794a18e 100644 --- a/httpserver/src/routes/game/alchemy_batch.rs +++ b/httpserver/src/routes/game/alchemy/alchemy_batch.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::AlchemyBatchRequest; use crypto::network::parse_packet; -use gameserver::logic::game::alchemy_batch; +use gameserver::logic::game::alchemy::alchemy_batch; use sqlx::SqlitePool; #[put("AlchemyBatch")] diff --git a/httpserver/src/routes/game/alchemy/mod.rs b/httpserver/src/routes/game/alchemy/mod.rs new file mode 100644 index 0000000..af1899f --- /dev/null +++ b/httpserver/src/routes/game/alchemy/mod.rs @@ -0,0 +1,2 @@ +pub mod alchemy; +pub mod alchemy_batch; diff --git a/httpserver/src/routes/game/all_char_refresh.rs b/httpserver/src/routes/game/all/all_char_refresh.rs similarity index 86% rename from httpserver/src/routes/game/all_char_refresh.rs rename to httpserver/src/routes/game/all/all_char_refresh.rs index 33198a9..1d40b0a 100644 --- a/httpserver/src/routes/game/all_char_refresh.rs +++ b/httpserver/src/routes/game/all/all_char_refresh.rs @@ -1,7 +1,7 @@ -use actix_web::{put, web, HttpResponse, Result}; +use actix_web::{HttpResponse, Result, put, web}; use bd2::proto::proto_net::AllCharRefreshRequest; use crypto::network::parse_packet; -use gameserver::logic::game::all_char_refresh; +use gameserver::logic::game::all::all_char_refresh; use sqlx::SqlitePool; #[put("AllCharRefresh")] diff --git a/httpserver/src/routes/game/all/mod.rs b/httpserver/src/routes/game/all/mod.rs new file mode 100644 index 0000000..876b072 --- /dev/null +++ b/httpserver/src/routes/game/all/mod.rs @@ -0,0 +1 @@ +pub mod all_char_refresh; diff --git a/httpserver/src/routes/game/attendance.rs b/httpserver/src/routes/game/attendance/attendance.rs similarity index 93% rename from httpserver/src/routes/game/attendance.rs rename to httpserver/src/routes/game/attendance/attendance.rs index c420151..2a94d87 100644 --- a/httpserver/src/routes/game/attendance.rs +++ b/httpserver/src/routes/game/attendance/attendance.rs @@ -1,4 +1,4 @@ -use actix_web::{put, web, HttpResponse, Result}; +use actix_web::{HttpResponse, Result, put, web}; use bd2::proto::proto_net::AttendanceRequest; use crypto::network::parse_packet; use gameserver::logic::game::attendance; diff --git a/httpserver/src/routes/game/attendance_info.rs b/httpserver/src/routes/game/attendance/attendance_info.rs similarity index 100% rename from httpserver/src/routes/game/attendance_info.rs rename to httpserver/src/routes/game/attendance/attendance_info.rs diff --git a/httpserver/src/routes/game/attendance/mod.rs b/httpserver/src/routes/game/attendance/mod.rs new file mode 100644 index 0000000..f2207ec --- /dev/null +++ b/httpserver/src/routes/game/attendance/mod.rs @@ -0,0 +1,2 @@ +pub mod attendance; +pub mod attendance_info; diff --git a/httpserver/src/routes/game/balance_version_check.rs b/httpserver/src/routes/game/balance/balance_version_check.rs similarity index 92% rename from httpserver/src/routes/game/balance_version_check.rs rename to httpserver/src/routes/game/balance/balance_version_check.rs index 1f1a482..33820c3 100644 --- a/httpserver/src/routes/game/balance_version_check.rs +++ b/httpserver/src/routes/game/balance/balance_version_check.rs @@ -1,7 +1,7 @@ use actix_web::{HttpResponse, Result, put, web}; use bd2::proto::proto_net::BalanceVersionCheckRequest; use crypto::network::parse_packet; -use gameserver::logic::game::balance_version_check; +use gameserver::logic::game::balance::balance_version_check; use sqlx::SqlitePool; #[put("BalanceVersionCheck")] diff --git a/httpserver/src/routes/game/balance/mod.rs b/httpserver/src/routes/game/balance/mod.rs new file mode 100644 index 0000000..6cb48b2 --- /dev/null +++ b/httpserver/src/routes/game/balance/mod.rs @@ -0,0 +1 @@ +pub mod balance_version_check; diff --git a/httpserver/src/routes/game/battle_end.rs b/httpserver/src/routes/game/battle/battle_end.rs similarity index 93% rename from httpserver/src/routes/game/battle_end.rs rename to httpserver/src/routes/game/battle/battle_end.rs index 903dc18..ebbc389 100644 --- a/httpserver/src/routes/game/battle_end.rs +++ b/httpserver/src/routes/game/battle/battle_end.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::BattleEndRequest; use crypto::network::parse_packet; -use gameserver::logic::game::battle_end; +use gameserver::logic::game::battle::battle_end; use sqlx::SqlitePool; #[put("BattleEnd")] diff --git a/httpserver/src/routes/game/battle_end_test.rs b/httpserver/src/routes/game/battle/battle_end_test.rs similarity index 92% rename from httpserver/src/routes/game/battle_end_test.rs rename to httpserver/src/routes/game/battle/battle_end_test.rs index 8814682..0218863 100644 --- a/httpserver/src/routes/game/battle_end_test.rs +++ b/httpserver/src/routes/game/battle/battle_end_test.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::BattleEndTestRequest; use crypto::network::parse_packet; -use gameserver::logic::game::battle_end_test; +use gameserver::logic::game::battle::battle_end_test; use sqlx::SqlitePool; #[put("BattleEndTest")] diff --git a/httpserver/src/routes/game/battle_enter.rs b/httpserver/src/routes/game/battle/battle_enter.rs similarity index 92% rename from httpserver/src/routes/game/battle_enter.rs rename to httpserver/src/routes/game/battle/battle_enter.rs index e909640..5f8cc3b 100644 --- a/httpserver/src/routes/game/battle_enter.rs +++ b/httpserver/src/routes/game/battle/battle_enter.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::BattleEnterRequest; use crypto::network::parse_packet; -use gameserver::logic::game::battle_enter; +use gameserver::logic::game::battle::battle_enter; use sqlx::SqlitePool; #[put("BattleEnter")] diff --git a/httpserver/src/routes/game/battle_exit.rs b/httpserver/src/routes/game/battle/battle_exit.rs similarity index 92% rename from httpserver/src/routes/game/battle_exit.rs rename to httpserver/src/routes/game/battle/battle_exit.rs index c6c669e..a5e23b4 100644 --- a/httpserver/src/routes/game/battle_exit.rs +++ b/httpserver/src/routes/game/battle/battle_exit.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::BattleExitRequest; use crypto::network::parse_packet; -use gameserver::logic::game::battle_exit; +use gameserver::logic::game::battle::battle_exit; use sqlx::SqlitePool; #[put("BattleExit")] diff --git a/httpserver/src/routes/game/battle_give_up.rs b/httpserver/src/routes/game/battle/battle_give_up.rs similarity index 92% rename from httpserver/src/routes/game/battle_give_up.rs rename to httpserver/src/routes/game/battle/battle_give_up.rs index 80b9baa..f7349bc 100644 --- a/httpserver/src/routes/game/battle_give_up.rs +++ b/httpserver/src/routes/game/battle/battle_give_up.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::BattleGiveUpRequest; use crypto::network::parse_packet; -use gameserver::logic::game::battle_give_up; +use gameserver::logic::game::battle::battle_give_up; use sqlx::SqlitePool; #[put("BattleGiveUp")] diff --git a/httpserver/src/routes/game/battle_retry.rs b/httpserver/src/routes/game/battle/battle_retry.rs similarity index 92% rename from httpserver/src/routes/game/battle_retry.rs rename to httpserver/src/routes/game/battle/battle_retry.rs index 5aadb3b..663b03c 100644 --- a/httpserver/src/routes/game/battle_retry.rs +++ b/httpserver/src/routes/game/battle/battle_retry.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::BattleRetryRequest; use crypto::network::parse_packet; -use gameserver::logic::game::battle_retry; +use gameserver::logic::game::battle::battle_retry; use sqlx::SqlitePool; #[put("BattleRetry")] diff --git a/httpserver/src/routes/game/battle_retry_previous_turn.rs b/httpserver/src/routes/game/battle/battle_retry_previous_turn.rs similarity index 92% rename from httpserver/src/routes/game/battle_retry_previous_turn.rs rename to httpserver/src/routes/game/battle/battle_retry_previous_turn.rs index 08e2796..e2edc08 100644 --- a/httpserver/src/routes/game/battle_retry_previous_turn.rs +++ b/httpserver/src/routes/game/battle/battle_retry_previous_turn.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::BattleRetryPreviousTurnRequest; use crypto::network::parse_packet; -use gameserver::logic::game::battle_retry_previous_turn; +use gameserver::logic::game::battle::battle_retry_previous_turn; use sqlx::SqlitePool; #[put("BattleRetryPreviousTurn")] diff --git a/httpserver/src/routes/game/battle_start.rs b/httpserver/src/routes/game/battle/battle_start.rs similarity index 92% rename from httpserver/src/routes/game/battle_start.rs rename to httpserver/src/routes/game/battle/battle_start.rs index d9bcaad..f15cc90 100644 --- a/httpserver/src/routes/game/battle_start.rs +++ b/httpserver/src/routes/game/battle/battle_start.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::BattleStartRequest; use crypto::network::parse_packet; -use gameserver::logic::game::battle_start; +use gameserver::logic::game::battle::battle_start; use sqlx::SqlitePool; #[put("BattleStart")] diff --git a/httpserver/src/routes/game/battle_verify_state.rs b/httpserver/src/routes/game/battle/battle_verify_state.rs similarity index 92% rename from httpserver/src/routes/game/battle_verify_state.rs rename to httpserver/src/routes/game/battle/battle_verify_state.rs index ba8109f..f07eb5f 100644 --- a/httpserver/src/routes/game/battle_verify_state.rs +++ b/httpserver/src/routes/game/battle/battle_verify_state.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::BattleVerifyStateRequest; use crypto::network::parse_packet; -use gameserver::logic::game::battle_verify_state; +use gameserver::logic::game::battle::battle_verify_state; use sqlx::SqlitePool; #[put("BattleVerifyState")] diff --git a/httpserver/src/routes/game/battle/mod.rs b/httpserver/src/routes/game/battle/mod.rs new file mode 100644 index 0000000..b09d68b --- /dev/null +++ b/httpserver/src/routes/game/battle/mod.rs @@ -0,0 +1,9 @@ +pub mod battle_end; +pub mod battle_end_test; +pub mod battle_enter; +pub mod battle_exit; +pub mod battle_give_up; +pub mod battle_retry; +pub mod battle_retry_previous_turn; +pub mod battle_start; +pub mod battle_verify_state; diff --git a/httpserver/src/routes/game/cafeteria_cumulative_reward.rs b/httpserver/src/routes/game/cafeteria/cafeteria_cumulative_reward.rs similarity index 91% rename from httpserver/src/routes/game/cafeteria_cumulative_reward.rs rename to httpserver/src/routes/game/cafeteria/cafeteria_cumulative_reward.rs index 73c7ce8..cccc63d 100644 --- a/httpserver/src/routes/game/cafeteria_cumulative_reward.rs +++ b/httpserver/src/routes/game/cafeteria/cafeteria_cumulative_reward.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::CafeteriaCumulativeRewardRequest; use crypto::network::parse_packet; -use gameserver::logic::game::cafeteria_cumulative_reward; +use gameserver::logic::game::cafeteria::cafeteria_cumulative_reward; use sqlx::SqlitePool; #[put("CafeteriaCumulativeReward")] diff --git a/httpserver/src/routes/game/cafeteria_daily_connection_costume_refresh.rs b/httpserver/src/routes/game/cafeteria/cafeteria_daily_connection_costume_refresh.rs similarity index 91% rename from httpserver/src/routes/game/cafeteria_daily_connection_costume_refresh.rs rename to httpserver/src/routes/game/cafeteria/cafeteria_daily_connection_costume_refresh.rs index 16fb836..541b505 100644 --- a/httpserver/src/routes/game/cafeteria_daily_connection_costume_refresh.rs +++ b/httpserver/src/routes/game/cafeteria/cafeteria_daily_connection_costume_refresh.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::CafeteriaDailyConnectionCostumeRefreshRequest; use crypto::network::parse_packet; -use gameserver::logic::game::cafeteria_daily_connection_costume_refresh; +use gameserver::logic::game::cafeteria::cafeteria_daily_connection_costume_refresh; use sqlx::SqlitePool; #[put("CafeteriaDailyConnectionCostumeRefresh")] diff --git a/httpserver/src/routes/game/cafeteria_event_npc_interaction_reward.rs b/httpserver/src/routes/game/cafeteria/cafeteria_event_npc_interaction_reward.rs similarity index 91% rename from httpserver/src/routes/game/cafeteria_event_npc_interaction_reward.rs rename to httpserver/src/routes/game/cafeteria/cafeteria_event_npc_interaction_reward.rs index 5ca4609..35d3403 100644 --- a/httpserver/src/routes/game/cafeteria_event_npc_interaction_reward.rs +++ b/httpserver/src/routes/game/cafeteria/cafeteria_event_npc_interaction_reward.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::CafeteriaEventNpcInteractionRewardRequest; use crypto::network::parse_packet; -use gameserver::logic::game::cafeteria_event_npc_interaction_reward; +use gameserver::logic::game::cafeteria::cafeteria_event_npc_interaction_reward; use sqlx::SqlitePool; #[put("CafeteriaEventNpcInteractionReward")] diff --git a/httpserver/src/routes/game/cafeteria_info.rs b/httpserver/src/routes/game/cafeteria/cafeteria_info.rs similarity index 92% rename from httpserver/src/routes/game/cafeteria_info.rs rename to httpserver/src/routes/game/cafeteria/cafeteria_info.rs index e4a386b..f9357e5 100644 --- a/httpserver/src/routes/game/cafeteria_info.rs +++ b/httpserver/src/routes/game/cafeteria/cafeteria_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::CafeteriaInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::cafeteria_info; +use gameserver::logic::game::cafeteria::cafeteria_info; use sqlx::SqlitePool; #[put("CafeteriaInfo")] diff --git a/httpserver/src/routes/game/cafeteria_introduction_story_reward.rs b/httpserver/src/routes/game/cafeteria/cafeteria_introduction_story_reward.rs similarity index 91% rename from httpserver/src/routes/game/cafeteria_introduction_story_reward.rs rename to httpserver/src/routes/game/cafeteria/cafeteria_introduction_story_reward.rs index aae49fe..3d616f0 100644 --- a/httpserver/src/routes/game/cafeteria_introduction_story_reward.rs +++ b/httpserver/src/routes/game/cafeteria/cafeteria_introduction_story_reward.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::CafeteriaIntroductionStoryRewardRequest; use crypto::network::parse_packet; -use gameserver::logic::game::cafeteria_introduction_story_reward; +use gameserver::logic::game::cafeteria::cafeteria_introduction_story_reward; use sqlx::SqlitePool; #[put("CafeteriaIntroductionStoryReward")] diff --git a/httpserver/src/routes/game/cafeteria_level_up.rs b/httpserver/src/routes/game/cafeteria/cafeteria_level_up.rs similarity index 92% rename from httpserver/src/routes/game/cafeteria_level_up.rs rename to httpserver/src/routes/game/cafeteria/cafeteria_level_up.rs index fda02ab..246560b 100644 --- a/httpserver/src/routes/game/cafeteria_level_up.rs +++ b/httpserver/src/routes/game/cafeteria/cafeteria_level_up.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::CafeteriaLevelUpRequest; use crypto::network::parse_packet; -use gameserver::logic::game::cafeteria_level_up; +use gameserver::logic::game::cafeteria::cafeteria_level_up; use sqlx::SqlitePool; #[put("CafeteriaLevelUp")] diff --git a/httpserver/src/routes/game/cafeteria_manage_item_add.rs b/httpserver/src/routes/game/cafeteria/cafeteria_manage_item_add.rs similarity index 91% rename from httpserver/src/routes/game/cafeteria_manage_item_add.rs rename to httpserver/src/routes/game/cafeteria/cafeteria_manage_item_add.rs index c283f9b..f9bfbaf 100644 --- a/httpserver/src/routes/game/cafeteria_manage_item_add.rs +++ b/httpserver/src/routes/game/cafeteria/cafeteria_manage_item_add.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::CafeteriaManageItemAddRequest; use crypto::network::parse_packet; -use gameserver::logic::game::cafeteria_manage_item_add; +use gameserver::logic::game::cafeteria::cafeteria_manage_item_add; use sqlx::SqlitePool; #[put("CafeteriaManageItemAdd")] diff --git a/httpserver/src/routes/game/cafeteria_rare_npc_interaction_reward.rs b/httpserver/src/routes/game/cafeteria/cafeteria_rare_npc_interaction_reward.rs similarity index 91% rename from httpserver/src/routes/game/cafeteria_rare_npc_interaction_reward.rs rename to httpserver/src/routes/game/cafeteria/cafeteria_rare_npc_interaction_reward.rs index bf25715..555e49c 100644 --- a/httpserver/src/routes/game/cafeteria_rare_npc_interaction_reward.rs +++ b/httpserver/src/routes/game/cafeteria/cafeteria_rare_npc_interaction_reward.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::CafeteriaRareNpcInteractionRewardRequest; use crypto::network::parse_packet; -use gameserver::logic::game::cafeteria_rare_npc_interaction_reward; +use gameserver::logic::game::cafeteria::cafeteria_rare_npc_interaction_reward; use sqlx::SqlitePool; #[put("CafeteriaRareNpcInteractionReward")] diff --git a/httpserver/src/routes/game/cafeteria_regular_costume_interaction_all_reward.rs b/httpserver/src/routes/game/cafeteria/cafeteria_regular_costume_interaction_all_reward.rs similarity index 91% rename from httpserver/src/routes/game/cafeteria_regular_costume_interaction_all_reward.rs rename to httpserver/src/routes/game/cafeteria/cafeteria_regular_costume_interaction_all_reward.rs index d0888d7..6cdee12 100644 --- a/httpserver/src/routes/game/cafeteria_regular_costume_interaction_all_reward.rs +++ b/httpserver/src/routes/game/cafeteria/cafeteria_regular_costume_interaction_all_reward.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::CafeteriaRegularCostumeInteractionAllRewardRequest; use crypto::network::parse_packet; -use gameserver::logic::game::cafeteria_regular_costume_interaction_all_reward; +use gameserver::logic::game::cafeteria::cafeteria_regular_costume_interaction_all_reward; use sqlx::SqlitePool; #[put("CafeteriaRegularCostumeInteractionAllReward")] diff --git a/httpserver/src/routes/game/cafeteria_regular_costume_interaction_reward.rs b/httpserver/src/routes/game/cafeteria/cafeteria_regular_costume_interaction_reward.rs similarity index 91% rename from httpserver/src/routes/game/cafeteria_regular_costume_interaction_reward.rs rename to httpserver/src/routes/game/cafeteria/cafeteria_regular_costume_interaction_reward.rs index d1e00f7..c640117 100644 --- a/httpserver/src/routes/game/cafeteria_regular_costume_interaction_reward.rs +++ b/httpserver/src/routes/game/cafeteria/cafeteria_regular_costume_interaction_reward.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::CafeteriaRegularCostumeInteractionRewardRequest; use crypto::network::parse_packet; -use gameserver::logic::game::cafeteria_regular_costume_interaction_reward; +use gameserver::logic::game::cafeteria::cafeteria_regular_costume_interaction_reward; use sqlx::SqlitePool; #[put("CafeteriaRegularCostumeInteractionReward")] diff --git a/httpserver/src/routes/game/cafeteria_regular_costume_note_all_reward.rs b/httpserver/src/routes/game/cafeteria/cafeteria_regular_costume_note_all_reward.rs similarity index 91% rename from httpserver/src/routes/game/cafeteria_regular_costume_note_all_reward.rs rename to httpserver/src/routes/game/cafeteria/cafeteria_regular_costume_note_all_reward.rs index bfee206..f8dfd38 100644 --- a/httpserver/src/routes/game/cafeteria_regular_costume_note_all_reward.rs +++ b/httpserver/src/routes/game/cafeteria/cafeteria_regular_costume_note_all_reward.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::CafeteriaRegularCostumeNoteAllRewardRequest; use crypto::network::parse_packet; -use gameserver::logic::game::cafeteria_regular_costume_note_all_reward; +use gameserver::logic::game::cafeteria::cafeteria_regular_costume_note_all_reward; use sqlx::SqlitePool; #[put("CafeteriaRegularCostumeNoteAllReward")] diff --git a/httpserver/src/routes/game/cafeteria_regular_costume_note_info.rs b/httpserver/src/routes/game/cafeteria/cafeteria_regular_costume_note_info.rs similarity index 91% rename from httpserver/src/routes/game/cafeteria_regular_costume_note_info.rs rename to httpserver/src/routes/game/cafeteria/cafeteria_regular_costume_note_info.rs index 382c2f0..bbe27aa 100644 --- a/httpserver/src/routes/game/cafeteria_regular_costume_note_info.rs +++ b/httpserver/src/routes/game/cafeteria/cafeteria_regular_costume_note_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::CafeteriaRegularCostumeNoteInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::cafeteria_regular_costume_note_info; +use gameserver::logic::game::cafeteria::cafeteria_regular_costume_note_info; use sqlx::SqlitePool; #[put("CafeteriaRegularCostumeNoteInfo")] diff --git a/httpserver/src/routes/game/cafeteria_regular_costume_note_reward.rs b/httpserver/src/routes/game/cafeteria/cafeteria_regular_costume_note_reward.rs similarity index 91% rename from httpserver/src/routes/game/cafeteria_regular_costume_note_reward.rs rename to httpserver/src/routes/game/cafeteria/cafeteria_regular_costume_note_reward.rs index 1829633..861c5aa 100644 --- a/httpserver/src/routes/game/cafeteria_regular_costume_note_reward.rs +++ b/httpserver/src/routes/game/cafeteria/cafeteria_regular_costume_note_reward.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::CafeteriaRegularCostumeNoteRewardRequest; use crypto::network::parse_packet; -use gameserver::logic::game::cafeteria_regular_costume_note_reward; +use gameserver::logic::game::cafeteria::cafeteria_regular_costume_note_reward; use sqlx::SqlitePool; #[put("CafeteriaRegularCostumeNoteReward")] diff --git a/httpserver/src/routes/game/cafeteria_reward_receipt_time_update_using_cheat.rs b/httpserver/src/routes/game/cafeteria/cafeteria_reward_receipt_time_update_using_cheat.rs similarity index 91% rename from httpserver/src/routes/game/cafeteria_reward_receipt_time_update_using_cheat.rs rename to httpserver/src/routes/game/cafeteria/cafeteria_reward_receipt_time_update_using_cheat.rs index 790a1b8..8e14623 100644 --- a/httpserver/src/routes/game/cafeteria_reward_receipt_time_update_using_cheat.rs +++ b/httpserver/src/routes/game/cafeteria/cafeteria_reward_receipt_time_update_using_cheat.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::CafeteriaRewardReceiptTimeUpdateUsingCheatRequest; use crypto::network::parse_packet; -use gameserver::logic::game::cafeteria_reward_receipt_time_update_using_cheat; +use gameserver::logic::game::cafeteria::cafeteria_reward_receipt_time_update_using_cheat; use sqlx::SqlitePool; #[put("CafeteriaRewardReceiptTimeUpdateUsingCheat")] diff --git a/httpserver/src/routes/game/cafeteria_spawn_reset.rs b/httpserver/src/routes/game/cafeteria/cafeteria_spawn_reset.rs similarity index 92% rename from httpserver/src/routes/game/cafeteria_spawn_reset.rs rename to httpserver/src/routes/game/cafeteria/cafeteria_spawn_reset.rs index 59269d9..e64e464 100644 --- a/httpserver/src/routes/game/cafeteria_spawn_reset.rs +++ b/httpserver/src/routes/game/cafeteria/cafeteria_spawn_reset.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::CafeteriaSpawnResetRequest; use crypto::network::parse_packet; -use gameserver::logic::game::cafeteria_spawn_reset; +use gameserver::logic::game::cafeteria::cafeteria_spawn_reset; use sqlx::SqlitePool; #[put("CafeteriaSpawnReset")] diff --git a/httpserver/src/routes/game/cafeteria_spawn_reset_cheat.rs b/httpserver/src/routes/game/cafeteria/cafeteria_spawn_reset_cheat.rs similarity index 91% rename from httpserver/src/routes/game/cafeteria_spawn_reset_cheat.rs rename to httpserver/src/routes/game/cafeteria/cafeteria_spawn_reset_cheat.rs index a7cb3ea..2816964 100644 --- a/httpserver/src/routes/game/cafeteria_spawn_reset_cheat.rs +++ b/httpserver/src/routes/game/cafeteria/cafeteria_spawn_reset_cheat.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::CafeteriaSpawnResetCheatRequest; use crypto::network::parse_packet; -use gameserver::logic::game::cafeteria_spawn_reset_cheat; +use gameserver::logic::game::cafeteria::cafeteria_spawn_reset_cheat; use sqlx::SqlitePool; #[put("CafeteriaSpawnResetCheat")] diff --git a/httpserver/src/routes/game/cafeteria/mod.rs b/httpserver/src/routes/game/cafeteria/mod.rs new file mode 100644 index 0000000..8d53c7a --- /dev/null +++ b/httpserver/src/routes/game/cafeteria/mod.rs @@ -0,0 +1,16 @@ +pub mod cafeteria_cumulative_reward; +pub mod cafeteria_daily_connection_costume_refresh; +pub mod cafeteria_event_npc_interaction_reward; +pub mod cafeteria_info; +pub mod cafeteria_introduction_story_reward; +pub mod cafeteria_level_up; +pub mod cafeteria_manage_item_add; +pub mod cafeteria_rare_npc_interaction_reward; +pub mod cafeteria_regular_costume_interaction_all_reward; +pub mod cafeteria_regular_costume_interaction_reward; +pub mod cafeteria_regular_costume_note_all_reward; +pub mod cafeteria_regular_costume_note_info; +pub mod cafeteria_regular_costume_note_reward; +pub mod cafeteria_reward_receipt_time_update_using_cheat; +pub mod cafeteria_spawn_reset; +pub mod cafeteria_spawn_reset_cheat; diff --git a/httpserver/src/routes/game/cancel_leave_user.rs b/httpserver/src/routes/game/cancel/cancel_leave_user.rs similarity index 92% rename from httpserver/src/routes/game/cancel_leave_user.rs rename to httpserver/src/routes/game/cancel/cancel_leave_user.rs index bab16be..9f416af 100644 --- a/httpserver/src/routes/game/cancel_leave_user.rs +++ b/httpserver/src/routes/game/cancel/cancel_leave_user.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::CancelLeaveUserRequest; use crypto::network::parse_packet; -use gameserver::logic::game::cancel_leave_user; +use gameserver::logic::game::cancel::cancel_leave_user; use sqlx::SqlitePool; #[put("CancelLeaveUser")] diff --git a/httpserver/src/routes/game/cancel/mod.rs b/httpserver/src/routes/game/cancel/mod.rs new file mode 100644 index 0000000..bf3d949 --- /dev/null +++ b/httpserver/src/routes/game/cancel/mod.rs @@ -0,0 +1 @@ +pub mod cancel_leave_user; diff --git a/httpserver/src/routes/game/cash_mail_info.rs b/httpserver/src/routes/game/cash/cash_mail_info.rs similarity index 92% rename from httpserver/src/routes/game/cash_mail_info.rs rename to httpserver/src/routes/game/cash/cash_mail_info.rs index 06335d1..97eacfc 100644 --- a/httpserver/src/routes/game/cash_mail_info.rs +++ b/httpserver/src/routes/game/cash/cash_mail_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::CashMailInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::cash_mail_info; +use gameserver::logic::game::cash::cash_mail_info; use sqlx::SqlitePool; #[put("CashMailInfo")] diff --git a/httpserver/src/routes/game/cash_shop_buy.rs b/httpserver/src/routes/game/cash/cash_shop_buy.rs similarity index 93% rename from httpserver/src/routes/game/cash_shop_buy.rs rename to httpserver/src/routes/game/cash/cash_shop_buy.rs index d40857f..de018a7 100644 --- a/httpserver/src/routes/game/cash_shop_buy.rs +++ b/httpserver/src/routes/game/cash/cash_shop_buy.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::CashShopBuyRequest; use crypto::network::parse_packet; -use gameserver::logic::game::cash_shop_buy; +use gameserver::logic::game::cash::cash_shop_buy; use sqlx::SqlitePool; #[put("CashShopBuy")] diff --git a/httpserver/src/routes/game/cash_shop_info.rs b/httpserver/src/routes/game/cash/cash_shop_info.rs similarity index 92% rename from httpserver/src/routes/game/cash_shop_info.rs rename to httpserver/src/routes/game/cash/cash_shop_info.rs index 87813f6..fb2efc0 100644 --- a/httpserver/src/routes/game/cash_shop_info.rs +++ b/httpserver/src/routes/game/cash/cash_shop_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::CashShopInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::cash_shop_info; +use gameserver::logic::game::cash::cash_shop_info; use sqlx::SqlitePool; #[put("CashShopInfo")] diff --git a/httpserver/src/routes/game/cash_shop_purchase_count_info.rs b/httpserver/src/routes/game/cash/cash_shop_purchase_count_info.rs similarity index 92% rename from httpserver/src/routes/game/cash_shop_purchase_count_info.rs rename to httpserver/src/routes/game/cash/cash_shop_purchase_count_info.rs index 18bf733..fd2c635 100644 --- a/httpserver/src/routes/game/cash_shop_purchase_count_info.rs +++ b/httpserver/src/routes/game/cash/cash_shop_purchase_count_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::CashShopPurchaseCountInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::cash_shop_purchase_count_info; +use gameserver::logic::game::cash::cash_shop_purchase_count_info; use sqlx::SqlitePool; #[put("CashShopPurchaseCountInfo")] diff --git a/httpserver/src/routes/game/cash/mod.rs b/httpserver/src/routes/game/cash/mod.rs new file mode 100644 index 0000000..ed67036 --- /dev/null +++ b/httpserver/src/routes/game/cash/mod.rs @@ -0,0 +1,4 @@ +pub mod cash_mail_info; +pub mod cash_shop_buy; +pub mod cash_shop_info; +pub mod cash_shop_purchase_count_info; diff --git a/httpserver/src/routes/game/char_all_revival.rs b/httpserver/src/routes/game/char/char_all_revival.rs similarity index 92% rename from httpserver/src/routes/game/char_all_revival.rs rename to httpserver/src/routes/game/char/char_all_revival.rs index 68cc55d..bf5f7ba 100644 --- a/httpserver/src/routes/game/char_all_revival.rs +++ b/httpserver/src/routes/game/char/char_all_revival.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::CharAllRevivalRequest; use crypto::network::parse_packet; -use gameserver::logic::game::char_all_revival; +use gameserver::logic::game::char::char_all_revival; use sqlx::SqlitePool; #[put("CharAllRevival")] diff --git a/httpserver/src/routes/game/char_auto_revive_set.rs b/httpserver/src/routes/game/char/char_auto_revive_set.rs similarity index 92% rename from httpserver/src/routes/game/char_auto_revive_set.rs rename to httpserver/src/routes/game/char/char_auto_revive_set.rs index f4a9ebe..a50388b 100644 --- a/httpserver/src/routes/game/char_auto_revive_set.rs +++ b/httpserver/src/routes/game/char/char_auto_revive_set.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::CharAutoReviveSetRequest; use crypto::network::parse_packet; -use gameserver::logic::game::char_auto_revive_set; +use gameserver::logic::game::char::char_auto_revive_set; use sqlx::SqlitePool; #[put("CharAutoReviveSet")] diff --git a/httpserver/src/routes/game/char_awake_active.rs b/httpserver/src/routes/game/char/char_awake_active.rs similarity index 92% rename from httpserver/src/routes/game/char_awake_active.rs rename to httpserver/src/routes/game/char/char_awake_active.rs index c4d4fb5..232d037 100644 --- a/httpserver/src/routes/game/char_awake_active.rs +++ b/httpserver/src/routes/game/char/char_awake_active.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::CharAwakeActiveRequest; use crypto::network::parse_packet; -use gameserver::logic::game::char_awake_active; +use gameserver::logic::game::char::char_awake_active; use sqlx::SqlitePool; #[put("CharAwakeActive")] diff --git a/httpserver/src/routes/game/char_awake_info.rs b/httpserver/src/routes/game/char/char_awake_info.rs similarity index 92% rename from httpserver/src/routes/game/char_awake_info.rs rename to httpserver/src/routes/game/char/char_awake_info.rs index 4bcc2bb..5d056f4 100644 --- a/httpserver/src/routes/game/char_awake_info.rs +++ b/httpserver/src/routes/game/char/char_awake_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::CharAwakeInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::char_awake_info; +use gameserver::logic::game::char::char_awake_info; use sqlx::SqlitePool; #[put("CharAwakeInfo")] diff --git a/httpserver/src/routes/game/char_class_up.rs b/httpserver/src/routes/game/char/char_class_up.rs similarity index 93% rename from httpserver/src/routes/game/char_class_up.rs rename to httpserver/src/routes/game/char/char_class_up.rs index d1b5682..5135933 100644 --- a/httpserver/src/routes/game/char_class_up.rs +++ b/httpserver/src/routes/game/char/char_class_up.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::CharClassUpRequest; use crypto::network::parse_packet; -use gameserver::logic::game::char_class_up; +use gameserver::logic::game::char::char_class_up; use sqlx::SqlitePool; #[put("CharClassUp")] diff --git a/httpserver/src/routes/game/char_expiry.rs b/httpserver/src/routes/game/char/char_expiry.rs similarity index 93% rename from httpserver/src/routes/game/char_expiry.rs rename to httpserver/src/routes/game/char/char_expiry.rs index 26b086b..cbf5373 100644 --- a/httpserver/src/routes/game/char_expiry.rs +++ b/httpserver/src/routes/game/char/char_expiry.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::CharExpiryRequest; use crypto::network::parse_packet; -use gameserver::logic::game::char_expiry; +use gameserver::logic::game::char::char_expiry; use sqlx::SqlitePool; #[put("CharExpiry")] diff --git a/httpserver/src/routes/game/char_growth.rs b/httpserver/src/routes/game/char/char_growth.rs similarity index 93% rename from httpserver/src/routes/game/char_growth.rs rename to httpserver/src/routes/game/char/char_growth.rs index 15c942a..c05d7c1 100644 --- a/httpserver/src/routes/game/char_growth.rs +++ b/httpserver/src/routes/game/char/char_growth.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::CharGrowthRequest; use crypto::network::parse_packet; -use gameserver::logic::game::char_growth; +use gameserver::logic::game::char::char_growth; use sqlx::SqlitePool; #[put("CharGrowth")] diff --git a/httpserver/src/routes/game/char_healing.rs b/httpserver/src/routes/game/char/char_healing.rs similarity index 93% rename from httpserver/src/routes/game/char_healing.rs rename to httpserver/src/routes/game/char/char_healing.rs index b9a989e..2aee3cc 100644 --- a/httpserver/src/routes/game/char_healing.rs +++ b/httpserver/src/routes/game/char/char_healing.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::CharHealingRequest; use crypto::network::parse_packet; -use gameserver::logic::game::char_healing; +use gameserver::logic::game::char::char_healing; use sqlx::SqlitePool; #[put("CharHealing")] diff --git a/httpserver/src/routes/game/char_immortal.rs b/httpserver/src/routes/game/char/char_immortal.rs similarity index 93% rename from httpserver/src/routes/game/char_immortal.rs rename to httpserver/src/routes/game/char/char_immortal.rs index 3db0edd..adcc34c 100644 --- a/httpserver/src/routes/game/char_immortal.rs +++ b/httpserver/src/routes/game/char/char_immortal.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::CharImmortalRequest; use crypto::network::parse_packet; -use gameserver::logic::game::char_immortal; +use gameserver::logic::game::char::char_immortal; use sqlx::SqlitePool; #[put("CharImmortal")] diff --git a/httpserver/src/routes/game/char_imprint_level_up.rs b/httpserver/src/routes/game/char/char_imprint_level_up.rs similarity index 92% rename from httpserver/src/routes/game/char_imprint_level_up.rs rename to httpserver/src/routes/game/char/char_imprint_level_up.rs index f1b0459..a306a29 100644 --- a/httpserver/src/routes/game/char_imprint_level_up.rs +++ b/httpserver/src/routes/game/char/char_imprint_level_up.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::CharImprintLevelUpRequest; use crypto::network::parse_packet; -use gameserver::logic::game::char_imprint_level_up; +use gameserver::logic::game::char::char_imprint_level_up; use sqlx::SqlitePool; #[put("CharImprintLevelUp")] diff --git a/httpserver/src/routes/game/char_info.rs b/httpserver/src/routes/game/char/char_info.rs similarity index 93% rename from httpserver/src/routes/game/char_info.rs rename to httpserver/src/routes/game/char/char_info.rs index e0ab465..fb03c1b 100644 --- a/httpserver/src/routes/game/char_info.rs +++ b/httpserver/src/routes/game/char/char_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::CharInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::char_info; +use gameserver::logic::game::char::char_info; use sqlx::SqlitePool; #[put("CharInfo")] diff --git a/httpserver/src/routes/game/char_level_up.rs b/httpserver/src/routes/game/char/char_level_up.rs similarity index 93% rename from httpserver/src/routes/game/char_level_up.rs rename to httpserver/src/routes/game/char/char_level_up.rs index e2e55b5..94263a7 100644 --- a/httpserver/src/routes/game/char_level_up.rs +++ b/httpserver/src/routes/game/char/char_level_up.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::CharLevelUpRequest; use crypto::network::parse_packet; -use gameserver::logic::game::char_level_up; +use gameserver::logic::game::char::char_level_up; use sqlx::SqlitePool; #[put("CharLevelUp")] diff --git a/httpserver/src/routes/game/char_partner_info.rs b/httpserver/src/routes/game/char/char_partner_info.rs similarity index 92% rename from httpserver/src/routes/game/char_partner_info.rs rename to httpserver/src/routes/game/char/char_partner_info.rs index b7b914f..b2c87e9 100644 --- a/httpserver/src/routes/game/char_partner_info.rs +++ b/httpserver/src/routes/game/char/char_partner_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::CharPartnerInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::char_partner_info; +use gameserver::logic::game::char::char_partner_info; use sqlx::SqlitePool; #[put("CharPartnerInfo")] diff --git a/httpserver/src/routes/game/char_partner_reward.rs b/httpserver/src/routes/game/char/char_partner_reward.rs similarity index 92% rename from httpserver/src/routes/game/char_partner_reward.rs rename to httpserver/src/routes/game/char/char_partner_reward.rs index 000c602..423d05d 100644 --- a/httpserver/src/routes/game/char_partner_reward.rs +++ b/httpserver/src/routes/game/char/char_partner_reward.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::CharPartnerRewardRequest; use crypto::network::parse_packet; -use gameserver::logic::game::char_partner_reward; +use gameserver::logic::game::char::char_partner_reward; use sqlx::SqlitePool; #[put("CharPartnerReward")] diff --git a/httpserver/src/routes/game/char_partner_story_reward.rs b/httpserver/src/routes/game/char/char_partner_story_reward.rs similarity index 92% rename from httpserver/src/routes/game/char_partner_story_reward.rs rename to httpserver/src/routes/game/char/char_partner_story_reward.rs index 9df2f15..45bfff1 100644 --- a/httpserver/src/routes/game/char_partner_story_reward.rs +++ b/httpserver/src/routes/game/char/char_partner_story_reward.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::CharPartnerStoryRewardRequest; use crypto::network::parse_packet; -use gameserver::logic::game::char_partner_story_reward; +use gameserver::logic::game::char::char_partner_story_reward; use sqlx::SqlitePool; #[put("CharPartnerStoryReward")] diff --git a/httpserver/src/routes/game/char_scout_info.rs b/httpserver/src/routes/game/char/char_scout_info.rs similarity index 92% rename from httpserver/src/routes/game/char_scout_info.rs rename to httpserver/src/routes/game/char/char_scout_info.rs index 782f108..2b8a724 100644 --- a/httpserver/src/routes/game/char_scout_info.rs +++ b/httpserver/src/routes/game/char/char_scout_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::CharScoutInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::char_scout_info; +use gameserver::logic::game::char::char_scout_info; use sqlx::SqlitePool; #[put("CharScoutInfo")] diff --git a/httpserver/src/routes/game/char_special_scout_buy.rs b/httpserver/src/routes/game/char/char_special_scout_buy.rs similarity index 92% rename from httpserver/src/routes/game/char_special_scout_buy.rs rename to httpserver/src/routes/game/char/char_special_scout_buy.rs index 2be26bb..2208abc 100644 --- a/httpserver/src/routes/game/char_special_scout_buy.rs +++ b/httpserver/src/routes/game/char/char_special_scout_buy.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::CharSpecialScoutBuyRequest; use crypto::network::parse_packet; -use gameserver::logic::game::char_special_scout_buy; +use gameserver::logic::game::char::char_special_scout_buy; use sqlx::SqlitePool; #[put("CharSpecialScoutBuy")] diff --git a/httpserver/src/routes/game/char_special_scout_reset.rs b/httpserver/src/routes/game/char/char_special_scout_reset.rs similarity index 92% rename from httpserver/src/routes/game/char_special_scout_reset.rs rename to httpserver/src/routes/game/char/char_special_scout_reset.rs index 9f48f23..2425aba 100644 --- a/httpserver/src/routes/game/char_special_scout_reset.rs +++ b/httpserver/src/routes/game/char/char_special_scout_reset.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::CharSpecialScoutResetRequest; use crypto::network::parse_packet; -use gameserver::logic::game::char_special_scout_reset; +use gameserver::logic::game::char::char_special_scout_reset; use sqlx::SqlitePool; #[put("CharSpecialScoutReset")] diff --git a/httpserver/src/routes/game/char/mod.rs b/httpserver/src/routes/game/char/mod.rs new file mode 100644 index 0000000..e0edd35 --- /dev/null +++ b/httpserver/src/routes/game/char/mod.rs @@ -0,0 +1,18 @@ +pub mod char_all_revival; +pub mod char_auto_revive_set; +pub mod char_awake_active; +pub mod char_awake_info; +pub mod char_class_up; +pub mod char_expiry; +pub mod char_growth; +pub mod char_healing; +pub mod char_immortal; +pub mod char_imprint_level_up; +pub mod char_info; +pub mod char_level_up; +pub mod char_partner_info; +pub mod char_partner_reward; +pub mod char_partner_story_reward; +pub mod char_scout_info; +pub mod char_special_scout_buy; +pub mod char_special_scout_reset; diff --git a/httpserver/src/routes/game/charge_cost_info.rs b/httpserver/src/routes/game/charge/charge_cost_info.rs similarity index 92% rename from httpserver/src/routes/game/charge_cost_info.rs rename to httpserver/src/routes/game/charge/charge_cost_info.rs index c321e56..657ee94 100644 --- a/httpserver/src/routes/game/charge_cost_info.rs +++ b/httpserver/src/routes/game/charge/charge_cost_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::ChargeCostInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::charge_cost_info; +use gameserver::logic::game::charge::charge_cost_info; use sqlx::SqlitePool; #[put("ChargeCostInfo")] diff --git a/httpserver/src/routes/game/charge/mod.rs b/httpserver/src/routes/game/charge/mod.rs new file mode 100644 index 0000000..fd4c000 --- /dev/null +++ b/httpserver/src/routes/game/charge/mod.rs @@ -0,0 +1 @@ +pub mod charge_cost_info; diff --git a/httpserver/src/routes/game/clear_package_reward.rs b/httpserver/src/routes/game/clear/clear_package_reward.rs similarity index 92% rename from httpserver/src/routes/game/clear_package_reward.rs rename to httpserver/src/routes/game/clear/clear_package_reward.rs index a81a7ad..4462334 100644 --- a/httpserver/src/routes/game/clear_package_reward.rs +++ b/httpserver/src/routes/game/clear/clear_package_reward.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::ClearPackageRewardRequest; use crypto::network::parse_packet; -use gameserver::logic::game::clear_package_reward; +use gameserver::logic::game::clear::clear_package_reward; use sqlx::SqlitePool; #[put("ClearPackageReward")] diff --git a/httpserver/src/routes/game/clear/mod.rs b/httpserver/src/routes/game/clear/mod.rs new file mode 100644 index 0000000..dea481c --- /dev/null +++ b/httpserver/src/routes/game/clear/mod.rs @@ -0,0 +1 @@ +pub mod clear_package_reward; diff --git a/httpserver/src/routes/game/client_custom_log.rs b/httpserver/src/routes/game/client/client_custom_log.rs similarity index 92% rename from httpserver/src/routes/game/client_custom_log.rs rename to httpserver/src/routes/game/client/client_custom_log.rs index 2d34a15..171aa4c 100644 --- a/httpserver/src/routes/game/client_custom_log.rs +++ b/httpserver/src/routes/game/client/client_custom_log.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::ClientCustomLogRequest; use crypto::network::parse_packet; -use gameserver::logic::game::client_custom_log; +use gameserver::logic::game::client::client_custom_log; use sqlx::SqlitePool; #[put("ClientCustomLog")] diff --git a/httpserver/src/routes/game/client/mod.rs b/httpserver/src/routes/game/client/mod.rs new file mode 100644 index 0000000..9685a04 --- /dev/null +++ b/httpserver/src/routes/game/client/mod.rs @@ -0,0 +1 @@ +pub mod client_custom_log; diff --git a/httpserver/src/routes/game/community_reward.rs b/httpserver/src/routes/game/community/community_reward.rs similarity index 92% rename from httpserver/src/routes/game/community_reward.rs rename to httpserver/src/routes/game/community/community_reward.rs index ac767bc..3dda9a0 100644 --- a/httpserver/src/routes/game/community_reward.rs +++ b/httpserver/src/routes/game/community/community_reward.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::CommunityRewardRequest; use crypto::network::parse_packet; -use gameserver::logic::game::community_reward; +use gameserver::logic::game::community::community_reward; use sqlx::SqlitePool; #[put("CommunityReward")] diff --git a/httpserver/src/routes/game/community_reward_info.rs b/httpserver/src/routes/game/community/community_reward_info.rs similarity index 92% rename from httpserver/src/routes/game/community_reward_info.rs rename to httpserver/src/routes/game/community/community_reward_info.rs index fe0594e..bcee602 100644 --- a/httpserver/src/routes/game/community_reward_info.rs +++ b/httpserver/src/routes/game/community/community_reward_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::CommunityRewardInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::community_reward_info; +use gameserver::logic::game::community::community_reward_info; use sqlx::SqlitePool; #[put("CommunityRewardInfo")] diff --git a/httpserver/src/routes/game/community/mod.rs b/httpserver/src/routes/game/community/mod.rs new file mode 100644 index 0000000..5a1d869 --- /dev/null +++ b/httpserver/src/routes/game/community/mod.rs @@ -0,0 +1,2 @@ +pub mod community_reward; +pub mod community_reward_info; diff --git a/httpserver/src/routes/game/cooking.rs b/httpserver/src/routes/game/cooking/cooking.rs similarity index 85% rename from httpserver/src/routes/game/cooking.rs rename to httpserver/src/routes/game/cooking/cooking.rs index 46c3368..8aa0542 100644 --- a/httpserver/src/routes/game/cooking.rs +++ b/httpserver/src/routes/game/cooking/cooking.rs @@ -1,7 +1,7 @@ -use actix_web::{put, web, HttpResponse, Result}; +use actix_web::{HttpResponse, Result, put, web}; use bd2::proto::proto_net::CookingRequest; use crypto::network::parse_packet; -use gameserver::logic::game::cooking; +use gameserver::logic::game::cooking::cooking; use sqlx::SqlitePool; #[put("Cooking")] diff --git a/httpserver/src/routes/game/cooking_research.rs b/httpserver/src/routes/game/cooking/cooking_research.rs similarity index 92% rename from httpserver/src/routes/game/cooking_research.rs rename to httpserver/src/routes/game/cooking/cooking_research.rs index 6363776..979669a 100644 --- a/httpserver/src/routes/game/cooking_research.rs +++ b/httpserver/src/routes/game/cooking/cooking_research.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::CookingResearchRequest; use crypto::network::parse_packet; -use gameserver::logic::game::cooking_research; +use gameserver::logic::game::cooking::cooking_research; use sqlx::SqlitePool; #[put("CookingResearch")] diff --git a/httpserver/src/routes/game/cooking/mod.rs b/httpserver/src/routes/game/cooking/mod.rs new file mode 100644 index 0000000..c0b115e --- /dev/null +++ b/httpserver/src/routes/game/cooking/mod.rs @@ -0,0 +1,2 @@ +pub mod cooking; +pub mod cooking_research; diff --git a/httpserver/src/routes/game/costume_all_rounder_upgrade.rs b/httpserver/src/routes/game/costume/costume_all_rounder_upgrade.rs similarity index 92% rename from httpserver/src/routes/game/costume_all_rounder_upgrade.rs rename to httpserver/src/routes/game/costume/costume_all_rounder_upgrade.rs index 0bf4585..4069dac 100644 --- a/httpserver/src/routes/game/costume_all_rounder_upgrade.rs +++ b/httpserver/src/routes/game/costume/costume_all_rounder_upgrade.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::CostumeAllRounderUpgradeRequest; use crypto::network::parse_packet; -use gameserver::logic::game::costume_all_rounder_upgrade; +use gameserver::logic::game::costume::costume_all_rounder_upgrade; use sqlx::SqlitePool; #[put("CostumeAllRounderUpgrade")] diff --git a/httpserver/src/routes/game/costume_clear.rs b/httpserver/src/routes/game/costume/costume_clear.rs similarity index 92% rename from httpserver/src/routes/game/costume_clear.rs rename to httpserver/src/routes/game/costume/costume_clear.rs index ca7cb9a..38e6333 100644 --- a/httpserver/src/routes/game/costume_clear.rs +++ b/httpserver/src/routes/game/costume/costume_clear.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::CostumeClearRequest; use crypto::network::parse_packet; -use gameserver::logic::game::costume_clear; +use gameserver::logic::game::costume::costume_clear; use sqlx::SqlitePool; #[put("CostumeClear")] diff --git a/httpserver/src/routes/game/costume_info.rs b/httpserver/src/routes/game/costume/costume_info.rs similarity index 92% rename from httpserver/src/routes/game/costume_info.rs rename to httpserver/src/routes/game/costume/costume_info.rs index 7ca9ff3..651e90c 100644 --- a/httpserver/src/routes/game/costume_info.rs +++ b/httpserver/src/routes/game/costume/costume_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::CostumeInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::costume_info; +use gameserver::logic::game::costume::costume_info; use sqlx::SqlitePool; #[put("CostumeInfo")] diff --git a/httpserver/src/routes/game/costume_node_activation.rs b/httpserver/src/routes/game/costume/costume_node_activation.rs similarity index 92% rename from httpserver/src/routes/game/costume_node_activation.rs rename to httpserver/src/routes/game/costume/costume_node_activation.rs index f00179a..a562181 100644 --- a/httpserver/src/routes/game/costume_node_activation.rs +++ b/httpserver/src/routes/game/costume/costume_node_activation.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::CostumeNodeActivationRequest; use crypto::network::parse_packet; -use gameserver::logic::game::costume_node_activation; +use gameserver::logic::game::costume::costume_node_activation; use sqlx::SqlitePool; #[put("CostumeNodeActivation")] diff --git a/httpserver/src/routes/game/costume_potential_connect.rs b/httpserver/src/routes/game/costume/costume_potential_connect.rs similarity index 92% rename from httpserver/src/routes/game/costume_potential_connect.rs rename to httpserver/src/routes/game/costume/costume_potential_connect.rs index 3eb9c66..76d32dd 100644 --- a/httpserver/src/routes/game/costume_potential_connect.rs +++ b/httpserver/src/routes/game/costume/costume_potential_connect.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::CostumePotentialConnectRequest; use crypto::network::parse_packet; -use gameserver::logic::game::costume_potential_connect; +use gameserver::logic::game::costume::costume_potential_connect; use sqlx::SqlitePool; #[put("CostumePotentialConnect")] diff --git a/httpserver/src/routes/game/costume_upgrade.rs b/httpserver/src/routes/game/costume/costume_upgrade.rs similarity index 92% rename from httpserver/src/routes/game/costume_upgrade.rs rename to httpserver/src/routes/game/costume/costume_upgrade.rs index 2dab6a8..0f0ca4d 100644 --- a/httpserver/src/routes/game/costume_upgrade.rs +++ b/httpserver/src/routes/game/costume/costume_upgrade.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::CostumeUpgradeRequest; use crypto::network::parse_packet; -use gameserver::logic::game::costume_upgrade; +use gameserver::logic::game::costume::costume_upgrade; use sqlx::SqlitePool; #[put("CostumeUpgrade")] diff --git a/httpserver/src/routes/game/costume_use.rs b/httpserver/src/routes/game/costume/costume_use.rs similarity index 92% rename from httpserver/src/routes/game/costume_use.rs rename to httpserver/src/routes/game/costume/costume_use.rs index 28916e7..eb68ade 100644 --- a/httpserver/src/routes/game/costume_use.rs +++ b/httpserver/src/routes/game/costume/costume_use.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::CostumeUseRequest; use crypto::network::parse_packet; -use gameserver::logic::game::costume_use; +use gameserver::logic::game::costume::costume_use; use sqlx::SqlitePool; #[put("CostumeUse")] diff --git a/httpserver/src/routes/game/costume/mod.rs b/httpserver/src/routes/game/costume/mod.rs new file mode 100644 index 0000000..157bf3c --- /dev/null +++ b/httpserver/src/routes/game/costume/mod.rs @@ -0,0 +1,7 @@ +pub mod costume_all_rounder_upgrade; +pub mod costume_clear; +pub mod costume_info; +pub mod costume_node_activation; +pub mod costume_potential_connect; +pub mod costume_upgrade; +pub mod costume_use; diff --git a/httpserver/src/routes/game/dating_episode_clear.rs b/httpserver/src/routes/game/dating/dating_episode_clear.rs similarity index 92% rename from httpserver/src/routes/game/dating_episode_clear.rs rename to httpserver/src/routes/game/dating/dating_episode_clear.rs index a057593..83a314f 100644 --- a/httpserver/src/routes/game/dating_episode_clear.rs +++ b/httpserver/src/routes/game/dating/dating_episode_clear.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::DatingEpisodeClearRequest; use crypto::network::parse_packet; -use gameserver::logic::game::dating_episode_clear; +use gameserver::logic::game::dating::dating_episode_clear; use sqlx::SqlitePool; #[put("DatingEpisodeClear")] diff --git a/httpserver/src/routes/game/dating_info.rs b/httpserver/src/routes/game/dating/dating_info.rs similarity index 92% rename from httpserver/src/routes/game/dating_info.rs rename to httpserver/src/routes/game/dating/dating_info.rs index 0617f5e..c094e47 100644 --- a/httpserver/src/routes/game/dating_info.rs +++ b/httpserver/src/routes/game/dating/dating_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::DatingInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::dating_info; +use gameserver::logic::game::dating::dating_info; use sqlx::SqlitePool; #[put("DatingInfo")] diff --git a/httpserver/src/routes/game/dating_message_update.rs b/httpserver/src/routes/game/dating/dating_message_update.rs similarity index 92% rename from httpserver/src/routes/game/dating_message_update.rs rename to httpserver/src/routes/game/dating/dating_message_update.rs index cc30f95..2375981 100644 --- a/httpserver/src/routes/game/dating_message_update.rs +++ b/httpserver/src/routes/game/dating/dating_message_update.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::DatingMessageUpdateRequest; use crypto::network::parse_packet; -use gameserver::logic::game::dating_message_update; +use gameserver::logic::game::dating::dating_message_update; use sqlx::SqlitePool; #[put("DatingMessageUpdate")] diff --git a/httpserver/src/routes/game/dating/mod.rs b/httpserver/src/routes/game/dating/mod.rs new file mode 100644 index 0000000..e33cb81 --- /dev/null +++ b/httpserver/src/routes/game/dating/mod.rs @@ -0,0 +1,3 @@ +pub mod dating_episode_clear; +pub mod dating_info; +pub mod dating_message_update; diff --git a/httpserver/src/routes/game/deck_char_auto_revive.rs b/httpserver/src/routes/game/deck/deck_char_auto_revive.rs similarity index 92% rename from httpserver/src/routes/game/deck_char_auto_revive.rs rename to httpserver/src/routes/game/deck/deck_char_auto_revive.rs index bf8a6b0..3d523fb 100644 --- a/httpserver/src/routes/game/deck_char_auto_revive.rs +++ b/httpserver/src/routes/game/deck/deck_char_auto_revive.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::DeckCharAutoReviveRequest; use crypto::network::parse_packet; -use gameserver::logic::game::deck_char_auto_revive; +use gameserver::logic::game::deck::deck_char_auto_revive; use sqlx::SqlitePool; #[put("DeckCharAutoRevive")] diff --git a/httpserver/src/routes/game/deck_costume_setting_info.rs b/httpserver/src/routes/game/deck/deck_costume_setting_info.rs similarity index 92% rename from httpserver/src/routes/game/deck_costume_setting_info.rs rename to httpserver/src/routes/game/deck/deck_costume_setting_info.rs index befaa6b..68584fc 100644 --- a/httpserver/src/routes/game/deck_costume_setting_info.rs +++ b/httpserver/src/routes/game/deck/deck_costume_setting_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::DeckCostumeSettingInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::deck_costume_setting_info; +use gameserver::logic::game::deck::deck_costume_setting_info; use sqlx::SqlitePool; #[put("DeckCostumeSettingInfo")] diff --git a/httpserver/src/routes/game/deck_costume_setting_save.rs b/httpserver/src/routes/game/deck/deck_costume_setting_save.rs similarity index 92% rename from httpserver/src/routes/game/deck_costume_setting_save.rs rename to httpserver/src/routes/game/deck/deck_costume_setting_save.rs index 63570ba..9063e4f 100644 --- a/httpserver/src/routes/game/deck_costume_setting_save.rs +++ b/httpserver/src/routes/game/deck/deck_costume_setting_save.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::DeckCostumeSettingSaveRequest; use crypto::network::parse_packet; -use gameserver::logic::game::deck_costume_setting_save; +use gameserver::logic::game::deck::deck_costume_setting_save; use sqlx::SqlitePool; #[put("DeckCostumeSettingSave")] diff --git a/httpserver/src/routes/game/deck_info.rs b/httpserver/src/routes/game/deck/deck_info.rs similarity index 93% rename from httpserver/src/routes/game/deck_info.rs rename to httpserver/src/routes/game/deck/deck_info.rs index de8e2be..4329048 100644 --- a/httpserver/src/routes/game/deck_info.rs +++ b/httpserver/src/routes/game/deck/deck_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::DeckInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::deck_info; +use gameserver::logic::game::deck::deck_info; use sqlx::SqlitePool; #[put("DeckInfo")] diff --git a/httpserver/src/routes/game/deck_save.rs b/httpserver/src/routes/game/deck/deck_save.rs similarity index 93% rename from httpserver/src/routes/game/deck_save.rs rename to httpserver/src/routes/game/deck/deck_save.rs index 43e190d..fa3efa1 100644 --- a/httpserver/src/routes/game/deck_save.rs +++ b/httpserver/src/routes/game/deck/deck_save.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::DeckSaveRequest; use crypto::network::parse_packet; -use gameserver::logic::game::deck_save; +use gameserver::logic::game::deck::deck_save; use sqlx::SqlitePool; #[put("DeckSave")] diff --git a/httpserver/src/routes/game/deck/mod.rs b/httpserver/src/routes/game/deck/mod.rs new file mode 100644 index 0000000..59f76b5 --- /dev/null +++ b/httpserver/src/routes/game/deck/mod.rs @@ -0,0 +1,5 @@ +pub mod deck_char_auto_revive; +pub mod deck_costume_setting_info; +pub mod deck_costume_setting_save; +pub mod deck_info; +pub mod deck_save; diff --git a/httpserver/src/routes/game/dispatch_info.rs b/httpserver/src/routes/game/dispatch/dispatch_info.rs similarity index 92% rename from httpserver/src/routes/game/dispatch_info.rs rename to httpserver/src/routes/game/dispatch/dispatch_info.rs index 6c191ec..144ab1a 100644 --- a/httpserver/src/routes/game/dispatch_info.rs +++ b/httpserver/src/routes/game/dispatch/dispatch_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::DispatchInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::dispatch_info; +use gameserver::logic::game::dispatch::dispatch_info; use sqlx::SqlitePool; #[put("DispatchInfo")] diff --git a/httpserver/src/routes/game/dispatch_reward.rs b/httpserver/src/routes/game/dispatch/dispatch_reward.rs similarity index 92% rename from httpserver/src/routes/game/dispatch_reward.rs rename to httpserver/src/routes/game/dispatch/dispatch_reward.rs index 6894d8b..d6a699a 100644 --- a/httpserver/src/routes/game/dispatch_reward.rs +++ b/httpserver/src/routes/game/dispatch/dispatch_reward.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::DispatchRewardRequest; use crypto::network::parse_packet; -use gameserver::logic::game::dispatch_reward; +use gameserver::logic::game::dispatch::dispatch_reward; use sqlx::SqlitePool; #[put("DispatchReward")] diff --git a/httpserver/src/routes/game/dispatch/mod.rs b/httpserver/src/routes/game/dispatch/mod.rs new file mode 100644 index 0000000..f5ddad5 --- /dev/null +++ b/httpserver/src/routes/game/dispatch/mod.rs @@ -0,0 +1,2 @@ +pub mod dispatch_info; +pub mod dispatch_reward; diff --git a/httpserver/src/routes/game/eat_food.rs b/httpserver/src/routes/game/eat/eat_food.rs similarity index 93% rename from httpserver/src/routes/game/eat_food.rs rename to httpserver/src/routes/game/eat/eat_food.rs index 9e9be2f..40f8faf 100644 --- a/httpserver/src/routes/game/eat_food.rs +++ b/httpserver/src/routes/game/eat/eat_food.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EatFoodRequest; use crypto::network::parse_packet; -use gameserver::logic::game::eat_food; +use gameserver::logic::game::eat::eat_food; use sqlx::SqlitePool; #[put("EatFood")] diff --git a/httpserver/src/routes/game/eat_food_auto.rs b/httpserver/src/routes/game/eat/eat_food_auto.rs similarity index 93% rename from httpserver/src/routes/game/eat_food_auto.rs rename to httpserver/src/routes/game/eat/eat_food_auto.rs index e7943c9..df75b65 100644 --- a/httpserver/src/routes/game/eat_food_auto.rs +++ b/httpserver/src/routes/game/eat/eat_food_auto.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EatFoodAutoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::eat_food_auto; +use gameserver::logic::game::eat::eat_food_auto; use sqlx::SqlitePool; #[put("EatFoodAuto")] diff --git a/httpserver/src/routes/game/eat/mod.rs b/httpserver/src/routes/game/eat/mod.rs new file mode 100644 index 0000000..043d51e --- /dev/null +++ b/httpserver/src/routes/game/eat/mod.rs @@ -0,0 +1,2 @@ +pub mod eat_food; +pub mod eat_food_auto; diff --git a/httpserver/src/routes/game/equip_add_slot.rs b/httpserver/src/routes/game/equip/equip_add_slot.rs similarity index 92% rename from httpserver/src/routes/game/equip_add_slot.rs rename to httpserver/src/routes/game/equip/equip_add_slot.rs index 36e4f90..9c40c4f 100644 --- a/httpserver/src/routes/game/equip_add_slot.rs +++ b/httpserver/src/routes/game/equip/equip_add_slot.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EquipAddSlotRequest; use crypto::network::parse_packet; -use gameserver::logic::game::equip_add_slot; +use gameserver::logic::game::equip::equip_add_slot; use sqlx::SqlitePool; #[put("EquipAddSlot")] diff --git a/httpserver/src/routes/game/equip_batch_use.rs b/httpserver/src/routes/game/equip/equip_batch_use.rs similarity index 92% rename from httpserver/src/routes/game/equip_batch_use.rs rename to httpserver/src/routes/game/equip/equip_batch_use.rs index 4bb7ebb..ccd1fc0 100644 --- a/httpserver/src/routes/game/equip_batch_use.rs +++ b/httpserver/src/routes/game/equip/equip_batch_use.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EquipBatchUseRequest; use crypto::network::parse_packet; -use gameserver::logic::game::equip_batch_use; +use gameserver::logic::game::equip::equip_batch_use; use sqlx::SqlitePool; #[put("EquipBatchUse")] diff --git a/httpserver/src/routes/game/equip_break.rs b/httpserver/src/routes/game/equip/equip_break.rs similarity index 93% rename from httpserver/src/routes/game/equip_break.rs rename to httpserver/src/routes/game/equip/equip_break.rs index 1880fa8..cdf47aa 100644 --- a/httpserver/src/routes/game/equip_break.rs +++ b/httpserver/src/routes/game/equip/equip_break.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EquipBreakRequest; use crypto::network::parse_packet; -use gameserver::logic::game::equip_break; +use gameserver::logic::game::equip::equip_break; use sqlx::SqlitePool; #[put("EquipBreak")] diff --git a/httpserver/src/routes/game/equip_change.rs b/httpserver/src/routes/game/equip/equip_change.rs similarity index 93% rename from httpserver/src/routes/game/equip_change.rs rename to httpserver/src/routes/game/equip/equip_change.rs index 42f2456..955e75d 100644 --- a/httpserver/src/routes/game/equip_change.rs +++ b/httpserver/src/routes/game/equip/equip_change.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EquipChangeRequest; use crypto::network::parse_packet; -use gameserver::logic::game::equip_change; +use gameserver::logic::game::equip::equip_change; use sqlx::SqlitePool; #[put("EquipChange")] diff --git a/httpserver/src/routes/game/equip_clear.rs b/httpserver/src/routes/game/equip/equip_clear.rs similarity index 93% rename from httpserver/src/routes/game/equip_clear.rs rename to httpserver/src/routes/game/equip/equip_clear.rs index 6584e5e..4f6fb06 100644 --- a/httpserver/src/routes/game/equip_clear.rs +++ b/httpserver/src/routes/game/equip/equip_clear.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EquipClearRequest; use crypto::network::parse_packet; -use gameserver::logic::game::equip_clear; +use gameserver::logic::game::equip::equip_clear; use sqlx::SqlitePool; #[put("EquipClear")] diff --git a/httpserver/src/routes/game/equip_from_making_to_break.rs b/httpserver/src/routes/game/equip/equip_from_making_to_break.rs similarity index 92% rename from httpserver/src/routes/game/equip_from_making_to_break.rs rename to httpserver/src/routes/game/equip/equip_from_making_to_break.rs index b4a0e21..47eb8a6 100644 --- a/httpserver/src/routes/game/equip_from_making_to_break.rs +++ b/httpserver/src/routes/game/equip/equip_from_making_to_break.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EquipFromMakingToBreakRequest; use crypto::network::parse_packet; -use gameserver::logic::game::equip_from_making_to_break; +use gameserver::logic::game::equip::equip_from_making_to_break; use sqlx::SqlitePool; #[put("EquipFromMakingToBreak")] diff --git a/httpserver/src/routes/game/equip_from_making_to_upgrade.rs b/httpserver/src/routes/game/equip/equip_from_making_to_upgrade.rs similarity index 92% rename from httpserver/src/routes/game/equip_from_making_to_upgrade.rs rename to httpserver/src/routes/game/equip/equip_from_making_to_upgrade.rs index 8034428..c974122 100644 --- a/httpserver/src/routes/game/equip_from_making_to_upgrade.rs +++ b/httpserver/src/routes/game/equip/equip_from_making_to_upgrade.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EquipFromMakingToUpgradeRequest; use crypto::network::parse_packet; -use gameserver::logic::game::equip_from_making_to_upgrade; +use gameserver::logic::game::equip::equip_from_making_to_upgrade; use sqlx::SqlitePool; #[put("EquipFromMakingToUpgrade")] diff --git a/httpserver/src/routes/game/equip_from_upgrade_to_break.rs b/httpserver/src/routes/game/equip/equip_from_upgrade_to_break.rs similarity index 92% rename from httpserver/src/routes/game/equip_from_upgrade_to_break.rs rename to httpserver/src/routes/game/equip/equip_from_upgrade_to_break.rs index 6769b4b..c470dc0 100644 --- a/httpserver/src/routes/game/equip_from_upgrade_to_break.rs +++ b/httpserver/src/routes/game/equip/equip_from_upgrade_to_break.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EquipFromUpgradeToBreakRequest; use crypto::network::parse_packet; -use gameserver::logic::game::equip_from_upgrade_to_break; +use gameserver::logic::game::equip::equip_from_upgrade_to_break; use sqlx::SqlitePool; #[put("EquipFromUpgradeToBreak")] diff --git a/httpserver/src/routes/game/equip_info.rs b/httpserver/src/routes/game/equip/equip_info.rs similarity index 93% rename from httpserver/src/routes/game/equip_info.rs rename to httpserver/src/routes/game/equip/equip_info.rs index 4118bf7..6aaf1d7 100644 --- a/httpserver/src/routes/game/equip_info.rs +++ b/httpserver/src/routes/game/equip/equip_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EquipInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::equip_info; +use gameserver::logic::game::equip::equip_info; use sqlx::SqlitePool; #[put("EquipInfo")] diff --git a/httpserver/src/routes/game/equip_lock.rs b/httpserver/src/routes/game/equip/equip_lock.rs similarity index 93% rename from httpserver/src/routes/game/equip_lock.rs rename to httpserver/src/routes/game/equip/equip_lock.rs index 7550f91..6b8a281 100644 --- a/httpserver/src/routes/game/equip_lock.rs +++ b/httpserver/src/routes/game/equip/equip_lock.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EquipLockRequest; use crypto::network::parse_packet; -use gameserver::logic::game::equip_lock; +use gameserver::logic::game::equip::equip_lock; use sqlx::SqlitePool; #[put("EquipLock")] diff --git a/httpserver/src/routes/game/equip_making.rs b/httpserver/src/routes/game/equip/equip_making.rs similarity index 93% rename from httpserver/src/routes/game/equip_making.rs rename to httpserver/src/routes/game/equip/equip_making.rs index 3f648a8..9e76fc0 100644 --- a/httpserver/src/routes/game/equip_making.rs +++ b/httpserver/src/routes/game/equip/equip_making.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EquipMakingRequest; use crypto::network::parse_packet; -use gameserver::logic::game::equip_making; +use gameserver::logic::game::equip::equip_making; use sqlx::SqlitePool; #[put("EquipMaking")] diff --git a/httpserver/src/routes/game/equip_mark_delete.rs b/httpserver/src/routes/game/equip/equip_mark_delete.rs similarity index 92% rename from httpserver/src/routes/game/equip_mark_delete.rs rename to httpserver/src/routes/game/equip/equip_mark_delete.rs index 87dfef4..805213f 100644 --- a/httpserver/src/routes/game/equip_mark_delete.rs +++ b/httpserver/src/routes/game/equip/equip_mark_delete.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EquipMarkDeleteRequest; use crypto::network::parse_packet; -use gameserver::logic::game::equip_mark_delete; +use gameserver::logic::game::equip::equip_mark_delete; use sqlx::SqlitePool; #[put("EquipMarkDelete")] diff --git a/httpserver/src/routes/game/equip_mark_set.rs b/httpserver/src/routes/game/equip/equip_mark_set.rs similarity index 92% rename from httpserver/src/routes/game/equip_mark_set.rs rename to httpserver/src/routes/game/equip/equip_mark_set.rs index a4257c5..cfe9791 100644 --- a/httpserver/src/routes/game/equip_mark_set.rs +++ b/httpserver/src/routes/game/equip/equip_mark_set.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EquipMarkSetRequest; use crypto::network::parse_packet; -use gameserver::logic::game::equip_mark_set; +use gameserver::logic::game::equip::equip_mark_set; use sqlx::SqlitePool; #[put("EquipMarkSet")] diff --git a/httpserver/src/routes/game/equip_option_re_roll.rs b/httpserver/src/routes/game/equip/equip_option_re_roll.rs similarity index 92% rename from httpserver/src/routes/game/equip_option_re_roll.rs rename to httpserver/src/routes/game/equip/equip_option_re_roll.rs index 03684fe..c83b6f1 100644 --- a/httpserver/src/routes/game/equip_option_re_roll.rs +++ b/httpserver/src/routes/game/equip/equip_option_re_roll.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EquipOptionReRollRequest; use crypto::network::parse_packet; -use gameserver::logic::game::equip_option_re_roll; +use gameserver::logic::game::equip::equip_option_re_roll; use sqlx::SqlitePool; #[put("EquipOptionReRoll")] diff --git a/httpserver/src/routes/game/equip_option_re_roll_confirm.rs b/httpserver/src/routes/game/equip/equip_option_re_roll_confirm.rs similarity index 92% rename from httpserver/src/routes/game/equip_option_re_roll_confirm.rs rename to httpserver/src/routes/game/equip/equip_option_re_roll_confirm.rs index feec25c..7561db7 100644 --- a/httpserver/src/routes/game/equip_option_re_roll_confirm.rs +++ b/httpserver/src/routes/game/equip/equip_option_re_roll_confirm.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EquipOptionReRollConfirmRequest; use crypto::network::parse_packet; -use gameserver::logic::game::equip_option_re_roll_confirm; +use gameserver::logic::game::equip::equip_option_re_roll_confirm; use sqlx::SqlitePool; #[put("EquipOptionReRollConfirm")] diff --git a/httpserver/src/routes/game/equip_preset_info.rs b/httpserver/src/routes/game/equip/equip_preset_info.rs similarity index 92% rename from httpserver/src/routes/game/equip_preset_info.rs rename to httpserver/src/routes/game/equip/equip_preset_info.rs index 7658bf7..96f840f 100644 --- a/httpserver/src/routes/game/equip_preset_info.rs +++ b/httpserver/src/routes/game/equip/equip_preset_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EquipPresetInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::equip_preset_info; +use gameserver::logic::game::equip::equip_preset_info; use sqlx::SqlitePool; #[put("EquipPresetInfo")] diff --git a/httpserver/src/routes/game/equip_preset_name_change.rs b/httpserver/src/routes/game/equip/equip_preset_name_change.rs similarity index 92% rename from httpserver/src/routes/game/equip_preset_name_change.rs rename to httpserver/src/routes/game/equip/equip_preset_name_change.rs index 176e480..d119c68 100644 --- a/httpserver/src/routes/game/equip_preset_name_change.rs +++ b/httpserver/src/routes/game/equip/equip_preset_name_change.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EquipPresetNameChangeRequest; use crypto::network::parse_packet; -use gameserver::logic::game::equip_preset_name_change; +use gameserver::logic::game::equip::equip_preset_name_change; use sqlx::SqlitePool; #[put("EquipPresetNameChange")] diff --git a/httpserver/src/routes/game/equip_preset_save.rs b/httpserver/src/routes/game/equip/equip_preset_save.rs similarity index 92% rename from httpserver/src/routes/game/equip_preset_save.rs rename to httpserver/src/routes/game/equip/equip_preset_save.rs index 175ead0..d29cd57 100644 --- a/httpserver/src/routes/game/equip_preset_save.rs +++ b/httpserver/src/routes/game/equip/equip_preset_save.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EquipPresetSaveRequest; use crypto::network::parse_packet; -use gameserver::logic::game::equip_preset_save; +use gameserver::logic::game::equip::equip_preset_save; use sqlx::SqlitePool; #[put("EquipPresetSave")] diff --git a/httpserver/src/routes/game/equip_sequence_smelting.rs b/httpserver/src/routes/game/equip/equip_sequence_smelting.rs similarity index 92% rename from httpserver/src/routes/game/equip_sequence_smelting.rs rename to httpserver/src/routes/game/equip/equip_sequence_smelting.rs index 2dec65e..9360246 100644 --- a/httpserver/src/routes/game/equip_sequence_smelting.rs +++ b/httpserver/src/routes/game/equip/equip_sequence_smelting.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EquipSequenceSmeltingRequest; use crypto::network::parse_packet; -use gameserver::logic::game::equip_sequence_smelting; +use gameserver::logic::game::equip::equip_sequence_smelting; use sqlx::SqlitePool; #[put("EquipSequenceSmelting")] diff --git a/httpserver/src/routes/game/equip_sequence_upgrade.rs b/httpserver/src/routes/game/equip/equip_sequence_upgrade.rs similarity index 92% rename from httpserver/src/routes/game/equip_sequence_upgrade.rs rename to httpserver/src/routes/game/equip/equip_sequence_upgrade.rs index 88339dd..e7fb414 100644 --- a/httpserver/src/routes/game/equip_sequence_upgrade.rs +++ b/httpserver/src/routes/game/equip/equip_sequence_upgrade.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EquipSequenceUpgradeRequest; use crypto::network::parse_packet; -use gameserver::logic::game::equip_sequence_upgrade; +use gameserver::logic::game::equip::equip_sequence_upgrade; use sqlx::SqlitePool; #[put("EquipSequenceUpgrade")] diff --git a/httpserver/src/routes/game/equip_smelting.rs b/httpserver/src/routes/game/equip/equip_smelting.rs similarity index 92% rename from httpserver/src/routes/game/equip_smelting.rs rename to httpserver/src/routes/game/equip/equip_smelting.rs index 0fa5330..2f2fb6b 100644 --- a/httpserver/src/routes/game/equip_smelting.rs +++ b/httpserver/src/routes/game/equip/equip_smelting.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EquipSmeltingRequest; use crypto::network::parse_packet; -use gameserver::logic::game::equip_smelting; +use gameserver::logic::game::equip::equip_smelting; use sqlx::SqlitePool; #[put("EquipSmelting")] diff --git a/httpserver/src/routes/game/equip_storage_add_slot.rs b/httpserver/src/routes/game/equip/equip_storage_add_slot.rs similarity index 92% rename from httpserver/src/routes/game/equip_storage_add_slot.rs rename to httpserver/src/routes/game/equip/equip_storage_add_slot.rs index ed71215..af37378 100644 --- a/httpserver/src/routes/game/equip_storage_add_slot.rs +++ b/httpserver/src/routes/game/equip/equip_storage_add_slot.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EquipStorageAddSlotRequest; use crypto::network::parse_packet; -use gameserver::logic::game::equip_storage_add_slot; +use gameserver::logic::game::equip::equip_storage_add_slot; use sqlx::SqlitePool; #[put("EquipStorageAddSlot")] diff --git a/httpserver/src/routes/game/equip_storage_info.rs b/httpserver/src/routes/game/equip/equip_storage_info.rs similarity index 92% rename from httpserver/src/routes/game/equip_storage_info.rs rename to httpserver/src/routes/game/equip/equip_storage_info.rs index e5b4893..6690931 100644 --- a/httpserver/src/routes/game/equip_storage_info.rs +++ b/httpserver/src/routes/game/equip/equip_storage_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EquipStorageInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::equip_storage_info; +use gameserver::logic::game::equip::equip_storage_info; use sqlx::SqlitePool; #[put("EquipStorageInfo")] diff --git a/httpserver/src/routes/game/equip_storage_out.rs b/httpserver/src/routes/game/equip/equip_storage_out.rs similarity index 92% rename from httpserver/src/routes/game/equip_storage_out.rs rename to httpserver/src/routes/game/equip/equip_storage_out.rs index 322b2c6..725e6d0 100644 --- a/httpserver/src/routes/game/equip_storage_out.rs +++ b/httpserver/src/routes/game/equip/equip_storage_out.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EquipStorageOutRequest; use crypto::network::parse_packet; -use gameserver::logic::game::equip_storage_out; +use gameserver::logic::game::equip::equip_storage_out; use sqlx::SqlitePool; #[put("EquipStorageOut")] diff --git a/httpserver/src/routes/game/equip_storage_put.rs b/httpserver/src/routes/game/equip/equip_storage_put.rs similarity index 92% rename from httpserver/src/routes/game/equip_storage_put.rs rename to httpserver/src/routes/game/equip/equip_storage_put.rs index c89a84d..b01194c 100644 --- a/httpserver/src/routes/game/equip_storage_put.rs +++ b/httpserver/src/routes/game/equip/equip_storage_put.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EquipStoragePutRequest; use crypto::network::parse_packet; -use gameserver::logic::game::equip_storage_put; +use gameserver::logic::game::equip::equip_storage_put; use sqlx::SqlitePool; #[put("EquipStoragePut")] diff --git a/httpserver/src/routes/game/equip_upgrade.rs b/httpserver/src/routes/game/equip/equip_upgrade.rs similarity index 92% rename from httpserver/src/routes/game/equip_upgrade.rs rename to httpserver/src/routes/game/equip/equip_upgrade.rs index 0a54548..6a07a60 100644 --- a/httpserver/src/routes/game/equip_upgrade.rs +++ b/httpserver/src/routes/game/equip/equip_upgrade.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EquipUpgradeRequest; use crypto::network::parse_packet; -use gameserver::logic::game::equip_upgrade; +use gameserver::logic::game::equip::equip_upgrade; use sqlx::SqlitePool; #[put("EquipUpgrade")] diff --git a/httpserver/src/routes/game/equip_use.rs b/httpserver/src/routes/game/equip/equip_use.rs similarity index 93% rename from httpserver/src/routes/game/equip_use.rs rename to httpserver/src/routes/game/equip/equip_use.rs index 43574e1..c13ee7b 100644 --- a/httpserver/src/routes/game/equip_use.rs +++ b/httpserver/src/routes/game/equip/equip_use.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EquipUseRequest; use crypto::network::parse_packet; -use gameserver::logic::game::equip_use; +use gameserver::logic::game::equip::equip_use; use sqlx::SqlitePool; #[put("EquipUse")] diff --git a/httpserver/src/routes/game/equip/mod.rs b/httpserver/src/routes/game/equip/mod.rs new file mode 100644 index 0000000..71c176d --- /dev/null +++ b/httpserver/src/routes/game/equip/mod.rs @@ -0,0 +1,27 @@ +pub mod equip_add_slot; +pub mod equip_batch_use; +pub mod equip_break; +pub mod equip_change; +pub mod equip_clear; +pub mod equip_from_making_to_break; +pub mod equip_from_making_to_upgrade; +pub mod equip_from_upgrade_to_break; +pub mod equip_info; +pub mod equip_lock; +pub mod equip_making; +pub mod equip_mark_delete; +pub mod equip_mark_set; +pub mod equip_option_re_roll; +pub mod equip_option_re_roll_confirm; +pub mod equip_preset_info; +pub mod equip_preset_name_change; +pub mod equip_preset_save; +pub mod equip_sequence_smelting; +pub mod equip_sequence_upgrade; +pub mod equip_smelting; +pub mod equip_storage_add_slot; +pub mod equip_storage_info; +pub mod equip_storage_out; +pub mod equip_storage_put; +pub mod equip_upgrade; +pub mod equip_use; diff --git a/httpserver/src/routes/game/equips_clear.rs b/httpserver/src/routes/game/equips/equips_clear.rs similarity index 92% rename from httpserver/src/routes/game/equips_clear.rs rename to httpserver/src/routes/game/equips/equips_clear.rs index 876eb4a..f525cfc 100644 --- a/httpserver/src/routes/game/equips_clear.rs +++ b/httpserver/src/routes/game/equips/equips_clear.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EquipsClearRequest; use crypto::network::parse_packet; -use gameserver::logic::game::equips_clear; +use gameserver::logic::game::equips::equips_clear; use sqlx::SqlitePool; #[put("EquipsClear")] diff --git a/httpserver/src/routes/game/equips_use.rs b/httpserver/src/routes/game/equips/equips_use.rs similarity index 93% rename from httpserver/src/routes/game/equips_use.rs rename to httpserver/src/routes/game/equips/equips_use.rs index e548349..e3b196c 100644 --- a/httpserver/src/routes/game/equips_use.rs +++ b/httpserver/src/routes/game/equips/equips_use.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EquipsUseRequest; use crypto::network::parse_packet; -use gameserver::logic::game::equips_use; +use gameserver::logic::game::equips::equips_use; use sqlx::SqlitePool; #[put("EquipsUse")] diff --git a/httpserver/src/routes/game/equips/mod.rs b/httpserver/src/routes/game/equips/mod.rs new file mode 100644 index 0000000..f117d6d --- /dev/null +++ b/httpserver/src/routes/game/equips/mod.rs @@ -0,0 +1,2 @@ +pub mod equips_clear; +pub mod equips_use; diff --git a/httpserver/src/routes/game/event_exchange_info.rs b/httpserver/src/routes/game/event/event_exchange_info.rs similarity index 92% rename from httpserver/src/routes/game/event_exchange_info.rs rename to httpserver/src/routes/game/event/event_exchange_info.rs index 720568c..390f8cd 100644 --- a/httpserver/src/routes/game/event_exchange_info.rs +++ b/httpserver/src/routes/game/event/event_exchange_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EventExchangeInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::event_exchange_info; +use gameserver::logic::game::event::event_exchange_info; use sqlx::SqlitePool; #[put("EventExchangeInfo")] diff --git a/httpserver/src/routes/game/event_exchange_next_page_open.rs b/httpserver/src/routes/game/event/event_exchange_next_page_open.rs similarity index 92% rename from httpserver/src/routes/game/event_exchange_next_page_open.rs rename to httpserver/src/routes/game/event/event_exchange_next_page_open.rs index 0226f3d..b333f08 100644 --- a/httpserver/src/routes/game/event_exchange_next_page_open.rs +++ b/httpserver/src/routes/game/event/event_exchange_next_page_open.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EventExchangeNextPageOpenRequest; use crypto::network::parse_packet; -use gameserver::logic::game::event_exchange_next_page_open; +use gameserver::logic::game::event::event_exchange_next_page_open; use sqlx::SqlitePool; #[put("EventExchangeNextPageOpen")] diff --git a/httpserver/src/routes/game/event_exchange_reward.rs b/httpserver/src/routes/game/event/event_exchange_reward.rs similarity index 92% rename from httpserver/src/routes/game/event_exchange_reward.rs rename to httpserver/src/routes/game/event/event_exchange_reward.rs index c7c78c8..33adba6 100644 --- a/httpserver/src/routes/game/event_exchange_reward.rs +++ b/httpserver/src/routes/game/event/event_exchange_reward.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EventExchangeRewardRequest; use crypto::network::parse_packet; -use gameserver::logic::game::event_exchange_reward; +use gameserver::logic::game::event::event_exchange_reward; use sqlx::SqlitePool; #[put("EventExchangeReward")] diff --git a/httpserver/src/routes/game/event_hub_info.rs b/httpserver/src/routes/game/event/event_hub_info.rs similarity index 92% rename from httpserver/src/routes/game/event_hub_info.rs rename to httpserver/src/routes/game/event/event_hub_info.rs index 08b6f02..47dfca3 100644 --- a/httpserver/src/routes/game/event_hub_info.rs +++ b/httpserver/src/routes/game/event/event_hub_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EventHubInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::event_hub_info; +use gameserver::logic::game::event::event_hub_info; use sqlx::SqlitePool; #[put("EventHubInfo")] diff --git a/httpserver/src/routes/game/event_mission_info.rs b/httpserver/src/routes/game/event/event_mission_info.rs similarity index 92% rename from httpserver/src/routes/game/event_mission_info.rs rename to httpserver/src/routes/game/event/event_mission_info.rs index 746d018..0e94f10 100644 --- a/httpserver/src/routes/game/event_mission_info.rs +++ b/httpserver/src/routes/game/event/event_mission_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EventMissionInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::event_mission_info; +use gameserver::logic::game::event::event_mission_info; use sqlx::SqlitePool; #[put("EventMissionInfo")] diff --git a/httpserver/src/routes/game/event_reward.rs b/httpserver/src/routes/game/event/event_reward.rs similarity index 93% rename from httpserver/src/routes/game/event_reward.rs rename to httpserver/src/routes/game/event/event_reward.rs index 9d69365..9b0ad52 100644 --- a/httpserver/src/routes/game/event_reward.rs +++ b/httpserver/src/routes/game/event/event_reward.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EventRewardRequest; use crypto::network::parse_packet; -use gameserver::logic::game::event_reward; +use gameserver::logic::game::event::event_reward; use sqlx::SqlitePool; #[put("EventReward")] diff --git a/httpserver/src/routes/game/event_reward_history.rs b/httpserver/src/routes/game/event/event_reward_history.rs similarity index 92% rename from httpserver/src/routes/game/event_reward_history.rs rename to httpserver/src/routes/game/event/event_reward_history.rs index ff6ba2b..1e3d981 100644 --- a/httpserver/src/routes/game/event_reward_history.rs +++ b/httpserver/src/routes/game/event/event_reward_history.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EventRewardHistoryRequest; use crypto::network::parse_packet; -use gameserver::logic::game::event_reward_history; +use gameserver::logic::game::event::event_reward_history; use sqlx::SqlitePool; #[put("EventRewardHistory")] diff --git a/httpserver/src/routes/game/event_schedule_info.rs b/httpserver/src/routes/game/event/event_schedule_info.rs similarity index 92% rename from httpserver/src/routes/game/event_schedule_info.rs rename to httpserver/src/routes/game/event/event_schedule_info.rs index 0c6dc1a..a6f0dcb 100644 --- a/httpserver/src/routes/game/event_schedule_info.rs +++ b/httpserver/src/routes/game/event/event_schedule_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EventScheduleInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::event_schedule_info; +use gameserver::logic::game::event::event_schedule_info; use sqlx::SqlitePool; #[put("EventScheduleInfo")] diff --git a/httpserver/src/routes/game/event/mod.rs b/httpserver/src/routes/game/event/mod.rs new file mode 100644 index 0000000..01de061 --- /dev/null +++ b/httpserver/src/routes/game/event/mod.rs @@ -0,0 +1,8 @@ +pub mod event_exchange_info; +pub mod event_exchange_next_page_open; +pub mod event_exchange_reward; +pub mod event_hub_info; +pub mod event_mission_info; +pub mod event_reward; +pub mod event_reward_history; +pub mod event_schedule_info; diff --git a/httpserver/src/routes/game/evil_castle_daily_reward.rs b/httpserver/src/routes/game/evil/evil_castle_daily_reward.rs similarity index 92% rename from httpserver/src/routes/game/evil_castle_daily_reward.rs rename to httpserver/src/routes/game/evil/evil_castle_daily_reward.rs index 8311e8f..97e0398 100644 --- a/httpserver/src/routes/game/evil_castle_daily_reward.rs +++ b/httpserver/src/routes/game/evil/evil_castle_daily_reward.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EvilCastleDailyRewardRequest; use crypto::network::parse_packet; -use gameserver::logic::game::evil_castle_daily_reward; +use gameserver::logic::game::evil::evil_castle_daily_reward; use sqlx::SqlitePool; #[put("EvilCastleDailyReward")] diff --git a/httpserver/src/routes/game/evil_castle_daily_reward_state.rs b/httpserver/src/routes/game/evil/evil_castle_daily_reward_state.rs similarity index 92% rename from httpserver/src/routes/game/evil_castle_daily_reward_state.rs rename to httpserver/src/routes/game/evil/evil_castle_daily_reward_state.rs index 41b4f59..1db227f 100644 --- a/httpserver/src/routes/game/evil_castle_daily_reward_state.rs +++ b/httpserver/src/routes/game/evil/evil_castle_daily_reward_state.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EvilCastleDailyRewardStateRequest; use crypto::network::parse_packet; -use gameserver::logic::game::evil_castle_daily_reward_state; +use gameserver::logic::game::evil::evil_castle_daily_reward_state; use sqlx::SqlitePool; #[put("EvilCastleDailyRewardState")] diff --git a/httpserver/src/routes/game/evil_castle_enter.rs b/httpserver/src/routes/game/evil/evil_castle_enter.rs similarity index 92% rename from httpserver/src/routes/game/evil_castle_enter.rs rename to httpserver/src/routes/game/evil/evil_castle_enter.rs index 3eb386e..698f52a 100644 --- a/httpserver/src/routes/game/evil_castle_enter.rs +++ b/httpserver/src/routes/game/evil/evil_castle_enter.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EvilCastleEnterRequest; use crypto::network::parse_packet; -use gameserver::logic::game::evil_castle_enter; +use gameserver::logic::game::evil::evil_castle_enter; use sqlx::SqlitePool; #[put("EvilCastleEnter")] diff --git a/httpserver/src/routes/game/evil_castle_info.rs b/httpserver/src/routes/game/evil/evil_castle_info.rs similarity index 92% rename from httpserver/src/routes/game/evil_castle_info.rs rename to httpserver/src/routes/game/evil/evil_castle_info.rs index df449d9..e20989c 100644 --- a/httpserver/src/routes/game/evil_castle_info.rs +++ b/httpserver/src/routes/game/evil/evil_castle_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EvilCastleInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::evil_castle_info; +use gameserver::logic::game::evil::evil_castle_info; use sqlx::SqlitePool; #[put("EvilCastleInfo")] diff --git a/httpserver/src/routes/game/evil_castle_ping.rs b/httpserver/src/routes/game/evil/evil_castle_ping.rs similarity index 92% rename from httpserver/src/routes/game/evil_castle_ping.rs rename to httpserver/src/routes/game/evil/evil_castle_ping.rs index 4604efb..3558c1f 100644 --- a/httpserver/src/routes/game/evil_castle_ping.rs +++ b/httpserver/src/routes/game/evil/evil_castle_ping.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EvilCastlePingRequest; use crypto::network::parse_packet; -use gameserver::logic::game::evil_castle_ping; +use gameserver::logic::game::evil::evil_castle_ping; use sqlx::SqlitePool; #[put("EvilCastlePing")] diff --git a/httpserver/src/routes/game/evil_castle_ranking_info.rs b/httpserver/src/routes/game/evil/evil_castle_ranking_info.rs similarity index 92% rename from httpserver/src/routes/game/evil_castle_ranking_info.rs rename to httpserver/src/routes/game/evil/evil_castle_ranking_info.rs index 75ecf84..de80ad4 100644 --- a/httpserver/src/routes/game/evil_castle_ranking_info.rs +++ b/httpserver/src/routes/game/evil/evil_castle_ranking_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EvilCastleRankingInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::evil_castle_ranking_info; +use gameserver::logic::game::evil::evil_castle_ranking_info; use sqlx::SqlitePool; #[put("EvilCastleRankingInfo")] diff --git a/httpserver/src/routes/game/evil_castle_reward_info.rs b/httpserver/src/routes/game/evil/evil_castle_reward_info.rs similarity index 92% rename from httpserver/src/routes/game/evil_castle_reward_info.rs rename to httpserver/src/routes/game/evil/evil_castle_reward_info.rs index f5cf950..1a66637 100644 --- a/httpserver/src/routes/game/evil_castle_reward_info.rs +++ b/httpserver/src/routes/game/evil/evil_castle_reward_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EvilCastleRewardInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::evil_castle_reward_info; +use gameserver::logic::game::evil::evil_castle_reward_info; use sqlx::SqlitePool; #[put("EvilCastleRewardInfo")] diff --git a/httpserver/src/routes/game/evil_castle_rogue_like_all_user_score_info.rs b/httpserver/src/routes/game/evil/evil_castle_rogue_like_all_user_score_info.rs similarity index 91% rename from httpserver/src/routes/game/evil_castle_rogue_like_all_user_score_info.rs rename to httpserver/src/routes/game/evil/evil_castle_rogue_like_all_user_score_info.rs index 05eb69b..6f0a266 100644 --- a/httpserver/src/routes/game/evil_castle_rogue_like_all_user_score_info.rs +++ b/httpserver/src/routes/game/evil/evil_castle_rogue_like_all_user_score_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EvilCastleRogueLikeAllUserScoreInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::evil_castle_rogue_like_all_user_score_info; +use gameserver::logic::game::evil::evil_castle_rogue_like_all_user_score_info; use sqlx::SqlitePool; #[put("EvilCastleRogueLikeAllUserScoreInfo")] diff --git a/httpserver/src/routes/game/evil_castle_rogue_like_battle_char_change.rs b/httpserver/src/routes/game/evil/evil_castle_rogue_like_battle_char_change.rs similarity index 91% rename from httpserver/src/routes/game/evil_castle_rogue_like_battle_char_change.rs rename to httpserver/src/routes/game/evil/evil_castle_rogue_like_battle_char_change.rs index 9110402..f39b542 100644 --- a/httpserver/src/routes/game/evil_castle_rogue_like_battle_char_change.rs +++ b/httpserver/src/routes/game/evil/evil_castle_rogue_like_battle_char_change.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EvilCastleRogueLikeBattleCharChangeRequest; use crypto::network::parse_packet; -use gameserver::logic::game::evil_castle_rogue_like_battle_char_change; +use gameserver::logic::game::evil::evil_castle_rogue_like_battle_char_change; use sqlx::SqlitePool; #[put("EvilCastleRogueLikeBattleCharChange")] diff --git a/httpserver/src/routes/game/evil_castle_rogue_like_battle_end_preview.rs b/httpserver/src/routes/game/evil/evil_castle_rogue_like_battle_end_preview.rs similarity index 91% rename from httpserver/src/routes/game/evil_castle_rogue_like_battle_end_preview.rs rename to httpserver/src/routes/game/evil/evil_castle_rogue_like_battle_end_preview.rs index b7b6f66..e0d9bfc 100644 --- a/httpserver/src/routes/game/evil_castle_rogue_like_battle_end_preview.rs +++ b/httpserver/src/routes/game/evil/evil_castle_rogue_like_battle_end_preview.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EvilCastleRogueLikeBattleEndPreviewRequest; use crypto::network::parse_packet; -use gameserver::logic::game::evil_castle_rogue_like_battle_end_preview; +use gameserver::logic::game::evil::evil_castle_rogue_like_battle_end_preview; use sqlx::SqlitePool; #[put("EvilCastleRogueLikeBattleEndPreview")] diff --git a/httpserver/src/routes/game/evil_castle_rogue_like_battle_skip.rs b/httpserver/src/routes/game/evil/evil_castle_rogue_like_battle_skip.rs similarity index 92% rename from httpserver/src/routes/game/evil_castle_rogue_like_battle_skip.rs rename to httpserver/src/routes/game/evil/evil_castle_rogue_like_battle_skip.rs index 4c211c5..8d48ed7 100644 --- a/httpserver/src/routes/game/evil_castle_rogue_like_battle_skip.rs +++ b/httpserver/src/routes/game/evil/evil_castle_rogue_like_battle_skip.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EvilCastleRogueLikeBattleSkipRequest; use crypto::network::parse_packet; -use gameserver::logic::game::evil_castle_rogue_like_battle_skip; +use gameserver::logic::game::evil::evil_castle_rogue_like_battle_skip; use sqlx::SqlitePool; #[put("EvilCastleRogueLikeBattleSkip")] diff --git a/httpserver/src/routes/game/evil_castle_rogue_like_char_revival.rs b/httpserver/src/routes/game/evil/evil_castle_rogue_like_char_revival.rs similarity index 92% rename from httpserver/src/routes/game/evil_castle_rogue_like_char_revival.rs rename to httpserver/src/routes/game/evil/evil_castle_rogue_like_char_revival.rs index 4f2a6f6..2a293af 100644 --- a/httpserver/src/routes/game/evil_castle_rogue_like_char_revival.rs +++ b/httpserver/src/routes/game/evil/evil_castle_rogue_like_char_revival.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EvilCastleRogueLikeCharRevivalRequest; use crypto::network::parse_packet; -use gameserver::logic::game::evil_castle_rogue_like_char_revival; +use gameserver::logic::game::evil::evil_castle_rogue_like_char_revival; use sqlx::SqlitePool; #[put("EvilCastleRogueLikeCharRevival")] diff --git a/httpserver/src/routes/game/evil_castle_rogue_like_costume_upgrade.rs b/httpserver/src/routes/game/evil/evil_castle_rogue_like_costume_upgrade.rs similarity index 91% rename from httpserver/src/routes/game/evil_castle_rogue_like_costume_upgrade.rs rename to httpserver/src/routes/game/evil/evil_castle_rogue_like_costume_upgrade.rs index 35b3682..36877a4 100644 --- a/httpserver/src/routes/game/evil_castle_rogue_like_costume_upgrade.rs +++ b/httpserver/src/routes/game/evil/evil_castle_rogue_like_costume_upgrade.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EvilCastleRogueLikeCostumeUpgradeRequest; use crypto::network::parse_packet; -use gameserver::logic::game::evil_castle_rogue_like_costume_upgrade; +use gameserver::logic::game::evil::evil_castle_rogue_like_costume_upgrade; use sqlx::SqlitePool; #[put("EvilCastleRogueLikeCostumeUpgrade")] diff --git a/httpserver/src/routes/game/evil_castle_rogue_like_deck_save.rs b/httpserver/src/routes/game/evil/evil_castle_rogue_like_deck_save.rs similarity index 92% rename from httpserver/src/routes/game/evil_castle_rogue_like_deck_save.rs rename to httpserver/src/routes/game/evil/evil_castle_rogue_like_deck_save.rs index fc1b45d..c651d39 100644 --- a/httpserver/src/routes/game/evil_castle_rogue_like_deck_save.rs +++ b/httpserver/src/routes/game/evil/evil_castle_rogue_like_deck_save.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EvilCastleRogueLikeDeckSaveRequest; use crypto::network::parse_packet; -use gameserver::logic::game::evil_castle_rogue_like_deck_save; +use gameserver::logic::game::evil::evil_castle_rogue_like_deck_save; use sqlx::SqlitePool; #[put("EvilCastleRogueLikeDeckSave")] diff --git a/httpserver/src/routes/game/evil_castle_rogue_like_edit_event.rs b/httpserver/src/routes/game/evil/evil_castle_rogue_like_edit_event.rs similarity index 92% rename from httpserver/src/routes/game/evil_castle_rogue_like_edit_event.rs rename to httpserver/src/routes/game/evil/evil_castle_rogue_like_edit_event.rs index da71523..5e504d1 100644 --- a/httpserver/src/routes/game/evil_castle_rogue_like_edit_event.rs +++ b/httpserver/src/routes/game/evil/evil_castle_rogue_like_edit_event.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EvilCastleRogueLikeEditEventRequest; use crypto::network::parse_packet; -use gameserver::logic::game::evil_castle_rogue_like_edit_event; +use gameserver::logic::game::evil::evil_castle_rogue_like_edit_event; use sqlx::SqlitePool; #[put("EvilCastleRogueLikeEditEvent")] diff --git a/httpserver/src/routes/game/evil_castle_rogue_like_enter.rs b/httpserver/src/routes/game/evil/evil_castle_rogue_like_enter.rs similarity index 92% rename from httpserver/src/routes/game/evil_castle_rogue_like_enter.rs rename to httpserver/src/routes/game/evil/evil_castle_rogue_like_enter.rs index fc09b1b..6144ddf 100644 --- a/httpserver/src/routes/game/evil_castle_rogue_like_enter.rs +++ b/httpserver/src/routes/game/evil/evil_castle_rogue_like_enter.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EvilCastleRogueLikeEnterRequest; use crypto::network::parse_packet; -use gameserver::logic::game::evil_castle_rogue_like_enter; +use gameserver::logic::game::evil::evil_castle_rogue_like_enter; use sqlx::SqlitePool; #[put("EvilCastleRogueLikeEnter")] diff --git a/httpserver/src/routes/game/evil_castle_rogue_like_event_choice.rs b/httpserver/src/routes/game/evil/evil_castle_rogue_like_event_choice.rs similarity index 92% rename from httpserver/src/routes/game/evil_castle_rogue_like_event_choice.rs rename to httpserver/src/routes/game/evil/evil_castle_rogue_like_event_choice.rs index 2c3a938..5cffb26 100644 --- a/httpserver/src/routes/game/evil_castle_rogue_like_event_choice.rs +++ b/httpserver/src/routes/game/evil/evil_castle_rogue_like_event_choice.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EvilCastleRogueLikeEventChoiceRequest; use crypto::network::parse_packet; -use gameserver::logic::game::evil_castle_rogue_like_event_choice; +use gameserver::logic::game::evil::evil_castle_rogue_like_event_choice; use sqlx::SqlitePool; #[put("EvilCastleRogueLikeEventChoice")] diff --git a/httpserver/src/routes/game/evil_castle_rogue_like_event_select.rs b/httpserver/src/routes/game/evil/evil_castle_rogue_like_event_select.rs similarity index 92% rename from httpserver/src/routes/game/evil_castle_rogue_like_event_select.rs rename to httpserver/src/routes/game/evil/evil_castle_rogue_like_event_select.rs index 5e3d082..f6077e5 100644 --- a/httpserver/src/routes/game/evil_castle_rogue_like_event_select.rs +++ b/httpserver/src/routes/game/evil/evil_castle_rogue_like_event_select.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EvilCastleRogueLikeEventSelectRequest; use crypto::network::parse_packet; -use gameserver::logic::game::evil_castle_rogue_like_event_select; +use gameserver::logic::game::evil::evil_castle_rogue_like_event_select; use sqlx::SqlitePool; #[put("EvilCastleRogueLikeEventSelect")] diff --git a/httpserver/src/routes/game/evil_castle_rogue_like_give_up.rs b/httpserver/src/routes/game/evil/evil_castle_rogue_like_give_up.rs similarity index 92% rename from httpserver/src/routes/game/evil_castle_rogue_like_give_up.rs rename to httpserver/src/routes/game/evil/evil_castle_rogue_like_give_up.rs index 0da88df..8c4c6a2 100644 --- a/httpserver/src/routes/game/evil_castle_rogue_like_give_up.rs +++ b/httpserver/src/routes/game/evil/evil_castle_rogue_like_give_up.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EvilCastleRogueLikeGiveUpRequest; use crypto::network::parse_packet; -use gameserver::logic::game::evil_castle_rogue_like_give_up; +use gameserver::logic::game::evil::evil_castle_rogue_like_give_up; use sqlx::SqlitePool; #[put("EvilCastleRogueLikeGiveUp")] diff --git a/httpserver/src/routes/game/evil_castle_rogue_like_give_up_info.rs b/httpserver/src/routes/game/evil/evil_castle_rogue_like_give_up_info.rs similarity index 92% rename from httpserver/src/routes/game/evil_castle_rogue_like_give_up_info.rs rename to httpserver/src/routes/game/evil/evil_castle_rogue_like_give_up_info.rs index a20efed..5d87b32 100644 --- a/httpserver/src/routes/game/evil_castle_rogue_like_give_up_info.rs +++ b/httpserver/src/routes/game/evil/evil_castle_rogue_like_give_up_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EvilCastleRogueLikeGiveUpInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::evil_castle_rogue_like_give_up_info; +use gameserver::logic::game::evil::evil_castle_rogue_like_give_up_info; use sqlx::SqlitePool; #[put("EvilCastleRogueLikeGiveUpInfo")] diff --git a/httpserver/src/routes/game/evil_castle_rogue_like_growth.rs b/httpserver/src/routes/game/evil/evil_castle_rogue_like_growth.rs similarity index 92% rename from httpserver/src/routes/game/evil_castle_rogue_like_growth.rs rename to httpserver/src/routes/game/evil/evil_castle_rogue_like_growth.rs index 1f4c451..51e0cf2 100644 --- a/httpserver/src/routes/game/evil_castle_rogue_like_growth.rs +++ b/httpserver/src/routes/game/evil/evil_castle_rogue_like_growth.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EvilCastleRogueLikeGrowthRequest; use crypto::network::parse_packet; -use gameserver::logic::game::evil_castle_rogue_like_growth; +use gameserver::logic::game::evil::evil_castle_rogue_like_growth; use sqlx::SqlitePool; #[put("EvilCastleRogueLikeGrowth")] diff --git a/httpserver/src/routes/game/evil_castle_rogue_like_info.rs b/httpserver/src/routes/game/evil/evil_castle_rogue_like_info.rs similarity index 92% rename from httpserver/src/routes/game/evil_castle_rogue_like_info.rs rename to httpserver/src/routes/game/evil/evil_castle_rogue_like_info.rs index d243a05..b7e8216 100644 --- a/httpserver/src/routes/game/evil_castle_rogue_like_info.rs +++ b/httpserver/src/routes/game/evil/evil_castle_rogue_like_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EvilCastleRogueLikeInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::evil_castle_rogue_like_info; +use gameserver::logic::game::evil::evil_castle_rogue_like_info; use sqlx::SqlitePool; #[put("EvilCastleRogueLikeInfo")] diff --git a/httpserver/src/routes/game/evil_castle_rogue_like_move_floor.rs b/httpserver/src/routes/game/evil/evil_castle_rogue_like_move_floor.rs similarity index 92% rename from httpserver/src/routes/game/evil_castle_rogue_like_move_floor.rs rename to httpserver/src/routes/game/evil/evil_castle_rogue_like_move_floor.rs index bd0f6d1..10a3e8e 100644 --- a/httpserver/src/routes/game/evil_castle_rogue_like_move_floor.rs +++ b/httpserver/src/routes/game/evil/evil_castle_rogue_like_move_floor.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EvilCastleRogueLikeMoveFloorRequest; use crypto::network::parse_packet; -use gameserver::logic::game::evil_castle_rogue_like_move_floor; +use gameserver::logic::game::evil::evil_castle_rogue_like_move_floor; use sqlx::SqlitePool; #[put("EvilCastleRogueLikeMoveFloor")] diff --git a/httpserver/src/routes/game/evil_castle_rogue_like_quick_battle.rs b/httpserver/src/routes/game/evil/evil_castle_rogue_like_quick_battle.rs similarity index 92% rename from httpserver/src/routes/game/evil_castle_rogue_like_quick_battle.rs rename to httpserver/src/routes/game/evil/evil_castle_rogue_like_quick_battle.rs index 32a4157..df77993 100644 --- a/httpserver/src/routes/game/evil_castle_rogue_like_quick_battle.rs +++ b/httpserver/src/routes/game/evil/evil_castle_rogue_like_quick_battle.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EvilCastleRogueLikeQuickBattleRequest; use crypto::network::parse_packet; -use gameserver::logic::game::evil_castle_rogue_like_quick_battle; +use gameserver::logic::game::evil::evil_castle_rogue_like_quick_battle; use sqlx::SqlitePool; #[put("EvilCastleRogueLikeQuickBattle")] diff --git a/httpserver/src/routes/game/evil_castle_rogue_like_rank_info.rs b/httpserver/src/routes/game/evil/evil_castle_rogue_like_rank_info.rs similarity index 92% rename from httpserver/src/routes/game/evil_castle_rogue_like_rank_info.rs rename to httpserver/src/routes/game/evil/evil_castle_rogue_like_rank_info.rs index a0c4be1..812151f 100644 --- a/httpserver/src/routes/game/evil_castle_rogue_like_rank_info.rs +++ b/httpserver/src/routes/game/evil/evil_castle_rogue_like_rank_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EvilCastleRogueLikeRankInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::evil_castle_rogue_like_rank_info; +use gameserver::logic::game::evil::evil_castle_rogue_like_rank_info; use sqlx::SqlitePool; #[put("EvilCastleRogueLikeRankInfo")] diff --git a/httpserver/src/routes/game/evil_castle_rogue_like_relic_mix.rs b/httpserver/src/routes/game/evil/evil_castle_rogue_like_relic_mix.rs similarity index 92% rename from httpserver/src/routes/game/evil_castle_rogue_like_relic_mix.rs rename to httpserver/src/routes/game/evil/evil_castle_rogue_like_relic_mix.rs index b8b7471..5f5ad73 100644 --- a/httpserver/src/routes/game/evil_castle_rogue_like_relic_mix.rs +++ b/httpserver/src/routes/game/evil/evil_castle_rogue_like_relic_mix.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EvilCastleRogueLikeRelicMixRequest; use crypto::network::parse_packet; -use gameserver::logic::game::evil_castle_rogue_like_relic_mix; +use gameserver::logic::game::evil::evil_castle_rogue_like_relic_mix; use sqlx::SqlitePool; #[put("EvilCastleRogueLikeRelicMix")] diff --git a/httpserver/src/routes/game/evil_castle_rogue_like_reward_re_roll.rs b/httpserver/src/routes/game/evil/evil_castle_rogue_like_reward_re_roll.rs similarity index 91% rename from httpserver/src/routes/game/evil_castle_rogue_like_reward_re_roll.rs rename to httpserver/src/routes/game/evil/evil_castle_rogue_like_reward_re_roll.rs index 8898871..b4fa582 100644 --- a/httpserver/src/routes/game/evil_castle_rogue_like_reward_re_roll.rs +++ b/httpserver/src/routes/game/evil/evil_castle_rogue_like_reward_re_roll.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EvilCastleRogueLikeRewardReRollRequest; use crypto::network::parse_packet; -use gameserver::logic::game::evil_castle_rogue_like_reward_re_roll; +use gameserver::logic::game::evil::evil_castle_rogue_like_reward_re_roll; use sqlx::SqlitePool; #[put("EvilCastleRogueLikeRewardReRoll")] diff --git a/httpserver/src/routes/game/evil_castle_rogue_like_room_enter.rs b/httpserver/src/routes/game/evil/evil_castle_rogue_like_room_enter.rs similarity index 92% rename from httpserver/src/routes/game/evil_castle_rogue_like_room_enter.rs rename to httpserver/src/routes/game/evil/evil_castle_rogue_like_room_enter.rs index 6ce5e0e..fb5645a 100644 --- a/httpserver/src/routes/game/evil_castle_rogue_like_room_enter.rs +++ b/httpserver/src/routes/game/evil/evil_castle_rogue_like_room_enter.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EvilCastleRogueLikeRoomEnterRequest; use crypto::network::parse_packet; -use gameserver::logic::game::evil_castle_rogue_like_room_enter; +use gameserver::logic::game::evil::evil_castle_rogue_like_room_enter; use sqlx::SqlitePool; #[put("EvilCastleRogueLikeRoomEnter")] diff --git a/httpserver/src/routes/game/evil_castle_rogue_like_season_reward.rs b/httpserver/src/routes/game/evil/evil_castle_rogue_like_season_reward.rs similarity index 92% rename from httpserver/src/routes/game/evil_castle_rogue_like_season_reward.rs rename to httpserver/src/routes/game/evil/evil_castle_rogue_like_season_reward.rs index 94bfeaf..afab9c2 100644 --- a/httpserver/src/routes/game/evil_castle_rogue_like_season_reward.rs +++ b/httpserver/src/routes/game/evil/evil_castle_rogue_like_season_reward.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EvilCastleRogueLikeSeasonRewardRequest; use crypto::network::parse_packet; -use gameserver::logic::game::evil_castle_rogue_like_season_reward; +use gameserver::logic::game::evil::evil_castle_rogue_like_season_reward; use sqlx::SqlitePool; #[put("EvilCastleRogueLikeSeasonReward")] diff --git a/httpserver/src/routes/game/evil_castle_rogue_like_select_reward.rs b/httpserver/src/routes/game/evil/evil_castle_rogue_like_select_reward.rs similarity index 92% rename from httpserver/src/routes/game/evil_castle_rogue_like_select_reward.rs rename to httpserver/src/routes/game/evil/evil_castle_rogue_like_select_reward.rs index b3bd895..70c7ace 100644 --- a/httpserver/src/routes/game/evil_castle_rogue_like_select_reward.rs +++ b/httpserver/src/routes/game/evil/evil_castle_rogue_like_select_reward.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EvilCastleRogueLikeSelectRewardRequest; use crypto::network::parse_packet; -use gameserver::logic::game::evil_castle_rogue_like_select_reward; +use gameserver::logic::game::evil::evil_castle_rogue_like_select_reward; use sqlx::SqlitePool; #[put("EvilCastleRogueLikeSelectReward")] diff --git a/httpserver/src/routes/game/evil_castle_rogue_like_shop_buy.rs b/httpserver/src/routes/game/evil/evil_castle_rogue_like_shop_buy.rs similarity index 92% rename from httpserver/src/routes/game/evil_castle_rogue_like_shop_buy.rs rename to httpserver/src/routes/game/evil/evil_castle_rogue_like_shop_buy.rs index d6fde9b..91e4894 100644 --- a/httpserver/src/routes/game/evil_castle_rogue_like_shop_buy.rs +++ b/httpserver/src/routes/game/evil/evil_castle_rogue_like_shop_buy.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EvilCastleRogueLikeShopBuyRequest; use crypto::network::parse_packet; -use gameserver::logic::game::evil_castle_rogue_like_shop_buy; +use gameserver::logic::game::evil::evil_castle_rogue_like_shop_buy; use sqlx::SqlitePool; #[put("EvilCastleRogueLikeShopBuy")] diff --git a/httpserver/src/routes/game/evil_castle_rogue_like_shop_exit.rs b/httpserver/src/routes/game/evil/evil_castle_rogue_like_shop_exit.rs similarity index 92% rename from httpserver/src/routes/game/evil_castle_rogue_like_shop_exit.rs rename to httpserver/src/routes/game/evil/evil_castle_rogue_like_shop_exit.rs index 2374c96..264b344 100644 --- a/httpserver/src/routes/game/evil_castle_rogue_like_shop_exit.rs +++ b/httpserver/src/routes/game/evil/evil_castle_rogue_like_shop_exit.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EvilCastleRogueLikeShopExitRequest; use crypto::network::parse_packet; -use gameserver::logic::game::evil_castle_rogue_like_shop_exit; +use gameserver::logic::game::evil::evil_castle_rogue_like_shop_exit; use sqlx::SqlitePool; #[put("EvilCastleRogueLikeShopExit")] diff --git a/httpserver/src/routes/game/evil_castle_rogue_like_shop_re_roll.rs b/httpserver/src/routes/game/evil/evil_castle_rogue_like_shop_re_roll.rs similarity index 92% rename from httpserver/src/routes/game/evil_castle_rogue_like_shop_re_roll.rs rename to httpserver/src/routes/game/evil/evil_castle_rogue_like_shop_re_roll.rs index bdafe7e..c1317be 100644 --- a/httpserver/src/routes/game/evil_castle_rogue_like_shop_re_roll.rs +++ b/httpserver/src/routes/game/evil/evil_castle_rogue_like_shop_re_roll.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EvilCastleRogueLikeShopReRollRequest; use crypto::network::parse_packet; -use gameserver::logic::game::evil_castle_rogue_like_shop_re_roll; +use gameserver::logic::game::evil::evil_castle_rogue_like_shop_re_roll; use sqlx::SqlitePool; #[put("EvilCastleRogueLikeShopReRoll")] diff --git a/httpserver/src/routes/game/evil_castle_stage_clear_reward.rs b/httpserver/src/routes/game/evil/evil_castle_stage_clear_reward.rs similarity index 92% rename from httpserver/src/routes/game/evil_castle_stage_clear_reward.rs rename to httpserver/src/routes/game/evil/evil_castle_stage_clear_reward.rs index 11de446..567f232 100644 --- a/httpserver/src/routes/game/evil_castle_stage_clear_reward.rs +++ b/httpserver/src/routes/game/evil/evil_castle_stage_clear_reward.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EvilCastleStageClearRewardRequest; use crypto::network::parse_packet; -use gameserver::logic::game::evil_castle_stage_clear_reward; +use gameserver::logic::game::evil::evil_castle_stage_clear_reward; use sqlx::SqlitePool; #[put("EvilCastleStageClearReward")] diff --git a/httpserver/src/routes/game/evil_castle_stage_ranking_info.rs b/httpserver/src/routes/game/evil/evil_castle_stage_ranking_info.rs similarity index 92% rename from httpserver/src/routes/game/evil_castle_stage_ranking_info.rs rename to httpserver/src/routes/game/evil/evil_castle_stage_ranking_info.rs index 837aab3..6dcc90e 100644 --- a/httpserver/src/routes/game/evil_castle_stage_ranking_info.rs +++ b/httpserver/src/routes/game/evil/evil_castle_stage_ranking_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EvilCastleStageRankingInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::evil_castle_stage_ranking_info; +use gameserver::logic::game::evil::evil_castle_stage_ranking_info; use sqlx::SqlitePool; #[put("EvilCastleStageRankingInfo")] diff --git a/httpserver/src/routes/game/evil_castle_tower_info.rs b/httpserver/src/routes/game/evil/evil_castle_tower_info.rs similarity index 92% rename from httpserver/src/routes/game/evil_castle_tower_info.rs rename to httpserver/src/routes/game/evil/evil_castle_tower_info.rs index c31c312..916fa7e 100644 --- a/httpserver/src/routes/game/evil_castle_tower_info.rs +++ b/httpserver/src/routes/game/evil/evil_castle_tower_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::EvilCastleTowerInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::evil_castle_tower_info; +use gameserver::logic::game::evil::evil_castle_tower_info; use sqlx::SqlitePool; #[put("EvilCastleTowerInfo")] diff --git a/httpserver/src/routes/game/evil/mod.rs b/httpserver/src/routes/game/evil/mod.rs new file mode 100644 index 0000000..0a5c9d1 --- /dev/null +++ b/httpserver/src/routes/game/evil/mod.rs @@ -0,0 +1,36 @@ +pub mod evil_castle_daily_reward; +pub mod evil_castle_daily_reward_state; +pub mod evil_castle_enter; +pub mod evil_castle_info; +pub mod evil_castle_ping; +pub mod evil_castle_ranking_info; +pub mod evil_castle_reward_info; +pub mod evil_castle_rogue_like_all_user_score_info; +pub mod evil_castle_rogue_like_battle_char_change; +pub mod evil_castle_rogue_like_battle_end_preview; +pub mod evil_castle_rogue_like_battle_skip; +pub mod evil_castle_rogue_like_char_revival; +pub mod evil_castle_rogue_like_costume_upgrade; +pub mod evil_castle_rogue_like_deck_save; +pub mod evil_castle_rogue_like_edit_event; +pub mod evil_castle_rogue_like_enter; +pub mod evil_castle_rogue_like_event_choice; +pub mod evil_castle_rogue_like_event_select; +pub mod evil_castle_rogue_like_give_up; +pub mod evil_castle_rogue_like_give_up_info; +pub mod evil_castle_rogue_like_growth; +pub mod evil_castle_rogue_like_info; +pub mod evil_castle_rogue_like_move_floor; +pub mod evil_castle_rogue_like_quick_battle; +pub mod evil_castle_rogue_like_rank_info; +pub mod evil_castle_rogue_like_relic_mix; +pub mod evil_castle_rogue_like_reward_re_roll; +pub mod evil_castle_rogue_like_room_enter; +pub mod evil_castle_rogue_like_season_reward; +pub mod evil_castle_rogue_like_select_reward; +pub mod evil_castle_rogue_like_shop_buy; +pub mod evil_castle_rogue_like_shop_exit; +pub mod evil_castle_rogue_like_shop_re_roll; +pub mod evil_castle_stage_clear_reward; +pub mod evil_castle_stage_ranking_info; +pub mod evil_castle_tower_info; diff --git a/httpserver/src/routes/game/field_deck_info.rs b/httpserver/src/routes/game/field/field_deck_info.rs similarity index 92% rename from httpserver/src/routes/game/field_deck_info.rs rename to httpserver/src/routes/game/field/field_deck_info.rs index f2c4987..293fd78 100644 --- a/httpserver/src/routes/game/field_deck_info.rs +++ b/httpserver/src/routes/game/field/field_deck_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::FieldDeckInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::field_deck_info; +use gameserver::logic::game::field::field_deck_info; use sqlx::SqlitePool; #[put("FieldDeckInfo")] diff --git a/httpserver/src/routes/game/field_deck_save.rs b/httpserver/src/routes/game/field/field_deck_save.rs similarity index 92% rename from httpserver/src/routes/game/field_deck_save.rs rename to httpserver/src/routes/game/field/field_deck_save.rs index bcddffb..697a2fd 100644 --- a/httpserver/src/routes/game/field_deck_save.rs +++ b/httpserver/src/routes/game/field/field_deck_save.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::FieldDeckSaveRequest; use crypto::network::parse_packet; -use gameserver::logic::game::field_deck_save; +use gameserver::logic::game::field::field_deck_save; use sqlx::SqlitePool; #[put("FieldDeckSave")] diff --git a/httpserver/src/routes/game/field_monster_damage.rs b/httpserver/src/routes/game/field/field_monster_damage.rs similarity index 92% rename from httpserver/src/routes/game/field_monster_damage.rs rename to httpserver/src/routes/game/field/field_monster_damage.rs index 91ead2a..664620e 100644 --- a/httpserver/src/routes/game/field_monster_damage.rs +++ b/httpserver/src/routes/game/field/field_monster_damage.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::FieldMonsterDamageRequest; use crypto::network::parse_packet; -use gameserver::logic::game::field_monster_damage; +use gameserver::logic::game::field::field_monster_damage; use sqlx::SqlitePool; #[put("FieldMonsterDamage")] diff --git a/httpserver/src/routes/game/field_monster_event.rs b/httpserver/src/routes/game/field/field_monster_event.rs similarity index 92% rename from httpserver/src/routes/game/field_monster_event.rs rename to httpserver/src/routes/game/field/field_monster_event.rs index 6816360..67a10f1 100644 --- a/httpserver/src/routes/game/field_monster_event.rs +++ b/httpserver/src/routes/game/field/field_monster_event.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::FieldMonsterEventRequest; use crypto::network::parse_packet; -use gameserver::logic::game::field_monster_event; +use gameserver::logic::game::field::field_monster_event; use sqlx::SqlitePool; #[put("FieldMonsterEvent")] diff --git a/httpserver/src/routes/game/field_monster_regen.rs b/httpserver/src/routes/game/field/field_monster_regen.rs similarity index 92% rename from httpserver/src/routes/game/field_monster_regen.rs rename to httpserver/src/routes/game/field/field_monster_regen.rs index 7a8e333..48d151e 100644 --- a/httpserver/src/routes/game/field_monster_regen.rs +++ b/httpserver/src/routes/game/field/field_monster_regen.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::FieldMonsterRegenRequest; use crypto::network::parse_packet; -use gameserver::logic::game::field_monster_regen; +use gameserver::logic::game::field::field_monster_regen; use sqlx::SqlitePool; #[put("FieldMonsterRegen")] diff --git a/httpserver/src/routes/game/field_monster_reward.rs b/httpserver/src/routes/game/field/field_monster_reward.rs similarity index 92% rename from httpserver/src/routes/game/field_monster_reward.rs rename to httpserver/src/routes/game/field/field_monster_reward.rs index baa3539..c90a6e6 100644 --- a/httpserver/src/routes/game/field_monster_reward.rs +++ b/httpserver/src/routes/game/field/field_monster_reward.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::FieldMonsterRewardRequest; use crypto::network::parse_packet; -use gameserver::logic::game::field_monster_reward; +use gameserver::logic::game::field::field_monster_reward; use sqlx::SqlitePool; #[put("FieldMonsterReward")] diff --git a/httpserver/src/routes/game/field_object_info.rs b/httpserver/src/routes/game/field/field_object_info.rs similarity index 92% rename from httpserver/src/routes/game/field_object_info.rs rename to httpserver/src/routes/game/field/field_object_info.rs index 3183432..4b49a9a 100644 --- a/httpserver/src/routes/game/field_object_info.rs +++ b/httpserver/src/routes/game/field/field_object_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::FieldObjectInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::field_object_info; +use gameserver::logic::game::field::field_object_info; use sqlx::SqlitePool; #[put("FieldObjectInfo")] diff --git a/httpserver/src/routes/game/field_object_position_update.rs b/httpserver/src/routes/game/field/field_object_position_update.rs similarity index 92% rename from httpserver/src/routes/game/field_object_position_update.rs rename to httpserver/src/routes/game/field/field_object_position_update.rs index 13cc852..8c22a00 100644 --- a/httpserver/src/routes/game/field_object_position_update.rs +++ b/httpserver/src/routes/game/field/field_object_position_update.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::FieldObjectPositionUpdateRequest; use crypto::network::parse_packet; -use gameserver::logic::game::field_object_position_update; +use gameserver::logic::game::field::field_object_position_update; use sqlx::SqlitePool; #[put("FieldObjectPositionUpdate")] diff --git a/httpserver/src/routes/game/field_object_preview.rs b/httpserver/src/routes/game/field/field_object_preview.rs similarity index 92% rename from httpserver/src/routes/game/field_object_preview.rs rename to httpserver/src/routes/game/field/field_object_preview.rs index 98bf14d..d36f27e 100644 --- a/httpserver/src/routes/game/field_object_preview.rs +++ b/httpserver/src/routes/game/field/field_object_preview.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::FieldObjectPreviewRequest; use crypto::network::parse_packet; -use gameserver::logic::game::field_object_preview; +use gameserver::logic::game::field::field_object_preview; use sqlx::SqlitePool; #[put("FieldObjectPreview")] diff --git a/httpserver/src/routes/game/field_object_research.rs b/httpserver/src/routes/game/field/field_object_research.rs similarity index 92% rename from httpserver/src/routes/game/field_object_research.rs rename to httpserver/src/routes/game/field/field_object_research.rs index 69130b0..bbad56c 100644 --- a/httpserver/src/routes/game/field_object_research.rs +++ b/httpserver/src/routes/game/field/field_object_research.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::FieldObjectResearchRequest; use crypto::network::parse_packet; -use gameserver::logic::game::field_object_research; +use gameserver::logic::game::field::field_object_research; use sqlx::SqlitePool; #[put("FieldObjectResearch")] diff --git a/httpserver/src/routes/game/field_object_respawn.rs b/httpserver/src/routes/game/field/field_object_respawn.rs similarity index 92% rename from httpserver/src/routes/game/field_object_respawn.rs rename to httpserver/src/routes/game/field/field_object_respawn.rs index a7c9f45..92dbfff 100644 --- a/httpserver/src/routes/game/field_object_respawn.rs +++ b/httpserver/src/routes/game/field/field_object_respawn.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::FieldObjectRespawnRequest; use crypto::network::parse_packet; -use gameserver::logic::game::field_object_respawn; +use gameserver::logic::game::field::field_object_respawn; use sqlx::SqlitePool; #[put("FieldObjectRespawn")] diff --git a/httpserver/src/routes/game/field_object_reward.rs b/httpserver/src/routes/game/field/field_object_reward.rs similarity index 92% rename from httpserver/src/routes/game/field_object_reward.rs rename to httpserver/src/routes/game/field/field_object_reward.rs index b6d4795..008a0dc 100644 --- a/httpserver/src/routes/game/field_object_reward.rs +++ b/httpserver/src/routes/game/field/field_object_reward.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::FieldObjectRewardRequest; use crypto::network::parse_packet; -use gameserver::logic::game::field_object_reward; +use gameserver::logic::game::field::field_object_reward; use sqlx::SqlitePool; #[put("FieldObjectReward")] diff --git a/httpserver/src/routes/game/field_object_reward_list.rs b/httpserver/src/routes/game/field/field_object_reward_list.rs similarity index 92% rename from httpserver/src/routes/game/field_object_reward_list.rs rename to httpserver/src/routes/game/field/field_object_reward_list.rs index 8ec91af..5219020 100644 --- a/httpserver/src/routes/game/field_object_reward_list.rs +++ b/httpserver/src/routes/game/field/field_object_reward_list.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::FieldObjectRewardListRequest; use crypto::network::parse_packet; -use gameserver::logic::game::field_object_reward_list; +use gameserver::logic::game::field::field_object_reward_list; use sqlx::SqlitePool; #[put("FieldObjectRewardList")] diff --git a/httpserver/src/routes/game/field_trap_info.rs b/httpserver/src/routes/game/field/field_trap_info.rs similarity index 92% rename from httpserver/src/routes/game/field_trap_info.rs rename to httpserver/src/routes/game/field/field_trap_info.rs index a38d850..ebc2f14 100644 --- a/httpserver/src/routes/game/field_trap_info.rs +++ b/httpserver/src/routes/game/field/field_trap_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::FieldTrapInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::field_trap_info; +use gameserver::logic::game::field::field_trap_info; use sqlx::SqlitePool; #[put("FieldTrapInfo")] diff --git a/httpserver/src/routes/game/field/mod.rs b/httpserver/src/routes/game/field/mod.rs new file mode 100644 index 0000000..8c51d35 --- /dev/null +++ b/httpserver/src/routes/game/field/mod.rs @@ -0,0 +1,14 @@ +pub mod field_deck_info; +pub mod field_deck_save; +pub mod field_monster_damage; +pub mod field_monster_event; +pub mod field_monster_regen; +pub mod field_monster_reward; +pub mod field_object_info; +pub mod field_object_position_update; +pub mod field_object_preview; +pub mod field_object_research; +pub mod field_object_respawn; +pub mod field_object_reward; +pub mod field_object_reward_list; +pub mod field_trap_info; diff --git a/httpserver/src/routes/game/friend_accept.rs b/httpserver/src/routes/game/friend/friend_accept.rs similarity index 92% rename from httpserver/src/routes/game/friend_accept.rs rename to httpserver/src/routes/game/friend/friend_accept.rs index 5c091df..c470a82 100644 --- a/httpserver/src/routes/game/friend_accept.rs +++ b/httpserver/src/routes/game/friend/friend_accept.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::FriendAcceptRequest; use crypto::network::parse_packet; -use gameserver::logic::game::friend_accept; +use gameserver::logic::game::friend::friend_accept; use sqlx::SqlitePool; #[put("FriendAccept")] diff --git a/httpserver/src/routes/game/friend_info_list.rs b/httpserver/src/routes/game/friend/friend_info_list.rs similarity index 92% rename from httpserver/src/routes/game/friend_info_list.rs rename to httpserver/src/routes/game/friend/friend_info_list.rs index 4970938..e54ab5c 100644 --- a/httpserver/src/routes/game/friend_info_list.rs +++ b/httpserver/src/routes/game/friend/friend_info_list.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::FriendInfoListRequest; use crypto::network::parse_packet; -use gameserver::logic::game::friend_info_list; +use gameserver::logic::game::friend::friend_info_list; use sqlx::SqlitePool; #[put("FriendInfoList")] diff --git a/httpserver/src/routes/game/friend_receive_list.rs b/httpserver/src/routes/game/friend/friend_receive_list.rs similarity index 92% rename from httpserver/src/routes/game/friend_receive_list.rs rename to httpserver/src/routes/game/friend/friend_receive_list.rs index 3a6bd6c..4fd1781 100644 --- a/httpserver/src/routes/game/friend_receive_list.rs +++ b/httpserver/src/routes/game/friend/friend_receive_list.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::FriendReceiveListRequest; use crypto::network::parse_packet; -use gameserver::logic::game::friend_receive_list; +use gameserver::logic::game::friend::friend_receive_list; use sqlx::SqlitePool; #[put("FriendReceiveList")] diff --git a/httpserver/src/routes/game/friend_recommend.rs b/httpserver/src/routes/game/friend/friend_recommend.rs similarity index 92% rename from httpserver/src/routes/game/friend_recommend.rs rename to httpserver/src/routes/game/friend/friend_recommend.rs index 21fab97..70d0845 100644 --- a/httpserver/src/routes/game/friend_recommend.rs +++ b/httpserver/src/routes/game/friend/friend_recommend.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::FriendRecommendRequest; use crypto::network::parse_packet; -use gameserver::logic::game::friend_recommend; +use gameserver::logic::game::friend::friend_recommend; use sqlx::SqlitePool; #[put("FriendRecommend")] diff --git a/httpserver/src/routes/game/friend_refuse.rs b/httpserver/src/routes/game/friend/friend_refuse.rs similarity index 92% rename from httpserver/src/routes/game/friend_refuse.rs rename to httpserver/src/routes/game/friend/friend_refuse.rs index 66e1a8a..1553a0d 100644 --- a/httpserver/src/routes/game/friend_refuse.rs +++ b/httpserver/src/routes/game/friend/friend_refuse.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::FriendRefuseRequest; use crypto::network::parse_packet; -use gameserver::logic::game::friend_refuse; +use gameserver::logic::game::friend::friend_refuse; use sqlx::SqlitePool; #[put("FriendRefuse")] diff --git a/httpserver/src/routes/game/friend_remove.rs b/httpserver/src/routes/game/friend/friend_remove.rs similarity index 92% rename from httpserver/src/routes/game/friend_remove.rs rename to httpserver/src/routes/game/friend/friend_remove.rs index 5ad610d..7077020 100644 --- a/httpserver/src/routes/game/friend_remove.rs +++ b/httpserver/src/routes/game/friend/friend_remove.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::FriendRemoveRequest; use crypto::network::parse_packet; -use gameserver::logic::game::friend_remove; +use gameserver::logic::game::friend::friend_remove; use sqlx::SqlitePool; #[put("FriendRemove")] diff --git a/httpserver/src/routes/game/friend_search.rs b/httpserver/src/routes/game/friend/friend_search.rs similarity index 92% rename from httpserver/src/routes/game/friend_search.rs rename to httpserver/src/routes/game/friend/friend_search.rs index afeafff..ffb072b 100644 --- a/httpserver/src/routes/game/friend_search.rs +++ b/httpserver/src/routes/game/friend/friend_search.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::FriendSearchRequest; use crypto::network::parse_packet; -use gameserver::logic::game::friend_search; +use gameserver::logic::game::friend::friend_search; use sqlx::SqlitePool; #[put("FriendSearch")] diff --git a/httpserver/src/routes/game/friend_send.rs b/httpserver/src/routes/game/friend/friend_send.rs similarity index 92% rename from httpserver/src/routes/game/friend_send.rs rename to httpserver/src/routes/game/friend/friend_send.rs index 43ed810..eb2a08f 100644 --- a/httpserver/src/routes/game/friend_send.rs +++ b/httpserver/src/routes/game/friend/friend_send.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::FriendSendRequest; use crypto::network::parse_packet; -use gameserver::logic::game::friend_send; +use gameserver::logic::game::friend::friend_send; use sqlx::SqlitePool; #[put("FriendSend")] diff --git a/httpserver/src/routes/game/friend_send_list.rs b/httpserver/src/routes/game/friend/friend_send_list.rs similarity index 92% rename from httpserver/src/routes/game/friend_send_list.rs rename to httpserver/src/routes/game/friend/friend_send_list.rs index 8cde027..d270214 100644 --- a/httpserver/src/routes/game/friend_send_list.rs +++ b/httpserver/src/routes/game/friend/friend_send_list.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::FriendSendListRequest; use crypto::network::parse_packet; -use gameserver::logic::game::friend_send_list; +use gameserver::logic::game::friend::friend_send_list; use sqlx::SqlitePool; #[put("FriendSendList")] diff --git a/httpserver/src/routes/game/friend_send_remove.rs b/httpserver/src/routes/game/friend/friend_send_remove.rs similarity index 92% rename from httpserver/src/routes/game/friend_send_remove.rs rename to httpserver/src/routes/game/friend/friend_send_remove.rs index c4940e1..34a4122 100644 --- a/httpserver/src/routes/game/friend_send_remove.rs +++ b/httpserver/src/routes/game/friend/friend_send_remove.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::FriendSendRemoveRequest; use crypto::network::parse_packet; -use gameserver::logic::game::friend_send_remove; +use gameserver::logic::game::friend::friend_send_remove; use sqlx::SqlitePool; #[put("FriendSendRemove")] diff --git a/httpserver/src/routes/game/friend/mod.rs b/httpserver/src/routes/game/friend/mod.rs new file mode 100644 index 0000000..8570451 --- /dev/null +++ b/httpserver/src/routes/game/friend/mod.rs @@ -0,0 +1,10 @@ +pub mod friend_accept; +pub mod friend_info_list; +pub mod friend_receive_list; +pub mod friend_recommend; +pub mod friend_refuse; +pub mod friend_remove; +pub mod friend_search; +pub mod friend_send; +pub mod friend_send_list; +pub mod friend_send_remove; diff --git a/httpserver/src/routes/game/gacha_buy.rs b/httpserver/src/routes/game/gacha/gacha_buy.rs similarity index 93% rename from httpserver/src/routes/game/gacha_buy.rs rename to httpserver/src/routes/game/gacha/gacha_buy.rs index e8ba188..758fdbc 100644 --- a/httpserver/src/routes/game/gacha_buy.rs +++ b/httpserver/src/routes/game/gacha/gacha_buy.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::GachaBuyRequest; use crypto::network::parse_packet; -use gameserver::logic::game::gacha_buy; +use gameserver::logic::game::gacha::gacha_buy; use sqlx::SqlitePool; #[put("GachaBuy")] diff --git a/httpserver/src/routes/game/gacha_buy_preview.rs b/httpserver/src/routes/game/gacha/gacha_buy_preview.rs similarity index 92% rename from httpserver/src/routes/game/gacha_buy_preview.rs rename to httpserver/src/routes/game/gacha/gacha_buy_preview.rs index 333109c..6b8dde6 100644 --- a/httpserver/src/routes/game/gacha_buy_preview.rs +++ b/httpserver/src/routes/game/gacha/gacha_buy_preview.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::GachaBuyPreviewRequest; use crypto::network::parse_packet; -use gameserver::logic::game::gacha_buy_preview; +use gameserver::logic::game::gacha::gacha_buy_preview; use sqlx::SqlitePool; #[put("GachaBuyPreview")] diff --git a/httpserver/src/routes/game/gacha_buy_preview_lock.rs b/httpserver/src/routes/game/gacha/gacha_buy_preview_lock.rs similarity index 92% rename from httpserver/src/routes/game/gacha_buy_preview_lock.rs rename to httpserver/src/routes/game/gacha/gacha_buy_preview_lock.rs index 3458a0b..09838da 100644 --- a/httpserver/src/routes/game/gacha_buy_preview_lock.rs +++ b/httpserver/src/routes/game/gacha/gacha_buy_preview_lock.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::GachaBuyPreviewLockRequest; use crypto::network::parse_packet; -use gameserver::logic::game::gacha_buy_preview_lock; +use gameserver::logic::game::gacha::gacha_buy_preview_lock; use sqlx::SqlitePool; #[put("GachaBuyPreviewLock")] diff --git a/httpserver/src/routes/game/gacha_info.rs b/httpserver/src/routes/game/gacha/gacha_info.rs similarity index 93% rename from httpserver/src/routes/game/gacha_info.rs rename to httpserver/src/routes/game/gacha/gacha_info.rs index a470d72..ce43ba9 100644 --- a/httpserver/src/routes/game/gacha_info.rs +++ b/httpserver/src/routes/game/gacha/gacha_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::GachaInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::gacha_info; +use gameserver::logic::game::gacha::gacha_info; use sqlx::SqlitePool; #[put("GachaInfo")] diff --git a/httpserver/src/routes/game/gacha_log.rs b/httpserver/src/routes/game/gacha/gacha_log.rs similarity index 93% rename from httpserver/src/routes/game/gacha_log.rs rename to httpserver/src/routes/game/gacha/gacha_log.rs index 8aa1db0..8211e48 100644 --- a/httpserver/src/routes/game/gacha_log.rs +++ b/httpserver/src/routes/game/gacha/gacha_log.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::GachaLogRequest; use crypto::network::parse_packet; -use gameserver::logic::game::gacha_log; +use gameserver::logic::game::gacha::gacha_log; use sqlx::SqlitePool; #[put("GachaLog")] diff --git a/httpserver/src/routes/game/gacha_point_exchange.rs b/httpserver/src/routes/game/gacha/gacha_point_exchange.rs similarity index 92% rename from httpserver/src/routes/game/gacha_point_exchange.rs rename to httpserver/src/routes/game/gacha/gacha_point_exchange.rs index 4cbba9d..05a694c 100644 --- a/httpserver/src/routes/game/gacha_point_exchange.rs +++ b/httpserver/src/routes/game/gacha/gacha_point_exchange.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::GachaPointExchangeRequest; use crypto::network::parse_packet; -use gameserver::logic::game::gacha_point_exchange; +use gameserver::logic::game::gacha::gacha_point_exchange; use sqlx::SqlitePool; #[put("GachaPointExchange")] diff --git a/httpserver/src/routes/game/gacha_point_manual_exchange.rs b/httpserver/src/routes/game/gacha/gacha_point_manual_exchange.rs similarity index 92% rename from httpserver/src/routes/game/gacha_point_manual_exchange.rs rename to httpserver/src/routes/game/gacha/gacha_point_manual_exchange.rs index a1c23b6..892eef9 100644 --- a/httpserver/src/routes/game/gacha_point_manual_exchange.rs +++ b/httpserver/src/routes/game/gacha/gacha_point_manual_exchange.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::GachaPointManualExchangeRequest; use crypto::network::parse_packet; -use gameserver::logic::game::gacha_point_manual_exchange; +use gameserver::logic::game::gacha::gacha_point_manual_exchange; use sqlx::SqlitePool; #[put("GachaPointManualExchange")] diff --git a/httpserver/src/routes/game/gacha_selection_save.rs b/httpserver/src/routes/game/gacha/gacha_selection_save.rs similarity index 92% rename from httpserver/src/routes/game/gacha_selection_save.rs rename to httpserver/src/routes/game/gacha/gacha_selection_save.rs index da19927..fe7d66e 100644 --- a/httpserver/src/routes/game/gacha_selection_save.rs +++ b/httpserver/src/routes/game/gacha/gacha_selection_save.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::GachaSelectionSaveRequest; use crypto::network::parse_packet; -use gameserver::logic::game::gacha_selection_save; +use gameserver::logic::game::gacha::gacha_selection_save; use sqlx::SqlitePool; #[put("GachaSelectionSave")] diff --git a/httpserver/src/routes/game/gacha/mod.rs b/httpserver/src/routes/game/gacha/mod.rs new file mode 100644 index 0000000..caf9da3 --- /dev/null +++ b/httpserver/src/routes/game/gacha/mod.rs @@ -0,0 +1,8 @@ +pub mod gacha_buy; +pub mod gacha_buy_preview; +pub mod gacha_buy_preview_lock; +pub mod gacha_info; +pub mod gacha_log; +pub mod gacha_point_exchange; +pub mod gacha_point_manual_exchange; +pub mod gacha_selection_save; diff --git a/httpserver/src/routes/game/guild_accept.rs b/httpserver/src/routes/game/guild/guild_accept.rs similarity index 93% rename from httpserver/src/routes/game/guild_accept.rs rename to httpserver/src/routes/game/guild/guild_accept.rs index 6dd00c9..648899c 100644 --- a/httpserver/src/routes/game/guild_accept.rs +++ b/httpserver/src/routes/game/guild/guild_accept.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::GuildAcceptRequest; use crypto::network::parse_packet; -use gameserver::logic::game::guild_accept; +use gameserver::logic::game::guild::guild_accept; use sqlx::SqlitePool; #[put("GuildAccept")] diff --git a/httpserver/src/routes/game/guild_create.rs b/httpserver/src/routes/game/guild/guild_create.rs similarity index 93% rename from httpserver/src/routes/game/guild_create.rs rename to httpserver/src/routes/game/guild/guild_create.rs index 7b101a5..67c6a24 100644 --- a/httpserver/src/routes/game/guild_create.rs +++ b/httpserver/src/routes/game/guild/guild_create.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::GuildCreateRequest; use crypto::network::parse_packet; -use gameserver::logic::game::guild_create; +use gameserver::logic::game::guild::guild_create; use sqlx::SqlitePool; #[put("GuildCreate")] diff --git a/httpserver/src/routes/game/guild_delete_cancel.rs b/httpserver/src/routes/game/guild/guild_delete_cancel.rs similarity index 92% rename from httpserver/src/routes/game/guild_delete_cancel.rs rename to httpserver/src/routes/game/guild/guild_delete_cancel.rs index 4c68d2b..4a36fc0 100644 --- a/httpserver/src/routes/game/guild_delete_cancel.rs +++ b/httpserver/src/routes/game/guild/guild_delete_cancel.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::GuildDeleteCancelRequest; use crypto::network::parse_packet; -use gameserver::logic::game::guild_delete_cancel; +use gameserver::logic::game::guild::guild_delete_cancel; use sqlx::SqlitePool; #[put("GuildDeleteCancel")] diff --git a/httpserver/src/routes/game/guild_info.rs b/httpserver/src/routes/game/guild/guild_info.rs similarity index 93% rename from httpserver/src/routes/game/guild_info.rs rename to httpserver/src/routes/game/guild/guild_info.rs index 6ef2d91..96d77d8 100644 --- a/httpserver/src/routes/game/guild_info.rs +++ b/httpserver/src/routes/game/guild/guild_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::GuildInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::guild_info; +use gameserver::logic::game::guild::guild_info; use sqlx::SqlitePool; #[put("GuildInfo")] diff --git a/httpserver/src/routes/game/guild_info_edit.rs b/httpserver/src/routes/game/guild/guild_info_edit.rs similarity index 92% rename from httpserver/src/routes/game/guild_info_edit.rs rename to httpserver/src/routes/game/guild/guild_info_edit.rs index b9ac79f..1222300 100644 --- a/httpserver/src/routes/game/guild_info_edit.rs +++ b/httpserver/src/routes/game/guild/guild_info_edit.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::GuildInfoEditRequest; use crypto::network::parse_packet; -use gameserver::logic::game::guild_info_edit; +use gameserver::logic::game::guild::guild_info_edit; use sqlx::SqlitePool; #[put("GuildInfoEdit")] diff --git a/httpserver/src/routes/game/guild_init_info.rs b/httpserver/src/routes/game/guild/guild_init_info.rs similarity index 92% rename from httpserver/src/routes/game/guild_init_info.rs rename to httpserver/src/routes/game/guild/guild_init_info.rs index 93df003..1de9d83 100644 --- a/httpserver/src/routes/game/guild_init_info.rs +++ b/httpserver/src/routes/game/guild/guild_init_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::GuildInitInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::guild_init_info; +use gameserver::logic::game::guild::guild_init_info; use sqlx::SqlitePool; #[put("GuildInitInfo")] diff --git a/httpserver/src/routes/game/guild_join.rs b/httpserver/src/routes/game/guild/guild_join.rs similarity index 93% rename from httpserver/src/routes/game/guild_join.rs rename to httpserver/src/routes/game/guild/guild_join.rs index eaccd82..b39b5e4 100644 --- a/httpserver/src/routes/game/guild_join.rs +++ b/httpserver/src/routes/game/guild/guild_join.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::GuildJoinRequest; use crypto::network::parse_packet; -use gameserver::logic::game::guild_join; +use gameserver::logic::game::guild::guild_join; use sqlx::SqlitePool; #[put("GuildJoin")] diff --git a/httpserver/src/routes/game/guild_join_refuse.rs b/httpserver/src/routes/game/guild/guild_join_refuse.rs similarity index 92% rename from httpserver/src/routes/game/guild_join_refuse.rs rename to httpserver/src/routes/game/guild/guild_join_refuse.rs index 564c00d..f064db7 100644 --- a/httpserver/src/routes/game/guild_join_refuse.rs +++ b/httpserver/src/routes/game/guild/guild_join_refuse.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::GuildJoinRefuseRequest; use crypto::network::parse_packet; -use gameserver::logic::game::guild_join_refuse; +use gameserver::logic::game::guild::guild_join_refuse; use sqlx::SqlitePool; #[put("GuildJoinRefuse")] diff --git a/httpserver/src/routes/game/guild_join_send_cancel.rs b/httpserver/src/routes/game/guild/guild_join_send_cancel.rs similarity index 92% rename from httpserver/src/routes/game/guild_join_send_cancel.rs rename to httpserver/src/routes/game/guild/guild_join_send_cancel.rs index 3843bd6..818b684 100644 --- a/httpserver/src/routes/game/guild_join_send_cancel.rs +++ b/httpserver/src/routes/game/guild/guild_join_send_cancel.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::GuildJoinSendCancelRequest; use crypto::network::parse_packet; -use gameserver::logic::game::guild_join_send_cancel; +use gameserver::logic::game::guild::guild_join_send_cancel; use sqlx::SqlitePool; #[put("GuildJoinSendCancel")] diff --git a/httpserver/src/routes/game/guild_join_send_info.rs b/httpserver/src/routes/game/guild/guild_join_send_info.rs similarity index 92% rename from httpserver/src/routes/game/guild_join_send_info.rs rename to httpserver/src/routes/game/guild/guild_join_send_info.rs index f5aeba9..02999e2 100644 --- a/httpserver/src/routes/game/guild_join_send_info.rs +++ b/httpserver/src/routes/game/guild/guild_join_send_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::GuildJoinSendInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::guild_join_send_info; +use gameserver::logic::game::guild::guild_join_send_info; use sqlx::SqlitePool; #[put("GuildJoinSendInfo")] diff --git a/httpserver/src/routes/game/guild_leave.rs b/httpserver/src/routes/game/guild/guild_leave.rs similarity index 93% rename from httpserver/src/routes/game/guild_leave.rs rename to httpserver/src/routes/game/guild/guild_leave.rs index dbb32ba..65ab357 100644 --- a/httpserver/src/routes/game/guild_leave.rs +++ b/httpserver/src/routes/game/guild/guild_leave.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::GuildLeaveRequest; use crypto::network::parse_packet; -use gameserver::logic::game::guild_leave; +use gameserver::logic::game::guild::guild_leave; use sqlx::SqlitePool; #[put("GuildLeave")] diff --git a/httpserver/src/routes/game/guild_member_ban.rs b/httpserver/src/routes/game/guild/guild_member_ban.rs similarity index 92% rename from httpserver/src/routes/game/guild_member_ban.rs rename to httpserver/src/routes/game/guild/guild_member_ban.rs index 8b00436..657bac8 100644 --- a/httpserver/src/routes/game/guild_member_ban.rs +++ b/httpserver/src/routes/game/guild/guild_member_ban.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::GuildMemberBanRequest; use crypto::network::parse_packet; -use gameserver::logic::game::guild_member_ban; +use gameserver::logic::game::guild::guild_member_ban; use sqlx::SqlitePool; #[put("GuildMemberBan")] diff --git a/httpserver/src/routes/game/guild_member_role_edit.rs b/httpserver/src/routes/game/guild/guild_member_role_edit.rs similarity index 92% rename from httpserver/src/routes/game/guild_member_role_edit.rs rename to httpserver/src/routes/game/guild/guild_member_role_edit.rs index ce26885..38705bc 100644 --- a/httpserver/src/routes/game/guild_member_role_edit.rs +++ b/httpserver/src/routes/game/guild/guild_member_role_edit.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::GuildMemberRoleEditRequest; use crypto::network::parse_packet; -use gameserver::logic::game::guild_member_role_edit; +use gameserver::logic::game::guild::guild_member_role_edit; use sqlx::SqlitePool; #[put("GuildMemberRoleEdit")] diff --git a/httpserver/src/routes/game/guild_notice_info.rs b/httpserver/src/routes/game/guild/guild_notice_info.rs similarity index 92% rename from httpserver/src/routes/game/guild_notice_info.rs rename to httpserver/src/routes/game/guild/guild_notice_info.rs index d8506eb..43e5bfd 100644 --- a/httpserver/src/routes/game/guild_notice_info.rs +++ b/httpserver/src/routes/game/guild/guild_notice_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::GuildNoticeInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::guild_notice_info; +use gameserver::logic::game::guild::guild_notice_info; use sqlx::SqlitePool; #[put("GuildNoticeInfo")] diff --git a/httpserver/src/routes/game/guild_notice_update.rs b/httpserver/src/routes/game/guild/guild_notice_update.rs similarity index 92% rename from httpserver/src/routes/game/guild_notice_update.rs rename to httpserver/src/routes/game/guild/guild_notice_update.rs index 4179849..6a6622e 100644 --- a/httpserver/src/routes/game/guild_notice_update.rs +++ b/httpserver/src/routes/game/guild/guild_notice_update.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::GuildNoticeUpdateRequest; use crypto::network::parse_packet; -use gameserver::logic::game::guild_notice_update; +use gameserver::logic::game::guild::guild_notice_update; use sqlx::SqlitePool; #[put("GuildNoticeUpdate")] diff --git a/httpserver/src/routes/game/guild_raid_boss_battle_enter.rs b/httpserver/src/routes/game/guild/guild_raid_boss_battle_enter.rs similarity index 92% rename from httpserver/src/routes/game/guild_raid_boss_battle_enter.rs rename to httpserver/src/routes/game/guild/guild_raid_boss_battle_enter.rs index a5cd299..82ab47d 100644 --- a/httpserver/src/routes/game/guild_raid_boss_battle_enter.rs +++ b/httpserver/src/routes/game/guild/guild_raid_boss_battle_enter.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::GuildRaidBossBattleEnterRequest; use crypto::network::parse_packet; -use gameserver::logic::game::guild_raid_boss_battle_enter; +use gameserver::logic::game::guild::guild_raid_boss_battle_enter; use sqlx::SqlitePool; #[put("GuildRaidBossBattleEnter")] diff --git a/httpserver/src/routes/game/guild_raid_boss_battle_history.rs b/httpserver/src/routes/game/guild/guild_raid_boss_battle_history.rs similarity index 92% rename from httpserver/src/routes/game/guild_raid_boss_battle_history.rs rename to httpserver/src/routes/game/guild/guild_raid_boss_battle_history.rs index ede379d..97239e8 100644 --- a/httpserver/src/routes/game/guild_raid_boss_battle_history.rs +++ b/httpserver/src/routes/game/guild/guild_raid_boss_battle_history.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::GuildRaidBossBattleHistoryRequest; use crypto::network::parse_packet; -use gameserver::logic::game::guild_raid_boss_battle_history; +use gameserver::logic::game::guild::guild_raid_boss_battle_history; use sqlx::SqlitePool; #[put("GuildRaidBossBattleHistory")] diff --git a/httpserver/src/routes/game/guild_raid_boss_battle_info.rs b/httpserver/src/routes/game/guild/guild_raid_boss_battle_info.rs similarity index 92% rename from httpserver/src/routes/game/guild_raid_boss_battle_info.rs rename to httpserver/src/routes/game/guild/guild_raid_boss_battle_info.rs index 1fe653a..018915e 100644 --- a/httpserver/src/routes/game/guild_raid_boss_battle_info.rs +++ b/httpserver/src/routes/game/guild/guild_raid_boss_battle_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::GuildRaidBossBattleInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::guild_raid_boss_battle_info; +use gameserver::logic::game::guild::guild_raid_boss_battle_info; use sqlx::SqlitePool; #[put("GuildRaidBossBattleInfo")] diff --git a/httpserver/src/routes/game/guild_raid_boss_practice_battle_enter.rs b/httpserver/src/routes/game/guild/guild_raid_boss_practice_battle_enter.rs similarity index 91% rename from httpserver/src/routes/game/guild_raid_boss_practice_battle_enter.rs rename to httpserver/src/routes/game/guild/guild_raid_boss_practice_battle_enter.rs index 6a6e6ae..0c277e9 100644 --- a/httpserver/src/routes/game/guild_raid_boss_practice_battle_enter.rs +++ b/httpserver/src/routes/game/guild/guild_raid_boss_practice_battle_enter.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::GuildRaidBossPracticeBattleEnterRequest; use crypto::network::parse_packet; -use gameserver::logic::game::guild_raid_boss_practice_battle_enter; +use gameserver::logic::game::guild::guild_raid_boss_practice_battle_enter; use sqlx::SqlitePool; #[put("GuildRaidBossPracticeBattleEnter")] diff --git a/httpserver/src/routes/game/guild_raid_boss_quick_battle.rs b/httpserver/src/routes/game/guild/guild_raid_boss_quick_battle.rs similarity index 92% rename from httpserver/src/routes/game/guild_raid_boss_quick_battle.rs rename to httpserver/src/routes/game/guild/guild_raid_boss_quick_battle.rs index 85fbebf..0aa5a10 100644 --- a/httpserver/src/routes/game/guild_raid_boss_quick_battle.rs +++ b/httpserver/src/routes/game/guild/guild_raid_boss_quick_battle.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::GuildRaidBossQuickBattleRequest; use crypto::network::parse_packet; -use gameserver::logic::game::guild_raid_boss_quick_battle; +use gameserver::logic::game::guild::guild_raid_boss_quick_battle; use sqlx::SqlitePool; #[put("GuildRaidBossQuickBattle")] diff --git a/httpserver/src/routes/game/guild_raid_deck_info.rs b/httpserver/src/routes/game/guild/guild_raid_deck_info.rs similarity index 92% rename from httpserver/src/routes/game/guild_raid_deck_info.rs rename to httpserver/src/routes/game/guild/guild_raid_deck_info.rs index 80e096d..1a039ab 100644 --- a/httpserver/src/routes/game/guild_raid_deck_info.rs +++ b/httpserver/src/routes/game/guild/guild_raid_deck_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::GuildRaidDeckInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::guild_raid_deck_info; +use gameserver::logic::game::guild::guild_raid_deck_info; use sqlx::SqlitePool; #[put("GuildRaidDeckInfo")] diff --git a/httpserver/src/routes/game/guild_raid_deck_save.rs b/httpserver/src/routes/game/guild/guild_raid_deck_save.rs similarity index 92% rename from httpserver/src/routes/game/guild_raid_deck_save.rs rename to httpserver/src/routes/game/guild/guild_raid_deck_save.rs index 125609e..18f5db4 100644 --- a/httpserver/src/routes/game/guild_raid_deck_save.rs +++ b/httpserver/src/routes/game/guild/guild_raid_deck_save.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::GuildRaidDeckSaveRequest; use crypto::network::parse_packet; -use gameserver::logic::game::guild_raid_deck_save; +use gameserver::logic::game::guild::guild_raid_deck_save; use sqlx::SqlitePool; #[put("GuildRaidDeckSave")] diff --git a/httpserver/src/routes/game/guild_raid_main_info.rs b/httpserver/src/routes/game/guild/guild_raid_main_info.rs similarity index 92% rename from httpserver/src/routes/game/guild_raid_main_info.rs rename to httpserver/src/routes/game/guild/guild_raid_main_info.rs index 35db0bf..782299e 100644 --- a/httpserver/src/routes/game/guild_raid_main_info.rs +++ b/httpserver/src/routes/game/guild/guild_raid_main_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::GuildRaidMainInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::guild_raid_main_info; +use gameserver::logic::game::guild::guild_raid_main_info; use sqlx::SqlitePool; #[put("GuildRaidMainInfo")] diff --git a/httpserver/src/routes/game/guild_raid_member_play_history_info.rs b/httpserver/src/routes/game/guild/guild_raid_member_play_history_info.rs similarity index 91% rename from httpserver/src/routes/game/guild_raid_member_play_history_info.rs rename to httpserver/src/routes/game/guild/guild_raid_member_play_history_info.rs index 63d2efd..256bf28 100644 --- a/httpserver/src/routes/game/guild_raid_member_play_history_info.rs +++ b/httpserver/src/routes/game/guild/guild_raid_member_play_history_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::GuildRaidMemberPlayHistoryInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::guild_raid_member_play_history_info; +use gameserver::logic::game::guild::guild_raid_member_play_history_info; use sqlx::SqlitePool; #[put("GuildRaidMemberPlayHistoryInfo")] diff --git a/httpserver/src/routes/game/guild_raid_member_ranking.rs b/httpserver/src/routes/game/guild/guild_raid_member_ranking.rs similarity index 92% rename from httpserver/src/routes/game/guild_raid_member_ranking.rs rename to httpserver/src/routes/game/guild/guild_raid_member_ranking.rs index 6c039e7..72cc4cb 100644 --- a/httpserver/src/routes/game/guild_raid_member_ranking.rs +++ b/httpserver/src/routes/game/guild/guild_raid_member_ranking.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::GuildRaidMemberRankingRequest; use crypto::network::parse_packet; -use gameserver::logic::game::guild_raid_member_ranking; +use gameserver::logic::game::guild::guild_raid_member_ranking; use sqlx::SqlitePool; #[put("GuildRaidMemberRanking")] diff --git a/httpserver/src/routes/game/guild_raid_normal_battle_history_info.rs b/httpserver/src/routes/game/guild/guild_raid_normal_battle_history_info.rs similarity index 91% rename from httpserver/src/routes/game/guild_raid_normal_battle_history_info.rs rename to httpserver/src/routes/game/guild/guild_raid_normal_battle_history_info.rs index dbe788e..7714663 100644 --- a/httpserver/src/routes/game/guild_raid_normal_battle_history_info.rs +++ b/httpserver/src/routes/game/guild/guild_raid_normal_battle_history_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::GuildRaidNormalBattleHistoryInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::guild_raid_normal_battle_history_info; +use gameserver::logic::game::guild::guild_raid_normal_battle_history_info; use sqlx::SqlitePool; #[put("GuildRaidNormalBattleHistoryInfo")] diff --git a/httpserver/src/routes/game/guild_raid_normal_battle_info.rs b/httpserver/src/routes/game/guild/guild_raid_normal_battle_info.rs similarity index 92% rename from httpserver/src/routes/game/guild_raid_normal_battle_info.rs rename to httpserver/src/routes/game/guild/guild_raid_normal_battle_info.rs index 8c6a113..574a961 100644 --- a/httpserver/src/routes/game/guild_raid_normal_battle_info.rs +++ b/httpserver/src/routes/game/guild/guild_raid_normal_battle_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::GuildRaidNormalBattleInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::guild_raid_normal_battle_info; +use gameserver::logic::game::guild::guild_raid_normal_battle_info; use sqlx::SqlitePool; #[put("GuildRaidNormalBattleInfo")] diff --git a/httpserver/src/routes/game/guild_raid_preset_delete.rs b/httpserver/src/routes/game/guild/guild_raid_preset_delete.rs similarity index 92% rename from httpserver/src/routes/game/guild_raid_preset_delete.rs rename to httpserver/src/routes/game/guild/guild_raid_preset_delete.rs index 9d86907..707ff2a 100644 --- a/httpserver/src/routes/game/guild_raid_preset_delete.rs +++ b/httpserver/src/routes/game/guild/guild_raid_preset_delete.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::GuildRaidPresetDeleteRequest; use crypto::network::parse_packet; -use gameserver::logic::game::guild_raid_preset_delete; +use gameserver::logic::game::guild::guild_raid_preset_delete; use sqlx::SqlitePool; #[put("GuildRaidPresetDelete")] diff --git a/httpserver/src/routes/game/guild_raid_preset_info.rs b/httpserver/src/routes/game/guild/guild_raid_preset_info.rs similarity index 92% rename from httpserver/src/routes/game/guild_raid_preset_info.rs rename to httpserver/src/routes/game/guild/guild_raid_preset_info.rs index 43b3e8e..88af207 100644 --- a/httpserver/src/routes/game/guild_raid_preset_info.rs +++ b/httpserver/src/routes/game/guild/guild_raid_preset_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::GuildRaidPresetInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::guild_raid_preset_info; +use gameserver::logic::game::guild::guild_raid_preset_info; use sqlx::SqlitePool; #[put("GuildRaidPresetInfo")] diff --git a/httpserver/src/routes/game/guild_raid_preset_info_change.rs b/httpserver/src/routes/game/guild/guild_raid_preset_info_change.rs similarity index 92% rename from httpserver/src/routes/game/guild_raid_preset_info_change.rs rename to httpserver/src/routes/game/guild/guild_raid_preset_info_change.rs index f207179..ba02966 100644 --- a/httpserver/src/routes/game/guild_raid_preset_info_change.rs +++ b/httpserver/src/routes/game/guild/guild_raid_preset_info_change.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::GuildRaidPresetInfoChangeRequest; use crypto::network::parse_packet; -use gameserver::logic::game::guild_raid_preset_info_change; +use gameserver::logic::game::guild::guild_raid_preset_info_change; use sqlx::SqlitePool; #[put("GuildRaidPresetInfoChange")] diff --git a/httpserver/src/routes/game/guild_raid_preset_save.rs b/httpserver/src/routes/game/guild/guild_raid_preset_save.rs similarity index 92% rename from httpserver/src/routes/game/guild_raid_preset_save.rs rename to httpserver/src/routes/game/guild/guild_raid_preset_save.rs index b3decac..50ee7f2 100644 --- a/httpserver/src/routes/game/guild_raid_preset_save.rs +++ b/httpserver/src/routes/game/guild/guild_raid_preset_save.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::GuildRaidPresetSaveRequest; use crypto::network::parse_packet; -use gameserver::logic::game::guild_raid_preset_save; +use gameserver::logic::game::guild::guild_raid_preset_save; use sqlx::SqlitePool; #[put("GuildRaidPresetSave")] diff --git a/httpserver/src/routes/game/guild_raid_preset_slot_add.rs b/httpserver/src/routes/game/guild/guild_raid_preset_slot_add.rs similarity index 92% rename from httpserver/src/routes/game/guild_raid_preset_slot_add.rs rename to httpserver/src/routes/game/guild/guild_raid_preset_slot_add.rs index b6b0fc7..9f27c8d 100644 --- a/httpserver/src/routes/game/guild_raid_preset_slot_add.rs +++ b/httpserver/src/routes/game/guild/guild_raid_preset_slot_add.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::GuildRaidPresetSlotAddRequest; use crypto::network::parse_packet; -use gameserver::logic::game::guild_raid_preset_slot_add; +use gameserver::logic::game::guild::guild_raid_preset_slot_add; use sqlx::SqlitePool; #[put("GuildRaidPresetSlotAdd")] diff --git a/httpserver/src/routes/game/guild_raid_preset_use.rs b/httpserver/src/routes/game/guild/guild_raid_preset_use.rs similarity index 92% rename from httpserver/src/routes/game/guild_raid_preset_use.rs rename to httpserver/src/routes/game/guild/guild_raid_preset_use.rs index 5e9bcd3..5eb4444 100644 --- a/httpserver/src/routes/game/guild_raid_preset_use.rs +++ b/httpserver/src/routes/game/guild/guild_raid_preset_use.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::GuildRaidPresetUseRequest; use crypto::network::parse_packet; -use gameserver::logic::game::guild_raid_preset_use; +use gameserver::logic::game::guild::guild_raid_preset_use; use sqlx::SqlitePool; #[put("GuildRaidPresetUse")] diff --git a/httpserver/src/routes/game/guild_raid_season_ranking.rs b/httpserver/src/routes/game/guild/guild_raid_season_ranking.rs similarity index 92% rename from httpserver/src/routes/game/guild_raid_season_ranking.rs rename to httpserver/src/routes/game/guild/guild_raid_season_ranking.rs index 7e3d6c7..03b1eb4 100644 --- a/httpserver/src/routes/game/guild_raid_season_ranking.rs +++ b/httpserver/src/routes/game/guild/guild_raid_season_ranking.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::GuildRaidSeasonRankingRequest; use crypto::network::parse_packet; -use gameserver::logic::game::guild_raid_season_ranking; +use gameserver::logic::game::guild::guild_raid_season_ranking; use sqlx::SqlitePool; #[put("GuildRaidSeasonRanking")] diff --git a/httpserver/src/routes/game/guild_raid_season_reward.rs b/httpserver/src/routes/game/guild/guild_raid_season_reward.rs similarity index 92% rename from httpserver/src/routes/game/guild_raid_season_reward.rs rename to httpserver/src/routes/game/guild/guild_raid_season_reward.rs index 1cdce1d..eae23fd 100644 --- a/httpserver/src/routes/game/guild_raid_season_reward.rs +++ b/httpserver/src/routes/game/guild/guild_raid_season_reward.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::GuildRaidSeasonRewardRequest; use crypto::network::parse_packet; -use gameserver::logic::game::guild_raid_season_reward; +use gameserver::logic::game::guild::guild_raid_season_reward; use sqlx::SqlitePool; #[put("GuildRaidSeasonReward")] diff --git a/httpserver/src/routes/game/guild_recommend.rs b/httpserver/src/routes/game/guild/guild_recommend.rs similarity index 92% rename from httpserver/src/routes/game/guild_recommend.rs rename to httpserver/src/routes/game/guild/guild_recommend.rs index a581471..51b1a58 100644 --- a/httpserver/src/routes/game/guild_recommend.rs +++ b/httpserver/src/routes/game/guild/guild_recommend.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::GuildRecommendRequest; use crypto::network::parse_packet; -use gameserver::logic::game::guild_recommend; +use gameserver::logic::game::guild::guild_recommend; use sqlx::SqlitePool; #[put("GuildRecommend")] diff --git a/httpserver/src/routes/game/guild_search.rs b/httpserver/src/routes/game/guild/guild_search.rs similarity index 93% rename from httpserver/src/routes/game/guild_search.rs rename to httpserver/src/routes/game/guild/guild_search.rs index c62f784..b380891 100644 --- a/httpserver/src/routes/game/guild_search.rs +++ b/httpserver/src/routes/game/guild/guild_search.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::GuildSearchRequest; use crypto::network::parse_packet; -use gameserver::logic::game::guild_search; +use gameserver::logic::game::guild::guild_search; use sqlx::SqlitePool; #[put("GuildSearch")] diff --git a/httpserver/src/routes/game/guild_supporter_add.rs b/httpserver/src/routes/game/guild/guild_supporter_add.rs similarity index 92% rename from httpserver/src/routes/game/guild_supporter_add.rs rename to httpserver/src/routes/game/guild/guild_supporter_add.rs index 4e065b8..1382a67 100644 --- a/httpserver/src/routes/game/guild_supporter_add.rs +++ b/httpserver/src/routes/game/guild/guild_supporter_add.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::GuildSupporterAddRequest; use crypto::network::parse_packet; -use gameserver::logic::game::guild_supporter_add; +use gameserver::logic::game::guild::guild_supporter_add; use sqlx::SqlitePool; #[put("GuildSupporterAdd")] diff --git a/httpserver/src/routes/game/guild_supporter_delete.rs b/httpserver/src/routes/game/guild/guild_supporter_delete.rs similarity index 92% rename from httpserver/src/routes/game/guild_supporter_delete.rs rename to httpserver/src/routes/game/guild/guild_supporter_delete.rs index eb8eb0a..518fe95 100644 --- a/httpserver/src/routes/game/guild_supporter_delete.rs +++ b/httpserver/src/routes/game/guild/guild_supporter_delete.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::GuildSupporterDeleteRequest; use crypto::network::parse_packet; -use gameserver::logic::game::guild_supporter_delete; +use gameserver::logic::game::guild::guild_supporter_delete; use sqlx::SqlitePool; #[put("GuildSupporterDelete")] diff --git a/httpserver/src/routes/game/guild_supporter_info.rs b/httpserver/src/routes/game/guild/guild_supporter_info.rs similarity index 92% rename from httpserver/src/routes/game/guild_supporter_info.rs rename to httpserver/src/routes/game/guild/guild_supporter_info.rs index cb25aa9..c21543b 100644 --- a/httpserver/src/routes/game/guild_supporter_info.rs +++ b/httpserver/src/routes/game/guild/guild_supporter_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::GuildSupporterInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::guild_supporter_info; +use gameserver::logic::game::guild::guild_supporter_info; use sqlx::SqlitePool; #[put("GuildSupporterInfo")] diff --git a/httpserver/src/routes/game/guild_supporter_info_list.rs b/httpserver/src/routes/game/guild/guild_supporter_info_list.rs similarity index 92% rename from httpserver/src/routes/game/guild_supporter_info_list.rs rename to httpserver/src/routes/game/guild/guild_supporter_info_list.rs index 24024bf..bb0f94c 100644 --- a/httpserver/src/routes/game/guild_supporter_info_list.rs +++ b/httpserver/src/routes/game/guild/guild_supporter_info_list.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::GuildSupporterInfoListRequest; use crypto::network::parse_packet; -use gameserver::logic::game::guild_supporter_info_list; +use gameserver::logic::game::guild::guild_supporter_info_list; use sqlx::SqlitePool; #[put("GuildSupporterInfoList")] diff --git a/httpserver/src/routes/game/guild_update_action_info.rs b/httpserver/src/routes/game/guild/guild_update_action_info.rs similarity index 92% rename from httpserver/src/routes/game/guild_update_action_info.rs rename to httpserver/src/routes/game/guild/guild_update_action_info.rs index e6325f0..3ff4670 100644 --- a/httpserver/src/routes/game/guild_update_action_info.rs +++ b/httpserver/src/routes/game/guild/guild_update_action_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::GuildUpdateActionInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::guild_update_action_info; +use gameserver::logic::game::guild::guild_update_action_info; use sqlx::SqlitePool; #[put("GuildUpdateActionInfo")] diff --git a/httpserver/src/routes/game/guild/mod.rs b/httpserver/src/routes/game/guild/mod.rs new file mode 100644 index 0000000..f02f993 --- /dev/null +++ b/httpserver/src/routes/game/guild/mod.rs @@ -0,0 +1,42 @@ +pub mod guild_accept; +pub mod guild_create; +pub mod guild_delete_cancel; +pub mod guild_info; +pub mod guild_info_edit; +pub mod guild_init_info; +pub mod guild_join; +pub mod guild_join_refuse; +pub mod guild_join_send_cancel; +pub mod guild_join_send_info; +pub mod guild_leave; +pub mod guild_member_ban; +pub mod guild_member_role_edit; +pub mod guild_notice_info; +pub mod guild_notice_update; +pub mod guild_raid_boss_battle_enter; +pub mod guild_raid_boss_battle_history; +pub mod guild_raid_boss_battle_info; +pub mod guild_raid_boss_practice_battle_enter; +pub mod guild_raid_boss_quick_battle; +pub mod guild_raid_deck_info; +pub mod guild_raid_deck_save; +pub mod guild_raid_main_info; +pub mod guild_raid_member_play_history_info; +pub mod guild_raid_member_ranking; +pub mod guild_raid_normal_battle_history_info; +pub mod guild_raid_normal_battle_info; +pub mod guild_raid_preset_delete; +pub mod guild_raid_preset_info; +pub mod guild_raid_preset_info_change; +pub mod guild_raid_preset_save; +pub mod guild_raid_preset_slot_add; +pub mod guild_raid_preset_use; +pub mod guild_raid_season_ranking; +pub mod guild_raid_season_reward; +pub mod guild_recommend; +pub mod guild_search; +pub mod guild_supporter_add; +pub mod guild_supporter_delete; +pub mod guild_supporter_info; +pub mod guild_supporter_info_list; +pub mod guild_update_action_info; diff --git a/httpserver/src/routes/game/hunt_dispatch.rs b/httpserver/src/routes/game/hunt/hunt_dispatch.rs similarity index 93% rename from httpserver/src/routes/game/hunt_dispatch.rs rename to httpserver/src/routes/game/hunt/hunt_dispatch.rs index 1cd4e2c..a289bd4 100644 --- a/httpserver/src/routes/game/hunt_dispatch.rs +++ b/httpserver/src/routes/game/hunt/hunt_dispatch.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::HuntDispatchRequest; use crypto::network::parse_packet; -use gameserver::logic::game::hunt_dispatch; +use gameserver::logic::game::hunt::hunt_dispatch; use sqlx::SqlitePool; #[put("HuntDispatch")] diff --git a/httpserver/src/routes/game/hunt_dispatch_end.rs b/httpserver/src/routes/game/hunt/hunt_dispatch_end.rs similarity index 92% rename from httpserver/src/routes/game/hunt_dispatch_end.rs rename to httpserver/src/routes/game/hunt/hunt_dispatch_end.rs index 29b85fd..1fb5796 100644 --- a/httpserver/src/routes/game/hunt_dispatch_end.rs +++ b/httpserver/src/routes/game/hunt/hunt_dispatch_end.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::HuntDispatchEndRequest; use crypto::network::parse_packet; -use gameserver::logic::game::hunt_dispatch_end; +use gameserver::logic::game::hunt::hunt_dispatch_end; use sqlx::SqlitePool; #[put("HuntDispatchEnd")] diff --git a/httpserver/src/routes/game/hunt_dispatch_info.rs b/httpserver/src/routes/game/hunt/hunt_dispatch_info.rs similarity index 92% rename from httpserver/src/routes/game/hunt_dispatch_info.rs rename to httpserver/src/routes/game/hunt/hunt_dispatch_info.rs index 15e4afd..74d0886 100644 --- a/httpserver/src/routes/game/hunt_dispatch_info.rs +++ b/httpserver/src/routes/game/hunt/hunt_dispatch_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::HuntDispatchInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::hunt_dispatch_info; +use gameserver::logic::game::hunt::hunt_dispatch_info; use sqlx::SqlitePool; #[put("HuntDispatchInfo")] diff --git a/httpserver/src/routes/game/hunt_dispatch_reward_preview.rs b/httpserver/src/routes/game/hunt/hunt_dispatch_reward_preview.rs similarity index 92% rename from httpserver/src/routes/game/hunt_dispatch_reward_preview.rs rename to httpserver/src/routes/game/hunt/hunt_dispatch_reward_preview.rs index 9414426..63039e1 100644 --- a/httpserver/src/routes/game/hunt_dispatch_reward_preview.rs +++ b/httpserver/src/routes/game/hunt/hunt_dispatch_reward_preview.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::HuntDispatchRewardPreviewRequest; use crypto::network::parse_packet; -use gameserver::logic::game::hunt_dispatch_reward_preview; +use gameserver::logic::game::hunt::hunt_dispatch_reward_preview; use sqlx::SqlitePool; #[put("HuntDispatchRewardPreview")] diff --git a/httpserver/src/routes/game/hunt_dispatch_start.rs b/httpserver/src/routes/game/hunt/hunt_dispatch_start.rs similarity index 92% rename from httpserver/src/routes/game/hunt_dispatch_start.rs rename to httpserver/src/routes/game/hunt/hunt_dispatch_start.rs index d5f4252..ab5e73d 100644 --- a/httpserver/src/routes/game/hunt_dispatch_start.rs +++ b/httpserver/src/routes/game/hunt/hunt_dispatch_start.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::HuntDispatchStartRequest; use crypto::network::parse_packet; -use gameserver::logic::game::hunt_dispatch_start; +use gameserver::logic::game::hunt::hunt_dispatch_start; use sqlx::SqlitePool; #[put("HuntDispatchStart")] diff --git a/httpserver/src/routes/game/hunt/mod.rs b/httpserver/src/routes/game/hunt/mod.rs new file mode 100644 index 0000000..483c4b4 --- /dev/null +++ b/httpserver/src/routes/game/hunt/mod.rs @@ -0,0 +1,5 @@ +pub mod hunt_dispatch; +pub mod hunt_dispatch_end; +pub mod hunt_dispatch_info; +pub mod hunt_dispatch_reward_preview; +pub mod hunt_dispatch_start; diff --git a/httpserver/src/routes/game/hunting_ground_enter.rs b/httpserver/src/routes/game/hunting/hunting_ground_enter.rs similarity index 92% rename from httpserver/src/routes/game/hunting_ground_enter.rs rename to httpserver/src/routes/game/hunting/hunting_ground_enter.rs index 65eace7..92aaa55 100644 --- a/httpserver/src/routes/game/hunting_ground_enter.rs +++ b/httpserver/src/routes/game/hunting/hunting_ground_enter.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::HuntingGroundEnterRequest; use crypto::network::parse_packet; -use gameserver::logic::game::hunting_ground_enter; +use gameserver::logic::game::hunting::hunting_ground_enter; use sqlx::SqlitePool; #[put("HuntingGroundEnter")] diff --git a/httpserver/src/routes/game/hunting_ground_info.rs b/httpserver/src/routes/game/hunting/hunting_ground_info.rs similarity index 92% rename from httpserver/src/routes/game/hunting_ground_info.rs rename to httpserver/src/routes/game/hunting/hunting_ground_info.rs index c348ad6..6e8b7e7 100644 --- a/httpserver/src/routes/game/hunting_ground_info.rs +++ b/httpserver/src/routes/game/hunting/hunting_ground_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::HuntingGroundInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::hunting_ground_info; +use gameserver::logic::game::hunting::hunting_ground_info; use sqlx::SqlitePool; #[put("HuntingGroundInfo")] diff --git a/httpserver/src/routes/game/hunting_ground_info_list.rs b/httpserver/src/routes/game/hunting/hunting_ground_info_list.rs similarity index 92% rename from httpserver/src/routes/game/hunting_ground_info_list.rs rename to httpserver/src/routes/game/hunting/hunting_ground_info_list.rs index 50e9d8b..6ec333f 100644 --- a/httpserver/src/routes/game/hunting_ground_info_list.rs +++ b/httpserver/src/routes/game/hunting/hunting_ground_info_list.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::HuntingGroundInfoListRequest; use crypto::network::parse_packet; -use gameserver::logic::game::hunting_ground_info_list; +use gameserver::logic::game::hunting::hunting_ground_info_list; use sqlx::SqlitePool; #[put("HuntingGroundInfoList")] diff --git a/httpserver/src/routes/game/hunting/mod.rs b/httpserver/src/routes/game/hunting/mod.rs new file mode 100644 index 0000000..40556c9 --- /dev/null +++ b/httpserver/src/routes/game/hunting/mod.rs @@ -0,0 +1,3 @@ +pub mod hunting_ground_enter; +pub mod hunting_ground_info; +pub mod hunting_ground_info_list; diff --git a/httpserver/src/routes/game/id_card_preset_delete.rs b/httpserver/src/routes/game/id/id_card_preset_delete.rs similarity index 92% rename from httpserver/src/routes/game/id_card_preset_delete.rs rename to httpserver/src/routes/game/id/id_card_preset_delete.rs index b2066fe..18a9646 100644 --- a/httpserver/src/routes/game/id_card_preset_delete.rs +++ b/httpserver/src/routes/game/id/id_card_preset_delete.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::IdCardPresetDeleteRequest; use crypto::network::parse_packet; -use gameserver::logic::game::id_card_preset_delete; +use gameserver::logic::game::id::id_card_preset_delete; use sqlx::SqlitePool; #[put("IdCardPresetDelete")] diff --git a/httpserver/src/routes/game/id_card_preset_info.rs b/httpserver/src/routes/game/id/id_card_preset_info.rs similarity index 92% rename from httpserver/src/routes/game/id_card_preset_info.rs rename to httpserver/src/routes/game/id/id_card_preset_info.rs index 413ca58..e8c7a51 100644 --- a/httpserver/src/routes/game/id_card_preset_info.rs +++ b/httpserver/src/routes/game/id/id_card_preset_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::IdCardPresetInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::id_card_preset_info; +use gameserver::logic::game::id::id_card_preset_info; use sqlx::SqlitePool; #[put("IdCardPresetInfo")] diff --git a/httpserver/src/routes/game/id_card_preset_save.rs b/httpserver/src/routes/game/id/id_card_preset_save.rs similarity index 92% rename from httpserver/src/routes/game/id_card_preset_save.rs rename to httpserver/src/routes/game/id/id_card_preset_save.rs index 90952d0..d2aa0d5 100644 --- a/httpserver/src/routes/game/id_card_preset_save.rs +++ b/httpserver/src/routes/game/id/id_card_preset_save.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::IdCardPresetSaveRequest; use crypto::network::parse_packet; -use gameserver::logic::game::id_card_preset_save; +use gameserver::logic::game::id::id_card_preset_save; use sqlx::SqlitePool; #[put("IdCardPresetSave")] diff --git a/httpserver/src/routes/game/id_card_recovery.rs b/httpserver/src/routes/game/id/id_card_recovery.rs similarity index 93% rename from httpserver/src/routes/game/id_card_recovery.rs rename to httpserver/src/routes/game/id/id_card_recovery.rs index 53eefb3..b63daff 100644 --- a/httpserver/src/routes/game/id_card_recovery.rs +++ b/httpserver/src/routes/game/id/id_card_recovery.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::IdCardRecoveryRequest; use crypto::network::parse_packet; -use gameserver::logic::game::id_card_recovery; +use gameserver::logic::game::id::id_card_recovery; use sqlx::SqlitePool; #[put("IdCardRecovery")] diff --git a/httpserver/src/routes/game/id_card_save.rs b/httpserver/src/routes/game/id/id_card_save.rs similarity index 93% rename from httpserver/src/routes/game/id_card_save.rs rename to httpserver/src/routes/game/id/id_card_save.rs index 2d42299..a161bf7 100644 --- a/httpserver/src/routes/game/id_card_save.rs +++ b/httpserver/src/routes/game/id/id_card_save.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::IdCardSaveRequest; use crypto::network::parse_packet; -use gameserver::logic::game::id_card_save; +use gameserver::logic::game::id::id_card_save; use sqlx::SqlitePool; #[put("IdCardSave")] diff --git a/httpserver/src/routes/game/id_card_shop_buy.rs b/httpserver/src/routes/game/id/id_card_shop_buy.rs similarity index 93% rename from httpserver/src/routes/game/id_card_shop_buy.rs rename to httpserver/src/routes/game/id/id_card_shop_buy.rs index 147b98a..4c4c0da 100644 --- a/httpserver/src/routes/game/id_card_shop_buy.rs +++ b/httpserver/src/routes/game/id/id_card_shop_buy.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::IdCardShopBuyRequest; use crypto::network::parse_packet; -use gameserver::logic::game::id_card_shop_buy; +use gameserver::logic::game::id::id_card_shop_buy; use sqlx::SqlitePool; #[put("IdCardShopBuy")] diff --git a/httpserver/src/routes/game/id_card_shop_info.rs b/httpserver/src/routes/game/id/id_card_shop_info.rs similarity index 93% rename from httpserver/src/routes/game/id_card_shop_info.rs rename to httpserver/src/routes/game/id/id_card_shop_info.rs index 4a47e6a..68d92a0 100644 --- a/httpserver/src/routes/game/id_card_shop_info.rs +++ b/httpserver/src/routes/game/id/id_card_shop_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::IdCardShopInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::id_card_shop_info; +use gameserver::logic::game::id::id_card_shop_info; use sqlx::SqlitePool; #[put("IdCardShopInfo")] diff --git a/httpserver/src/routes/game/id/mod.rs b/httpserver/src/routes/game/id/mod.rs new file mode 100644 index 0000000..e04f865 --- /dev/null +++ b/httpserver/src/routes/game/id/mod.rs @@ -0,0 +1,7 @@ +pub mod id_card_preset_delete; +pub mod id_card_preset_info; +pub mod id_card_preset_save; +pub mod id_card_recovery; +pub mod id_card_save; +pub mod id_card_shop_buy; +pub mod id_card_shop_info; diff --git a/httpserver/src/routes/game/inn_open.rs b/httpserver/src/routes/game/inn/inn_open.rs similarity index 93% rename from httpserver/src/routes/game/inn_open.rs rename to httpserver/src/routes/game/inn/inn_open.rs index 1f61fe0..ff67b6e 100644 --- a/httpserver/src/routes/game/inn_open.rs +++ b/httpserver/src/routes/game/inn/inn_open.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::InnOpenRequest; use crypto::network::parse_packet; -use gameserver::logic::game::inn_open; +use gameserver::logic::game::inn::inn_open; use sqlx::SqlitePool; #[put("InnOpen")] diff --git a/httpserver/src/routes/game/inn/mod.rs b/httpserver/src/routes/game/inn/mod.rs new file mode 100644 index 0000000..e449d78 --- /dev/null +++ b/httpserver/src/routes/game/inn/mod.rs @@ -0,0 +1 @@ +pub mod inn_open; diff --git a/httpserver/src/routes/game/interaction_trigger.rs b/httpserver/src/routes/game/interaction/interaction_trigger.rs similarity index 92% rename from httpserver/src/routes/game/interaction_trigger.rs rename to httpserver/src/routes/game/interaction/interaction_trigger.rs index 6ed24fc..a5c5ca9 100644 --- a/httpserver/src/routes/game/interaction_trigger.rs +++ b/httpserver/src/routes/game/interaction/interaction_trigger.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::InteractionTriggerRequest; use crypto::network::parse_packet; -use gameserver::logic::game::interaction_trigger; +use gameserver::logic::game::interaction::interaction_trigger; use sqlx::SqlitePool; #[put("InteractionTrigger")] diff --git a/httpserver/src/routes/game/interaction/mod.rs b/httpserver/src/routes/game/interaction/mod.rs new file mode 100644 index 0000000..e357548 --- /dev/null +++ b/httpserver/src/routes/game/interaction/mod.rs @@ -0,0 +1 @@ +pub mod interaction_trigger; diff --git a/httpserver/src/routes/game/inven_add_slot.rs b/httpserver/src/routes/game/inven/inven_add_slot.rs similarity index 92% rename from httpserver/src/routes/game/inven_add_slot.rs rename to httpserver/src/routes/game/inven/inven_add_slot.rs index 21eb4a3..ef28a85 100644 --- a/httpserver/src/routes/game/inven_add_slot.rs +++ b/httpserver/src/routes/game/inven/inven_add_slot.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::InvenAddSlotRequest; use crypto::network::parse_packet; -use gameserver::logic::game::inven_add_slot; +use gameserver::logic::game::inven::inven_add_slot; use sqlx::SqlitePool; #[put("InvenAddSlot")] diff --git a/httpserver/src/routes/game/inven/mod.rs b/httpserver/src/routes/game/inven/mod.rs new file mode 100644 index 0000000..474f05d --- /dev/null +++ b/httpserver/src/routes/game/inven/mod.rs @@ -0,0 +1 @@ +pub mod inven_add_slot; diff --git a/httpserver/src/routes/game/item_dump.rs b/httpserver/src/routes/game/item/item_dump.rs similarity index 93% rename from httpserver/src/routes/game/item_dump.rs rename to httpserver/src/routes/game/item/item_dump.rs index dcbe9cb..6092dd9 100644 --- a/httpserver/src/routes/game/item_dump.rs +++ b/httpserver/src/routes/game/item/item_dump.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::ItemDumpRequest; use crypto::network::parse_packet; -use gameserver::logic::game::item_dump; +use gameserver::logic::game::item::item_dump; use sqlx::SqlitePool; #[put("ItemDump")] diff --git a/httpserver/src/routes/game/item_info.rs b/httpserver/src/routes/game/item/item_info.rs similarity index 93% rename from httpserver/src/routes/game/item_info.rs rename to httpserver/src/routes/game/item/item_info.rs index 38641fa..bbdc04a 100644 --- a/httpserver/src/routes/game/item_info.rs +++ b/httpserver/src/routes/game/item/item_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::ItemInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::item_info; +use gameserver::logic::game::item::item_info; use sqlx::SqlitePool; #[put("ItemInfo")] diff --git a/httpserver/src/routes/game/item_storage_info.rs b/httpserver/src/routes/game/item/item_storage_info.rs similarity index 92% rename from httpserver/src/routes/game/item_storage_info.rs rename to httpserver/src/routes/game/item/item_storage_info.rs index 44c22fc..c3f130e 100644 --- a/httpserver/src/routes/game/item_storage_info.rs +++ b/httpserver/src/routes/game/item/item_storage_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::ItemStorageInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::item_storage_info; +use gameserver::logic::game::item::item_storage_info; use sqlx::SqlitePool; #[put("ItemStorageInfo")] diff --git a/httpserver/src/routes/game/item_storage_out.rs b/httpserver/src/routes/game/item/item_storage_out.rs similarity index 92% rename from httpserver/src/routes/game/item_storage_out.rs rename to httpserver/src/routes/game/item/item_storage_out.rs index 16f0dab..aa5901d 100644 --- a/httpserver/src/routes/game/item_storage_out.rs +++ b/httpserver/src/routes/game/item/item_storage_out.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::ItemStorageOutRequest; use crypto::network::parse_packet; -use gameserver::logic::game::item_storage_out; +use gameserver::logic::game::item::item_storage_out; use sqlx::SqlitePool; #[put("ItemStorageOut")] diff --git a/httpserver/src/routes/game/item_storage_put.rs b/httpserver/src/routes/game/item/item_storage_put.rs similarity index 92% rename from httpserver/src/routes/game/item_storage_put.rs rename to httpserver/src/routes/game/item/item_storage_put.rs index fc80d75..9e7722e 100644 --- a/httpserver/src/routes/game/item_storage_put.rs +++ b/httpserver/src/routes/game/item/item_storage_put.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::ItemStoragePutRequest; use crypto::network::parse_packet; -use gameserver::logic::game::item_storage_put; +use gameserver::logic::game::item::item_storage_put; use sqlx::SqlitePool; #[put("ItemStoragePut")] diff --git a/httpserver/src/routes/game/item_storage_update.rs b/httpserver/src/routes/game/item/item_storage_update.rs similarity index 92% rename from httpserver/src/routes/game/item_storage_update.rs rename to httpserver/src/routes/game/item/item_storage_update.rs index f3f85f5..a2ebc30 100644 --- a/httpserver/src/routes/game/item_storage_update.rs +++ b/httpserver/src/routes/game/item/item_storage_update.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::ItemStorageUpdateRequest; use crypto::network::parse_packet; -use gameserver::logic::game::item_storage_update; +use gameserver::logic::game::item::item_storage_update; use sqlx::SqlitePool; #[put("ItemStorageUpdate")] diff --git a/httpserver/src/routes/game/item/mod.rs b/httpserver/src/routes/game/item/mod.rs new file mode 100644 index 0000000..39f6170 --- /dev/null +++ b/httpserver/src/routes/game/item/mod.rs @@ -0,0 +1,6 @@ +pub mod item_dump; +pub mod item_info; +pub mod item_storage_info; +pub mod item_storage_out; +pub mod item_storage_put; +pub mod item_storage_update; diff --git a/httpserver/src/routes/game/join_user.rs b/httpserver/src/routes/game/join/join_user.rs similarity index 93% rename from httpserver/src/routes/game/join_user.rs rename to httpserver/src/routes/game/join/join_user.rs index 052410f..7dab381 100644 --- a/httpserver/src/routes/game/join_user.rs +++ b/httpserver/src/routes/game/join/join_user.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::JoinUserRequest; use crypto::network::parse_packet; -use gameserver::logic::game::join_user; +use gameserver::logic::game::join::join_user; use sqlx::SqlitePool; #[put("JoinUser")] diff --git a/httpserver/src/routes/game/join/mod.rs b/httpserver/src/routes/game/join/mod.rs new file mode 100644 index 0000000..bb42fcf --- /dev/null +++ b/httpserver/src/routes/game/join/mod.rs @@ -0,0 +1 @@ +pub mod join_user; diff --git a/httpserver/src/routes/game/jp_user.rs b/httpserver/src/routes/game/jp/jp_user.rs similarity index 93% rename from httpserver/src/routes/game/jp_user.rs rename to httpserver/src/routes/game/jp/jp_user.rs index dce78af..7a56cdc 100644 --- a/httpserver/src/routes/game/jp_user.rs +++ b/httpserver/src/routes/game/jp/jp_user.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::JpUserRequest; use crypto::network::parse_packet; -use gameserver::logic::game::jp_user; +use gameserver::logic::game::jp::jp_user; use sqlx::SqlitePool; #[put("JpUser")] diff --git a/httpserver/src/routes/game/jp_user_info.rs b/httpserver/src/routes/game/jp/jp_user_info.rs similarity index 93% rename from httpserver/src/routes/game/jp_user_info.rs rename to httpserver/src/routes/game/jp/jp_user_info.rs index 32a146f..ee6d66b 100644 --- a/httpserver/src/routes/game/jp_user_info.rs +++ b/httpserver/src/routes/game/jp/jp_user_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::JpUserInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::jp_user_info; +use gameserver::logic::game::jp::jp_user_info; use sqlx::SqlitePool; #[put("JpUserInfo")] diff --git a/httpserver/src/routes/game/jp/mod.rs b/httpserver/src/routes/game/jp/mod.rs new file mode 100644 index 0000000..a2ce17f --- /dev/null +++ b/httpserver/src/routes/game/jp/mod.rs @@ -0,0 +1,2 @@ +pub mod jp_user; +pub mod jp_user_info; diff --git a/httpserver/src/routes/game/leave_user.rs b/httpserver/src/routes/game/leave/leave_user.rs similarity index 93% rename from httpserver/src/routes/game/leave_user.rs rename to httpserver/src/routes/game/leave/leave_user.rs index 37ffb44..4f8f7d0 100644 --- a/httpserver/src/routes/game/leave_user.rs +++ b/httpserver/src/routes/game/leave/leave_user.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::LeaveUserRequest; use crypto::network::parse_packet; -use gameserver::logic::game::leave_user; +use gameserver::logic::game::leave::leave_user; use sqlx::SqlitePool; #[put("LeaveUser")] diff --git a/httpserver/src/routes/game/leave/mod.rs b/httpserver/src/routes/game/leave/mod.rs new file mode 100644 index 0000000..c22be00 --- /dev/null +++ b/httpserver/src/routes/game/leave/mod.rs @@ -0,0 +1 @@ +pub mod leave_user; diff --git a/httpserver/src/routes/game/like_user.rs b/httpserver/src/routes/game/like/like_user.rs similarity index 93% rename from httpserver/src/routes/game/like_user.rs rename to httpserver/src/routes/game/like/like_user.rs index 1b677db..de4a73e 100644 --- a/httpserver/src/routes/game/like_user.rs +++ b/httpserver/src/routes/game/like/like_user.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::LikeUserRequest; use crypto::network::parse_packet; -use gameserver::logic::game::like_user; +use gameserver::logic::game::like::like_user; use sqlx::SqlitePool; #[put("LikeUser")] diff --git a/httpserver/src/routes/game/like/mod.rs b/httpserver/src/routes/game/like/mod.rs new file mode 100644 index 0000000..60ffb6c --- /dev/null +++ b/httpserver/src/routes/game/like/mod.rs @@ -0,0 +1 @@ +pub mod like_user; diff --git a/httpserver/src/routes/game/login_event.rs b/httpserver/src/routes/game/login/login_event.rs similarity index 93% rename from httpserver/src/routes/game/login_event.rs rename to httpserver/src/routes/game/login/login_event.rs index 34d9837..dd3b2ef 100644 --- a/httpserver/src/routes/game/login_event.rs +++ b/httpserver/src/routes/game/login/login_event.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::LoginEventRequest; use crypto::network::parse_packet; -use gameserver::logic::game::login_event; +use gameserver::logic::game::login::login_event; use sqlx::SqlitePool; #[put("LoginEvent")] diff --git a/httpserver/src/routes/game/login_user.rs b/httpserver/src/routes/game/login/login_user.rs similarity index 93% rename from httpserver/src/routes/game/login_user.rs rename to httpserver/src/routes/game/login/login_user.rs index d9e74ae..6dbb088 100644 --- a/httpserver/src/routes/game/login_user.rs +++ b/httpserver/src/routes/game/login/login_user.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::LoginUserRequest; use crypto::network::parse_packet; -use gameserver::logic::game::login_user; +use gameserver::logic::game::login::login_user; use sqlx::SqlitePool; #[put("LoginUser")] diff --git a/httpserver/src/routes/game/login/mod.rs b/httpserver/src/routes/game/login/mod.rs new file mode 100644 index 0000000..43cc70a --- /dev/null +++ b/httpserver/src/routes/game/login/mod.rs @@ -0,0 +1,2 @@ +pub mod login_event; +pub mod login_user; diff --git a/httpserver/src/routes/game/logout_user.rs b/httpserver/src/routes/game/logout/logout_user.rs similarity index 92% rename from httpserver/src/routes/game/logout_user.rs rename to httpserver/src/routes/game/logout/logout_user.rs index 3edbff1..0377765 100644 --- a/httpserver/src/routes/game/logout_user.rs +++ b/httpserver/src/routes/game/logout/logout_user.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::LogoutUserRequest; use crypto::network::parse_packet; -use gameserver::logic::game::logout_user; +use gameserver::logic::game::logout::logout_user; use sqlx::SqlitePool; #[put("LogoutUser")] diff --git a/httpserver/src/routes/game/logout/mod.rs b/httpserver/src/routes/game/logout/mod.rs new file mode 100644 index 0000000..12ac54e --- /dev/null +++ b/httpserver/src/routes/game/logout/mod.rs @@ -0,0 +1 @@ +pub mod logout_user; diff --git a/httpserver/src/routes/game/mail_history_info.rs b/httpserver/src/routes/game/mail/mail_history_info.rs similarity index 92% rename from httpserver/src/routes/game/mail_history_info.rs rename to httpserver/src/routes/game/mail/mail_history_info.rs index ddbe2c4..5ddab92 100644 --- a/httpserver/src/routes/game/mail_history_info.rs +++ b/httpserver/src/routes/game/mail/mail_history_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MailHistoryInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::mail_history_info; +use gameserver::logic::game::mail::mail_history_info; use sqlx::SqlitePool; #[put("MailHistoryInfo")] diff --git a/httpserver/src/routes/game/mail_info.rs b/httpserver/src/routes/game/mail/mail_info.rs similarity index 93% rename from httpserver/src/routes/game/mail_info.rs rename to httpserver/src/routes/game/mail/mail_info.rs index e442a5d..8810857 100644 --- a/httpserver/src/routes/game/mail_info.rs +++ b/httpserver/src/routes/game/mail/mail_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MailInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::mail_info; +use gameserver::logic::game::mail::mail_info; use sqlx::SqlitePool; #[put("MailInfo")] diff --git a/httpserver/src/routes/game/mail_open.rs b/httpserver/src/routes/game/mail/mail_open.rs similarity index 93% rename from httpserver/src/routes/game/mail_open.rs rename to httpserver/src/routes/game/mail/mail_open.rs index 1c63088..f1de90d 100644 --- a/httpserver/src/routes/game/mail_open.rs +++ b/httpserver/src/routes/game/mail/mail_open.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MailOpenRequest; use crypto::network::parse_packet; -use gameserver::logic::game::mail_open; +use gameserver::logic::game::mail::mail_open; use sqlx::SqlitePool; #[put("MailOpen")] diff --git a/httpserver/src/routes/game/mail/mod.rs b/httpserver/src/routes/game/mail/mod.rs new file mode 100644 index 0000000..a055dc2 --- /dev/null +++ b/httpserver/src/routes/game/mail/mod.rs @@ -0,0 +1,3 @@ +pub mod mail_history_info; +pub mod mail_info; +pub mod mail_open; diff --git a/httpserver/src/routes/game/maintenance_info.rs b/httpserver/src/routes/game/maintenance/maintenance_info.rs similarity index 92% rename from httpserver/src/routes/game/maintenance_info.rs rename to httpserver/src/routes/game/maintenance/maintenance_info.rs index 5e50b4b..aee79f9 100644 --- a/httpserver/src/routes/game/maintenance_info.rs +++ b/httpserver/src/routes/game/maintenance/maintenance_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MaintenanceInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::maintenance_info; +use gameserver::logic::game::maintenance::maintenance_info; use sqlx::SqlitePool; #[put("MaintenanceInfo")] diff --git a/httpserver/src/routes/game/maintenance/mod.rs b/httpserver/src/routes/game/maintenance/mod.rs new file mode 100644 index 0000000..30a83fb --- /dev/null +++ b/httpserver/src/routes/game/maintenance/mod.rs @@ -0,0 +1 @@ +pub mod maintenance_info; diff --git a/httpserver/src/routes/game/mercenary_scout.rs b/httpserver/src/routes/game/mercenary/mercenary_scout.rs similarity index 92% rename from httpserver/src/routes/game/mercenary_scout.rs rename to httpserver/src/routes/game/mercenary/mercenary_scout.rs index e4bab23..9373f1e 100644 --- a/httpserver/src/routes/game/mercenary_scout.rs +++ b/httpserver/src/routes/game/mercenary/mercenary_scout.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MercenaryScoutRequest; use crypto::network::parse_packet; -use gameserver::logic::game::mercenary_scout; +use gameserver::logic::game::mercenary::mercenary_scout; use sqlx::SqlitePool; #[put("MercenaryScout")] diff --git a/httpserver/src/routes/game/mercenary/mod.rs b/httpserver/src/routes/game/mercenary/mod.rs new file mode 100644 index 0000000..d2ce762 --- /dev/null +++ b/httpserver/src/routes/game/mercenary/mod.rs @@ -0,0 +1 @@ +pub mod mercenary_scout; diff --git a/httpserver/src/routes/game/mini_game_action_end.rs b/httpserver/src/routes/game/mini/mini_game_action_end.rs similarity index 92% rename from httpserver/src/routes/game/mini_game_action_end.rs rename to httpserver/src/routes/game/mini/mini_game_action_end.rs index 21d3c71..65cc972 100644 --- a/httpserver/src/routes/game/mini_game_action_end.rs +++ b/httpserver/src/routes/game/mini/mini_game_action_end.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MiniGameActionEndRequest; use crypto::network::parse_packet; -use gameserver::logic::game::mini_game_action_end; +use gameserver::logic::game::mini::mini_game_action_end; use sqlx::SqlitePool; #[put("MiniGameActionEnd")] diff --git a/httpserver/src/routes/game/mini_game_action_info.rs b/httpserver/src/routes/game/mini/mini_game_action_info.rs similarity index 92% rename from httpserver/src/routes/game/mini_game_action_info.rs rename to httpserver/src/routes/game/mini/mini_game_action_info.rs index c80e947..6164bd3 100644 --- a/httpserver/src/routes/game/mini_game_action_info.rs +++ b/httpserver/src/routes/game/mini/mini_game_action_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MiniGameActionInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::mini_game_action_info; +use gameserver::logic::game::mini::mini_game_action_info; use sqlx::SqlitePool; #[put("MiniGameActionInfo")] diff --git a/httpserver/src/routes/game/mini_game_action_ranking.rs b/httpserver/src/routes/game/mini/mini_game_action_ranking.rs similarity index 92% rename from httpserver/src/routes/game/mini_game_action_ranking.rs rename to httpserver/src/routes/game/mini/mini_game_action_ranking.rs index 39cae6e..703c134 100644 --- a/httpserver/src/routes/game/mini_game_action_ranking.rs +++ b/httpserver/src/routes/game/mini/mini_game_action_ranking.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MiniGameActionRankingRequest; use crypto::network::parse_packet; -use gameserver::logic::game::mini_game_action_ranking; +use gameserver::logic::game::mini::mini_game_action_ranking; use sqlx::SqlitePool; #[put("MiniGameActionRanking")] diff --git a/httpserver/src/routes/game/mini_game_action_start.rs b/httpserver/src/routes/game/mini/mini_game_action_start.rs similarity index 92% rename from httpserver/src/routes/game/mini_game_action_start.rs rename to httpserver/src/routes/game/mini/mini_game_action_start.rs index bb4a785..e941381 100644 --- a/httpserver/src/routes/game/mini_game_action_start.rs +++ b/httpserver/src/routes/game/mini/mini_game_action_start.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MiniGameActionStartRequest; use crypto::network::parse_packet; -use gameserver::logic::game::mini_game_action_start; +use gameserver::logic::game::mini::mini_game_action_start; use sqlx::SqlitePool; #[put("MiniGameActionStart")] diff --git a/httpserver/src/routes/game/mini_game_bingo_info.rs b/httpserver/src/routes/game/mini/mini_game_bingo_info.rs similarity index 92% rename from httpserver/src/routes/game/mini_game_bingo_info.rs rename to httpserver/src/routes/game/mini/mini_game_bingo_info.rs index ccc33b5..6ad5409 100644 --- a/httpserver/src/routes/game/mini_game_bingo_info.rs +++ b/httpserver/src/routes/game/mini/mini_game_bingo_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MiniGameBingoInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::mini_game_bingo_info; +use gameserver::logic::game::mini::mini_game_bingo_info; use sqlx::SqlitePool; #[put("MiniGameBingoInfo")] diff --git a/httpserver/src/routes/game/mini_game_bingo_play.rs b/httpserver/src/routes/game/mini/mini_game_bingo_play.rs similarity index 92% rename from httpserver/src/routes/game/mini_game_bingo_play.rs rename to httpserver/src/routes/game/mini/mini_game_bingo_play.rs index 6497e3b..f2d4144 100644 --- a/httpserver/src/routes/game/mini_game_bingo_play.rs +++ b/httpserver/src/routes/game/mini/mini_game_bingo_play.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MiniGameBingoPlayRequest; use crypto::network::parse_packet; -use gameserver::logic::game::mini_game_bingo_play; +use gameserver::logic::game::mini::mini_game_bingo_play; use sqlx::SqlitePool; #[put("MiniGameBingoPlay")] diff --git a/httpserver/src/routes/game/mini_game_board_info.rs b/httpserver/src/routes/game/mini/mini_game_board_info.rs similarity index 92% rename from httpserver/src/routes/game/mini_game_board_info.rs rename to httpserver/src/routes/game/mini/mini_game_board_info.rs index 4635cbe..683c962 100644 --- a/httpserver/src/routes/game/mini_game_board_info.rs +++ b/httpserver/src/routes/game/mini/mini_game_board_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MiniGameBoardInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::mini_game_board_info; +use gameserver::logic::game::mini::mini_game_board_info; use sqlx::SqlitePool; #[put("MiniGameBoardInfo")] diff --git a/httpserver/src/routes/game/mini_game_board_play.rs b/httpserver/src/routes/game/mini/mini_game_board_play.rs similarity index 92% rename from httpserver/src/routes/game/mini_game_board_play.rs rename to httpserver/src/routes/game/mini/mini_game_board_play.rs index c21e632..307f915 100644 --- a/httpserver/src/routes/game/mini_game_board_play.rs +++ b/httpserver/src/routes/game/mini/mini_game_board_play.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MiniGameBoardPlayRequest; use crypto::network::parse_packet; -use gameserver::logic::game::mini_game_board_play; +use gameserver::logic::game::mini::mini_game_board_play; use sqlx::SqlitePool; #[put("MiniGameBoardPlay")] diff --git a/httpserver/src/routes/game/mini_game_defense_end.rs b/httpserver/src/routes/game/mini/mini_game_defense_end.rs similarity index 92% rename from httpserver/src/routes/game/mini_game_defense_end.rs rename to httpserver/src/routes/game/mini/mini_game_defense_end.rs index 0b58aa5..d581b5f 100644 --- a/httpserver/src/routes/game/mini_game_defense_end.rs +++ b/httpserver/src/routes/game/mini/mini_game_defense_end.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MiniGameDefenseEndRequest; use crypto::network::parse_packet; -use gameserver::logic::game::mini_game_defense_end; +use gameserver::logic::game::mini::mini_game_defense_end; use sqlx::SqlitePool; #[put("MiniGameDefenseEnd")] diff --git a/httpserver/src/routes/game/mini_game_defense_info.rs b/httpserver/src/routes/game/mini/mini_game_defense_info.rs similarity index 92% rename from httpserver/src/routes/game/mini_game_defense_info.rs rename to httpserver/src/routes/game/mini/mini_game_defense_info.rs index 6e9205a..228a9f0 100644 --- a/httpserver/src/routes/game/mini_game_defense_info.rs +++ b/httpserver/src/routes/game/mini/mini_game_defense_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MiniGameDefenseInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::mini_game_defense_info; +use gameserver::logic::game::mini::mini_game_defense_info; use sqlx::SqlitePool; #[put("MiniGameDefenseInfo")] diff --git a/httpserver/src/routes/game/mini_game_defense_matching.rs b/httpserver/src/routes/game/mini/mini_game_defense_matching.rs similarity index 92% rename from httpserver/src/routes/game/mini_game_defense_matching.rs rename to httpserver/src/routes/game/mini/mini_game_defense_matching.rs index 6d35c7e..aeab1ca 100644 --- a/httpserver/src/routes/game/mini_game_defense_matching.rs +++ b/httpserver/src/routes/game/mini/mini_game_defense_matching.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MiniGameDefenseMatchingRequest; use crypto::network::parse_packet; -use gameserver::logic::game::mini_game_defense_matching; +use gameserver::logic::game::mini::mini_game_defense_matching; use sqlx::SqlitePool; #[put("MiniGameDefenseMatching")] diff --git a/httpserver/src/routes/game/mini_game_defense_start.rs b/httpserver/src/routes/game/mini/mini_game_defense_start.rs similarity index 92% rename from httpserver/src/routes/game/mini_game_defense_start.rs rename to httpserver/src/routes/game/mini/mini_game_defense_start.rs index acf3a99..0155696 100644 --- a/httpserver/src/routes/game/mini_game_defense_start.rs +++ b/httpserver/src/routes/game/mini/mini_game_defense_start.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MiniGameDefenseStartRequest; use crypto::network::parse_packet; -use gameserver::logic::game::mini_game_defense_start; +use gameserver::logic::game::mini::mini_game_defense_start; use sqlx::SqlitePool; #[put("MiniGameDefenseStart")] diff --git a/httpserver/src/routes/game/mini_game_field_end.rs b/httpserver/src/routes/game/mini/mini_game_field_end.rs similarity index 92% rename from httpserver/src/routes/game/mini_game_field_end.rs rename to httpserver/src/routes/game/mini/mini_game_field_end.rs index ce9559c..e27ba26 100644 --- a/httpserver/src/routes/game/mini_game_field_end.rs +++ b/httpserver/src/routes/game/mini/mini_game_field_end.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MiniGameFieldEndRequest; use crypto::network::parse_packet; -use gameserver::logic::game::mini_game_field_end; +use gameserver::logic::game::mini::mini_game_field_end; use sqlx::SqlitePool; #[put("MiniGameFieldEnd")] diff --git a/httpserver/src/routes/game/mini_game_field_info.rs b/httpserver/src/routes/game/mini/mini_game_field_info.rs similarity index 92% rename from httpserver/src/routes/game/mini_game_field_info.rs rename to httpserver/src/routes/game/mini/mini_game_field_info.rs index 20f5598..7e34eb4 100644 --- a/httpserver/src/routes/game/mini_game_field_info.rs +++ b/httpserver/src/routes/game/mini/mini_game_field_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MiniGameFieldInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::mini_game_field_info; +use gameserver::logic::game::mini::mini_game_field_info; use sqlx::SqlitePool; #[put("MiniGameFieldInfo")] diff --git a/httpserver/src/routes/game/mini_game_field_quick_reward.rs b/httpserver/src/routes/game/mini/mini_game_field_quick_reward.rs similarity index 92% rename from httpserver/src/routes/game/mini_game_field_quick_reward.rs rename to httpserver/src/routes/game/mini/mini_game_field_quick_reward.rs index f39a86d..40651f8 100644 --- a/httpserver/src/routes/game/mini_game_field_quick_reward.rs +++ b/httpserver/src/routes/game/mini/mini_game_field_quick_reward.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MiniGameFieldQuickRewardRequest; use crypto::network::parse_packet; -use gameserver::logic::game::mini_game_field_quick_reward; +use gameserver::logic::game::mini::mini_game_field_quick_reward; use sqlx::SqlitePool; #[put("MiniGameFieldQuickReward")] diff --git a/httpserver/src/routes/game/mini_game_field_reward.rs b/httpserver/src/routes/game/mini/mini_game_field_reward.rs similarity index 92% rename from httpserver/src/routes/game/mini_game_field_reward.rs rename to httpserver/src/routes/game/mini/mini_game_field_reward.rs index ff99502..dd7391b 100644 --- a/httpserver/src/routes/game/mini_game_field_reward.rs +++ b/httpserver/src/routes/game/mini/mini_game_field_reward.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MiniGameFieldRewardRequest; use crypto::network::parse_packet; -use gameserver::logic::game::mini_game_field_reward; +use gameserver::logic::game::mini::mini_game_field_reward; use sqlx::SqlitePool; #[put("MiniGameFieldReward")] diff --git a/httpserver/src/routes/game/mini_game_field_score.rs b/httpserver/src/routes/game/mini/mini_game_field_score.rs similarity index 92% rename from httpserver/src/routes/game/mini_game_field_score.rs rename to httpserver/src/routes/game/mini/mini_game_field_score.rs index 4a2fb18..f8ce424 100644 --- a/httpserver/src/routes/game/mini_game_field_score.rs +++ b/httpserver/src/routes/game/mini/mini_game_field_score.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MiniGameFieldScoreRequest; use crypto::network::parse_packet; -use gameserver::logic::game::mini_game_field_score; +use gameserver::logic::game::mini::mini_game_field_score; use sqlx::SqlitePool; #[put("MiniGameFieldScore")] diff --git a/httpserver/src/routes/game/mini_game_field_start.rs b/httpserver/src/routes/game/mini/mini_game_field_start.rs similarity index 92% rename from httpserver/src/routes/game/mini_game_field_start.rs rename to httpserver/src/routes/game/mini/mini_game_field_start.rs index 7c355e6..639aa6a 100644 --- a/httpserver/src/routes/game/mini_game_field_start.rs +++ b/httpserver/src/routes/game/mini/mini_game_field_start.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MiniGameFieldStartRequest; use crypto::network::parse_packet; -use gameserver::logic::game::mini_game_field_start; +use gameserver::logic::game::mini::mini_game_field_start; use sqlx::SqlitePool; #[put("MiniGameFieldStart")] diff --git a/httpserver/src/routes/game/mini_game_hub_info.rs b/httpserver/src/routes/game/mini/mini_game_hub_info.rs similarity index 92% rename from httpserver/src/routes/game/mini_game_hub_info.rs rename to httpserver/src/routes/game/mini/mini_game_hub_info.rs index e05135a..148ec72 100644 --- a/httpserver/src/routes/game/mini_game_hub_info.rs +++ b/httpserver/src/routes/game/mini/mini_game_hub_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MiniGameHubInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::mini_game_hub_info; +use gameserver::logic::game::mini::mini_game_hub_info; use sqlx::SqlitePool; #[put("MiniGameHubInfo")] diff --git a/httpserver/src/routes/game/mini_game_relay_server_info.rs b/httpserver/src/routes/game/mini/mini_game_relay_server_info.rs similarity index 92% rename from httpserver/src/routes/game/mini_game_relay_server_info.rs rename to httpserver/src/routes/game/mini/mini_game_relay_server_info.rs index 35bc2b0..cdec6da 100644 --- a/httpserver/src/routes/game/mini_game_relay_server_info.rs +++ b/httpserver/src/routes/game/mini/mini_game_relay_server_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MiniGameRelayServerInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::mini_game_relay_server_info; +use gameserver::logic::game::mini::mini_game_relay_server_info; use sqlx::SqlitePool; #[put("MiniGameRelayServerInfo")] diff --git a/httpserver/src/routes/game/mini_game_rhythm_info.rs b/httpserver/src/routes/game/mini/mini_game_rhythm_info.rs similarity index 92% rename from httpserver/src/routes/game/mini_game_rhythm_info.rs rename to httpserver/src/routes/game/mini/mini_game_rhythm_info.rs index 10223ba..7cf1bf9 100644 --- a/httpserver/src/routes/game/mini_game_rhythm_info.rs +++ b/httpserver/src/routes/game/mini/mini_game_rhythm_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MiniGameRhythmInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::mini_game_rhythm_info; +use gameserver::logic::game::mini::mini_game_rhythm_info; use sqlx::SqlitePool; #[put("MiniGameRhythmInfo")] diff --git a/httpserver/src/routes/game/mini_game_rhythm_play_end.rs b/httpserver/src/routes/game/mini/mini_game_rhythm_play_end.rs similarity index 92% rename from httpserver/src/routes/game/mini_game_rhythm_play_end.rs rename to httpserver/src/routes/game/mini/mini_game_rhythm_play_end.rs index d29ab5b..b11fa85 100644 --- a/httpserver/src/routes/game/mini_game_rhythm_play_end.rs +++ b/httpserver/src/routes/game/mini/mini_game_rhythm_play_end.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MiniGameRhythmPlayEndRequest; use crypto::network::parse_packet; -use gameserver::logic::game::mini_game_rhythm_play_end; +use gameserver::logic::game::mini::mini_game_rhythm_play_end; use sqlx::SqlitePool; #[put("MiniGameRhythmPlayEnd")] diff --git a/httpserver/src/routes/game/mini_game_rhythm_play_start.rs b/httpserver/src/routes/game/mini/mini_game_rhythm_play_start.rs similarity index 92% rename from httpserver/src/routes/game/mini_game_rhythm_play_start.rs rename to httpserver/src/routes/game/mini/mini_game_rhythm_play_start.rs index c1737a4..afea4e1 100644 --- a/httpserver/src/routes/game/mini_game_rhythm_play_start.rs +++ b/httpserver/src/routes/game/mini/mini_game_rhythm_play_start.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MiniGameRhythmPlayStartRequest; use crypto::network::parse_packet; -use gameserver::logic::game::mini_game_rhythm_play_start; +use gameserver::logic::game::mini::mini_game_rhythm_play_start; use sqlx::SqlitePool; #[put("MiniGameRhythmPlayStart")] diff --git a/httpserver/src/routes/game/mini_game_rhythm_ranking.rs b/httpserver/src/routes/game/mini/mini_game_rhythm_ranking.rs similarity index 92% rename from httpserver/src/routes/game/mini_game_rhythm_ranking.rs rename to httpserver/src/routes/game/mini/mini_game_rhythm_ranking.rs index cb69c88..69116c4 100644 --- a/httpserver/src/routes/game/mini_game_rhythm_ranking.rs +++ b/httpserver/src/routes/game/mini/mini_game_rhythm_ranking.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MiniGameRhythmRankingRequest; use crypto::network::parse_packet; -use gameserver::logic::game::mini_game_rhythm_ranking; +use gameserver::logic::game::mini::mini_game_rhythm_ranking; use sqlx::SqlitePool; #[put("MiniGameRhythmRanking")] diff --git a/httpserver/src/routes/game/mini_game_roulette_draw.rs b/httpserver/src/routes/game/mini/mini_game_roulette_draw.rs similarity index 92% rename from httpserver/src/routes/game/mini_game_roulette_draw.rs rename to httpserver/src/routes/game/mini/mini_game_roulette_draw.rs index 8902193..470b87b 100644 --- a/httpserver/src/routes/game/mini_game_roulette_draw.rs +++ b/httpserver/src/routes/game/mini/mini_game_roulette_draw.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MiniGameRouletteDrawRequest; use crypto::network::parse_packet; -use gameserver::logic::game::mini_game_roulette_draw; +use gameserver::logic::game::mini::mini_game_roulette_draw; use sqlx::SqlitePool; #[put("MiniGameRouletteDraw")] diff --git a/httpserver/src/routes/game/mini_game_roulette_info.rs b/httpserver/src/routes/game/mini/mini_game_roulette_info.rs similarity index 92% rename from httpserver/src/routes/game/mini_game_roulette_info.rs rename to httpserver/src/routes/game/mini/mini_game_roulette_info.rs index 9d4005f..7c16e3d 100644 --- a/httpserver/src/routes/game/mini_game_roulette_info.rs +++ b/httpserver/src/routes/game/mini/mini_game_roulette_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MiniGameRouletteInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::mini_game_roulette_info; +use gameserver::logic::game::mini::mini_game_roulette_info; use sqlx::SqlitePool; #[put("MiniGameRouletteInfo")] diff --git a/httpserver/src/routes/game/mini_game_run_end.rs b/httpserver/src/routes/game/mini/mini_game_run_end.rs similarity index 92% rename from httpserver/src/routes/game/mini_game_run_end.rs rename to httpserver/src/routes/game/mini/mini_game_run_end.rs index 327a285..51fa11d 100644 --- a/httpserver/src/routes/game/mini_game_run_end.rs +++ b/httpserver/src/routes/game/mini/mini_game_run_end.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MiniGameRunEndRequest; use crypto::network::parse_packet; -use gameserver::logic::game::mini_game_run_end; +use gameserver::logic::game::mini::mini_game_run_end; use sqlx::SqlitePool; #[put("MiniGameRunEnd")] diff --git a/httpserver/src/routes/game/mini_game_run_info.rs b/httpserver/src/routes/game/mini/mini_game_run_info.rs similarity index 92% rename from httpserver/src/routes/game/mini_game_run_info.rs rename to httpserver/src/routes/game/mini/mini_game_run_info.rs index c221868..8d78c0e 100644 --- a/httpserver/src/routes/game/mini_game_run_info.rs +++ b/httpserver/src/routes/game/mini/mini_game_run_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MiniGameRunInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::mini_game_run_info; +use gameserver::logic::game::mini::mini_game_run_info; use sqlx::SqlitePool; #[put("MiniGameRunInfo")] diff --git a/httpserver/src/routes/game/mini_game_run_quick_reward.rs b/httpserver/src/routes/game/mini/mini_game_run_quick_reward.rs similarity index 92% rename from httpserver/src/routes/game/mini_game_run_quick_reward.rs rename to httpserver/src/routes/game/mini/mini_game_run_quick_reward.rs index ab81efc..ce8acf2 100644 --- a/httpserver/src/routes/game/mini_game_run_quick_reward.rs +++ b/httpserver/src/routes/game/mini/mini_game_run_quick_reward.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MiniGameRunQuickRewardRequest; use crypto::network::parse_packet; -use gameserver::logic::game::mini_game_run_quick_reward; +use gameserver::logic::game::mini::mini_game_run_quick_reward; use sqlx::SqlitePool; #[put("MiniGameRunQuickReward")] diff --git a/httpserver/src/routes/game/mini_game_run_start.rs b/httpserver/src/routes/game/mini/mini_game_run_start.rs similarity index 92% rename from httpserver/src/routes/game/mini_game_run_start.rs rename to httpserver/src/routes/game/mini/mini_game_run_start.rs index 4b6b2a6..5275fe1 100644 --- a/httpserver/src/routes/game/mini_game_run_start.rs +++ b/httpserver/src/routes/game/mini/mini_game_run_start.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MiniGameRunStartRequest; use crypto::network::parse_packet; -use gameserver::logic::game::mini_game_run_start; +use gameserver::logic::game::mini::mini_game_run_start; use sqlx::SqlitePool; #[put("MiniGameRunStart")] diff --git a/httpserver/src/routes/game/mini_game_sichuan_end.rs b/httpserver/src/routes/game/mini/mini_game_sichuan_end.rs similarity index 92% rename from httpserver/src/routes/game/mini_game_sichuan_end.rs rename to httpserver/src/routes/game/mini/mini_game_sichuan_end.rs index 9e519cb..a45c6a6 100644 --- a/httpserver/src/routes/game/mini_game_sichuan_end.rs +++ b/httpserver/src/routes/game/mini/mini_game_sichuan_end.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MiniGameSichuanEndRequest; use crypto::network::parse_packet; -use gameserver::logic::game::mini_game_sichuan_end; +use gameserver::logic::game::mini::mini_game_sichuan_end; use sqlx::SqlitePool; #[put("MiniGameSichuanEnd")] diff --git a/httpserver/src/routes/game/mini_game_sichuan_info.rs b/httpserver/src/routes/game/mini/mini_game_sichuan_info.rs similarity index 92% rename from httpserver/src/routes/game/mini_game_sichuan_info.rs rename to httpserver/src/routes/game/mini/mini_game_sichuan_info.rs index b2b8fc5..6ab1b63 100644 --- a/httpserver/src/routes/game/mini_game_sichuan_info.rs +++ b/httpserver/src/routes/game/mini/mini_game_sichuan_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MiniGameSichuanInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::mini_game_sichuan_info; +use gameserver::logic::game::mini::mini_game_sichuan_info; use sqlx::SqlitePool; #[put("MiniGameSichuanInfo")] diff --git a/httpserver/src/routes/game/mini_game_sichuan_ranking.rs b/httpserver/src/routes/game/mini/mini_game_sichuan_ranking.rs similarity index 92% rename from httpserver/src/routes/game/mini_game_sichuan_ranking.rs rename to httpserver/src/routes/game/mini/mini_game_sichuan_ranking.rs index 71a3f63..9c3a902 100644 --- a/httpserver/src/routes/game/mini_game_sichuan_ranking.rs +++ b/httpserver/src/routes/game/mini/mini_game_sichuan_ranking.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MiniGameSichuanRankingRequest; use crypto::network::parse_packet; -use gameserver::logic::game::mini_game_sichuan_ranking; +use gameserver::logic::game::mini::mini_game_sichuan_ranking; use sqlx::SqlitePool; #[put("MiniGameSichuanRanking")] diff --git a/httpserver/src/routes/game/mini_game_sichuan_start.rs b/httpserver/src/routes/game/mini/mini_game_sichuan_start.rs similarity index 92% rename from httpserver/src/routes/game/mini_game_sichuan_start.rs rename to httpserver/src/routes/game/mini/mini_game_sichuan_start.rs index f7fc618..340bd1c 100644 --- a/httpserver/src/routes/game/mini_game_sichuan_start.rs +++ b/httpserver/src/routes/game/mini/mini_game_sichuan_start.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MiniGameSichuanStartRequest; use crypto::network::parse_packet; -use gameserver::logic::game::mini_game_sichuan_start; +use gameserver::logic::game::mini::mini_game_sichuan_start; use sqlx::SqlitePool; #[put("MiniGameSichuanStart")] diff --git a/httpserver/src/routes/game/mini_game_survival_char_upgrade.rs b/httpserver/src/routes/game/mini/mini_game_survival_char_upgrade.rs similarity index 92% rename from httpserver/src/routes/game/mini_game_survival_char_upgrade.rs rename to httpserver/src/routes/game/mini/mini_game_survival_char_upgrade.rs index e8311a4..a3b997c 100644 --- a/httpserver/src/routes/game/mini_game_survival_char_upgrade.rs +++ b/httpserver/src/routes/game/mini/mini_game_survival_char_upgrade.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MiniGameSurvivalCharUpgradeRequest; use crypto::network::parse_packet; -use gameserver::logic::game::mini_game_survival_char_upgrade; +use gameserver::logic::game::mini::mini_game_survival_char_upgrade; use sqlx::SqlitePool; #[put("MiniGameSurvivalCharUpgrade")] diff --git a/httpserver/src/routes/game/mini_game_survival_char_upgrade_reset.rs b/httpserver/src/routes/game/mini/mini_game_survival_char_upgrade_reset.rs similarity index 91% rename from httpserver/src/routes/game/mini_game_survival_char_upgrade_reset.rs rename to httpserver/src/routes/game/mini/mini_game_survival_char_upgrade_reset.rs index 621f7e8..ded0158 100644 --- a/httpserver/src/routes/game/mini_game_survival_char_upgrade_reset.rs +++ b/httpserver/src/routes/game/mini/mini_game_survival_char_upgrade_reset.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MiniGameSurvivalCharUpgradeResetRequest; use crypto::network::parse_packet; -use gameserver::logic::game::mini_game_survival_char_upgrade_reset; +use gameserver::logic::game::mini::mini_game_survival_char_upgrade_reset; use sqlx::SqlitePool; #[put("MiniGameSurvivalCharUpgradeReset")] diff --git a/httpserver/src/routes/game/mini_game_survival_end.rs b/httpserver/src/routes/game/mini/mini_game_survival_end.rs similarity index 92% rename from httpserver/src/routes/game/mini_game_survival_end.rs rename to httpserver/src/routes/game/mini/mini_game_survival_end.rs index 74571b8..3ae6e7e 100644 --- a/httpserver/src/routes/game/mini_game_survival_end.rs +++ b/httpserver/src/routes/game/mini/mini_game_survival_end.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MiniGameSurvivalEndRequest; use crypto::network::parse_packet; -use gameserver::logic::game::mini_game_survival_end; +use gameserver::logic::game::mini::mini_game_survival_end; use sqlx::SqlitePool; #[put("MiniGameSurvivalEnd")] diff --git a/httpserver/src/routes/game/mini_game_survival_info.rs b/httpserver/src/routes/game/mini/mini_game_survival_info.rs similarity index 92% rename from httpserver/src/routes/game/mini_game_survival_info.rs rename to httpserver/src/routes/game/mini/mini_game_survival_info.rs index 4d95a32..59491b0 100644 --- a/httpserver/src/routes/game/mini_game_survival_info.rs +++ b/httpserver/src/routes/game/mini/mini_game_survival_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MiniGameSurvivalInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::mini_game_survival_info; +use gameserver::logic::game::mini::mini_game_survival_info; use sqlx::SqlitePool; #[put("MiniGameSurvivalInfo")] diff --git a/httpserver/src/routes/game/mini_game_survival_play.rs b/httpserver/src/routes/game/mini/mini_game_survival_play.rs similarity index 92% rename from httpserver/src/routes/game/mini_game_survival_play.rs rename to httpserver/src/routes/game/mini/mini_game_survival_play.rs index 9eac44c..b82d357 100644 --- a/httpserver/src/routes/game/mini_game_survival_play.rs +++ b/httpserver/src/routes/game/mini/mini_game_survival_play.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MiniGameSurvivalPlayRequest; use crypto::network::parse_packet; -use gameserver::logic::game::mini_game_survival_play; +use gameserver::logic::game::mini::mini_game_survival_play; use sqlx::SqlitePool; #[put("MiniGameSurvivalPlay")] diff --git a/httpserver/src/routes/game/mini_game_survival_ranking.rs b/httpserver/src/routes/game/mini/mini_game_survival_ranking.rs similarity index 92% rename from httpserver/src/routes/game/mini_game_survival_ranking.rs rename to httpserver/src/routes/game/mini/mini_game_survival_ranking.rs index 7b32f4f..3b310e1 100644 --- a/httpserver/src/routes/game/mini_game_survival_ranking.rs +++ b/httpserver/src/routes/game/mini/mini_game_survival_ranking.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MiniGameSurvivalRankingRequest; use crypto::network::parse_packet; -use gameserver::logic::game::mini_game_survival_ranking; +use gameserver::logic::game::mini::mini_game_survival_ranking; use sqlx::SqlitePool; #[put("MiniGameSurvivalRanking")] diff --git a/httpserver/src/routes/game/mini_game_survival_skill_select_list.rs b/httpserver/src/routes/game/mini/mini_game_survival_skill_select_list.rs similarity index 92% rename from httpserver/src/routes/game/mini_game_survival_skill_select_list.rs rename to httpserver/src/routes/game/mini/mini_game_survival_skill_select_list.rs index 3e9d7d6..cd7f867 100644 --- a/httpserver/src/routes/game/mini_game_survival_skill_select_list.rs +++ b/httpserver/src/routes/game/mini/mini_game_survival_skill_select_list.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MiniGameSurvivalSkillSelectListRequest; use crypto::network::parse_packet; -use gameserver::logic::game::mini_game_survival_skill_select_list; +use gameserver::logic::game::mini::mini_game_survival_skill_select_list; use sqlx::SqlitePool; #[put("MiniGameSurvivalSkillSelectList")] diff --git a/httpserver/src/routes/game/mini_game_survival_skill_up.rs b/httpserver/src/routes/game/mini/mini_game_survival_skill_up.rs similarity index 92% rename from httpserver/src/routes/game/mini_game_survival_skill_up.rs rename to httpserver/src/routes/game/mini/mini_game_survival_skill_up.rs index 4f4a2b2..efe5c45 100644 --- a/httpserver/src/routes/game/mini_game_survival_skill_up.rs +++ b/httpserver/src/routes/game/mini/mini_game_survival_skill_up.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MiniGameSurvivalSkillUpRequest; use crypto::network::parse_packet; -use gameserver::logic::game::mini_game_survival_skill_up; +use gameserver::logic::game::mini::mini_game_survival_skill_up; use sqlx::SqlitePool; #[put("MiniGameSurvivalSkillUp")] diff --git a/httpserver/src/routes/game/mini_game_survival_start.rs b/httpserver/src/routes/game/mini/mini_game_survival_start.rs similarity index 92% rename from httpserver/src/routes/game/mini_game_survival_start.rs rename to httpserver/src/routes/game/mini/mini_game_survival_start.rs index 1677f10..0cee131 100644 --- a/httpserver/src/routes/game/mini_game_survival_start.rs +++ b/httpserver/src/routes/game/mini/mini_game_survival_start.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MiniGameSurvivalStartRequest; use crypto::network::parse_packet; -use gameserver::logic::game::mini_game_survival_start; +use gameserver::logic::game::mini::mini_game_survival_start; use sqlx::SqlitePool; #[put("MiniGameSurvivalStart")] diff --git a/httpserver/src/routes/game/mini_puzzle_all_open.rs b/httpserver/src/routes/game/mini/mini_puzzle_all_open.rs similarity index 92% rename from httpserver/src/routes/game/mini_puzzle_all_open.rs rename to httpserver/src/routes/game/mini/mini_puzzle_all_open.rs index df04173..94828b3 100644 --- a/httpserver/src/routes/game/mini_puzzle_all_open.rs +++ b/httpserver/src/routes/game/mini/mini_puzzle_all_open.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MiniPuzzleAllOpenRequest; use crypto::network::parse_packet; -use gameserver::logic::game::mini_puzzle_all_open; +use gameserver::logic::game::mini::mini_puzzle_all_open; use sqlx::SqlitePool; #[put("MiniPuzzleAllOpen")] diff --git a/httpserver/src/routes/game/mini_puzzle_info.rs b/httpserver/src/routes/game/mini/mini_puzzle_info.rs similarity index 92% rename from httpserver/src/routes/game/mini_puzzle_info.rs rename to httpserver/src/routes/game/mini/mini_puzzle_info.rs index d05b7a1..41c3f05 100644 --- a/httpserver/src/routes/game/mini_puzzle_info.rs +++ b/httpserver/src/routes/game/mini/mini_puzzle_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MiniPuzzleInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::mini_puzzle_info; +use gameserver::logic::game::mini::mini_puzzle_info; use sqlx::SqlitePool; #[put("MiniPuzzleInfo")] diff --git a/httpserver/src/routes/game/mini_puzzle_open.rs b/httpserver/src/routes/game/mini/mini_puzzle_open.rs similarity index 92% rename from httpserver/src/routes/game/mini_puzzle_open.rs rename to httpserver/src/routes/game/mini/mini_puzzle_open.rs index a808bdf..5b105ef 100644 --- a/httpserver/src/routes/game/mini_puzzle_open.rs +++ b/httpserver/src/routes/game/mini/mini_puzzle_open.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MiniPuzzleOpenRequest; use crypto::network::parse_packet; -use gameserver::logic::game::mini_puzzle_open; +use gameserver::logic::game::mini::mini_puzzle_open; use sqlx::SqlitePool; #[put("MiniPuzzleOpen")] diff --git a/httpserver/src/routes/game/mini_puzzle_renew.rs b/httpserver/src/routes/game/mini/mini_puzzle_renew.rs similarity index 92% rename from httpserver/src/routes/game/mini_puzzle_renew.rs rename to httpserver/src/routes/game/mini/mini_puzzle_renew.rs index 2fad8ed..f858aff 100644 --- a/httpserver/src/routes/game/mini_puzzle_renew.rs +++ b/httpserver/src/routes/game/mini/mini_puzzle_renew.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MiniPuzzleRenewRequest; use crypto::network::parse_packet; -use gameserver::logic::game::mini_puzzle_renew; +use gameserver::logic::game::mini::mini_puzzle_renew; use sqlx::SqlitePool; #[put("MiniPuzzleRenew")] diff --git a/httpserver/src/routes/game/mini/mod.rs b/httpserver/src/routes/game/mini/mod.rs new file mode 100644 index 0000000..97329a3 --- /dev/null +++ b/httpserver/src/routes/game/mini/mod.rs @@ -0,0 +1,47 @@ +pub mod mini_game_action_end; +pub mod mini_game_action_info; +pub mod mini_game_action_ranking; +pub mod mini_game_action_start; +pub mod mini_game_bingo_info; +pub mod mini_game_bingo_play; +pub mod mini_game_board_info; +pub mod mini_game_board_play; +pub mod mini_game_defense_end; +pub mod mini_game_defense_info; +pub mod mini_game_defense_matching; +pub mod mini_game_defense_start; +pub mod mini_game_field_end; +pub mod mini_game_field_info; +pub mod mini_game_field_quick_reward; +pub mod mini_game_field_reward; +pub mod mini_game_field_score; +pub mod mini_game_field_start; +pub mod mini_game_hub_info; +pub mod mini_game_relay_server_info; +pub mod mini_game_rhythm_info; +pub mod mini_game_rhythm_play_end; +pub mod mini_game_rhythm_play_start; +pub mod mini_game_rhythm_ranking; +pub mod mini_game_roulette_draw; +pub mod mini_game_roulette_info; +pub mod mini_game_run_end; +pub mod mini_game_run_info; +pub mod mini_game_run_quick_reward; +pub mod mini_game_run_start; +pub mod mini_game_sichuan_end; +pub mod mini_game_sichuan_info; +pub mod mini_game_sichuan_ranking; +pub mod mini_game_sichuan_start; +pub mod mini_game_survival_char_upgrade; +pub mod mini_game_survival_char_upgrade_reset; +pub mod mini_game_survival_end; +pub mod mini_game_survival_info; +pub mod mini_game_survival_play; +pub mod mini_game_survival_ranking; +pub mod mini_game_survival_skill_select_list; +pub mod mini_game_survival_skill_up; +pub mod mini_game_survival_start; +pub mod mini_puzzle_all_open; +pub mod mini_puzzle_info; +pub mod mini_puzzle_open; +pub mod mini_puzzle_renew; diff --git a/httpserver/src/routes/game/mission_clear.rs b/httpserver/src/routes/game/mission/mission_clear.rs similarity index 92% rename from httpserver/src/routes/game/mission_clear.rs rename to httpserver/src/routes/game/mission/mission_clear.rs index 9e362e6..4c76350 100644 --- a/httpserver/src/routes/game/mission_clear.rs +++ b/httpserver/src/routes/game/mission/mission_clear.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MissionClearRequest; use crypto::network::parse_packet; -use gameserver::logic::game::mission_clear; +use gameserver::logic::game::mission::mission_clear; use sqlx::SqlitePool; #[put("MissionClear")] diff --git a/httpserver/src/routes/game/mission_info.rs b/httpserver/src/routes/game/mission/mission_info.rs similarity index 92% rename from httpserver/src/routes/game/mission_info.rs rename to httpserver/src/routes/game/mission/mission_info.rs index adc9272..77b4fdd 100644 --- a/httpserver/src/routes/game/mission_info.rs +++ b/httpserver/src/routes/game/mission/mission_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MissionInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::mission_info; +use gameserver::logic::game::mission::mission_info; use sqlx::SqlitePool; #[put("MissionInfo")] diff --git a/httpserver/src/routes/game/mission_section_reward.rs b/httpserver/src/routes/game/mission/mission_section_reward.rs similarity index 92% rename from httpserver/src/routes/game/mission_section_reward.rs rename to httpserver/src/routes/game/mission/mission_section_reward.rs index 632501e..ea5063b 100644 --- a/httpserver/src/routes/game/mission_section_reward.rs +++ b/httpserver/src/routes/game/mission/mission_section_reward.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MissionSectionRewardRequest; use crypto::network::parse_packet; -use gameserver::logic::game::mission_section_reward; +use gameserver::logic::game::mission::mission_section_reward; use sqlx::SqlitePool; #[put("MissionSectionReward")] diff --git a/httpserver/src/routes/game/mission_update.rs b/httpserver/src/routes/game/mission/mission_update.rs similarity index 92% rename from httpserver/src/routes/game/mission_update.rs rename to httpserver/src/routes/game/mission/mission_update.rs index e30b0c8..2f4a6bf 100644 --- a/httpserver/src/routes/game/mission_update.rs +++ b/httpserver/src/routes/game/mission/mission_update.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MissionUpdateRequest; use crypto::network::parse_packet; -use gameserver::logic::game::mission_update; +use gameserver::logic::game::mission::mission_update; use sqlx::SqlitePool; #[put("MissionUpdate")] diff --git a/httpserver/src/routes/game/mission/mod.rs b/httpserver/src/routes/game/mission/mod.rs new file mode 100644 index 0000000..30b7388 --- /dev/null +++ b/httpserver/src/routes/game/mission/mod.rs @@ -0,0 +1,4 @@ +pub mod mission_clear; +pub mod mission_info; +pub mod mission_section_reward; +pub mod mission_update; diff --git a/httpserver/src/routes/game/mod.rs b/httpserver/src/routes/game/mod.rs index 3eea629..6d8822c 100644 --- a/httpserver/src/routes/game/mod.rs +++ b/httpserver/src/routes/game/mod.rs @@ -1,476 +1,90 @@ -pub mod all_char_refresh; -pub mod attendance; -pub mod charge_cost_info; -pub mod equip_info; -pub mod event_mission_info; -pub mod event_reward_history; -pub mod field_deck_info; -pub mod hunting_ground_info; -pub mod hunting_ground_info_list; -pub mod login_event; -pub mod monster_info; -pub mod notice_detail_info; -pub mod pack_event_battle_info; -pub mod pack_event_story_info; -pub mod pack_preview_info; -pub mod pictorial_book_info; -pub mod save_total_battle_power; -pub mod save_user_position; -pub mod schedule_info; -pub mod today_quest_info; -pub mod tutorial_clear; -pub mod waypoint_info; - -pub mod achievement_clear; -pub mod achievement_info; -pub mod achievement_update; -pub mod active_map; +pub mod achievement; +pub mod active; pub mod alchemy; -pub mod alchemy_batch; -pub mod attendance_info; -pub mod balance_version_check; -pub mod battle_end; -pub mod battle_end_test; -pub mod battle_enter; -pub mod battle_exit; -pub mod battle_give_up; -pub mod battle_retry; -pub mod battle_retry_previous_turn; -pub mod battle_start; -pub mod battle_verify_state; -pub mod cafeteria_cumulative_reward; -pub mod cafeteria_daily_connection_costume_refresh; -pub mod cafeteria_event_npc_interaction_reward; -pub mod cafeteria_info; -pub mod cafeteria_introduction_story_reward; -pub mod cafeteria_level_up; -pub mod cafeteria_manage_item_add; -pub mod cafeteria_rare_npc_interaction_reward; -pub mod cafeteria_regular_costume_interaction_all_reward; -pub mod cafeteria_regular_costume_interaction_reward; -pub mod cafeteria_regular_costume_note_all_reward; -pub mod cafeteria_regular_costume_note_info; -pub mod cafeteria_regular_costume_note_reward; -pub mod cafeteria_reward_receipt_time_update_using_cheat; -pub mod cafeteria_spawn_reset; -pub mod cafeteria_spawn_reset_cheat; -pub mod cancel_leave_user; -pub mod cash_mail_info; -pub mod cash_shop_buy; -pub mod cash_shop_info; -pub mod cash_shop_purchase_count_info; -pub mod char_all_revival; -pub mod char_auto_revive_set; -pub mod char_awake_active; -pub mod char_awake_info; -pub mod char_class_up; -pub mod char_expiry; -pub mod char_growth; -pub mod char_healing; -pub mod char_immortal; -pub mod char_imprint_level_up; -pub mod char_info; -pub mod char_level_up; -pub mod char_partner_info; -pub mod char_partner_reward; -pub mod char_partner_story_reward; -pub mod char_scout_info; -pub mod char_special_scout_buy; -pub mod char_special_scout_reset; -pub mod clear_package_reward; -pub mod client_custom_log; -pub mod community_reward; -pub mod community_reward_info; +pub mod all; +pub mod attendance; +pub mod balance; +pub mod battle; +pub mod cafeteria; +pub mod cancel; +pub mod cash; +pub mod char; +pub mod charge; +pub mod clear; +pub mod client; +pub mod community; pub mod cooking; -pub mod cooking_research; -pub mod costume_all_rounder_upgrade; -pub mod costume_clear; -pub mod costume_info; -pub mod costume_node_activation; -pub mod costume_potential_connect; -pub mod costume_upgrade; -pub mod costume_use; -pub mod dating_episode_clear; -pub mod dating_info; -pub mod dating_message_update; -pub mod deck_char_auto_revive; -pub mod deck_costume_setting_info; -pub mod deck_costume_setting_save; -pub mod deck_info; -pub mod deck_save; -pub mod dispatch_info; -pub mod dispatch_reward; -pub mod eat_food; -pub mod eat_food_auto; -pub mod equip_add_slot; -pub mod equip_batch_use; -pub mod equip_break; -pub mod equip_change; -pub mod equip_clear; -pub mod equip_from_making_to_break; -pub mod equip_from_making_to_upgrade; -pub mod equip_from_upgrade_to_break; -pub mod equip_lock; -pub mod equip_making; -pub mod equip_mark_delete; -pub mod equip_mark_set; -pub mod equip_option_re_roll; -pub mod equip_option_re_roll_confirm; -pub mod equip_preset_info; -pub mod equip_preset_name_change; -pub mod equip_preset_save; -pub mod equip_sequence_smelting; -pub mod equip_sequence_upgrade; -pub mod equip_smelting; -pub mod equip_storage_add_slot; -pub mod equip_storage_info; -pub mod equip_storage_out; -pub mod equip_storage_put; -pub mod equip_upgrade; -pub mod equip_use; -pub mod equips_clear; -pub mod equips_use; -pub mod event_exchange_info; -pub mod event_exchange_next_page_open; -pub mod event_exchange_reward; -pub mod event_hub_info; -pub mod event_reward; -pub mod event_schedule_info; -pub mod evil_castle_daily_reward; -pub mod evil_castle_daily_reward_state; -pub mod evil_castle_enter; -pub mod evil_castle_info; -pub mod evil_castle_ping; -pub mod evil_castle_ranking_info; -pub mod evil_castle_reward_info; -pub mod evil_castle_rogue_like_all_user_score_info; -pub mod evil_castle_rogue_like_battle_char_change; -pub mod evil_castle_rogue_like_battle_end_preview; -pub mod evil_castle_rogue_like_battle_skip; -pub mod evil_castle_rogue_like_char_revival; -pub mod evil_castle_rogue_like_costume_upgrade; -pub mod evil_castle_rogue_like_deck_save; -pub mod evil_castle_rogue_like_edit_event; -pub mod evil_castle_rogue_like_enter; -pub mod evil_castle_rogue_like_event_choice; -pub mod evil_castle_rogue_like_event_select; -pub mod evil_castle_rogue_like_give_up; -pub mod evil_castle_rogue_like_give_up_info; -pub mod evil_castle_rogue_like_growth; -pub mod evil_castle_rogue_like_info; -pub mod evil_castle_rogue_like_move_floor; -pub mod evil_castle_rogue_like_quick_battle; -pub mod evil_castle_rogue_like_rank_info; -pub mod evil_castle_rogue_like_relic_mix; -pub mod evil_castle_rogue_like_reward_re_roll; -pub mod evil_castle_rogue_like_room_enter; -pub mod evil_castle_rogue_like_season_reward; -pub mod evil_castle_rogue_like_select_reward; -pub mod evil_castle_rogue_like_shop_buy; -pub mod evil_castle_rogue_like_shop_exit; -pub mod evil_castle_rogue_like_shop_re_roll; -pub mod evil_castle_stage_clear_reward; -pub mod evil_castle_stage_ranking_info; -pub mod evil_castle_tower_info; -pub mod field_deck_save; -pub mod field_monster_damage; -pub mod field_monster_event; -pub mod field_monster_regen; -pub mod field_monster_reward; -pub mod field_object_info; -pub mod field_object_position_update; -pub mod field_object_preview; -pub mod field_object_research; -pub mod field_object_respawn; -pub mod field_object_reward; -pub mod field_object_reward_list; -pub mod field_trap_info; -pub mod friend_accept; -pub mod friend_info_list; -pub mod friend_receive_list; -pub mod friend_recommend; -pub mod friend_refuse; -pub mod friend_remove; -pub mod friend_search; -pub mod friend_send; -pub mod friend_send_list; -pub mod friend_send_remove; -pub mod gacha_buy; -pub mod gacha_buy_preview; -pub mod gacha_buy_preview_lock; -pub mod gacha_info; -pub mod gacha_log; -pub mod gacha_point_exchange; -pub mod gacha_point_manual_exchange; -pub mod gacha_selection_save; -pub mod guild_accept; -pub mod guild_create; -pub mod guild_delete_cancel; -pub mod guild_info; -pub mod guild_info_edit; -pub mod guild_init_info; -pub mod guild_join; -pub mod guild_join_refuse; -pub mod guild_join_send_cancel; -pub mod guild_join_send_info; -pub mod guild_leave; -pub mod guild_member_ban; -pub mod guild_member_role_edit; -pub mod guild_notice_info; -pub mod guild_notice_update; -pub mod guild_raid_boss_battle_enter; -pub mod guild_raid_boss_battle_history; -pub mod guild_raid_boss_battle_info; -pub mod guild_raid_boss_practice_battle_enter; -pub mod guild_raid_boss_quick_battle; -pub mod guild_raid_deck_info; -pub mod guild_raid_deck_save; -pub mod guild_raid_main_info; -pub mod guild_raid_member_play_history_info; -pub mod guild_raid_member_ranking; -pub mod guild_raid_normal_battle_history_info; -pub mod guild_raid_normal_battle_info; -pub mod guild_raid_preset_delete; -pub mod guild_raid_preset_info; -pub mod guild_raid_preset_info_change; -pub mod guild_raid_preset_save; -pub mod guild_raid_preset_slot_add; -pub mod guild_raid_preset_use; -pub mod guild_raid_season_ranking; -pub mod guild_raid_season_reward; -pub mod guild_recommend; -pub mod guild_search; -pub mod guild_supporter_add; -pub mod guild_supporter_delete; -pub mod guild_supporter_info; -pub mod guild_supporter_info_list; -pub mod guild_update_action_info; -pub mod hunt_dispatch; -pub mod hunt_dispatch_end; -pub mod hunt_dispatch_info; -pub mod hunt_dispatch_reward_preview; -pub mod hunt_dispatch_start; -pub mod hunting_ground_enter; -pub mod id_card_preset_delete; -pub mod id_card_preset_info; -pub mod id_card_preset_save; -pub mod id_card_recovery; -pub mod id_card_save; -pub mod id_card_shop_buy; -pub mod id_card_shop_info; -pub mod inn_open; -pub mod interaction_trigger; -pub mod inven_add_slot; -pub mod item_dump; -pub mod item_info; -pub mod item_storage_info; -pub mod item_storage_out; -pub mod item_storage_put; -pub mod item_storage_update; -pub mod join_user; -pub mod jp_user; -pub mod jp_user_info; -pub mod leave_user; -pub mod like_user; -pub mod login_user; -pub mod logout_user; -pub mod mail_history_info; -pub mod mail_info; -pub mod mail_open; -pub mod maintenance_info; -pub mod mercenary_scout; -pub mod mini_game_action_end; -pub mod mini_game_action_info; -pub mod mini_game_action_ranking; -pub mod mini_game_action_start; -pub mod mini_game_bingo_info; -pub mod mini_game_bingo_play; -pub mod mini_game_board_info; -pub mod mini_game_board_play; -pub mod mini_game_defense_end; -pub mod mini_game_defense_info; -pub mod mini_game_defense_matching; -pub mod mini_game_defense_start; -pub mod mini_game_field_end; -pub mod mini_game_field_info; -pub mod mini_game_field_quick_reward; -pub mod mini_game_field_reward; -pub mod mini_game_field_score; -pub mod mini_game_field_start; -pub mod mini_game_hub_info; -pub mod mini_game_relay_server_info; -pub mod mini_game_rhythm_info; -pub mod mini_game_rhythm_play_end; -pub mod mini_game_rhythm_play_start; -pub mod mini_game_rhythm_ranking; -pub mod mini_game_roulette_draw; -pub mod mini_game_roulette_info; -pub mod mini_game_run_end; -pub mod mini_game_run_info; -pub mod mini_game_run_quick_reward; -pub mod mini_game_run_start; -pub mod mini_game_sichuan_end; -pub mod mini_game_sichuan_info; -pub mod mini_game_sichuan_ranking; -pub mod mini_game_sichuan_start; -pub mod mini_game_survival_char_upgrade; -pub mod mini_game_survival_char_upgrade_reset; -pub mod mini_game_survival_end; -pub mod mini_game_survival_info; -pub mod mini_game_survival_play; -pub mod mini_game_survival_ranking; -pub mod mini_game_survival_skill_select_list; -pub mod mini_game_survival_skill_up; -pub mod mini_game_survival_start; -pub mod mini_puzzle_all_open; -pub mod mini_puzzle_info; -pub mod mini_puzzle_open; -pub mod mini_puzzle_renew; -pub mod mission_clear; -pub mod mission_info; -pub mod mission_section_reward; -pub mod mission_update; -pub mod monster_hunt_change_team; -pub mod monster_hunt_deck_info; -pub mod monster_hunt_deck_save; -pub mod monster_hunt_preset_delete; -pub mod monster_hunt_preset_info; -pub mod monster_hunt_preset_info_change; -pub mod monster_hunt_preset_save; -pub mod monster_hunt_preset_slot_add; -pub mod monster_hunt_preset_use; -pub mod monster_hunt_quick_battle; -pub mod monster_hunt_rank_info; -pub mod monster_hunt_schedule_info; -pub mod monster_hunt_season_reward; -pub mod monster_hunt_user_info; -pub mod my_like_info; -pub mod my_room_expand; -pub mod my_room_hide; -pub mod my_room_item_info; -pub mod my_room_like; -pub mod my_room_move; -pub mod my_room_name_change; -pub mod my_room_primary_change; -pub mod my_room_save; -pub mod my_room_search_friend; -pub mod my_room_search_guild; -pub mod my_room_search_recommend; -pub mod my_room_shop_buy; -pub mod my_room_shop_info; -pub mod my_room_user_info; -pub mod notice_info; -pub mod npc_reputation_info; -pub mod npc_reputation_recovery; -pub mod overwhelm; -pub mod pack_buy; -pub mod pack_detail; -pub mod pack_event_story_clear; -pub mod pack_event_story_replay_clear; -pub mod pack_in_game_info; -pub mod pack_info; -pub mod pack_jam_event; -pub mod pack_reward_object_count; -pub mod pack_sub_quest_clear_info; -pub mod pass_buy; -pub mod pass_info; -pub mod pass_reward; -pub mod personal_info; -pub mod ping_check; -pub mod platform_login; -pub mod popular_costume_info; -pub mod popular_equip_info; -pub mod preset_add_slot; -pub mod preset_delete; -pub mod preset_info; -pub mod preset_info_change; -pub mod preset_save; -pub mod preset_use; -pub mod prestige_skin_info; -pub mod prestige_skin_set; -pub mod pvp_battle_deck_info; -pub mod pvp_battle_deck_save; -pub mod pvp_battle_end; -pub mod pvp_battle_history; -pub mod pvp_battle_history_deck_info; -pub mod pvp_battle_matching; -pub mod pvp_battle_once_reward_info; -pub mod pvp_battle_rank_user_detail; -pub mod pvp_battle_ranking; -pub mod pvp_battle_replay_info; -pub mod pvp_battle_reset; -pub mod pvp_battle_reward; -pub mod pvp_battle_start; -pub mod pvp_battle_user_info; -pub mod pvp_contents_item_renew; -pub mod pvp_season_reward; -pub mod quest_accept; -pub mod quest_clear; -pub mod quest_give_up; -pub mod quest_immortal_reset; -pub mod quest_info; -pub mod quest_max_clear_info; -pub mod quest_update; -pub mod quick_battle; -pub mod recipe_info; -pub mod recommend_deck_info; -pub mod recommend_deck_user_option_save; -pub mod refresh_token; -pub mod report_user; -pub mod reputation_info; -pub mod root_sort_id_info; -pub mod save_field_char_control_deck_type; -pub mod season_reward_info; -pub mod select_platform_other_data; -pub mod send_log; -pub mod server_info; -pub mod server_now_time; -pub mod shop_buy; -pub mod shop_info; -pub mod shop_open; -pub mod shop_sell; -pub mod sky_way_enter; -pub mod sky_way_info; -pub mod sky_way_schedule_info; - -pub mod statue_object_reward; -pub mod storage_add_slot; -pub mod supporter_battle_info; -pub mod supporter_borrow; -pub mod supporter_detail; -pub mod supporter_info; -pub mod supporter_register; -pub mod supporter_remove; -pub mod supporter_reward; -pub mod supporter_status; -pub mod talent_skill_upgrade; -pub mod talent_skill_use; -pub mod talent_slot_save; -pub mod time_pause; -pub mod total_war_battle_end; -pub mod total_war_battle_start; -pub mod total_war_contents_item_renew; -pub mod total_war_deck_info; -pub mod total_war_deck_preset_info; -pub mod total_war_deck_preset_save; -pub mod total_war_deck_preset_slot_add; -pub mod total_war_deck_save; -pub mod total_war_info; -pub mod total_war_preset_delete; -pub mod total_war_preset_info_change; -pub mod total_war_reward; -pub mod total_war_reward_state; -pub mod trap_damage; -pub mod tutorial_info; -pub mod update_user_contents_info_option; -pub mod use_random_box; -pub mod use_resource_item; -pub mod user_contents_info; -pub mod user_contents_info_option; -pub mod user_greeting_change; -pub mod user_level_reward; -pub mod user_nickname_change; -pub mod user_portrait_change; -pub mod user_title_change; -pub mod waypoint_save; -pub mod waypoint_use; +pub mod costume; +pub mod dating; +pub mod deck; +pub mod dispatch; +pub mod eat; +pub mod equip; +pub mod equips; +pub mod event; +pub mod evil; +pub mod field; +pub mod friend; +pub mod gacha; +pub mod guild; +pub mod hunt; +pub mod hunting; +pub mod id; +pub mod inn; +pub mod interaction; +pub mod inven; +pub mod item; +pub mod join; +pub mod jp; +pub mod leave; +pub mod like; +pub mod login; +pub mod logout; +pub mod mail; +pub mod maintenance; +pub mod mercenary; +pub mod mini; +pub mod mission; +pub mod monster; +pub mod my; +pub mod notice; +pub mod npc; +pub mod pack; +pub mod pass; +pub mod personal; +pub mod pictorial; +pub mod ping; +pub mod platform; +pub mod popular; +pub mod preset; +pub mod prestige; +pub mod pvp; +pub mod quest; +pub mod quick; +pub mod recipe; +pub mod recommend; +pub mod refresh; +pub mod report; +pub mod reputation; +pub mod root; +pub mod save; +pub mod schedule; +pub mod season; +pub mod select; +pub mod send; +pub mod server; +pub mod shop; +pub mod sky; +pub mod statue; +pub mod storage; +pub mod supporter; +pub mod talent; +pub mod time; +pub mod today; +pub mod total; +pub mod trap; +pub mod tutorial; +pub mod update; +pub mod use2; +pub mod user; +pub mod waypoint; diff --git a/httpserver/src/routes/game/monster/mod.rs b/httpserver/src/routes/game/monster/mod.rs new file mode 100644 index 0000000..1998b8e --- /dev/null +++ b/httpserver/src/routes/game/monster/mod.rs @@ -0,0 +1,15 @@ +pub mod monster_hunt_change_team; +pub mod monster_hunt_deck_info; +pub mod monster_hunt_deck_save; +pub mod monster_hunt_preset_delete; +pub mod monster_hunt_preset_info; +pub mod monster_hunt_preset_info_change; +pub mod monster_hunt_preset_save; +pub mod monster_hunt_preset_slot_add; +pub mod monster_hunt_preset_use; +pub mod monster_hunt_quick_battle; +pub mod monster_hunt_rank_info; +pub mod monster_hunt_schedule_info; +pub mod monster_hunt_season_reward; +pub mod monster_hunt_user_info; +pub mod monster_info; diff --git a/httpserver/src/routes/game/monster_hunt_change_team.rs b/httpserver/src/routes/game/monster/monster_hunt_change_team.rs similarity index 92% rename from httpserver/src/routes/game/monster_hunt_change_team.rs rename to httpserver/src/routes/game/monster/monster_hunt_change_team.rs index a6ba6fb..780579d 100644 --- a/httpserver/src/routes/game/monster_hunt_change_team.rs +++ b/httpserver/src/routes/game/monster/monster_hunt_change_team.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MonsterHuntChangeTeamRequest; use crypto::network::parse_packet; -use gameserver::logic::game::monster_hunt_change_team; +use gameserver::logic::game::monster::monster_hunt_change_team; use sqlx::SqlitePool; #[put("MonsterHuntChangeTeam")] diff --git a/httpserver/src/routes/game/monster_hunt_deck_info.rs b/httpserver/src/routes/game/monster/monster_hunt_deck_info.rs similarity index 92% rename from httpserver/src/routes/game/monster_hunt_deck_info.rs rename to httpserver/src/routes/game/monster/monster_hunt_deck_info.rs index bf55cd4..b136cd4 100644 --- a/httpserver/src/routes/game/monster_hunt_deck_info.rs +++ b/httpserver/src/routes/game/monster/monster_hunt_deck_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MonsterHuntDeckInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::monster_hunt_deck_info; +use gameserver::logic::game::monster::monster_hunt_deck_info; use sqlx::SqlitePool; #[put("MonsterHuntDeckInfo")] diff --git a/httpserver/src/routes/game/monster_hunt_deck_save.rs b/httpserver/src/routes/game/monster/monster_hunt_deck_save.rs similarity index 92% rename from httpserver/src/routes/game/monster_hunt_deck_save.rs rename to httpserver/src/routes/game/monster/monster_hunt_deck_save.rs index 0078fc1..839d93f 100644 --- a/httpserver/src/routes/game/monster_hunt_deck_save.rs +++ b/httpserver/src/routes/game/monster/monster_hunt_deck_save.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MonsterHuntDeckSaveRequest; use crypto::network::parse_packet; -use gameserver::logic::game::monster_hunt_deck_save; +use gameserver::logic::game::monster::monster_hunt_deck_save; use sqlx::SqlitePool; #[put("MonsterHuntDeckSave")] diff --git a/httpserver/src/routes/game/monster_hunt_preset_delete.rs b/httpserver/src/routes/game/monster/monster_hunt_preset_delete.rs similarity index 92% rename from httpserver/src/routes/game/monster_hunt_preset_delete.rs rename to httpserver/src/routes/game/monster/monster_hunt_preset_delete.rs index 98fa37d..c45f76d 100644 --- a/httpserver/src/routes/game/monster_hunt_preset_delete.rs +++ b/httpserver/src/routes/game/monster/monster_hunt_preset_delete.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MonsterHuntPresetDeleteRequest; use crypto::network::parse_packet; -use gameserver::logic::game::monster_hunt_preset_delete; +use gameserver::logic::game::monster::monster_hunt_preset_delete; use sqlx::SqlitePool; #[put("MonsterHuntPresetDelete")] diff --git a/httpserver/src/routes/game/monster_hunt_preset_info.rs b/httpserver/src/routes/game/monster/monster_hunt_preset_info.rs similarity index 92% rename from httpserver/src/routes/game/monster_hunt_preset_info.rs rename to httpserver/src/routes/game/monster/monster_hunt_preset_info.rs index ed2cae5..f31e8ad 100644 --- a/httpserver/src/routes/game/monster_hunt_preset_info.rs +++ b/httpserver/src/routes/game/monster/monster_hunt_preset_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MonsterHuntPresetInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::monster_hunt_preset_info; +use gameserver::logic::game::monster::monster_hunt_preset_info; use sqlx::SqlitePool; #[put("MonsterHuntPresetInfo")] diff --git a/httpserver/src/routes/game/monster_hunt_preset_info_change.rs b/httpserver/src/routes/game/monster/monster_hunt_preset_info_change.rs similarity index 92% rename from httpserver/src/routes/game/monster_hunt_preset_info_change.rs rename to httpserver/src/routes/game/monster/monster_hunt_preset_info_change.rs index a2c14a0..c1543bd 100644 --- a/httpserver/src/routes/game/monster_hunt_preset_info_change.rs +++ b/httpserver/src/routes/game/monster/monster_hunt_preset_info_change.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MonsterHuntPresetInfoChangeRequest; use crypto::network::parse_packet; -use gameserver::logic::game::monster_hunt_preset_info_change; +use gameserver::logic::game::monster::monster_hunt_preset_info_change; use sqlx::SqlitePool; #[put("MonsterHuntPresetInfoChange")] diff --git a/httpserver/src/routes/game/monster_hunt_preset_save.rs b/httpserver/src/routes/game/monster/monster_hunt_preset_save.rs similarity index 92% rename from httpserver/src/routes/game/monster_hunt_preset_save.rs rename to httpserver/src/routes/game/monster/monster_hunt_preset_save.rs index 4a18c31..ad4094a 100644 --- a/httpserver/src/routes/game/monster_hunt_preset_save.rs +++ b/httpserver/src/routes/game/monster/monster_hunt_preset_save.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MonsterHuntPresetSaveRequest; use crypto::network::parse_packet; -use gameserver::logic::game::monster_hunt_preset_save; +use gameserver::logic::game::monster::monster_hunt_preset_save; use sqlx::SqlitePool; #[put("MonsterHuntPresetSave")] diff --git a/httpserver/src/routes/game/monster_hunt_preset_slot_add.rs b/httpserver/src/routes/game/monster/monster_hunt_preset_slot_add.rs similarity index 92% rename from httpserver/src/routes/game/monster_hunt_preset_slot_add.rs rename to httpserver/src/routes/game/monster/monster_hunt_preset_slot_add.rs index 0636562..51be6bd 100644 --- a/httpserver/src/routes/game/monster_hunt_preset_slot_add.rs +++ b/httpserver/src/routes/game/monster/monster_hunt_preset_slot_add.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MonsterHuntPresetSlotAddRequest; use crypto::network::parse_packet; -use gameserver::logic::game::monster_hunt_preset_slot_add; +use gameserver::logic::game::monster::monster_hunt_preset_slot_add; use sqlx::SqlitePool; #[put("MonsterHuntPresetSlotAdd")] diff --git a/httpserver/src/routes/game/monster_hunt_preset_use.rs b/httpserver/src/routes/game/monster/monster_hunt_preset_use.rs similarity index 92% rename from httpserver/src/routes/game/monster_hunt_preset_use.rs rename to httpserver/src/routes/game/monster/monster_hunt_preset_use.rs index 6938f03..ae9cc78 100644 --- a/httpserver/src/routes/game/monster_hunt_preset_use.rs +++ b/httpserver/src/routes/game/monster/monster_hunt_preset_use.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MonsterHuntPresetUseRequest; use crypto::network::parse_packet; -use gameserver::logic::game::monster_hunt_preset_use; +use gameserver::logic::game::monster::monster_hunt_preset_use; use sqlx::SqlitePool; #[put("MonsterHuntPresetUse")] diff --git a/httpserver/src/routes/game/monster_hunt_quick_battle.rs b/httpserver/src/routes/game/monster/monster_hunt_quick_battle.rs similarity index 92% rename from httpserver/src/routes/game/monster_hunt_quick_battle.rs rename to httpserver/src/routes/game/monster/monster_hunt_quick_battle.rs index 3fc58cb..8535cad 100644 --- a/httpserver/src/routes/game/monster_hunt_quick_battle.rs +++ b/httpserver/src/routes/game/monster/monster_hunt_quick_battle.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MonsterHuntQuickBattleRequest; use crypto::network::parse_packet; -use gameserver::logic::game::monster_hunt_quick_battle; +use gameserver::logic::game::monster::monster_hunt_quick_battle; use sqlx::SqlitePool; #[put("MonsterHuntQuickBattle")] diff --git a/httpserver/src/routes/game/monster_hunt_rank_info.rs b/httpserver/src/routes/game/monster/monster_hunt_rank_info.rs similarity index 92% rename from httpserver/src/routes/game/monster_hunt_rank_info.rs rename to httpserver/src/routes/game/monster/monster_hunt_rank_info.rs index 247973f..3697ceb 100644 --- a/httpserver/src/routes/game/monster_hunt_rank_info.rs +++ b/httpserver/src/routes/game/monster/monster_hunt_rank_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MonsterHuntRankInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::monster_hunt_rank_info; +use gameserver::logic::game::monster::monster_hunt_rank_info; use sqlx::SqlitePool; #[put("MonsterHuntRankInfo")] diff --git a/httpserver/src/routes/game/monster_hunt_schedule_info.rs b/httpserver/src/routes/game/monster/monster_hunt_schedule_info.rs similarity index 92% rename from httpserver/src/routes/game/monster_hunt_schedule_info.rs rename to httpserver/src/routes/game/monster/monster_hunt_schedule_info.rs index fa98494..97fe44e 100644 --- a/httpserver/src/routes/game/monster_hunt_schedule_info.rs +++ b/httpserver/src/routes/game/monster/monster_hunt_schedule_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MonsterHuntScheduleInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::monster_hunt_schedule_info; +use gameserver::logic::game::monster::monster_hunt_schedule_info; use sqlx::SqlitePool; #[put("MonsterHuntScheduleInfo")] diff --git a/httpserver/src/routes/game/monster_hunt_season_reward.rs b/httpserver/src/routes/game/monster/monster_hunt_season_reward.rs similarity index 92% rename from httpserver/src/routes/game/monster_hunt_season_reward.rs rename to httpserver/src/routes/game/monster/monster_hunt_season_reward.rs index 99af185..1b66efc 100644 --- a/httpserver/src/routes/game/monster_hunt_season_reward.rs +++ b/httpserver/src/routes/game/monster/monster_hunt_season_reward.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MonsterHuntSeasonRewardRequest; use crypto::network::parse_packet; -use gameserver::logic::game::monster_hunt_season_reward; +use gameserver::logic::game::monster::monster_hunt_season_reward; use sqlx::SqlitePool; #[put("MonsterHuntSeasonReward")] diff --git a/httpserver/src/routes/game/monster_hunt_user_info.rs b/httpserver/src/routes/game/monster/monster_hunt_user_info.rs similarity index 92% rename from httpserver/src/routes/game/monster_hunt_user_info.rs rename to httpserver/src/routes/game/monster/monster_hunt_user_info.rs index f10a537..39bc2ed 100644 --- a/httpserver/src/routes/game/monster_hunt_user_info.rs +++ b/httpserver/src/routes/game/monster/monster_hunt_user_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MonsterHuntUserInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::monster_hunt_user_info; +use gameserver::logic::game::monster::monster_hunt_user_info; use sqlx::SqlitePool; #[put("MonsterHuntUserInfo")] diff --git a/httpserver/src/routes/game/monster_info.rs b/httpserver/src/routes/game/monster/monster_info.rs similarity index 92% rename from httpserver/src/routes/game/monster_info.rs rename to httpserver/src/routes/game/monster/monster_info.rs index 67fe3d2..69092e1 100644 --- a/httpserver/src/routes/game/monster_info.rs +++ b/httpserver/src/routes/game/monster/monster_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MonsterInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::monster_info; +use gameserver::logic::game::monster::monster_info; use sqlx::SqlitePool; #[put("MonsterInfo")] diff --git a/httpserver/src/routes/game/my/mod.rs b/httpserver/src/routes/game/my/mod.rs new file mode 100644 index 0000000..69d331e --- /dev/null +++ b/httpserver/src/routes/game/my/mod.rs @@ -0,0 +1,15 @@ +pub mod my_like_info; +pub mod my_room_expand; +pub mod my_room_hide; +pub mod my_room_item_info; +pub mod my_room_like; +pub mod my_room_move; +pub mod my_room_name_change; +pub mod my_room_primary_change; +pub mod my_room_save; +pub mod my_room_search_friend; +pub mod my_room_search_guild; +pub mod my_room_search_recommend; +pub mod my_room_shop_buy; +pub mod my_room_shop_info; +pub mod my_room_user_info; diff --git a/httpserver/src/routes/game/my_like_info.rs b/httpserver/src/routes/game/my/my_like_info.rs similarity index 93% rename from httpserver/src/routes/game/my_like_info.rs rename to httpserver/src/routes/game/my/my_like_info.rs index c9c6d0a..4b4aa6e 100644 --- a/httpserver/src/routes/game/my_like_info.rs +++ b/httpserver/src/routes/game/my/my_like_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MyLikeInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::my_like_info; +use gameserver::logic::game::my::my_like_info; use sqlx::SqlitePool; #[put("MyLikeInfo")] diff --git a/httpserver/src/routes/game/my_room_expand.rs b/httpserver/src/routes/game/my/my_room_expand.rs similarity index 93% rename from httpserver/src/routes/game/my_room_expand.rs rename to httpserver/src/routes/game/my/my_room_expand.rs index e8e3b43..167a34e 100644 --- a/httpserver/src/routes/game/my_room_expand.rs +++ b/httpserver/src/routes/game/my/my_room_expand.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MyRoomExpandRequest; use crypto::network::parse_packet; -use gameserver::logic::game::my_room_expand; +use gameserver::logic::game::my::my_room_expand; use sqlx::SqlitePool; #[put("MyRoomExpand")] diff --git a/httpserver/src/routes/game/my_room_hide.rs b/httpserver/src/routes/game/my/my_room_hide.rs similarity index 93% rename from httpserver/src/routes/game/my_room_hide.rs rename to httpserver/src/routes/game/my/my_room_hide.rs index aeb4dde..076cc32 100644 --- a/httpserver/src/routes/game/my_room_hide.rs +++ b/httpserver/src/routes/game/my/my_room_hide.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MyRoomHideRequest; use crypto::network::parse_packet; -use gameserver::logic::game::my_room_hide; +use gameserver::logic::game::my::my_room_hide; use sqlx::SqlitePool; #[put("MyRoomHide")] diff --git a/httpserver/src/routes/game/my_room_item_info.rs b/httpserver/src/routes/game/my/my_room_item_info.rs similarity index 93% rename from httpserver/src/routes/game/my_room_item_info.rs rename to httpserver/src/routes/game/my/my_room_item_info.rs index 4e205c3..1a1df71 100644 --- a/httpserver/src/routes/game/my_room_item_info.rs +++ b/httpserver/src/routes/game/my/my_room_item_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MyRoomItemInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::my_room_item_info; +use gameserver::logic::game::my::my_room_item_info; use sqlx::SqlitePool; #[put("MyRoomItemInfo")] diff --git a/httpserver/src/routes/game/my_room_like.rs b/httpserver/src/routes/game/my/my_room_like.rs similarity index 93% rename from httpserver/src/routes/game/my_room_like.rs rename to httpserver/src/routes/game/my/my_room_like.rs index fc4eb4b..195e2f0 100644 --- a/httpserver/src/routes/game/my_room_like.rs +++ b/httpserver/src/routes/game/my/my_room_like.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MyRoomLikeRequest; use crypto::network::parse_packet; -use gameserver::logic::game::my_room_like; +use gameserver::logic::game::my::my_room_like; use sqlx::SqlitePool; #[put("MyRoomLike")] diff --git a/httpserver/src/routes/game/my_room_move.rs b/httpserver/src/routes/game/my/my_room_move.rs similarity index 93% rename from httpserver/src/routes/game/my_room_move.rs rename to httpserver/src/routes/game/my/my_room_move.rs index 17f48ea..19786b0 100644 --- a/httpserver/src/routes/game/my_room_move.rs +++ b/httpserver/src/routes/game/my/my_room_move.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MyRoomMoveRequest; use crypto::network::parse_packet; -use gameserver::logic::game::my_room_move; +use gameserver::logic::game::my::my_room_move; use sqlx::SqlitePool; #[put("MyRoomMove")] diff --git a/httpserver/src/routes/game/my_room_name_change.rs b/httpserver/src/routes/game/my/my_room_name_change.rs similarity index 92% rename from httpserver/src/routes/game/my_room_name_change.rs rename to httpserver/src/routes/game/my/my_room_name_change.rs index 1adf077..cff13da 100644 --- a/httpserver/src/routes/game/my_room_name_change.rs +++ b/httpserver/src/routes/game/my/my_room_name_change.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MyRoomNameChangeRequest; use crypto::network::parse_packet; -use gameserver::logic::game::my_room_name_change; +use gameserver::logic::game::my::my_room_name_change; use sqlx::SqlitePool; #[put("MyRoomNameChange")] diff --git a/httpserver/src/routes/game/my_room_primary_change.rs b/httpserver/src/routes/game/my/my_room_primary_change.rs similarity index 92% rename from httpserver/src/routes/game/my_room_primary_change.rs rename to httpserver/src/routes/game/my/my_room_primary_change.rs index 0eb2649..4561dd0 100644 --- a/httpserver/src/routes/game/my_room_primary_change.rs +++ b/httpserver/src/routes/game/my/my_room_primary_change.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MyRoomPrimaryChangeRequest; use crypto::network::parse_packet; -use gameserver::logic::game::my_room_primary_change; +use gameserver::logic::game::my::my_room_primary_change; use sqlx::SqlitePool; #[put("MyRoomPrimaryChange")] diff --git a/httpserver/src/routes/game/my_room_save.rs b/httpserver/src/routes/game/my/my_room_save.rs similarity index 93% rename from httpserver/src/routes/game/my_room_save.rs rename to httpserver/src/routes/game/my/my_room_save.rs index 18f09e9..d5475ef 100644 --- a/httpserver/src/routes/game/my_room_save.rs +++ b/httpserver/src/routes/game/my/my_room_save.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MyRoomSaveRequest; use crypto::network::parse_packet; -use gameserver::logic::game::my_room_save; +use gameserver::logic::game::my::my_room_save; use sqlx::SqlitePool; #[put("MyRoomSave")] diff --git a/httpserver/src/routes/game/my_room_search_friend.rs b/httpserver/src/routes/game/my/my_room_search_friend.rs similarity index 92% rename from httpserver/src/routes/game/my_room_search_friend.rs rename to httpserver/src/routes/game/my/my_room_search_friend.rs index 02f4a92..08918d5 100644 --- a/httpserver/src/routes/game/my_room_search_friend.rs +++ b/httpserver/src/routes/game/my/my_room_search_friend.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MyRoomSearchFriendRequest; use crypto::network::parse_packet; -use gameserver::logic::game::my_room_search_friend; +use gameserver::logic::game::my::my_room_search_friend; use sqlx::SqlitePool; #[put("MyRoomSearchFriend")] diff --git a/httpserver/src/routes/game/my_room_search_guild.rs b/httpserver/src/routes/game/my/my_room_search_guild.rs similarity index 93% rename from httpserver/src/routes/game/my_room_search_guild.rs rename to httpserver/src/routes/game/my/my_room_search_guild.rs index caec89c..0373482 100644 --- a/httpserver/src/routes/game/my_room_search_guild.rs +++ b/httpserver/src/routes/game/my/my_room_search_guild.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MyRoomSearchGuildRequest; use crypto::network::parse_packet; -use gameserver::logic::game::my_room_search_guild; +use gameserver::logic::game::my::my_room_search_guild; use sqlx::SqlitePool; #[put("MyRoomSearchGuild")] diff --git a/httpserver/src/routes/game/my_room_search_recommend.rs b/httpserver/src/routes/game/my/my_room_search_recommend.rs similarity index 92% rename from httpserver/src/routes/game/my_room_search_recommend.rs rename to httpserver/src/routes/game/my/my_room_search_recommend.rs index 5ec8868..79a9c6e 100644 --- a/httpserver/src/routes/game/my_room_search_recommend.rs +++ b/httpserver/src/routes/game/my/my_room_search_recommend.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MyRoomSearchRecommendRequest; use crypto::network::parse_packet; -use gameserver::logic::game::my_room_search_recommend; +use gameserver::logic::game::my::my_room_search_recommend; use sqlx::SqlitePool; #[put("MyRoomSearchRecommend")] diff --git a/httpserver/src/routes/game/my_room_shop_buy.rs b/httpserver/src/routes/game/my/my_room_shop_buy.rs similarity index 93% rename from httpserver/src/routes/game/my_room_shop_buy.rs rename to httpserver/src/routes/game/my/my_room_shop_buy.rs index e132125..103165f 100644 --- a/httpserver/src/routes/game/my_room_shop_buy.rs +++ b/httpserver/src/routes/game/my/my_room_shop_buy.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MyRoomShopBuyRequest; use crypto::network::parse_packet; -use gameserver::logic::game::my_room_shop_buy; +use gameserver::logic::game::my::my_room_shop_buy; use sqlx::SqlitePool; #[put("MyRoomShopBuy")] diff --git a/httpserver/src/routes/game/my_room_shop_info.rs b/httpserver/src/routes/game/my/my_room_shop_info.rs similarity index 93% rename from httpserver/src/routes/game/my_room_shop_info.rs rename to httpserver/src/routes/game/my/my_room_shop_info.rs index bb58628..dc22552 100644 --- a/httpserver/src/routes/game/my_room_shop_info.rs +++ b/httpserver/src/routes/game/my/my_room_shop_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MyRoomShopInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::my_room_shop_info; +use gameserver::logic::game::my::my_room_shop_info; use sqlx::SqlitePool; #[put("MyRoomShopInfo")] diff --git a/httpserver/src/routes/game/my_room_user_info.rs b/httpserver/src/routes/game/my/my_room_user_info.rs similarity index 93% rename from httpserver/src/routes/game/my_room_user_info.rs rename to httpserver/src/routes/game/my/my_room_user_info.rs index 5717509..cc8db6a 100644 --- a/httpserver/src/routes/game/my_room_user_info.rs +++ b/httpserver/src/routes/game/my/my_room_user_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::MyRoomUserInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::my_room_user_info; +use gameserver::logic::game::my::my_room_user_info; use sqlx::SqlitePool; #[put("MyRoomUserInfo")] diff --git a/httpserver/src/routes/game/notice/mod.rs b/httpserver/src/routes/game/notice/mod.rs new file mode 100644 index 0000000..7619593 --- /dev/null +++ b/httpserver/src/routes/game/notice/mod.rs @@ -0,0 +1,2 @@ +pub mod notice_detail_info; +pub mod notice_info; diff --git a/httpserver/src/routes/game/notice_detail_info.rs b/httpserver/src/routes/game/notice/notice_detail_info.rs similarity index 92% rename from httpserver/src/routes/game/notice_detail_info.rs rename to httpserver/src/routes/game/notice/notice_detail_info.rs index 26dcafe..931e11b 100644 --- a/httpserver/src/routes/game/notice_detail_info.rs +++ b/httpserver/src/routes/game/notice/notice_detail_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::NoticeDetailInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::notice_detail_info; +use gameserver::logic::game::notice::notice_detail_info; use sqlx::SqlitePool; #[put("NoticeDetailInfo")] diff --git a/httpserver/src/routes/game/notice_info.rs b/httpserver/src/routes/game/notice/notice_info.rs similarity index 92% rename from httpserver/src/routes/game/notice_info.rs rename to httpserver/src/routes/game/notice/notice_info.rs index b3879e7..0515072 100644 --- a/httpserver/src/routes/game/notice_info.rs +++ b/httpserver/src/routes/game/notice/notice_info.rs @@ -1,7 +1,7 @@ use actix_web::{HttpResponse, Result, put, web}; use bd2::proto::proto_net::NoticeInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::notice_info; +use gameserver::logic::game::notice::notice_info; use sqlx::SqlitePool; #[put("NoticeInfo")] diff --git a/httpserver/src/routes/game/npc/mod.rs b/httpserver/src/routes/game/npc/mod.rs new file mode 100644 index 0000000..60d8271 --- /dev/null +++ b/httpserver/src/routes/game/npc/mod.rs @@ -0,0 +1,2 @@ +pub mod npc_reputation_info; +pub mod npc_reputation_recovery; diff --git a/httpserver/src/routes/game/npc_reputation_info.rs b/httpserver/src/routes/game/npc/npc_reputation_info.rs similarity index 92% rename from httpserver/src/routes/game/npc_reputation_info.rs rename to httpserver/src/routes/game/npc/npc_reputation_info.rs index 0872811..dbe4d05 100644 --- a/httpserver/src/routes/game/npc_reputation_info.rs +++ b/httpserver/src/routes/game/npc/npc_reputation_info.rs @@ -1,7 +1,7 @@ use actix_web::{HttpResponse, Result, put, web}; use bd2::NpcReputationInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::npc_reputation_info; +use gameserver::logic::game::npc::npc_reputation_info; use sqlx::SqlitePool; #[put("NpcReputationInfo")] diff --git a/httpserver/src/routes/game/npc_reputation_recovery.rs b/httpserver/src/routes/game/npc/npc_reputation_recovery.rs similarity index 92% rename from httpserver/src/routes/game/npc_reputation_recovery.rs rename to httpserver/src/routes/game/npc/npc_reputation_recovery.rs index 90aabc3..5305974 100644 --- a/httpserver/src/routes/game/npc_reputation_recovery.rs +++ b/httpserver/src/routes/game/npc/npc_reputation_recovery.rs @@ -1,7 +1,7 @@ use actix_web::{HttpResponse, Result, put, web}; use bd2::NpcReputationRecoveryRequest; use crypto::network::parse_packet; -use gameserver::logic::game::npc_reputation_recovery; +use gameserver::logic::game::npc::npc_reputation_recovery; use sqlx::SqlitePool; #[put("NpcReputationRecovery")] diff --git a/httpserver/src/routes/game/overwhelm.rs b/httpserver/src/routes/game/overwhelm.rs index 2548d33..6ac261d 100644 --- a/httpserver/src/routes/game/overwhelm.rs +++ b/httpserver/src/routes/game/overwhelm.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::OverwhelmRequest; use crypto::network::parse_packet; -use gameserver::logic::game::overwhelm; +use gameserver::logic::game::game::overwhelm; use sqlx::SqlitePool; #[put("Overwhelm")] diff --git a/httpserver/src/routes/game/pack/mod.rs b/httpserver/src/routes/game/pack/mod.rs new file mode 100644 index 0000000..586c5fc --- /dev/null +++ b/httpserver/src/routes/game/pack/mod.rs @@ -0,0 +1,12 @@ +pub mod pack_buy; +pub mod pack_detail; +pub mod pack_event_battle_info; +pub mod pack_event_story_clear; +pub mod pack_event_story_info; +pub mod pack_event_story_replay_clear; +pub mod pack_in_game_info; +pub mod pack_info; +pub mod pack_jam_event; +pub mod pack_preview_info; +pub mod pack_reward_object_count; +pub mod pack_sub_quest_clear_info; diff --git a/httpserver/src/routes/game/pack_buy.rs b/httpserver/src/routes/game/pack/pack_buy.rs similarity index 93% rename from httpserver/src/routes/game/pack_buy.rs rename to httpserver/src/routes/game/pack/pack_buy.rs index 9429236..5df6a46 100644 --- a/httpserver/src/routes/game/pack_buy.rs +++ b/httpserver/src/routes/game/pack/pack_buy.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::PackBuyRequest; use crypto::network::parse_packet; -use gameserver::logic::game::pack_buy; +use gameserver::logic::game::pack::pack_buy; use sqlx::SqlitePool; #[put("PackBuy")] diff --git a/httpserver/src/routes/game/pack_detail.rs b/httpserver/src/routes/game/pack/pack_detail.rs similarity index 93% rename from httpserver/src/routes/game/pack_detail.rs rename to httpserver/src/routes/game/pack/pack_detail.rs index 0758379..f472192 100644 --- a/httpserver/src/routes/game/pack_detail.rs +++ b/httpserver/src/routes/game/pack/pack_detail.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::PackDetailRequest; use crypto::network::parse_packet; -use gameserver::logic::game::pack_detail; +use gameserver::logic::game::pack::pack_detail; use sqlx::SqlitePool; #[put("PackDetail")] diff --git a/httpserver/src/routes/game/pack_event_battle_info.rs b/httpserver/src/routes/game/pack/pack_event_battle_info.rs similarity index 92% rename from httpserver/src/routes/game/pack_event_battle_info.rs rename to httpserver/src/routes/game/pack/pack_event_battle_info.rs index 1060f0c..a9101c0 100644 --- a/httpserver/src/routes/game/pack_event_battle_info.rs +++ b/httpserver/src/routes/game/pack/pack_event_battle_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::PackEventBattleInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::pack_event_battle_info; +use gameserver::logic::game::pack::pack_event_battle_info; use sqlx::SqlitePool; #[put("PackEventBattleInfo")] diff --git a/httpserver/src/routes/game/pack_event_story_clear.rs b/httpserver/src/routes/game/pack/pack_event_story_clear.rs similarity index 92% rename from httpserver/src/routes/game/pack_event_story_clear.rs rename to httpserver/src/routes/game/pack/pack_event_story_clear.rs index abffa71..fcadf79 100644 --- a/httpserver/src/routes/game/pack_event_story_clear.rs +++ b/httpserver/src/routes/game/pack/pack_event_story_clear.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::PackEventStoryClearRequest; use crypto::network::parse_packet; -use gameserver::logic::game::pack_event_story_clear; +use gameserver::logic::game::pack::pack_event_story_clear; use sqlx::SqlitePool; #[put("PackEventStoryClear")] diff --git a/httpserver/src/routes/game/pack_event_story_info.rs b/httpserver/src/routes/game/pack/pack_event_story_info.rs similarity index 92% rename from httpserver/src/routes/game/pack_event_story_info.rs rename to httpserver/src/routes/game/pack/pack_event_story_info.rs index 42b77db..f9cf61b 100644 --- a/httpserver/src/routes/game/pack_event_story_info.rs +++ b/httpserver/src/routes/game/pack/pack_event_story_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::PackEventStoryInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::pack_event_story_info; +use gameserver::logic::game::pack::pack_event_story_info; use sqlx::SqlitePool; #[put("PackEventStoryInfo")] diff --git a/httpserver/src/routes/game/pack_event_story_replay_clear.rs b/httpserver/src/routes/game/pack/pack_event_story_replay_clear.rs similarity index 92% rename from httpserver/src/routes/game/pack_event_story_replay_clear.rs rename to httpserver/src/routes/game/pack/pack_event_story_replay_clear.rs index 7fd4de8..4ec7930 100644 --- a/httpserver/src/routes/game/pack_event_story_replay_clear.rs +++ b/httpserver/src/routes/game/pack/pack_event_story_replay_clear.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::PackEventStoryReplayClearRequest; use crypto::network::parse_packet; -use gameserver::logic::game::pack_event_story_replay_clear; +use gameserver::logic::game::pack::pack_event_story_replay_clear; use sqlx::SqlitePool; #[put("PackEventStoryReplayClear")] diff --git a/httpserver/src/routes/game/pack_in_game_info.rs b/httpserver/src/routes/game/pack/pack_in_game_info.rs similarity index 92% rename from httpserver/src/routes/game/pack_in_game_info.rs rename to httpserver/src/routes/game/pack/pack_in_game_info.rs index 80933d6..8c6c0c9 100644 --- a/httpserver/src/routes/game/pack_in_game_info.rs +++ b/httpserver/src/routes/game/pack/pack_in_game_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::PackInGameInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::pack_in_game_info; +use gameserver::logic::game::pack::pack_in_game_info; use sqlx::SqlitePool; #[put("PackInGameInfo")] diff --git a/httpserver/src/routes/game/pack_info.rs b/httpserver/src/routes/game/pack/pack_info.rs similarity index 93% rename from httpserver/src/routes/game/pack_info.rs rename to httpserver/src/routes/game/pack/pack_info.rs index 139b5f6..46f94a8 100644 --- a/httpserver/src/routes/game/pack_info.rs +++ b/httpserver/src/routes/game/pack/pack_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::PackInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::pack_info; +use gameserver::logic::game::pack::pack_info; use sqlx::SqlitePool; #[put("PackInfo")] diff --git a/httpserver/src/routes/game/pack_jam_event.rs b/httpserver/src/routes/game/pack/pack_jam_event.rs similarity index 92% rename from httpserver/src/routes/game/pack_jam_event.rs rename to httpserver/src/routes/game/pack/pack_jam_event.rs index 7f891cd..3c7fd5a 100644 --- a/httpserver/src/routes/game/pack_jam_event.rs +++ b/httpserver/src/routes/game/pack/pack_jam_event.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::PackJamEventRequest; use crypto::network::parse_packet; -use gameserver::logic::game::pack_jam_event; +use gameserver::logic::game::pack::pack_jam_event; use sqlx::SqlitePool; #[put("PackJamEvent")] diff --git a/httpserver/src/routes/game/pack_preview_info.rs b/httpserver/src/routes/game/pack/pack_preview_info.rs similarity index 92% rename from httpserver/src/routes/game/pack_preview_info.rs rename to httpserver/src/routes/game/pack/pack_preview_info.rs index f6637a8..2dc938e 100644 --- a/httpserver/src/routes/game/pack_preview_info.rs +++ b/httpserver/src/routes/game/pack/pack_preview_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::PackPreviewInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::pack_preview_info; +use gameserver::logic::game::pack::pack_preview_info; use sqlx::SqlitePool; #[put("PackPreviewInfo")] diff --git a/httpserver/src/routes/game/pack_reward_object_count.rs b/httpserver/src/routes/game/pack/pack_reward_object_count.rs similarity index 92% rename from httpserver/src/routes/game/pack_reward_object_count.rs rename to httpserver/src/routes/game/pack/pack_reward_object_count.rs index 0046b71..633c7d6 100644 --- a/httpserver/src/routes/game/pack_reward_object_count.rs +++ b/httpserver/src/routes/game/pack/pack_reward_object_count.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::PackRewardObjectCountRequest; use crypto::network::parse_packet; -use gameserver::logic::game::pack_reward_object_count; +use gameserver::logic::game::pack::pack_reward_object_count; use sqlx::SqlitePool; #[put("PackRewardObjectCount")] diff --git a/httpserver/src/routes/game/pack_sub_quest_clear_info.rs b/httpserver/src/routes/game/pack/pack_sub_quest_clear_info.rs similarity index 92% rename from httpserver/src/routes/game/pack_sub_quest_clear_info.rs rename to httpserver/src/routes/game/pack/pack_sub_quest_clear_info.rs index b5d4202..4083da9 100644 --- a/httpserver/src/routes/game/pack_sub_quest_clear_info.rs +++ b/httpserver/src/routes/game/pack/pack_sub_quest_clear_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::PackSubQuestClearInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::pack_sub_quest_clear_info; +use gameserver::logic::game::pack::pack_sub_quest_clear_info; use sqlx::SqlitePool; #[put("PackSubQuestClearInfo")] diff --git a/httpserver/src/routes/game/pass/mod.rs b/httpserver/src/routes/game/pass/mod.rs new file mode 100644 index 0000000..7f6d22c --- /dev/null +++ b/httpserver/src/routes/game/pass/mod.rs @@ -0,0 +1,3 @@ +pub mod pass_buy; +pub mod pass_info; +pub mod pass_reward; diff --git a/httpserver/src/routes/game/pass_buy.rs b/httpserver/src/routes/game/pass/pass_buy.rs similarity index 93% rename from httpserver/src/routes/game/pass_buy.rs rename to httpserver/src/routes/game/pass/pass_buy.rs index 53b6960..a8d4387 100644 --- a/httpserver/src/routes/game/pass_buy.rs +++ b/httpserver/src/routes/game/pass/pass_buy.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::PassBuyRequest; use crypto::network::parse_packet; -use gameserver::logic::game::pass_buy; +use gameserver::logic::game::pass::pass_buy; use sqlx::SqlitePool; #[put("PassBuy")] diff --git a/httpserver/src/routes/game/pass_info.rs b/httpserver/src/routes/game/pass/pass_info.rs similarity index 93% rename from httpserver/src/routes/game/pass_info.rs rename to httpserver/src/routes/game/pass/pass_info.rs index f147cb8..19ae773 100644 --- a/httpserver/src/routes/game/pass_info.rs +++ b/httpserver/src/routes/game/pass/pass_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::PassInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::pass_info; +use gameserver::logic::game::pass::pass_info; use sqlx::SqlitePool; #[put("PassInfo")] diff --git a/httpserver/src/routes/game/pass_reward.rs b/httpserver/src/routes/game/pass/pass_reward.rs similarity index 93% rename from httpserver/src/routes/game/pass_reward.rs rename to httpserver/src/routes/game/pass/pass_reward.rs index fdedd6a..422c6ce 100644 --- a/httpserver/src/routes/game/pass_reward.rs +++ b/httpserver/src/routes/game/pass/pass_reward.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::PassRewardRequest; use crypto::network::parse_packet; -use gameserver::logic::game::pass_reward; +use gameserver::logic::game::pass::pass_reward; use sqlx::SqlitePool; #[put("PassReward")] diff --git a/httpserver/src/routes/game/personal/mod.rs b/httpserver/src/routes/game/personal/mod.rs new file mode 100644 index 0000000..2eac6ff --- /dev/null +++ b/httpserver/src/routes/game/personal/mod.rs @@ -0,0 +1 @@ +pub mod personal_info; diff --git a/httpserver/src/routes/game/personal_info.rs b/httpserver/src/routes/game/personal/personal_info.rs similarity index 92% rename from httpserver/src/routes/game/personal_info.rs rename to httpserver/src/routes/game/personal/personal_info.rs index b69e4d8..3da490e 100644 --- a/httpserver/src/routes/game/personal_info.rs +++ b/httpserver/src/routes/game/personal/personal_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::PersonalInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::personal_info; +use gameserver::logic::game::personal::personal_info; use sqlx::SqlitePool; #[put("PersonalInfo")] diff --git a/httpserver/src/routes/game/pictorial/mod.rs b/httpserver/src/routes/game/pictorial/mod.rs new file mode 100644 index 0000000..cd56a5d --- /dev/null +++ b/httpserver/src/routes/game/pictorial/mod.rs @@ -0,0 +1 @@ +pub mod pictorial_book_info; diff --git a/httpserver/src/routes/game/pictorial_book_info.rs b/httpserver/src/routes/game/pictorial/pictorial_book_info.rs similarity index 92% rename from httpserver/src/routes/game/pictorial_book_info.rs rename to httpserver/src/routes/game/pictorial/pictorial_book_info.rs index 5142c16..c66b524 100644 --- a/httpserver/src/routes/game/pictorial_book_info.rs +++ b/httpserver/src/routes/game/pictorial/pictorial_book_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::PictorialBookInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::pictorial_book_info; +use gameserver::logic::game::pictorial::pictorial_book_info; use sqlx::SqlitePool; #[put("PictorialBookInfo")] diff --git a/httpserver/src/routes/game/ping/mod.rs b/httpserver/src/routes/game/ping/mod.rs new file mode 100644 index 0000000..538849c --- /dev/null +++ b/httpserver/src/routes/game/ping/mod.rs @@ -0,0 +1 @@ +pub mod ping_check; diff --git a/httpserver/src/routes/game/ping_check.rs b/httpserver/src/routes/game/ping/ping_check.rs similarity index 93% rename from httpserver/src/routes/game/ping_check.rs rename to httpserver/src/routes/game/ping/ping_check.rs index d4afaa2..ede36ca 100644 --- a/httpserver/src/routes/game/ping_check.rs +++ b/httpserver/src/routes/game/ping/ping_check.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::PingCheckRequest; use crypto::network::parse_packet; -use gameserver::logic::game::ping_check; +use gameserver::logic::game::ping::ping_check; use sqlx::SqlitePool; #[put("PingCheck")] diff --git a/httpserver/src/routes/game/platform/mod.rs b/httpserver/src/routes/game/platform/mod.rs new file mode 100644 index 0000000..b6e13b0 --- /dev/null +++ b/httpserver/src/routes/game/platform/mod.rs @@ -0,0 +1 @@ +pub mod platform_login; diff --git a/httpserver/src/routes/game/platform_login.rs b/httpserver/src/routes/game/platform/platform_login.rs similarity index 92% rename from httpserver/src/routes/game/platform_login.rs rename to httpserver/src/routes/game/platform/platform_login.rs index abf7845..0d768ed 100644 --- a/httpserver/src/routes/game/platform_login.rs +++ b/httpserver/src/routes/game/platform/platform_login.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::PlatformLoginRequest; use crypto::network::parse_packet; -use gameserver::logic::game::platform_login; +use gameserver::logic::game::platform::platform_login; use sqlx::SqlitePool; #[put("PlatformLogin")] diff --git a/httpserver/src/routes/game/popular/mod.rs b/httpserver/src/routes/game/popular/mod.rs new file mode 100644 index 0000000..43392d1 --- /dev/null +++ b/httpserver/src/routes/game/popular/mod.rs @@ -0,0 +1,2 @@ +pub mod popular_costume_info; +pub mod popular_equip_info; diff --git a/httpserver/src/routes/game/popular_costume_info.rs b/httpserver/src/routes/game/popular/popular_costume_info.rs similarity index 92% rename from httpserver/src/routes/game/popular_costume_info.rs rename to httpserver/src/routes/game/popular/popular_costume_info.rs index 418418b..b7bd0b8 100644 --- a/httpserver/src/routes/game/popular_costume_info.rs +++ b/httpserver/src/routes/game/popular/popular_costume_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::PopularCostumeInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::popular_costume_info; +use gameserver::logic::game::popular::popular_costume_info; use sqlx::SqlitePool; #[put("PopularCostumeInfo")] diff --git a/httpserver/src/routes/game/popular_equip_info.rs b/httpserver/src/routes/game/popular/popular_equip_info.rs similarity index 92% rename from httpserver/src/routes/game/popular_equip_info.rs rename to httpserver/src/routes/game/popular/popular_equip_info.rs index 6659bb9..2b41b00 100644 --- a/httpserver/src/routes/game/popular_equip_info.rs +++ b/httpserver/src/routes/game/popular/popular_equip_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::PopularEquipInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::popular_equip_info; +use gameserver::logic::game::popular::popular_equip_info; use sqlx::SqlitePool; #[put("PopularEquipInfo")] diff --git a/httpserver/src/routes/game/preset/mod.rs b/httpserver/src/routes/game/preset/mod.rs new file mode 100644 index 0000000..2d250e9 --- /dev/null +++ b/httpserver/src/routes/game/preset/mod.rs @@ -0,0 +1,6 @@ +pub mod preset_add_slot; +pub mod preset_delete; +pub mod preset_info; +pub mod preset_info_change; +pub mod preset_save; +pub mod preset_use; diff --git a/httpserver/src/routes/game/preset_add_slot.rs b/httpserver/src/routes/game/preset/preset_add_slot.rs similarity index 92% rename from httpserver/src/routes/game/preset_add_slot.rs rename to httpserver/src/routes/game/preset/preset_add_slot.rs index a512715..52b58f5 100644 --- a/httpserver/src/routes/game/preset_add_slot.rs +++ b/httpserver/src/routes/game/preset/preset_add_slot.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::PresetAddSlotRequest; use crypto::network::parse_packet; -use gameserver::logic::game::preset_add_slot; +use gameserver::logic::game::preset::preset_add_slot; use sqlx::SqlitePool; #[put("PresetAddSlot")] diff --git a/httpserver/src/routes/game/preset_delete.rs b/httpserver/src/routes/game/preset/preset_delete.rs similarity index 92% rename from httpserver/src/routes/game/preset_delete.rs rename to httpserver/src/routes/game/preset/preset_delete.rs index 9c7bd32..58d00b2 100644 --- a/httpserver/src/routes/game/preset_delete.rs +++ b/httpserver/src/routes/game/preset/preset_delete.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::PresetDeleteRequest; use crypto::network::parse_packet; -use gameserver::logic::game::preset_delete; +use gameserver::logic::game::preset::preset_delete; use sqlx::SqlitePool; #[put("PresetDelete")] diff --git a/httpserver/src/routes/game/preset_info.rs b/httpserver/src/routes/game/preset/preset_info.rs similarity index 92% rename from httpserver/src/routes/game/preset_info.rs rename to httpserver/src/routes/game/preset/preset_info.rs index 777be30..41c3700 100644 --- a/httpserver/src/routes/game/preset_info.rs +++ b/httpserver/src/routes/game/preset/preset_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::PresetInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::preset_info; +use gameserver::logic::game::preset::preset_info; use sqlx::SqlitePool; #[put("PresetInfo")] diff --git a/httpserver/src/routes/game/preset_info_change.rs b/httpserver/src/routes/game/preset/preset_info_change.rs similarity index 92% rename from httpserver/src/routes/game/preset_info_change.rs rename to httpserver/src/routes/game/preset/preset_info_change.rs index 86d7b0a..75d0571 100644 --- a/httpserver/src/routes/game/preset_info_change.rs +++ b/httpserver/src/routes/game/preset/preset_info_change.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::PresetInfoChangeRequest; use crypto::network::parse_packet; -use gameserver::logic::game::preset_info_change; +use gameserver::logic::game::preset::preset_info_change; use sqlx::SqlitePool; #[put("PresetInfoChange")] diff --git a/httpserver/src/routes/game/preset_save.rs b/httpserver/src/routes/game/preset/preset_save.rs similarity index 92% rename from httpserver/src/routes/game/preset_save.rs rename to httpserver/src/routes/game/preset/preset_save.rs index faed510..cde47b6 100644 --- a/httpserver/src/routes/game/preset_save.rs +++ b/httpserver/src/routes/game/preset/preset_save.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::PresetSaveRequest; use crypto::network::parse_packet; -use gameserver::logic::game::preset_save; +use gameserver::logic::game::preset::preset_save; use sqlx::SqlitePool; #[put("PresetSave")] diff --git a/httpserver/src/routes/game/preset_use.rs b/httpserver/src/routes/game/preset/preset_use.rs similarity index 93% rename from httpserver/src/routes/game/preset_use.rs rename to httpserver/src/routes/game/preset/preset_use.rs index e56ac44..f780d6d 100644 --- a/httpserver/src/routes/game/preset_use.rs +++ b/httpserver/src/routes/game/preset/preset_use.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::PresetUseRequest; use crypto::network::parse_packet; -use gameserver::logic::game::preset_use; +use gameserver::logic::game::preset::preset_use; use sqlx::SqlitePool; #[put("PresetUse")] diff --git a/httpserver/src/routes/game/prestige/mod.rs b/httpserver/src/routes/game/prestige/mod.rs new file mode 100644 index 0000000..fe8a7ab --- /dev/null +++ b/httpserver/src/routes/game/prestige/mod.rs @@ -0,0 +1,2 @@ +pub mod prestige_skin_info; +pub mod prestige_skin_set; diff --git a/httpserver/src/routes/game/prestige_skin_info.rs b/httpserver/src/routes/game/prestige/prestige_skin_info.rs similarity index 92% rename from httpserver/src/routes/game/prestige_skin_info.rs rename to httpserver/src/routes/game/prestige/prestige_skin_info.rs index 0bba606..76a8c10 100644 --- a/httpserver/src/routes/game/prestige_skin_info.rs +++ b/httpserver/src/routes/game/prestige/prestige_skin_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::PrestigeSkinInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::prestige_skin_info; +use gameserver::logic::game::prestige::prestige_skin_info; use sqlx::SqlitePool; #[put("PrestigeSkinInfo")] diff --git a/httpserver/src/routes/game/prestige_skin_set.rs b/httpserver/src/routes/game/prestige/prestige_skin_set.rs similarity index 92% rename from httpserver/src/routes/game/prestige_skin_set.rs rename to httpserver/src/routes/game/prestige/prestige_skin_set.rs index 6a2b506..58991fd 100644 --- a/httpserver/src/routes/game/prestige_skin_set.rs +++ b/httpserver/src/routes/game/prestige/prestige_skin_set.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::PrestigeSkinSetRequest; use crypto::network::parse_packet; -use gameserver::logic::game::prestige_skin_set; +use gameserver::logic::game::prestige::prestige_skin_set; use sqlx::SqlitePool; #[put("PrestigeSkinSet")] diff --git a/httpserver/src/routes/game/pvp/mod.rs b/httpserver/src/routes/game/pvp/mod.rs new file mode 100644 index 0000000..749b8c5 --- /dev/null +++ b/httpserver/src/routes/game/pvp/mod.rs @@ -0,0 +1,16 @@ +pub mod pvp_battle_deck_info; +pub mod pvp_battle_deck_save; +pub mod pvp_battle_end; +pub mod pvp_battle_history; +pub mod pvp_battle_history_deck_info; +pub mod pvp_battle_matching; +pub mod pvp_battle_once_reward_info; +pub mod pvp_battle_rank_user_detail; +pub mod pvp_battle_ranking; +pub mod pvp_battle_replay_info; +pub mod pvp_battle_reset; +pub mod pvp_battle_reward; +pub mod pvp_battle_start; +pub mod pvp_battle_user_info; +pub mod pvp_contents_item_renew; +pub mod pvp_season_reward; diff --git a/httpserver/src/routes/game/pvp_battle_deck_info.rs b/httpserver/src/routes/game/pvp/pvp_battle_deck_info.rs similarity index 92% rename from httpserver/src/routes/game/pvp_battle_deck_info.rs rename to httpserver/src/routes/game/pvp/pvp_battle_deck_info.rs index 5701058..94c7b41 100644 --- a/httpserver/src/routes/game/pvp_battle_deck_info.rs +++ b/httpserver/src/routes/game/pvp/pvp_battle_deck_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::PvpBattleDeckInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::pvp_battle_deck_info; +use gameserver::logic::game::pvp::pvp_battle_deck_info; use sqlx::SqlitePool; #[put("PvpBattleDeckInfo")] diff --git a/httpserver/src/routes/game/pvp_battle_deck_save.rs b/httpserver/src/routes/game/pvp/pvp_battle_deck_save.rs similarity index 92% rename from httpserver/src/routes/game/pvp_battle_deck_save.rs rename to httpserver/src/routes/game/pvp/pvp_battle_deck_save.rs index 13829db..ca5e29b 100644 --- a/httpserver/src/routes/game/pvp_battle_deck_save.rs +++ b/httpserver/src/routes/game/pvp/pvp_battle_deck_save.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::PvpBattleDeckSaveRequest; use crypto::network::parse_packet; -use gameserver::logic::game::pvp_battle_deck_save; +use gameserver::logic::game::pvp::pvp_battle_deck_save; use sqlx::SqlitePool; #[put("PvpBattleDeckSave")] diff --git a/httpserver/src/routes/game/pvp_battle_end.rs b/httpserver/src/routes/game/pvp/pvp_battle_end.rs similarity index 93% rename from httpserver/src/routes/game/pvp_battle_end.rs rename to httpserver/src/routes/game/pvp/pvp_battle_end.rs index a7924a9..a59ea8c 100644 --- a/httpserver/src/routes/game/pvp_battle_end.rs +++ b/httpserver/src/routes/game/pvp/pvp_battle_end.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::PvpBattleEndRequest; use crypto::network::parse_packet; -use gameserver::logic::game::pvp_battle_end; +use gameserver::logic::game::pvp::pvp_battle_end; use sqlx::SqlitePool; #[put("PvpBattleEnd")] diff --git a/httpserver/src/routes/game/pvp_battle_history.rs b/httpserver/src/routes/game/pvp/pvp_battle_history.rs similarity index 92% rename from httpserver/src/routes/game/pvp_battle_history.rs rename to httpserver/src/routes/game/pvp/pvp_battle_history.rs index f3b2fb0..f414fc7 100644 --- a/httpserver/src/routes/game/pvp_battle_history.rs +++ b/httpserver/src/routes/game/pvp/pvp_battle_history.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::PvpBattleHistoryRequest; use crypto::network::parse_packet; -use gameserver::logic::game::pvp_battle_history; +use gameserver::logic::game::pvp::pvp_battle_history; use sqlx::SqlitePool; #[put("PvpBattleHistory")] diff --git a/httpserver/src/routes/game/pvp_battle_history_deck_info.rs b/httpserver/src/routes/game/pvp/pvp_battle_history_deck_info.rs similarity index 92% rename from httpserver/src/routes/game/pvp_battle_history_deck_info.rs rename to httpserver/src/routes/game/pvp/pvp_battle_history_deck_info.rs index a6deea4..8583adb 100644 --- a/httpserver/src/routes/game/pvp_battle_history_deck_info.rs +++ b/httpserver/src/routes/game/pvp/pvp_battle_history_deck_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::PvpBattleHistoryDeckInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::pvp_battle_history_deck_info; +use gameserver::logic::game::pvp::pvp_battle_history_deck_info; use sqlx::SqlitePool; #[put("PvpBattleHistoryDeckInfo")] diff --git a/httpserver/src/routes/game/pvp_battle_matching.rs b/httpserver/src/routes/game/pvp/pvp_battle_matching.rs similarity index 92% rename from httpserver/src/routes/game/pvp_battle_matching.rs rename to httpserver/src/routes/game/pvp/pvp_battle_matching.rs index ab56fe4..3a8db41 100644 --- a/httpserver/src/routes/game/pvp_battle_matching.rs +++ b/httpserver/src/routes/game/pvp/pvp_battle_matching.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::PvpBattleMatchingRequest; use crypto::network::parse_packet; -use gameserver::logic::game::pvp_battle_matching; +use gameserver::logic::game::pvp::pvp_battle_matching; use sqlx::SqlitePool; #[put("PvpBattleMatching")] diff --git a/httpserver/src/routes/game/pvp_battle_once_reward_info.rs b/httpserver/src/routes/game/pvp/pvp_battle_once_reward_info.rs similarity index 92% rename from httpserver/src/routes/game/pvp_battle_once_reward_info.rs rename to httpserver/src/routes/game/pvp/pvp_battle_once_reward_info.rs index 537dbb8..ba781ea 100644 --- a/httpserver/src/routes/game/pvp_battle_once_reward_info.rs +++ b/httpserver/src/routes/game/pvp/pvp_battle_once_reward_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::PvpBattleOnceRewardInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::pvp_battle_once_reward_info; +use gameserver::logic::game::pvp::pvp_battle_once_reward_info; use sqlx::SqlitePool; #[put("PvpBattleOnceRewardInfo")] diff --git a/httpserver/src/routes/game/pvp_battle_rank_user_detail.rs b/httpserver/src/routes/game/pvp/pvp_battle_rank_user_detail.rs similarity index 92% rename from httpserver/src/routes/game/pvp_battle_rank_user_detail.rs rename to httpserver/src/routes/game/pvp/pvp_battle_rank_user_detail.rs index b9089e0..388fd22 100644 --- a/httpserver/src/routes/game/pvp_battle_rank_user_detail.rs +++ b/httpserver/src/routes/game/pvp/pvp_battle_rank_user_detail.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::PvpBattleRankUserDetailRequest; use crypto::network::parse_packet; -use gameserver::logic::game::pvp_battle_rank_user_detail; +use gameserver::logic::game::pvp::pvp_battle_rank_user_detail; use sqlx::SqlitePool; #[put("PvpBattleRankUserDetail")] diff --git a/httpserver/src/routes/game/pvp_battle_ranking.rs b/httpserver/src/routes/game/pvp/pvp_battle_ranking.rs similarity index 92% rename from httpserver/src/routes/game/pvp_battle_ranking.rs rename to httpserver/src/routes/game/pvp/pvp_battle_ranking.rs index cdfe5bf..8188590 100644 --- a/httpserver/src/routes/game/pvp_battle_ranking.rs +++ b/httpserver/src/routes/game/pvp/pvp_battle_ranking.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::PvpBattleRankingRequest; use crypto::network::parse_packet; -use gameserver::logic::game::pvp_battle_ranking; +use gameserver::logic::game::pvp::pvp_battle_ranking; use sqlx::SqlitePool; #[put("PvpBattleRanking")] diff --git a/httpserver/src/routes/game/pvp_battle_replay_info.rs b/httpserver/src/routes/game/pvp/pvp_battle_replay_info.rs similarity index 92% rename from httpserver/src/routes/game/pvp_battle_replay_info.rs rename to httpserver/src/routes/game/pvp/pvp_battle_replay_info.rs index d4cf8a1..4ae729b 100644 --- a/httpserver/src/routes/game/pvp_battle_replay_info.rs +++ b/httpserver/src/routes/game/pvp/pvp_battle_replay_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::PvpBattleReplayInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::pvp_battle_replay_info; +use gameserver::logic::game::pvp::pvp_battle_replay_info; use sqlx::SqlitePool; #[put("PvpBattleReplayInfo")] diff --git a/httpserver/src/routes/game/pvp_battle_reset.rs b/httpserver/src/routes/game/pvp/pvp_battle_reset.rs similarity index 92% rename from httpserver/src/routes/game/pvp_battle_reset.rs rename to httpserver/src/routes/game/pvp/pvp_battle_reset.rs index cec9644..b462973 100644 --- a/httpserver/src/routes/game/pvp_battle_reset.rs +++ b/httpserver/src/routes/game/pvp/pvp_battle_reset.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::PvpBattleResetRequest; use crypto::network::parse_packet; -use gameserver::logic::game::pvp_battle_reset; +use gameserver::logic::game::pvp::pvp_battle_reset; use sqlx::SqlitePool; #[put("PvpBattleReset")] diff --git a/httpserver/src/routes/game/pvp_battle_reward.rs b/httpserver/src/routes/game/pvp/pvp_battle_reward.rs similarity index 92% rename from httpserver/src/routes/game/pvp_battle_reward.rs rename to httpserver/src/routes/game/pvp/pvp_battle_reward.rs index 2b2b206..1cf5a18 100644 --- a/httpserver/src/routes/game/pvp_battle_reward.rs +++ b/httpserver/src/routes/game/pvp/pvp_battle_reward.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::PvpBattleRewardRequest; use crypto::network::parse_packet; -use gameserver::logic::game::pvp_battle_reward; +use gameserver::logic::game::pvp::pvp_battle_reward; use sqlx::SqlitePool; #[put("PvpBattleReward")] diff --git a/httpserver/src/routes/game/pvp_battle_start.rs b/httpserver/src/routes/game/pvp/pvp_battle_start.rs similarity index 92% rename from httpserver/src/routes/game/pvp_battle_start.rs rename to httpserver/src/routes/game/pvp/pvp_battle_start.rs index fbc7457..3282614 100644 --- a/httpserver/src/routes/game/pvp_battle_start.rs +++ b/httpserver/src/routes/game/pvp/pvp_battle_start.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::PvpBattleStartRequest; use crypto::network::parse_packet; -use gameserver::logic::game::pvp_battle_start; +use gameserver::logic::game::pvp::pvp_battle_start; use sqlx::SqlitePool; #[put("PvpBattleStart")] diff --git a/httpserver/src/routes/game/pvp_battle_user_info.rs b/httpserver/src/routes/game/pvp/pvp_battle_user_info.rs similarity index 92% rename from httpserver/src/routes/game/pvp_battle_user_info.rs rename to httpserver/src/routes/game/pvp/pvp_battle_user_info.rs index 275bc50..4ca2292 100644 --- a/httpserver/src/routes/game/pvp_battle_user_info.rs +++ b/httpserver/src/routes/game/pvp/pvp_battle_user_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::PvpBattleUserInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::pvp_battle_user_info; +use gameserver::logic::game::pvp::pvp_battle_user_info; use sqlx::SqlitePool; #[put("PvpBattleUserInfo")] diff --git a/httpserver/src/routes/game/pvp_contents_item_renew.rs b/httpserver/src/routes/game/pvp/pvp_contents_item_renew.rs similarity index 92% rename from httpserver/src/routes/game/pvp_contents_item_renew.rs rename to httpserver/src/routes/game/pvp/pvp_contents_item_renew.rs index 2c7cc8a..77f2393 100644 --- a/httpserver/src/routes/game/pvp_contents_item_renew.rs +++ b/httpserver/src/routes/game/pvp/pvp_contents_item_renew.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::PvpContentsItemRenewRequest; use crypto::network::parse_packet; -use gameserver::logic::game::pvp_contents_item_renew; +use gameserver::logic::game::pvp::pvp_contents_item_renew; use sqlx::SqlitePool; #[put("PvpContentsItemRenew")] diff --git a/httpserver/src/routes/game/pvp_season_reward.rs b/httpserver/src/routes/game/pvp/pvp_season_reward.rs similarity index 92% rename from httpserver/src/routes/game/pvp_season_reward.rs rename to httpserver/src/routes/game/pvp/pvp_season_reward.rs index 117e013..b2894bb 100644 --- a/httpserver/src/routes/game/pvp_season_reward.rs +++ b/httpserver/src/routes/game/pvp/pvp_season_reward.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::PvpSeasonRewardRequest; use crypto::network::parse_packet; -use gameserver::logic::game::pvp_season_reward; +use gameserver::logic::game::pvp::pvp_season_reward; use sqlx::SqlitePool; #[put("PvpSeasonReward")] diff --git a/httpserver/src/routes/game/quest/mod.rs b/httpserver/src/routes/game/quest/mod.rs new file mode 100644 index 0000000..3d527ad --- /dev/null +++ b/httpserver/src/routes/game/quest/mod.rs @@ -0,0 +1,7 @@ +pub mod quest_accept; +pub mod quest_clear; +pub mod quest_give_up; +pub mod quest_immortal_reset; +pub mod quest_info; +pub mod quest_max_clear_info; +pub mod quest_update; diff --git a/httpserver/src/routes/game/quest_accept.rs b/httpserver/src/routes/game/quest/quest_accept.rs similarity index 93% rename from httpserver/src/routes/game/quest_accept.rs rename to httpserver/src/routes/game/quest/quest_accept.rs index 9c70a9c..60fa106 100644 --- a/httpserver/src/routes/game/quest_accept.rs +++ b/httpserver/src/routes/game/quest/quest_accept.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::QuestAcceptRequest; use crypto::network::parse_packet; -use gameserver::logic::game::quest_accept; +use gameserver::logic::game::quest::quest_accept; use sqlx::SqlitePool; #[put("QuestAccept")] diff --git a/httpserver/src/routes/game/quest_clear.rs b/httpserver/src/routes/game/quest/quest_clear.rs similarity index 93% rename from httpserver/src/routes/game/quest_clear.rs rename to httpserver/src/routes/game/quest/quest_clear.rs index 9ac4aea..4bed646 100644 --- a/httpserver/src/routes/game/quest_clear.rs +++ b/httpserver/src/routes/game/quest/quest_clear.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::QuestClearRequest; use crypto::network::parse_packet; -use gameserver::logic::game::quest_clear; +use gameserver::logic::game::quest::quest_clear; use sqlx::SqlitePool; #[put("QuestClear")] diff --git a/httpserver/src/routes/game/quest_give_up.rs b/httpserver/src/routes/game/quest/quest_give_up.rs similarity index 92% rename from httpserver/src/routes/game/quest_give_up.rs rename to httpserver/src/routes/game/quest/quest_give_up.rs index f15988b..5d5bdea 100644 --- a/httpserver/src/routes/game/quest_give_up.rs +++ b/httpserver/src/routes/game/quest/quest_give_up.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::QuestGiveUpRequest; use crypto::network::parse_packet; -use gameserver::logic::game::quest_give_up; +use gameserver::logic::game::quest::quest_give_up; use sqlx::SqlitePool; #[put("QuestGiveUp")] diff --git a/httpserver/src/routes/game/quest_immortal_reset.rs b/httpserver/src/routes/game/quest/quest_immortal_reset.rs similarity index 92% rename from httpserver/src/routes/game/quest_immortal_reset.rs rename to httpserver/src/routes/game/quest/quest_immortal_reset.rs index fcf906b..9cf8004 100644 --- a/httpserver/src/routes/game/quest_immortal_reset.rs +++ b/httpserver/src/routes/game/quest/quest_immortal_reset.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::QuestImmortalResetRequest; use crypto::network::parse_packet; -use gameserver::logic::game::quest_immortal_reset; +use gameserver::logic::game::quest::quest_immortal_reset; use sqlx::SqlitePool; #[put("QuestImmortalReset")] diff --git a/httpserver/src/routes/game/quest_info.rs b/httpserver/src/routes/game/quest/quest_info.rs similarity index 93% rename from httpserver/src/routes/game/quest_info.rs rename to httpserver/src/routes/game/quest/quest_info.rs index 02bf918..6779df3 100644 --- a/httpserver/src/routes/game/quest_info.rs +++ b/httpserver/src/routes/game/quest/quest_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::QuestInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::quest_info; +use gameserver::logic::game::quest::quest_info; use sqlx::SqlitePool; #[put("QuestInfo")] diff --git a/httpserver/src/routes/game/quest_max_clear_info.rs b/httpserver/src/routes/game/quest/quest_max_clear_info.rs similarity index 92% rename from httpserver/src/routes/game/quest_max_clear_info.rs rename to httpserver/src/routes/game/quest/quest_max_clear_info.rs index da869fc..d999cc2 100644 --- a/httpserver/src/routes/game/quest_max_clear_info.rs +++ b/httpserver/src/routes/game/quest/quest_max_clear_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::QuestMaxClearInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::quest_max_clear_info; +use gameserver::logic::game::quest::quest_max_clear_info; use sqlx::SqlitePool; #[put("QuestMaxClearInfo")] diff --git a/httpserver/src/routes/game/quest_update.rs b/httpserver/src/routes/game/quest/quest_update.rs similarity index 93% rename from httpserver/src/routes/game/quest_update.rs rename to httpserver/src/routes/game/quest/quest_update.rs index 8eb5c20..d96bd40 100644 --- a/httpserver/src/routes/game/quest_update.rs +++ b/httpserver/src/routes/game/quest/quest_update.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::QuestUpdateRequest; use crypto::network::parse_packet; -use gameserver::logic::game::quest_update; +use gameserver::logic::game::quest::quest_update; use sqlx::SqlitePool; #[put("QuestUpdate")] diff --git a/httpserver/src/routes/game/quick/mod.rs b/httpserver/src/routes/game/quick/mod.rs new file mode 100644 index 0000000..fba6fcf --- /dev/null +++ b/httpserver/src/routes/game/quick/mod.rs @@ -0,0 +1 @@ +pub mod quick_battle; diff --git a/httpserver/src/routes/game/quick_battle.rs b/httpserver/src/routes/game/quick/quick_battle.rs similarity index 93% rename from httpserver/src/routes/game/quick_battle.rs rename to httpserver/src/routes/game/quick/quick_battle.rs index 77f79be..9bc0a26 100644 --- a/httpserver/src/routes/game/quick_battle.rs +++ b/httpserver/src/routes/game/quick/quick_battle.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::QuickBattleRequest; use crypto::network::parse_packet; -use gameserver::logic::game::quick_battle; +use gameserver::logic::game::quick::quick_battle; use sqlx::SqlitePool; #[put("QuickBattle")] diff --git a/httpserver/src/routes/game/recipe/mod.rs b/httpserver/src/routes/game/recipe/mod.rs new file mode 100644 index 0000000..51f00d1 --- /dev/null +++ b/httpserver/src/routes/game/recipe/mod.rs @@ -0,0 +1 @@ +pub mod recipe_info; diff --git a/httpserver/src/routes/game/recipe_info.rs b/httpserver/src/routes/game/recipe/recipe_info.rs similarity index 92% rename from httpserver/src/routes/game/recipe_info.rs rename to httpserver/src/routes/game/recipe/recipe_info.rs index e708127..6216688 100644 --- a/httpserver/src/routes/game/recipe_info.rs +++ b/httpserver/src/routes/game/recipe/recipe_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::RecipeInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::recipe_info; +use gameserver::logic::game::recipe::recipe_info; use sqlx::SqlitePool; #[put("RecipeInfo")] diff --git a/httpserver/src/routes/game/recommend/mod.rs b/httpserver/src/routes/game/recommend/mod.rs new file mode 100644 index 0000000..929f9d8 --- /dev/null +++ b/httpserver/src/routes/game/recommend/mod.rs @@ -0,0 +1,2 @@ +pub mod recommend_deck_info; +pub mod recommend_deck_user_option_save; diff --git a/httpserver/src/routes/game/recommend_deck_info.rs b/httpserver/src/routes/game/recommend/recommend_deck_info.rs similarity index 92% rename from httpserver/src/routes/game/recommend_deck_info.rs rename to httpserver/src/routes/game/recommend/recommend_deck_info.rs index 8d40d86..cb3039c 100644 --- a/httpserver/src/routes/game/recommend_deck_info.rs +++ b/httpserver/src/routes/game/recommend/recommend_deck_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::RecommendDeckInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::recommend_deck_info; +use gameserver::logic::game::recommend::recommend_deck_info; use sqlx::SqlitePool; #[put("RecommendDeckInfo")] diff --git a/httpserver/src/routes/game/recommend_deck_user_option_save.rs b/httpserver/src/routes/game/recommend/recommend_deck_user_option_save.rs similarity index 91% rename from httpserver/src/routes/game/recommend_deck_user_option_save.rs rename to httpserver/src/routes/game/recommend/recommend_deck_user_option_save.rs index a67a86b..f453b34 100644 --- a/httpserver/src/routes/game/recommend_deck_user_option_save.rs +++ b/httpserver/src/routes/game/recommend/recommend_deck_user_option_save.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::RecommendDeckUserOptionSaveRequest; use crypto::network::parse_packet; -use gameserver::logic::game::recommend_deck_user_option_save; +use gameserver::logic::game::recommend::recommend_deck_user_option_save; use sqlx::SqlitePool; #[put("RecommendDeckUserOptionSave")] diff --git a/httpserver/src/routes/game/refresh/mod.rs b/httpserver/src/routes/game/refresh/mod.rs new file mode 100644 index 0000000..8646d34 --- /dev/null +++ b/httpserver/src/routes/game/refresh/mod.rs @@ -0,0 +1 @@ +pub mod refresh_token; diff --git a/httpserver/src/routes/game/refresh_token.rs b/httpserver/src/routes/game/refresh/refresh_token.rs similarity index 92% rename from httpserver/src/routes/game/refresh_token.rs rename to httpserver/src/routes/game/refresh/refresh_token.rs index 4876860..abb97f0 100644 --- a/httpserver/src/routes/game/refresh_token.rs +++ b/httpserver/src/routes/game/refresh/refresh_token.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::RefreshTokenRequest; use crypto::network::parse_packet; -use gameserver::logic::game::refresh_token; +use gameserver::logic::game::refresh::refresh_token; use sqlx::SqlitePool; #[put("RefreshToken")] diff --git a/httpserver/src/routes/game/report/mod.rs b/httpserver/src/routes/game/report/mod.rs new file mode 100644 index 0000000..77e5f30 --- /dev/null +++ b/httpserver/src/routes/game/report/mod.rs @@ -0,0 +1 @@ +pub mod report_user; diff --git a/httpserver/src/routes/game/report_user.rs b/httpserver/src/routes/game/report/report_user.rs similarity index 92% rename from httpserver/src/routes/game/report_user.rs rename to httpserver/src/routes/game/report/report_user.rs index f7517b3..1c25470 100644 --- a/httpserver/src/routes/game/report_user.rs +++ b/httpserver/src/routes/game/report/report_user.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::ReportUserRequest; use crypto::network::parse_packet; -use gameserver::logic::game::report_user; +use gameserver::logic::game::report::report_user; use sqlx::SqlitePool; #[put("ReportUser")] diff --git a/httpserver/src/routes/game/reputation/mod.rs b/httpserver/src/routes/game/reputation/mod.rs new file mode 100644 index 0000000..ba8257a --- /dev/null +++ b/httpserver/src/routes/game/reputation/mod.rs @@ -0,0 +1 @@ +pub mod reputation_info; diff --git a/httpserver/src/routes/game/reputation_info.rs b/httpserver/src/routes/game/reputation/reputation_info.rs similarity index 92% rename from httpserver/src/routes/game/reputation_info.rs rename to httpserver/src/routes/game/reputation/reputation_info.rs index 18c8eda..df4db7a 100644 --- a/httpserver/src/routes/game/reputation_info.rs +++ b/httpserver/src/routes/game/reputation/reputation_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::ReputationInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::reputation_info; +use gameserver::logic::game::reputation::reputation_info; use sqlx::SqlitePool; #[put("ReputationInfo")] diff --git a/httpserver/src/routes/game/root/mod.rs b/httpserver/src/routes/game/root/mod.rs new file mode 100644 index 0000000..9ddd99e --- /dev/null +++ b/httpserver/src/routes/game/root/mod.rs @@ -0,0 +1 @@ +pub mod root_sort_id_info; diff --git a/httpserver/src/routes/game/root_sort_id_info.rs b/httpserver/src/routes/game/root/root_sort_id_info.rs similarity index 92% rename from httpserver/src/routes/game/root_sort_id_info.rs rename to httpserver/src/routes/game/root/root_sort_id_info.rs index 959bf6b..76049c1 100644 --- a/httpserver/src/routes/game/root_sort_id_info.rs +++ b/httpserver/src/routes/game/root/root_sort_id_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::RootSortIdInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::root_sort_id_info; +use gameserver::logic::game::root::root_sort_id_info; use sqlx::SqlitePool; #[put("RootSortIdInfo")] diff --git a/httpserver/src/routes/game/save/mod.rs b/httpserver/src/routes/game/save/mod.rs new file mode 100644 index 0000000..610f615 --- /dev/null +++ b/httpserver/src/routes/game/save/mod.rs @@ -0,0 +1,3 @@ +pub mod save_field_char_control_deck_type; +pub mod save_total_battle_power; +pub mod save_user_position; diff --git a/httpserver/src/routes/game/save_field_char_control_deck_type.rs b/httpserver/src/routes/game/save/save_field_char_control_deck_type.rs similarity index 92% rename from httpserver/src/routes/game/save_field_char_control_deck_type.rs rename to httpserver/src/routes/game/save/save_field_char_control_deck_type.rs index ab5c4cb..71a48aa 100644 --- a/httpserver/src/routes/game/save_field_char_control_deck_type.rs +++ b/httpserver/src/routes/game/save/save_field_char_control_deck_type.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::SaveFieldCharControlDeckTypeRequest; use crypto::network::parse_packet; -use gameserver::logic::game::save_field_char_control_deck_type; +use gameserver::logic::game::save::save_field_char_control_deck_type; use sqlx::SqlitePool; #[put("SaveFieldCharControlDeckType")] diff --git a/httpserver/src/routes/game/save_total_battle_power.rs b/httpserver/src/routes/game/save/save_total_battle_power.rs similarity index 92% rename from httpserver/src/routes/game/save_total_battle_power.rs rename to httpserver/src/routes/game/save/save_total_battle_power.rs index 326282a..82fbaf2 100644 --- a/httpserver/src/routes/game/save_total_battle_power.rs +++ b/httpserver/src/routes/game/save/save_total_battle_power.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::SaveTotalBattlePowerRequest; use crypto::network::parse_packet; -use gameserver::logic::game::save_total_battle_power; +use gameserver::logic::game::save::save_total_battle_power; use sqlx::SqlitePool; #[put("SaveTotalBattlePower")] diff --git a/httpserver/src/routes/game/save_user_position.rs b/httpserver/src/routes/game/save/save_user_position.rs similarity index 92% rename from httpserver/src/routes/game/save_user_position.rs rename to httpserver/src/routes/game/save/save_user_position.rs index e99ab3c..56487e3 100644 --- a/httpserver/src/routes/game/save_user_position.rs +++ b/httpserver/src/routes/game/save/save_user_position.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::SaveUserPositionRequest; use crypto::network::parse_packet; -use gameserver::logic::game::save_user_position; +use gameserver::logic::game::save::save_user_position; use sqlx::SqlitePool; #[put("SaveUserPosition")] diff --git a/httpserver/src/routes/game/schedule/mod.rs b/httpserver/src/routes/game/schedule/mod.rs new file mode 100644 index 0000000..40fa316 --- /dev/null +++ b/httpserver/src/routes/game/schedule/mod.rs @@ -0,0 +1 @@ +pub mod schedule_info; diff --git a/httpserver/src/routes/game/schedule_info.rs b/httpserver/src/routes/game/schedule/schedule_info.rs similarity index 92% rename from httpserver/src/routes/game/schedule_info.rs rename to httpserver/src/routes/game/schedule/schedule_info.rs index 30dec5a..bd7f741 100644 --- a/httpserver/src/routes/game/schedule_info.rs +++ b/httpserver/src/routes/game/schedule/schedule_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::ScheduleInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::schedule_info; +use gameserver::logic::game::schedule::schedule_info; use sqlx::SqlitePool; #[put("ScheduleInfo")] diff --git a/httpserver/src/routes/game/season/mod.rs b/httpserver/src/routes/game/season/mod.rs new file mode 100644 index 0000000..ef2de72 --- /dev/null +++ b/httpserver/src/routes/game/season/mod.rs @@ -0,0 +1 @@ +pub mod season_reward_info; diff --git a/httpserver/src/routes/game/season_reward_info.rs b/httpserver/src/routes/game/season/season_reward_info.rs similarity index 92% rename from httpserver/src/routes/game/season_reward_info.rs rename to httpserver/src/routes/game/season/season_reward_info.rs index 049a8e3..5fb6cbf 100644 --- a/httpserver/src/routes/game/season_reward_info.rs +++ b/httpserver/src/routes/game/season/season_reward_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::SeasonRewardInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::season_reward_info; +use gameserver::logic::game::season::season_reward_info; use sqlx::SqlitePool; #[put("SeasonRewardInfo")] diff --git a/httpserver/src/routes/game/select/mod.rs b/httpserver/src/routes/game/select/mod.rs new file mode 100644 index 0000000..c996f6d --- /dev/null +++ b/httpserver/src/routes/game/select/mod.rs @@ -0,0 +1 @@ +pub mod select_platform_other_data; diff --git a/httpserver/src/routes/game/select_platform_other_data.rs b/httpserver/src/routes/game/select/select_platform_other_data.rs similarity index 92% rename from httpserver/src/routes/game/select_platform_other_data.rs rename to httpserver/src/routes/game/select/select_platform_other_data.rs index a002bff..ff1993b 100644 --- a/httpserver/src/routes/game/select_platform_other_data.rs +++ b/httpserver/src/routes/game/select/select_platform_other_data.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::SelectPlatformOtherDataRequest; use crypto::network::parse_packet; -use gameserver::logic::game::select_platform_other_data; +use gameserver::logic::game::select::select_platform_other_data; use sqlx::SqlitePool; #[put("SelectPlatformOtherData")] diff --git a/httpserver/src/routes/game/send/mod.rs b/httpserver/src/routes/game/send/mod.rs new file mode 100644 index 0000000..5d509ba --- /dev/null +++ b/httpserver/src/routes/game/send/mod.rs @@ -0,0 +1 @@ +pub mod send_log; diff --git a/httpserver/src/routes/game/send_log.rs b/httpserver/src/routes/game/send/send_log.rs similarity index 93% rename from httpserver/src/routes/game/send_log.rs rename to httpserver/src/routes/game/send/send_log.rs index ea4b126..dfe372b 100644 --- a/httpserver/src/routes/game/send_log.rs +++ b/httpserver/src/routes/game/send/send_log.rs @@ -1,7 +1,7 @@ use actix_web::{HttpResponse, Result, put, web}; use bd2::SendLogRequest; use crypto::network::parse_packet; -use gameserver::logic::game::send_log; +use gameserver::logic::game::send::send_log; use sqlx::SqlitePool; #[put("SendLog")] diff --git a/httpserver/src/routes/game/server/mod.rs b/httpserver/src/routes/game/server/mod.rs new file mode 100644 index 0000000..dd4fb26 --- /dev/null +++ b/httpserver/src/routes/game/server/mod.rs @@ -0,0 +1,2 @@ +pub mod server_info; +pub mod server_now_time; diff --git a/httpserver/src/routes/game/server_info.rs b/httpserver/src/routes/game/server/server_info.rs similarity index 92% rename from httpserver/src/routes/game/server_info.rs rename to httpserver/src/routes/game/server/server_info.rs index 58d7146..1edab32 100644 --- a/httpserver/src/routes/game/server_info.rs +++ b/httpserver/src/routes/game/server/server_info.rs @@ -1,7 +1,7 @@ use actix_web::{HttpResponse, Result, put, web}; use bd2::proto::proto_net::ServerInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::server_info; +use gameserver::logic::game::server::server_info; use sqlx::SqlitePool; #[put("ServerInfo")] diff --git a/httpserver/src/routes/game/server_now_time.rs b/httpserver/src/routes/game/server/server_now_time.rs similarity index 92% rename from httpserver/src/routes/game/server_now_time.rs rename to httpserver/src/routes/game/server/server_now_time.rs index 025c0c9..16b06f1 100644 --- a/httpserver/src/routes/game/server_now_time.rs +++ b/httpserver/src/routes/game/server/server_now_time.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::ServerNowTimeRequest; use crypto::network::parse_packet; -use gameserver::logic::game::server_now_time; +use gameserver::logic::game::server::server_now_time; use sqlx::SqlitePool; #[put("ServerNowTime")] diff --git a/httpserver/src/routes/game/shop/mod.rs b/httpserver/src/routes/game/shop/mod.rs new file mode 100644 index 0000000..80d0754 --- /dev/null +++ b/httpserver/src/routes/game/shop/mod.rs @@ -0,0 +1,4 @@ +pub mod shop_buy; +pub mod shop_info; +pub mod shop_open; +pub mod shop_sell; diff --git a/httpserver/src/routes/game/shop_buy.rs b/httpserver/src/routes/game/shop/shop_buy.rs similarity index 93% rename from httpserver/src/routes/game/shop_buy.rs rename to httpserver/src/routes/game/shop/shop_buy.rs index 25439cc..8740f41 100644 --- a/httpserver/src/routes/game/shop_buy.rs +++ b/httpserver/src/routes/game/shop/shop_buy.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::ShopBuyRequest; use crypto::network::parse_packet; -use gameserver::logic::game::shop_buy; +use gameserver::logic::game::shop::shop_buy; use sqlx::SqlitePool; #[put("ShopBuy")] diff --git a/httpserver/src/routes/game/shop_info.rs b/httpserver/src/routes/game/shop/shop_info.rs similarity index 93% rename from httpserver/src/routes/game/shop_info.rs rename to httpserver/src/routes/game/shop/shop_info.rs index 99b7e8b..0f078d3 100644 --- a/httpserver/src/routes/game/shop_info.rs +++ b/httpserver/src/routes/game/shop/shop_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::ShopInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::shop_info; +use gameserver::logic::game::shop::shop_info; use sqlx::SqlitePool; #[put("ShopInfo")] diff --git a/httpserver/src/routes/game/shop_open.rs b/httpserver/src/routes/game/shop/shop_open.rs similarity index 93% rename from httpserver/src/routes/game/shop_open.rs rename to httpserver/src/routes/game/shop/shop_open.rs index f5905a0..b1504f0 100644 --- a/httpserver/src/routes/game/shop_open.rs +++ b/httpserver/src/routes/game/shop/shop_open.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::ShopOpenRequest; use crypto::network::parse_packet; -use gameserver::logic::game::shop_open; +use gameserver::logic::game::shop::shop_open; use sqlx::SqlitePool; #[put("ShopOpen")] diff --git a/httpserver/src/routes/game/shop_sell.rs b/httpserver/src/routes/game/shop/shop_sell.rs similarity index 93% rename from httpserver/src/routes/game/shop_sell.rs rename to httpserver/src/routes/game/shop/shop_sell.rs index daafbb2..5b36a87 100644 --- a/httpserver/src/routes/game/shop_sell.rs +++ b/httpserver/src/routes/game/shop/shop_sell.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::ShopSellRequest; use crypto::network::parse_packet; -use gameserver::logic::game::shop_sell; +use gameserver::logic::game::shop::shop_sell; use sqlx::SqlitePool; #[put("ShopSell")] diff --git a/httpserver/src/routes/game/sky/mod.rs b/httpserver/src/routes/game/sky/mod.rs new file mode 100644 index 0000000..078f9d7 --- /dev/null +++ b/httpserver/src/routes/game/sky/mod.rs @@ -0,0 +1,3 @@ +pub mod sky_way_enter; +pub mod sky_way_info; +pub mod sky_way_schedule_info; diff --git a/httpserver/src/routes/game/sky_way_enter.rs b/httpserver/src/routes/game/sky/sky_way_enter.rs similarity index 93% rename from httpserver/src/routes/game/sky_way_enter.rs rename to httpserver/src/routes/game/sky/sky_way_enter.rs index a41b20e..84a636c 100644 --- a/httpserver/src/routes/game/sky_way_enter.rs +++ b/httpserver/src/routes/game/sky/sky_way_enter.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::SkyWayEnterRequest; use crypto::network::parse_packet; -use gameserver::logic::game::sky_way_enter; +use gameserver::logic::game::sky::sky_way_enter; use sqlx::SqlitePool; #[put("SkyWayEnter")] diff --git a/httpserver/src/routes/game/sky_way_info.rs b/httpserver/src/routes/game/sky/sky_way_info.rs similarity index 93% rename from httpserver/src/routes/game/sky_way_info.rs rename to httpserver/src/routes/game/sky/sky_way_info.rs index 4499667..5a1f3c9 100644 --- a/httpserver/src/routes/game/sky_way_info.rs +++ b/httpserver/src/routes/game/sky/sky_way_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::SkyWayInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::sky_way_info; +use gameserver::logic::game::sky::sky_way_info; use sqlx::SqlitePool; #[put("SkyWayInfo")] diff --git a/httpserver/src/routes/game/sky_way_schedule_info.rs b/httpserver/src/routes/game/sky/sky_way_schedule_info.rs similarity index 92% rename from httpserver/src/routes/game/sky_way_schedule_info.rs rename to httpserver/src/routes/game/sky/sky_way_schedule_info.rs index c6527e5..f434743 100644 --- a/httpserver/src/routes/game/sky_way_schedule_info.rs +++ b/httpserver/src/routes/game/sky/sky_way_schedule_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::SkyWayScheduleInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::sky_way_schedule_info; +use gameserver::logic::game::sky::sky_way_schedule_info; use sqlx::SqlitePool; #[put("SkyWayScheduleInfo")] diff --git a/httpserver/src/routes/game/statue/mod.rs b/httpserver/src/routes/game/statue/mod.rs new file mode 100644 index 0000000..75e7f3b --- /dev/null +++ b/httpserver/src/routes/game/statue/mod.rs @@ -0,0 +1 @@ +pub mod statue_object_reward; diff --git a/httpserver/src/routes/game/statue_object_reward.rs b/httpserver/src/routes/game/statue/statue_object_reward.rs similarity index 92% rename from httpserver/src/routes/game/statue_object_reward.rs rename to httpserver/src/routes/game/statue/statue_object_reward.rs index eb30d8b..f2b70ab 100644 --- a/httpserver/src/routes/game/statue_object_reward.rs +++ b/httpserver/src/routes/game/statue/statue_object_reward.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::StatueObjectRewardRequest; use crypto::network::parse_packet; -use gameserver::logic::game::statue_object_reward; +use gameserver::logic::game::statue::statue_object_reward; use sqlx::SqlitePool; #[put("StatueObjectReward")] diff --git a/httpserver/src/routes/game/storage/mod.rs b/httpserver/src/routes/game/storage/mod.rs new file mode 100644 index 0000000..5164ca0 --- /dev/null +++ b/httpserver/src/routes/game/storage/mod.rs @@ -0,0 +1 @@ +pub mod storage_add_slot; diff --git a/httpserver/src/routes/game/storage_add_slot.rs b/httpserver/src/routes/game/storage/storage_add_slot.rs similarity index 92% rename from httpserver/src/routes/game/storage_add_slot.rs rename to httpserver/src/routes/game/storage/storage_add_slot.rs index 0dd1072..8922c5b 100644 --- a/httpserver/src/routes/game/storage_add_slot.rs +++ b/httpserver/src/routes/game/storage/storage_add_slot.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::StorageAddSlotRequest; use crypto::network::parse_packet; -use gameserver::logic::game::storage_add_slot; +use gameserver::logic::game::storage::storage_add_slot; use sqlx::SqlitePool; #[put("StorageAddSlot")] diff --git a/httpserver/src/routes/game/supporter/mod.rs b/httpserver/src/routes/game/supporter/mod.rs new file mode 100644 index 0000000..c4029ee --- /dev/null +++ b/httpserver/src/routes/game/supporter/mod.rs @@ -0,0 +1,8 @@ +pub mod supporter_battle_info; +pub mod supporter_borrow; +pub mod supporter_detail; +pub mod supporter_info; +pub mod supporter_register; +pub mod supporter_remove; +pub mod supporter_reward; +pub mod supporter_status; diff --git a/httpserver/src/routes/game/supporter_battle_info.rs b/httpserver/src/routes/game/supporter/supporter_battle_info.rs similarity index 92% rename from httpserver/src/routes/game/supporter_battle_info.rs rename to httpserver/src/routes/game/supporter/supporter_battle_info.rs index 62c0499..8426d12 100644 --- a/httpserver/src/routes/game/supporter_battle_info.rs +++ b/httpserver/src/routes/game/supporter/supporter_battle_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::SupporterBattleInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::supporter_battle_info; +use gameserver::logic::game::supporter::supporter_battle_info; use sqlx::SqlitePool; #[put("SupporterBattleInfo")] diff --git a/httpserver/src/routes/game/supporter_borrow.rs b/httpserver/src/routes/game/supporter/supporter_borrow.rs similarity index 92% rename from httpserver/src/routes/game/supporter_borrow.rs rename to httpserver/src/routes/game/supporter/supporter_borrow.rs index 7df5338..78fd2b4 100644 --- a/httpserver/src/routes/game/supporter_borrow.rs +++ b/httpserver/src/routes/game/supporter/supporter_borrow.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::SupporterBorrowRequest; use crypto::network::parse_packet; -use gameserver::logic::game::supporter_borrow; +use gameserver::logic::game::supporter::supporter_borrow; use sqlx::SqlitePool; #[put("SupporterBorrow")] diff --git a/httpserver/src/routes/game/supporter_detail.rs b/httpserver/src/routes/game/supporter/supporter_detail.rs similarity index 92% rename from httpserver/src/routes/game/supporter_detail.rs rename to httpserver/src/routes/game/supporter/supporter_detail.rs index 07be240..5a84a9c 100644 --- a/httpserver/src/routes/game/supporter_detail.rs +++ b/httpserver/src/routes/game/supporter/supporter_detail.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::SupporterDetailRequest; use crypto::network::parse_packet; -use gameserver::logic::game::supporter_detail; +use gameserver::logic::game::supporter::supporter_detail; use sqlx::SqlitePool; #[put("SupporterDetail")] diff --git a/httpserver/src/routes/game/supporter_info.rs b/httpserver/src/routes/game/supporter/supporter_info.rs similarity index 92% rename from httpserver/src/routes/game/supporter_info.rs rename to httpserver/src/routes/game/supporter/supporter_info.rs index 3b98182..e9b88d4 100644 --- a/httpserver/src/routes/game/supporter_info.rs +++ b/httpserver/src/routes/game/supporter/supporter_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::SupporterInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::supporter_info; +use gameserver::logic::game::supporter::supporter_info; use sqlx::SqlitePool; #[put("SupporterInfo")] diff --git a/httpserver/src/routes/game/supporter_register.rs b/httpserver/src/routes/game/supporter/supporter_register.rs similarity index 92% rename from httpserver/src/routes/game/supporter_register.rs rename to httpserver/src/routes/game/supporter/supporter_register.rs index 675a143..f5456c0 100644 --- a/httpserver/src/routes/game/supporter_register.rs +++ b/httpserver/src/routes/game/supporter/supporter_register.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::SupporterRegisterRequest; use crypto::network::parse_packet; -use gameserver::logic::game::supporter_register; +use gameserver::logic::game::supporter::supporter_register; use sqlx::SqlitePool; #[put("SupporterRegister")] diff --git a/httpserver/src/routes/game/supporter_remove.rs b/httpserver/src/routes/game/supporter/supporter_remove.rs similarity index 92% rename from httpserver/src/routes/game/supporter_remove.rs rename to httpserver/src/routes/game/supporter/supporter_remove.rs index c677c19..4017b21 100644 --- a/httpserver/src/routes/game/supporter_remove.rs +++ b/httpserver/src/routes/game/supporter/supporter_remove.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::SupporterRemoveRequest; use crypto::network::parse_packet; -use gameserver::logic::game::supporter_remove; +use gameserver::logic::game::supporter::supporter_remove; use sqlx::SqlitePool; #[put("SupporterRemove")] diff --git a/httpserver/src/routes/game/supporter_reward.rs b/httpserver/src/routes/game/supporter/supporter_reward.rs similarity index 92% rename from httpserver/src/routes/game/supporter_reward.rs rename to httpserver/src/routes/game/supporter/supporter_reward.rs index 385670f..180b77b 100644 --- a/httpserver/src/routes/game/supporter_reward.rs +++ b/httpserver/src/routes/game/supporter/supporter_reward.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::SupporterRewardRequest; use crypto::network::parse_packet; -use gameserver::logic::game::supporter_reward; +use gameserver::logic::game::supporter::supporter_reward; use sqlx::SqlitePool; #[put("SupporterReward")] diff --git a/httpserver/src/routes/game/supporter_status.rs b/httpserver/src/routes/game/supporter/supporter_status.rs similarity index 92% rename from httpserver/src/routes/game/supporter_status.rs rename to httpserver/src/routes/game/supporter/supporter_status.rs index b0571fe..93c8d8a 100644 --- a/httpserver/src/routes/game/supporter_status.rs +++ b/httpserver/src/routes/game/supporter/supporter_status.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::SupporterStatusRequest; use crypto::network::parse_packet; -use gameserver::logic::game::supporter_status; +use gameserver::logic::game::supporter::supporter_status; use sqlx::SqlitePool; #[put("SupporterStatus")] diff --git a/httpserver/src/routes/game/talent/mod.rs b/httpserver/src/routes/game/talent/mod.rs new file mode 100644 index 0000000..294e19d --- /dev/null +++ b/httpserver/src/routes/game/talent/mod.rs @@ -0,0 +1,3 @@ +pub mod talent_skill_upgrade; +pub mod talent_skill_use; +pub mod talent_slot_save; diff --git a/httpserver/src/routes/game/talent_skill_upgrade.rs b/httpserver/src/routes/game/talent/talent_skill_upgrade.rs similarity index 92% rename from httpserver/src/routes/game/talent_skill_upgrade.rs rename to httpserver/src/routes/game/talent/talent_skill_upgrade.rs index b1474c6..1f49cc0 100644 --- a/httpserver/src/routes/game/talent_skill_upgrade.rs +++ b/httpserver/src/routes/game/talent/talent_skill_upgrade.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::TalentSkillUpgradeRequest; use crypto::network::parse_packet; -use gameserver::logic::game::talent_skill_upgrade; +use gameserver::logic::game::talent::talent_skill_upgrade; use sqlx::SqlitePool; #[put("TalentSkillUpgrade")] diff --git a/httpserver/src/routes/game/talent_skill_use.rs b/httpserver/src/routes/game/talent/talent_skill_use.rs similarity index 92% rename from httpserver/src/routes/game/talent_skill_use.rs rename to httpserver/src/routes/game/talent/talent_skill_use.rs index d51d61e..334cae3 100644 --- a/httpserver/src/routes/game/talent_skill_use.rs +++ b/httpserver/src/routes/game/talent/talent_skill_use.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::TalentSkillUseRequest; use crypto::network::parse_packet; -use gameserver::logic::game::talent_skill_use; +use gameserver::logic::game::talent::talent_skill_use; use sqlx::SqlitePool; #[put("TalentSkillUse")] diff --git a/httpserver/src/routes/game/talent_slot_save.rs b/httpserver/src/routes/game/talent/talent_slot_save.rs similarity index 92% rename from httpserver/src/routes/game/talent_slot_save.rs rename to httpserver/src/routes/game/talent/talent_slot_save.rs index ae3fc42..4a3d7d6 100644 --- a/httpserver/src/routes/game/talent_slot_save.rs +++ b/httpserver/src/routes/game/talent/talent_slot_save.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::TalentSlotSaveRequest; use crypto::network::parse_packet; -use gameserver::logic::game::talent_slot_save; +use gameserver::logic::game::talent::talent_slot_save; use sqlx::SqlitePool; #[put("TalentSlotSave")] diff --git a/httpserver/src/routes/game/time/mod.rs b/httpserver/src/routes/game/time/mod.rs new file mode 100644 index 0000000..5e56d21 --- /dev/null +++ b/httpserver/src/routes/game/time/mod.rs @@ -0,0 +1 @@ +pub mod time_pause; diff --git a/httpserver/src/routes/game/time_pause.rs b/httpserver/src/routes/game/time/time_pause.rs similarity index 93% rename from httpserver/src/routes/game/time_pause.rs rename to httpserver/src/routes/game/time/time_pause.rs index 7b34283..736aca3 100644 --- a/httpserver/src/routes/game/time_pause.rs +++ b/httpserver/src/routes/game/time/time_pause.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::TimePauseRequest; use crypto::network::parse_packet; -use gameserver::logic::game::time_pause; +use gameserver::logic::game::time::time_pause; use sqlx::SqlitePool; #[put("TimePause")] diff --git a/httpserver/src/routes/game/today/mod.rs b/httpserver/src/routes/game/today/mod.rs new file mode 100644 index 0000000..4536971 --- /dev/null +++ b/httpserver/src/routes/game/today/mod.rs @@ -0,0 +1 @@ +pub mod today_quest_info; diff --git a/httpserver/src/routes/game/today_quest_info.rs b/httpserver/src/routes/game/today/today_quest_info.rs similarity index 92% rename from httpserver/src/routes/game/today_quest_info.rs rename to httpserver/src/routes/game/today/today_quest_info.rs index 2a5e41f..77afa2d 100644 --- a/httpserver/src/routes/game/today_quest_info.rs +++ b/httpserver/src/routes/game/today/today_quest_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::TodayQuestInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::today_quest_info; +use gameserver::logic::game::today::today_quest_info; use sqlx::SqlitePool; #[put("TodayQuestInfo")] diff --git a/httpserver/src/routes/game/total/mod.rs b/httpserver/src/routes/game/total/mod.rs new file mode 100644 index 0000000..82121b2 --- /dev/null +++ b/httpserver/src/routes/game/total/mod.rs @@ -0,0 +1,13 @@ +pub mod total_war_battle_end; +pub mod total_war_battle_start; +pub mod total_war_contents_item_renew; +pub mod total_war_deck_info; +pub mod total_war_deck_preset_info; +pub mod total_war_deck_preset_save; +pub mod total_war_deck_preset_slot_add; +pub mod total_war_deck_save; +pub mod total_war_info; +pub mod total_war_preset_delete; +pub mod total_war_preset_info_change; +pub mod total_war_reward; +pub mod total_war_reward_state; diff --git a/httpserver/src/routes/game/total_war_battle_end.rs b/httpserver/src/routes/game/total/total_war_battle_end.rs similarity index 92% rename from httpserver/src/routes/game/total_war_battle_end.rs rename to httpserver/src/routes/game/total/total_war_battle_end.rs index 14f4a5e..2a77a9c 100644 --- a/httpserver/src/routes/game/total_war_battle_end.rs +++ b/httpserver/src/routes/game/total/total_war_battle_end.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::TotalWarBattleEndRequest; use crypto::network::parse_packet; -use gameserver::logic::game::total_war_battle_end; +use gameserver::logic::game::total::total_war_battle_end; use sqlx::SqlitePool; #[put("TotalWarBattleEnd")] diff --git a/httpserver/src/routes/game/total_war_battle_start.rs b/httpserver/src/routes/game/total/total_war_battle_start.rs similarity index 92% rename from httpserver/src/routes/game/total_war_battle_start.rs rename to httpserver/src/routes/game/total/total_war_battle_start.rs index d7ead02..84d8cdd 100644 --- a/httpserver/src/routes/game/total_war_battle_start.rs +++ b/httpserver/src/routes/game/total/total_war_battle_start.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::TotalWarBattleStartRequest; use crypto::network::parse_packet; -use gameserver::logic::game::total_war_battle_start; +use gameserver::logic::game::total::total_war_battle_start; use sqlx::SqlitePool; #[put("TotalWarBattleStart")] diff --git a/httpserver/src/routes/game/total_war_contents_item_renew.rs b/httpserver/src/routes/game/total/total_war_contents_item_renew.rs similarity index 92% rename from httpserver/src/routes/game/total_war_contents_item_renew.rs rename to httpserver/src/routes/game/total/total_war_contents_item_renew.rs index 26fc76c..dca2ccf 100644 --- a/httpserver/src/routes/game/total_war_contents_item_renew.rs +++ b/httpserver/src/routes/game/total/total_war_contents_item_renew.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::TotalWarContentsItemRenewRequest; use crypto::network::parse_packet; -use gameserver::logic::game::total_war_contents_item_renew; +use gameserver::logic::game::total::total_war_contents_item_renew; use sqlx::SqlitePool; #[put("TotalWarContentsItemRenew")] diff --git a/httpserver/src/routes/game/total_war_deck_info.rs b/httpserver/src/routes/game/total/total_war_deck_info.rs similarity index 92% rename from httpserver/src/routes/game/total_war_deck_info.rs rename to httpserver/src/routes/game/total/total_war_deck_info.rs index e8a79a3..fafaf35 100644 --- a/httpserver/src/routes/game/total_war_deck_info.rs +++ b/httpserver/src/routes/game/total/total_war_deck_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::TotalWarDeckInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::total_war_deck_info; +use gameserver::logic::game::total::total_war_deck_info; use sqlx::SqlitePool; #[put("TotalWarDeckInfo")] diff --git a/httpserver/src/routes/game/total_war_deck_preset_info.rs b/httpserver/src/routes/game/total/total_war_deck_preset_info.rs similarity index 92% rename from httpserver/src/routes/game/total_war_deck_preset_info.rs rename to httpserver/src/routes/game/total/total_war_deck_preset_info.rs index a66628e..e365185 100644 --- a/httpserver/src/routes/game/total_war_deck_preset_info.rs +++ b/httpserver/src/routes/game/total/total_war_deck_preset_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::TotalWarDeckPresetInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::total_war_deck_preset_info; +use gameserver::logic::game::total::total_war_deck_preset_info; use sqlx::SqlitePool; #[put("TotalWarDeckPresetInfo")] diff --git a/httpserver/src/routes/game/total_war_deck_preset_save.rs b/httpserver/src/routes/game/total/total_war_deck_preset_save.rs similarity index 92% rename from httpserver/src/routes/game/total_war_deck_preset_save.rs rename to httpserver/src/routes/game/total/total_war_deck_preset_save.rs index 8a1ad26..2dd5615 100644 --- a/httpserver/src/routes/game/total_war_deck_preset_save.rs +++ b/httpserver/src/routes/game/total/total_war_deck_preset_save.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::TotalWarDeckPresetSaveRequest; use crypto::network::parse_packet; -use gameserver::logic::game::total_war_deck_preset_save; +use gameserver::logic::game::total::total_war_deck_preset_save; use sqlx::SqlitePool; #[put("TotalWarDeckPresetSave")] diff --git a/httpserver/src/routes/game/total_war_deck_preset_slot_add.rs b/httpserver/src/routes/game/total/total_war_deck_preset_slot_add.rs similarity index 92% rename from httpserver/src/routes/game/total_war_deck_preset_slot_add.rs rename to httpserver/src/routes/game/total/total_war_deck_preset_slot_add.rs index 8375f64..7df60b9 100644 --- a/httpserver/src/routes/game/total_war_deck_preset_slot_add.rs +++ b/httpserver/src/routes/game/total/total_war_deck_preset_slot_add.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::TotalWarDeckPresetSlotAddRequest; use crypto::network::parse_packet; -use gameserver::logic::game::total_war_deck_preset_slot_add; +use gameserver::logic::game::total::total_war_deck_preset_slot_add; use sqlx::SqlitePool; #[put("TotalWarDeckPresetSlotAdd")] diff --git a/httpserver/src/routes/game/total_war_deck_save.rs b/httpserver/src/routes/game/total/total_war_deck_save.rs similarity index 92% rename from httpserver/src/routes/game/total_war_deck_save.rs rename to httpserver/src/routes/game/total/total_war_deck_save.rs index a612021..8a8aeef 100644 --- a/httpserver/src/routes/game/total_war_deck_save.rs +++ b/httpserver/src/routes/game/total/total_war_deck_save.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::TotalWarDeckSaveRequest; use crypto::network::parse_packet; -use gameserver::logic::game::total_war_deck_save; +use gameserver::logic::game::total::total_war_deck_save; use sqlx::SqlitePool; #[put("TotalWarDeckSave")] diff --git a/httpserver/src/routes/game/total_war_info.rs b/httpserver/src/routes/game/total/total_war_info.rs similarity index 92% rename from httpserver/src/routes/game/total_war_info.rs rename to httpserver/src/routes/game/total/total_war_info.rs index 0b1beef..598a1ab 100644 --- a/httpserver/src/routes/game/total_war_info.rs +++ b/httpserver/src/routes/game/total/total_war_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::TotalWarInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::total_war_info; +use gameserver::logic::game::total::total_war_info; use sqlx::SqlitePool; #[put("TotalWarInfo")] diff --git a/httpserver/src/routes/game/total_war_preset_delete.rs b/httpserver/src/routes/game/total/total_war_preset_delete.rs similarity index 92% rename from httpserver/src/routes/game/total_war_preset_delete.rs rename to httpserver/src/routes/game/total/total_war_preset_delete.rs index e711f5f..bfc1e11 100644 --- a/httpserver/src/routes/game/total_war_preset_delete.rs +++ b/httpserver/src/routes/game/total/total_war_preset_delete.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::TotalWarPresetDeleteRequest; use crypto::network::parse_packet; -use gameserver::logic::game::total_war_preset_delete; +use gameserver::logic::game::total::total_war_preset_delete; use sqlx::SqlitePool; #[put("TotalWarPresetDelete")] diff --git a/httpserver/src/routes/game/total_war_preset_info_change.rs b/httpserver/src/routes/game/total/total_war_preset_info_change.rs similarity index 92% rename from httpserver/src/routes/game/total_war_preset_info_change.rs rename to httpserver/src/routes/game/total/total_war_preset_info_change.rs index 965787a..9ccde6a 100644 --- a/httpserver/src/routes/game/total_war_preset_info_change.rs +++ b/httpserver/src/routes/game/total/total_war_preset_info_change.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::TotalWarPresetInfoChangeRequest; use crypto::network::parse_packet; -use gameserver::logic::game::total_war_preset_info_change; +use gameserver::logic::game::total::total_war_preset_info_change; use sqlx::SqlitePool; #[put("TotalWarPresetInfoChange")] diff --git a/httpserver/src/routes/game/total_war_reward.rs b/httpserver/src/routes/game/total/total_war_reward.rs similarity index 92% rename from httpserver/src/routes/game/total_war_reward.rs rename to httpserver/src/routes/game/total/total_war_reward.rs index b6241df..26b233f 100644 --- a/httpserver/src/routes/game/total_war_reward.rs +++ b/httpserver/src/routes/game/total/total_war_reward.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::TotalWarRewardRequest; use crypto::network::parse_packet; -use gameserver::logic::game::total_war_reward; +use gameserver::logic::game::total::total_war_reward; use sqlx::SqlitePool; #[put("TotalWarReward")] diff --git a/httpserver/src/routes/game/total_war_reward_state.rs b/httpserver/src/routes/game/total/total_war_reward_state.rs similarity index 92% rename from httpserver/src/routes/game/total_war_reward_state.rs rename to httpserver/src/routes/game/total/total_war_reward_state.rs index a978d32..c2a53a0 100644 --- a/httpserver/src/routes/game/total_war_reward_state.rs +++ b/httpserver/src/routes/game/total/total_war_reward_state.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::TotalWarRewardStateRequest; use crypto::network::parse_packet; -use gameserver::logic::game::total_war_reward_state; +use gameserver::logic::game::total::total_war_reward_state; use sqlx::SqlitePool; #[put("TotalWarRewardState")] diff --git a/httpserver/src/routes/game/trap/mod.rs b/httpserver/src/routes/game/trap/mod.rs new file mode 100644 index 0000000..da3808a --- /dev/null +++ b/httpserver/src/routes/game/trap/mod.rs @@ -0,0 +1 @@ +pub mod trap_damage; diff --git a/httpserver/src/routes/game/trap_damage.rs b/httpserver/src/routes/game/trap/trap_damage.rs similarity index 93% rename from httpserver/src/routes/game/trap_damage.rs rename to httpserver/src/routes/game/trap/trap_damage.rs index a75743c..939e9af 100644 --- a/httpserver/src/routes/game/trap_damage.rs +++ b/httpserver/src/routes/game/trap/trap_damage.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::TrapDamageRequest; use crypto::network::parse_packet; -use gameserver::logic::game::trap_damage; +use gameserver::logic::game::trap::trap_damage; use sqlx::SqlitePool; #[put("TrapDamage")] diff --git a/httpserver/src/routes/game/tutorial/mod.rs b/httpserver/src/routes/game/tutorial/mod.rs new file mode 100644 index 0000000..32a8d1f --- /dev/null +++ b/httpserver/src/routes/game/tutorial/mod.rs @@ -0,0 +1,2 @@ +pub mod tutorial_clear; +pub mod tutorial_info; diff --git a/httpserver/src/routes/game/tutorial_clear.rs b/httpserver/src/routes/game/tutorial/tutorial_clear.rs similarity index 92% rename from httpserver/src/routes/game/tutorial_clear.rs rename to httpserver/src/routes/game/tutorial/tutorial_clear.rs index 929c6bb..02e8cb4 100644 --- a/httpserver/src/routes/game/tutorial_clear.rs +++ b/httpserver/src/routes/game/tutorial/tutorial_clear.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::TutorialClearRequest; use crypto::network::parse_packet; -use gameserver::logic::game::tutorial_clear; +use gameserver::logic::game::tutorial::tutorial_clear; use sqlx::SqlitePool; #[put("TutorialClear")] diff --git a/httpserver/src/routes/game/tutorial_info.rs b/httpserver/src/routes/game/tutorial/tutorial_info.rs similarity index 92% rename from httpserver/src/routes/game/tutorial_info.rs rename to httpserver/src/routes/game/tutorial/tutorial_info.rs index 27faaf4..2c58e02 100644 --- a/httpserver/src/routes/game/tutorial_info.rs +++ b/httpserver/src/routes/game/tutorial/tutorial_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::TutorialInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::tutorial_info; +use gameserver::logic::game::tutorial::tutorial_info; use sqlx::SqlitePool; #[put("TutorialInfo")] diff --git a/httpserver/src/routes/game/update/mod.rs b/httpserver/src/routes/game/update/mod.rs new file mode 100644 index 0000000..e58416b --- /dev/null +++ b/httpserver/src/routes/game/update/mod.rs @@ -0,0 +1 @@ +pub mod update_user_contents_info_option; diff --git a/httpserver/src/routes/game/update_user_contents_info_option.rs b/httpserver/src/routes/game/update/update_user_contents_info_option.rs similarity index 92% rename from httpserver/src/routes/game/update_user_contents_info_option.rs rename to httpserver/src/routes/game/update/update_user_contents_info_option.rs index c677e5b..13e438a 100644 --- a/httpserver/src/routes/game/update_user_contents_info_option.rs +++ b/httpserver/src/routes/game/update/update_user_contents_info_option.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::UpdateUserContentsInfoOptionRequest; use crypto::network::parse_packet; -use gameserver::logic::game::update_user_contents_info_option; +use gameserver::logic::game::update::update_user_contents_info_option; use sqlx::SqlitePool; #[put("UpdateUserContentsInfoOption")] diff --git a/httpserver/src/routes/game/use2/mod.rs b/httpserver/src/routes/game/use2/mod.rs new file mode 100644 index 0000000..681fa75 --- /dev/null +++ b/httpserver/src/routes/game/use2/mod.rs @@ -0,0 +1,2 @@ +pub mod use_random_box; +pub mod use_resource_item; diff --git a/httpserver/src/routes/game/use_random_box.rs b/httpserver/src/routes/game/use2/use_random_box.rs similarity index 92% rename from httpserver/src/routes/game/use_random_box.rs rename to httpserver/src/routes/game/use2/use_random_box.rs index 5f86ad8..8c52512 100644 --- a/httpserver/src/routes/game/use_random_box.rs +++ b/httpserver/src/routes/game/use2/use_random_box.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::UseRandomBoxRequest; use crypto::network::parse_packet; -use gameserver::logic::game::use_random_box; +use gameserver::logic::game::use2::use_random_box; use sqlx::SqlitePool; #[put("UseRandomBox")] diff --git a/httpserver/src/routes/game/use_resource_item.rs b/httpserver/src/routes/game/use2/use_resource_item.rs similarity index 86% rename from httpserver/src/routes/game/use_resource_item.rs rename to httpserver/src/routes/game/use2/use_resource_item.rs index fdc007c..ddf55de 100644 --- a/httpserver/src/routes/game/use_resource_item.rs +++ b/httpserver/src/routes/game/use2/use_resource_item.rs @@ -1,7 +1,7 @@ -use actix_web::{put, web, HttpResponse, Result}; +use actix_web::{HttpResponse, Result, put, web}; use bd2::proto::proto_net::UseResourceItemRequest; use crypto::network::parse_packet; -use gameserver::logic::game::use_resource_item; +use gameserver::logic::game::use2::use_resource_item; use sqlx::SqlitePool; #[put("UseResourceItem")] diff --git a/httpserver/src/routes/game/user/mod.rs b/httpserver/src/routes/game/user/mod.rs new file mode 100644 index 0000000..48757a1 --- /dev/null +++ b/httpserver/src/routes/game/user/mod.rs @@ -0,0 +1,7 @@ +pub mod user_contents_info; +pub mod user_contents_info_option; +pub mod user_greeting_change; +pub mod user_level_reward; +pub mod user_nickname_change; +pub mod user_portrait_change; +pub mod user_title_change; diff --git a/httpserver/src/routes/game/user_contents_info.rs b/httpserver/src/routes/game/user/user_contents_info.rs similarity index 92% rename from httpserver/src/routes/game/user_contents_info.rs rename to httpserver/src/routes/game/user/user_contents_info.rs index 76bcafc..a8feb9a 100644 --- a/httpserver/src/routes/game/user_contents_info.rs +++ b/httpserver/src/routes/game/user/user_contents_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::UserContentsInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::user_contents_info; +use gameserver::logic::game::user::user_contents_info; use sqlx::SqlitePool; #[put("UserContentsInfo")] diff --git a/httpserver/src/routes/game/user_contents_info_option.rs b/httpserver/src/routes/game/user/user_contents_info_option.rs similarity index 92% rename from httpserver/src/routes/game/user_contents_info_option.rs rename to httpserver/src/routes/game/user/user_contents_info_option.rs index 4cb51ab..8a3ccee 100644 --- a/httpserver/src/routes/game/user_contents_info_option.rs +++ b/httpserver/src/routes/game/user/user_contents_info_option.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::UserContentsInfoOptionRequest; use crypto::network::parse_packet; -use gameserver::logic::game::user_contents_info_option; +use gameserver::logic::game::user::user_contents_info_option; use sqlx::SqlitePool; #[put("UserContentsInfoOption")] diff --git a/httpserver/src/routes/game/user_greeting_change.rs b/httpserver/src/routes/game/user/user_greeting_change.rs similarity index 92% rename from httpserver/src/routes/game/user_greeting_change.rs rename to httpserver/src/routes/game/user/user_greeting_change.rs index 6505594..62ae000 100644 --- a/httpserver/src/routes/game/user_greeting_change.rs +++ b/httpserver/src/routes/game/user/user_greeting_change.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::UserGreetingChangeRequest; use crypto::network::parse_packet; -use gameserver::logic::game::user_greeting_change; +use gameserver::logic::game::user::user_greeting_change; use sqlx::SqlitePool; #[put("UserGreetingChange")] diff --git a/httpserver/src/routes/game/user_level_reward.rs b/httpserver/src/routes/game/user/user_level_reward.rs similarity index 92% rename from httpserver/src/routes/game/user_level_reward.rs rename to httpserver/src/routes/game/user/user_level_reward.rs index 434963b..d58f4bb 100644 --- a/httpserver/src/routes/game/user_level_reward.rs +++ b/httpserver/src/routes/game/user/user_level_reward.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::UserLevelRewardRequest; use crypto::network::parse_packet; -use gameserver::logic::game::user_level_reward; +use gameserver::logic::game::user::user_level_reward; use sqlx::SqlitePool; #[put("UserLevelReward")] diff --git a/httpserver/src/routes/game/user_nickname_change.rs b/httpserver/src/routes/game/user/user_nickname_change.rs similarity index 92% rename from httpserver/src/routes/game/user_nickname_change.rs rename to httpserver/src/routes/game/user/user_nickname_change.rs index 5c49792..58949a9 100644 --- a/httpserver/src/routes/game/user_nickname_change.rs +++ b/httpserver/src/routes/game/user/user_nickname_change.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::UserNicknameChangeRequest; use crypto::network::parse_packet; -use gameserver::logic::game::user_nickname_change; +use gameserver::logic::game::user::user_nickname_change; use sqlx::SqlitePool; #[put("UserNicknameChange")] diff --git a/httpserver/src/routes/game/user_portrait_change.rs b/httpserver/src/routes/game/user/user_portrait_change.rs similarity index 92% rename from httpserver/src/routes/game/user_portrait_change.rs rename to httpserver/src/routes/game/user/user_portrait_change.rs index 266a3e4..0b359fc 100644 --- a/httpserver/src/routes/game/user_portrait_change.rs +++ b/httpserver/src/routes/game/user/user_portrait_change.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::UserPortraitChangeRequest; use crypto::network::parse_packet; -use gameserver::logic::game::user_portrait_change; +use gameserver::logic::game::user::user_portrait_change; use sqlx::SqlitePool; #[put("UserPortraitChange")] diff --git a/httpserver/src/routes/game/user_title_change.rs b/httpserver/src/routes/game/user/user_title_change.rs similarity index 92% rename from httpserver/src/routes/game/user_title_change.rs rename to httpserver/src/routes/game/user/user_title_change.rs index d5a02a0..7252647 100644 --- a/httpserver/src/routes/game/user_title_change.rs +++ b/httpserver/src/routes/game/user/user_title_change.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::UserTitleChangeRequest; use crypto::network::parse_packet; -use gameserver::logic::game::user_title_change; +use gameserver::logic::game::user::user_title_change; use sqlx::SqlitePool; #[put("UserTitleChange")] diff --git a/httpserver/src/routes/game/waypoint/mod.rs b/httpserver/src/routes/game/waypoint/mod.rs new file mode 100644 index 0000000..0846d27 --- /dev/null +++ b/httpserver/src/routes/game/waypoint/mod.rs @@ -0,0 +1,3 @@ +pub mod waypoint_info; +pub mod waypoint_save; +pub mod waypoint_use; diff --git a/httpserver/src/routes/game/waypoint_info.rs b/httpserver/src/routes/game/waypoint/waypoint_info.rs similarity index 92% rename from httpserver/src/routes/game/waypoint_info.rs rename to httpserver/src/routes/game/waypoint/waypoint_info.rs index c69c018..3440105 100644 --- a/httpserver/src/routes/game/waypoint_info.rs +++ b/httpserver/src/routes/game/waypoint/waypoint_info.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::WaypointInfoRequest; use crypto::network::parse_packet; -use gameserver::logic::game::waypoint_info; +use gameserver::logic::game::waypoint::waypoint_info; use sqlx::SqlitePool; #[put("WaypointInfo")] diff --git a/httpserver/src/routes/game/waypoint_save.rs b/httpserver/src/routes/game/waypoint/waypoint_save.rs similarity index 92% rename from httpserver/src/routes/game/waypoint_save.rs rename to httpserver/src/routes/game/waypoint/waypoint_save.rs index 3f3f80c..2362ca2 100644 --- a/httpserver/src/routes/game/waypoint_save.rs +++ b/httpserver/src/routes/game/waypoint/waypoint_save.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::WaypointSaveRequest; use crypto::network::parse_packet; -use gameserver::logic::game::waypoint_save; +use gameserver::logic::game::waypoint::waypoint_save; use sqlx::SqlitePool; #[put("WaypointSave")] diff --git a/httpserver/src/routes/game/waypoint_use.rs b/httpserver/src/routes/game/waypoint/waypoint_use.rs similarity index 92% rename from httpserver/src/routes/game/waypoint_use.rs rename to httpserver/src/routes/game/waypoint/waypoint_use.rs index fff112a..7de2be9 100644 --- a/httpserver/src/routes/game/waypoint_use.rs +++ b/httpserver/src/routes/game/waypoint/waypoint_use.rs @@ -1,7 +1,7 @@ use actix_web::{put, web, HttpResponse, Result}; use bd2::proto::proto_net::WaypointUseRequest; use crypto::network::parse_packet; -use gameserver::logic::game::waypoint_use; +use gameserver::logic::game::waypoint::waypoint_use; use sqlx::SqlitePool; #[put("WaypointUse")]