diff --git a/README.md b/README.md index 449ddb5..391e310 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Supported Version: 2.2.51 +# Supported Version: 2.2.51, 2.2.53, 2.2.54 Run the game by clicking run.bat file. Tool website: [https://freesr-tools.pages.dev](https://freesr-tools.pages.dev) @@ -9,16 +9,16 @@ Some scenes might not loaded properly. If you stuck at loading screen, remove `p # RobinSR Original: + [https://git.xeondev.com/reversedrooms/RobinSR](https://git.xeondev.com/reversedrooms/RobinSR) + [https://git.xeondev.com/reversedrooms/JadeSR](https://git.xeondev.com/reversedrooms/JadeSR) -A Server emulator for the game [`Honkai: Star Rail`](https://hsr.hoyoverse.com/en-us/) +A Server emulator for turn-based anime game. ![screenshot](https://raw.githubusercontent.com/amizing25/robinsr/main/screenshot.png) ## Installation -### From Source - #### Requirements - [Rust](https://www.rust-lang.org/tools/install) @@ -34,37 +34,15 @@ rustup default nightly #### Building ```sh -git clone https://git.xeondev.com/reversedrooms/RobinSR.git -cd RobinSR +git clone https://github.com/amizing25/robinsr.git +cd robinsr cargo install --path gameserver cargo install --path sdkserver ``` -### From Pre-built Binaries - -Navigate to the [Releases](https://git.xeondev.com/reversedrooms/RobinSR/releases) -page and download the latest release for your platform. - ## Usage -To begin using the server, you need to run both the SDK server and the game server. - -If you installed from source, Rust's installer should have added .cargo/bin to your -path, so simply run the following: - -```sh -gameserver -sdkserver -``` - -If you installed from pre-built binaries, navigate to the directory where you downloaded -the binaries and either a) double-click on the following executable names or b) -run the following in a terminal: - -```sh -./gameserver -./sdkserver -``` +To begin using the server, you need to run both the SDK server and the game server. Just run the `run.bat` file. ## Connecting [Get 2.2 beta client](https://bhrpg-prod.oss-accelerate.aliyuncs.com/client/beta/20240322124944_scfGE0xJXlWtoJ1r/StarRail_2.1.51.zip) diff --git a/gameserver/src/net/handlers/gacha.rs b/gameserver/src/net/handlers/gacha.rs new file mode 100644 index 0000000..369158c --- /dev/null +++ b/gameserver/src/net/handlers/gacha.rs @@ -0,0 +1,63 @@ +pub use super::*; + +pub async fn on_get_gacha_info_cs_req( + session: &mut PlayerSession, + _: &GetGachaInfoCsReq, +) -> anyhow::Result<()> { + let gacha = GachaInfo { + end_time: 1924992000, + begin_time: 0, + eegijjhombi: Some(Ldhikjljmdc::default()), + hjefpibalip: vec![23002, 1003, 1101, 1104, 23000, 23003], + ibomhpajoji: vec![ + 1001, 1002, 1008, 1009, 1013, 1103, 1105, 1106, 1108, 1109, 1110, 1111, 1201, 1202, + 1206, 1207, 1210, 1003, 1004, 1101, 1107, 1104, 1209, 1211, 21000, 21001, 21002, 21003, + 21004, 21005, 21006, 21007, 21008, 21009, 21010, 21011, 21012, 21013, 21014, 21015, + 21016, 21017, 21018, 21019, 21020, 23000, 23002, 23003, 23004, 23005, 23012, 23013, + ], + gacha_id: 1001, + ..Default::default() + }; + session + .send( + CMD_GET_GACHA_INFO_SC_RSP, + GetGachaInfoScRsp { + gacha_info_list: vec![gacha], + ..Default::default() + }, + ) + .await +} + +pub async fn on_do_gacha_cs_req( + session: &mut PlayerSession, + req: &DoGachaCsReq, +) -> anyhow::Result<()> { + session + .send( + CMD_DO_GACHA_SC_RSP, + DoGachaScRsp { + gacha_id: req.gacha_id, + gacha_num: req.gacha_num, + gacha_item_list: (0..req.gacha_num) + .map(|v| GachaItem { + is_new: false, + gacha_item: Some(Item { + item_id: if v % 2 == 0 { 1310 } else { 1314 }, + ..Default::default() + }), + fhfenbcnkei: Some(ItemList { + item_list: vec![Item { + item_id: 251, + num: 100, + ..Default::default() + }], + }), + eginhhfhbbh: Some(ItemList { item_list: vec![] }), + }) + .collect(), + ..Default::default() + }, + ) + .await +} \ No newline at end of file diff --git a/gameserver/src/net/handlers/inventory.rs b/gameserver/src/net/handlers/inventory.rs index 01b5efc..2b2f06d 100644 --- a/gameserver/src/net/handlers/inventory.rs +++ b/gameserver/src/net/handlers/inventory.rs @@ -18,6 +18,18 @@ pub async fn on_get_bag_cs_req(session: &mut PlayerSession, _: &GetBagCsReq) -> .map(|v| v.to_equipment_proto()) .collect(), relic_list: player.relics.iter().map(|v| v.to_relic_proto()).collect(), + macfjibhfad: vec![ + Efdnhdlcegi { + tid: 101, // Normal Pass + num: 999999, + ..Default::default() + }, + Efdnhdlcegi { + tid: 102, // Special Pass + num: 999999, + ..Default::default() + }, + ], ..Default::default() }, ) diff --git a/gameserver/src/net/handlers/mail.rs b/gameserver/src/net/handlers/mail.rs new file mode 100644 index 0000000..da28c92 --- /dev/null +++ b/gameserver/src/net/handlers/mail.rs @@ -0,0 +1,37 @@ +use super::*; +use anyhow::Result; + +pub async fn on_get_mail_cs_req(session: &mut PlayerSession, _: &GetMailCsReq) -> Result<()> { + session + .send( + CMD_GET_MAIL_SC_RSP, + GetMailScRsp { + is_end: true, + mail_list: vec![ClientMail { + title: String::from("Welcome!"), + sender: String::from("Server"), + content: String::from("Welcome!"), + id: 1, + is_read: false, + time: 1716041089, + expire_time: 1718633089, + para_list: vec![], + attachment: Some(ItemList { + item_list: vec![Item { + item_id: 1310, + level: 80, + num: 1, + ..Default::default() + }], + }), + mail_type: MailType::Normal.into(), + template_id: 0, + }], + notice_mail_list: vec![], + start: 0, + retcode: 0, + total_num: 1, + }, + ) + .await +} \ No newline at end of file diff --git a/gameserver/src/net/handlers/mission.rs b/gameserver/src/net/handlers/mission.rs index eb79d94..908a6cc 100644 --- a/gameserver/src/net/handlers/mission.rs +++ b/gameserver/src/net/handlers/mission.rs @@ -167,3 +167,288 @@ pub async fn on_get_mission_status_cs_req( session.send(CMD_GET_MISSION_STATUS_SC_RSP, rsp).await } + +static QUEST_LIST: [u32; 2575] = [ + 1001711, 1001712, 1001713, 1001714, 1001715, 1001721, 1001723, 1001734, 1001742, 1001798, + 1001731, 1001722, 1001732, 1001725, 1001724, 1001761, 1001799, 1001726, 1001727, 1001716, + 1001741, 1001752, 1001753, 1001754, 1001766, 1001717, 1001763, 1001764, 1001773, 1001771, + 1001772, 1001783, 1001785, 1001765, 1001792, 1001775, 1001776, 1001782, 1001793, 1001795, + 1001796, 1001762, 1001743, 1001744, 1001797, 1001784, 1001767, 1001801, 1001802, 1001803, + 1001804, 1001901, 1001902, 1001903, 1001904, 1001905, 1001906, 1001907, 1001921, 1001922, + 1001923, 1001924, 1001925, 1002001, 1002002, 1002003, 1002004, 1002005, 1002006, 1002007, + 1002008, 1002009, 2000001, 2000002, 2000003, 2000004, 2000101, 2000102, 2000103, 2000104, + 2000105, 2000106, 2000107, 2000108, 2000109, 2000110, 2000111, 2000112, 2000113, 2000114, + 2000115, 2000116, 2000117, 2000118, 2000119, 2000120, 2000121, 2000122, 2000123, 2000124, + 2000201, 2000202, 2000203, 2000204, 2000205, 2000206, 2000207, 2000208, 2000209, 2000210, + 2000225, 2000211, 2000212, 2000213, 2000214, 2000216, 2000217, 2000218, 2000219, 2000220, + 2000221, 2000222, 2000215, 2000223, 2000224, 2000226, 2000227, 2000228, 2000229, 2000230, + 2000231, 2000232, 2000233, 2000234, 2000235, 2000236, 2000237, 2000238, 2000239, 2000240, + 2000241, 2000242, 2000243, 2000244, 2000245, 2000246, 2000247, 2000248, 2000249, 2000250, + 2000251, 2000252, 2000253, 2000254, 2000255, 2000256, 2000257, 2000258, 2000259, 2000260, + 2000261, 2000262, 2000263, 2000264, 2000265, 2000266, 2000267, 2000268, 2000269, 2000270, + 2000271, 2000272, 2000273, 2000274, 2000275, 2000276, 2000277, 2000278, 2000279, 2000280, + 2000281, 2000282, 2000283, 2000284, 2000285, 2000286, 2000287, 2000288, 2000289, 2000290, + 2000291, 2000292, 2000293, 2000294, 2200001, 2200002, 2200003, 2200004, 2200005, 2200006, + 2200007, 2200010, 2200011, 2200012, 2200013, 2200014, 2200015, 2200016, 2200110, 2200111, + 2200112, 2200210, 2200211, 2200212, 2200213, 2200214, 2200215, 2200300, 2200017, 2200018, + 2200019, 2200020, 2200021, 2200022, 2200023, 2200024, 2200025, 2200026, 2200037, 2200038, + 2200039, 2200040, 2200041, 2200042, 2200043, 2200044, 2200045, 2200046, 2200047, 2200048, + 2200049, 2200050, 2200051, 2200057, 2200058, 2200059, 2200067, 2200068, 2200069, 2200401, + 2200402, 2200403, 2200404, 2200405, 2200406, 2200407, 2200408, 2200409, 2200410, 2200411, + 2200412, 2200413, 2200414, 2200415, 2200416, 2200417, 2200418, 2200419, 2200420, 3000001, + 3000002, 3000003, 3000004, 3000011, 3000012, 3000013, 3000014, 3011102, 3011106, 3011109, + 3011105, 3011204, 3011206, 3011103, 3011001, 3000015, 3000016, 3000017, 3000018, 3000019, + 3000101, 3000102, 3000103, 3000104, 3000105, 3000106, 3000107, 3000108, 3000109, 3000110, + 3000111, 3000112, 3000113, 3000114, 3000115, 3000116, 3000117, 3000118, 3000119, 3000120, + 3000121, 3000122, 3000123, 3000124, 3000125, 3000126, 3000127, 3000128, 3000129, 3000130, + 3000131, 3000132, 3000133, 3000134, 3000135, 3000136, 3000137, 3000138, 3000139, 3000140, + 3000141, 3000142, 3000143, 3000144, 3000145, 3000146, 3000147, 3000148, 3000149, 3000150, + 3000151, 3000152, 3000153, 3000154, 3000155, 3000156, 4000001, 4000003, 4010101, 4010102, + 4010103, 4010104, 4010105, 4010201, 4010202, 4010203, 4010301, 4010302, 4010303, 4010401, + 4010501, 4010502, 4010503, 4010504, 4020201, 4020202, 4020203, 4020401, 4020402, 4020403, + 4020502, 4020503, 4020701, 4020702, 4030101, 4030102, 4030103, 4030104, 4030105, 4030201, + 4030202, 4040101, 4040102, 4040201, 4040202, 4040301, 4040302, 4040402, 4040403, 4040404, + 4040406, 4040407, 4040408, 4040409, 4040410, 4040411, 4040412, 4040503, 4040504, 4040601, + 4040602, 4040603, 4040604, 4040701, 4040702, 4051001, 4051002, 4051003, 4051004, 4051005, + 4051006, 4051101, 4051103, 4051104, 4051105, 4051106, 4051107, 4051108, 4051109, 4051110, + 4051111, 4060101, 4060102, 4060103, 4060201, 4060202, 4060203, 4060301, 4060302, 4060303, + 4060401, 4060402, 4080101, 4080201, 4080202, 4080203, 4080301, 4080302, 4080303, 4080304, + 4080305, 4080401, 4080402, 4080403, 4080404, 4080501, 4080502, 4080503, 4080504, 4080505, + 4080506, 4080601, 4080602, 4080603, 4080604, 4080605, 4080606, 4090201, 4090202, 4090203, + 4090204, 4090205, 4090206, 4090207, 4090301, 4090303, 4090501, 4090503, 4091001, 4091003, + 4070101, 4070201, 4070301, 4070302, 4070303, 4070401, 4070402, 4070403, 4070421, 4070441, + 4070501, 4070502, 4070601, 4070602, 4070603, 4070604, 4070605, 4070606, 4070607, 4070608, + 4070609, 4070610, 4070611, 4070612, 4070701, 4070702, 4070703, 4070704, 4070705, 4070706, + 4070707, 4070708, 4070709, 4070801, 4070802, 4070803, 4070804, 4070805, 4070806, 4070807, + 4070808, 4070810, 4070812, 4070901, 4070902, 4070903, 4070904, 4070905, 4070906, 4070907, + 4070908, 4070909, 4070910, 4070911, 4070912, 4070913, 4070914, 4070915, 4070916, 4070917, + 4071001, 4071002, 4071003, 4071004, 4071005, 4071006, 4071007, 4071008, 4071009, 4071012, + 4071013, 4071014, 4071015, 4071016, 4071017, 4071018, 4071401, 4071501, 4071502, 4071503, + 4071504, 4071505, 4071506, 4071601, 4071602, 4071603, 4071604, 4071605, 4071606, 4071607, + 4071608, 4071609, 4071610, 4072001, 4072002, 4072003, 4072004, 4072008, 4072012, 4072013, + 4072014, 4072016, 4072017, 4072018, 4072019, 4072020, 4072022, 4072023, 4072024, 4072026, + 4072027, 4072101, 4072103, 4072104, 4072105, 4042301, 4072305, 4012301, 4012302, 4022302, + 4042307, 4042308, 4082303, 4082301, 4092301, 4092302, 4092303, 4092312, 4092313, 4092314, + 4092315, 4092316, 4092317, 4092318, 4092319, 4092320, 4092321, 4092322, 4092323, 4092324, + 4092325, 4092326, 4092327, 4092328, 4092329, 4092330, 4092331, 4092332, 4092333, 4092334, + 4092335, 4092336, 4092337, 4092338, 4092339, 4092340, 4092341, 4092342, 4092343, 4092344, + 4092345, 4092346, 4092347, 4092349, 4092350, 4092351, 4092352, 4092353, 4092361, 4052302, + 4052304, 4052305, 4052306, 4052307, 4052308, 4052309, 4052310, 4052311, 4052312, 4052313, + 4052314, 4052315, 4052316, 4052317, 4052318, 4052319, 4052320, 4052321, 4032305, 4032306, + 4032307, 4032308, 4032309, 4052323, 4052324, 4052325, 4052326, 4052327, 4052328, 4052329, + 4052330, 4052331, 4052332, 4052333, 4052334, 4052335, 4052336, 4052337, 4052338, 4052339, + 4052340, 4052341, 4052342, 4052343, 4052344, 4052345, 4052346, 4052347, 4052348, 4052349, + 4052350, 4052351, 4052352, 4052353, 4052354, 4042401, 4052401, 4052402, 4052403, 4052404, + 4052405, 4052406, 4052407, 4052408, 4052409, 4022401, 4022402, 4022403, 4022404, 4072401, + 4072402, 4082401, 4082402, 4042501, 4042502, 4042503, 4042504, 4042505, 4042506, 4042507, + 4072501, 4072502, 4072503, 4072504, 4082501, 4072505, 4072506, 4032501, 4032502, 4032503, + 4052501, 4052502, 4052503, 4052504, 4052505, 4052506, 4052507, 4052508, 4052509, 4072507, + 4062501, 4052510, 4042551, 4042552, 4042553, 4042554, 4042555, 4042556, 4052511, 4092601, + 4092602, 4092603, 4092604, 4092605, 4092606, 4092607, 4092608, 4092609, 4092610, 4092611, + 4092612, 4092613, 4092614, 4092615, 4092616, 4092617, 4092618, 4092619, 4092620, 4092621, + 4092622, 4092623, 4092624, 4092625, 4092626, 4092627, 4092628, 4092629, 4092630, 4092631, + 4092632, 4092633, 4092634, 4092635, 4092636, 4092637, 4092638, 4092639, 4092640, 4092641, + 4082601, 4082602, 4082603, 4082604, 4082605, 4082606, 4082607, 4082608, 4032601, 4052601, + 4052602, 4052603, 4052604, 4052605, 4052606, 4052607, 4052608, 4052609, 4052610, 4052611, + 4052612, 4052613, 4052614, 4052615, 4052616, 4052617, 4052618, 4052619, 4052620, 4072601, + 4072602, 4072603, 4072604, 4072605, 4072606, 4072607, 4072608, 4072609, 4072610, 4072611, + 4072612, 4032701, 4052701, 4052702, 4052703, 4052704, 4052705, 4052706, 4052707, 4052708, + 4052709, 4052710, 4052711, 4052712, 4052713, 4052714, 4052715, 4052716, 4052717, 4052718, + 4052719, 4052720, 4052721, 4052722, 4052723, 4052724, 4052725, 4052726, 4052727, 4052728, + 4052729, 4052730, 4072701, 4072702, 4072703, 4072704, 4082701, 4082702, 4082703, 4082704, + 4082705, 4082706, 4082707, 4082708, 4082709, 4092801, 4082801, 4082802, 4082803, 4082804, + 4082805, 4082806, 4032801, 4032802, 4012801, 4052801, 4052802, 4052803, 4052804, 4052805, + 4052806, 4052807, 4052808, 4052809, 4052810, 4052811, 4052812, 4052813, 4052814, 4052815, + 4052816, 4052817, 4052818, 4052819, 4052820, 4052821, 4052822, 4052823, 4052824, 4042801, + 4042802, 4072801, 4072802, 4072803, 4072804, 4072805, 4072806, 4032901, 4052901, 4052902, + 4052903, 4052904, 4052905, 4052906, 4052907, 4052908, 4052909, 4052910, 4052911, 4052912, + 4052913, 4052914, 4052915, 4052916, 4052917, 4052918, 4052919, 4072901, 4072902, 4072903, + 4072904, 4072905, 4072906, 4072907, 4092902, 4092903, 4092904, 4092905, 4092906, 4092907, + 4092909, 4092910, 4092911, 4092912, 4092913, 4092914, 4092915, 4092916, 4092917, 4092918, + 4092919, 4092920, 4092921, 4092922, 4092923, 4092924, 4092925, 4092926, 4092927, 4092928, + 4092929, 4092930, 4092931, 4092932, 4092933, 4092934, 4092935, 4092936, 4092937, 4092938, + 4092939, 4092940, 4092941, 4043001, 4043002, 4043003, 4043004, 4043005, 4043006, 4043007, + 4083001, 4053001, 4043008, 4043009, 4083002, 4083003, 4083004, 4043010, 4043011, 4043012, + 4043013, 4043014, 4043015, 4043016, 4073001, 4073002, 4073003, 4073004, 4073005, 4073006, + 4073007, 4073008, 4073009, 4073010, 4043017, 4043018, 4043019, 4043020, 4053002, 4053003, + 4053004, 4053005, 4053006, 4053007, 4053008, 4053009, 4053010, 4053011, 4053012, 4053014, + 4053015, 4053016, 4043021, 4033001, 4033002, 4033003, 4033004, 4033005, 4033006, 4053017, + 4053018, 4053019, 4053020, 4053021, 4053022, 4053023, 4053024, 4053025, 4053026, 4053027, + 4053028, 4053029, 4053030, 4053031, 4083006, 4083007, 4053032, 4053033, 4053034, 4053035, + 4053036, 4053037, 4053038, 4053039, 4053040, 4053041, 4053042, 4053043, 4053044, 4053045, + 4053046, 4053047, 4053048, 4053049, 4053050, 4053051, 4083008, 4053052, 4053053, 4033007, + 4033009, 4033010, 4033011, 4043022, 4043023, 4043024, 4043025, 4043026, 4043027, 4043028, + 4043029, 4043030, 4043031, 4043032, 4043033, 4043034, 4043035, 4053054, 4053055, 4053056, + 4053057, 4053058, 4053059, 4053060, 4053061, 4053062, 4053063, 4053064, 4053065, 4053066, + 4053067, 4053068, 4053069, 4073011, 4073012, 4073013, 4073014, 4073015, 4073016, 4073017, + 4083009, 4083010, 4053070, 4053071, 4043036, 4033201, 4033202, 4033203, 4033204, 4033205, + 4033206, 4043201, 4043202, 4043203, 4043204, 4043205, 4043206, 4043207, 4043208, 4043209, + 4083201, 4043210, 4053201, 4053202, 4053203, 4053204, 4043211, 4083202, 4043212, 4043213, + 4043214, 4043215, 4043216, 4043217, 4043218, 4043219, 4043220, 4043221, 4043222, 4043223, + 4053206, 4053207, 4053208, 4053209, 4053210, 4053211, 4053212, 4053213, 4053214, 4053215, + 4053216, 4053217, 4053218, 4053219, 4053220, 4053221, 4053222, 4053223, 4053224, 4053225, + 4053226, 4053227, 4043224, 4043225, 4043226, 4083203, 4073201, 4073202, 4073203, 4073204, + 4073205, 4073206, 4073207, 4073208, 4073209, 4073210, 4073211, 4073212, 4053228, 4053229, + 4053230, 4053231, 4053232, 4013201, 4043291, 4043292, 4043293, 4033301, 4033302, 4033303, + 4033304, 4033305, 4033306, 4043301, 4043302, 4053205, 4053301, 4053302, 4053303, 4053304, + 4053305, 4053306, 4053307, 4053308, 4053309, 4053310, 4053311, 4053312, 4053313, 4053314, + 4053315, 4053316, 4053317, 4053318, 4053319, 4053320, 4053321, 4053322, 4053323, 4053324, + 4053325, 4073301, 4073302, 4073303, 4073304, 4073305, 4083301, 4073306, 4053326, 4053327, + 4053328, 4053329, 6000001, 6000002, 6000003, 6000004, 2100002, 2100003, 2100101, 2100102, + 2100104, 2100105, 2100107, 2100108, 2100109, 2100110, 2100111, 2100112, 2100114, 2100115, + 2100116, 2100117, 2100119, 2100123, 2100124, 2100125, 2100126, 2100127, 2100128, 2100129, + 2100131, 2100132, 2100133, 2100134, 2100135, 2100136, 2100137, 2100138, 2100139, 2100140, + 2100141, 2100142, 2100143, 2100144, 2100145, 2100146, 2100147, 2100148, 2100149, 2100150, + 2100151, 2100152, 2100153, 2100154, 2100155, 6000010, 6000011, 6000012, 6000013, 6000014, + 6000015, 6000016, 6000017, 6000018, 6000019, 6000020, 6000021, 6000022, 6000023, 6000024, + 6000025, 6000026, 6000027, 6000028, 6000029, 6000030, 6000031, 6000032, 6000033, 6000034, + 6000035, 6000036, 6000037, 6000038, 6000039, 6000040, 6000041, 6000042, 6000043, 6000044, + 6000045, 6000046, 6000047, 6000048, 6000049, 6000050, 6000051, 6000052, 6000053, 6000054, + 6000055, 6000060, 6000061, 6000062, 6000063, 6000064, 6000065, 6000066, 6000067, 6000068, + 6000069, 6000070, 6000071, 6000072, 6000073, 6000074, 6000075, 6000076, 6000077, 6000078, + 6000079, 6000080, 6000081, 6000082, 6000083, 6000084, 6000085, 6000086, 6000087, 6000088, + 6000089, 6000101, 6000102, 6000103, 6000104, 6000105, 6000111, 6000112, 6000113, 6000114, + 6000115, 6000116, 6000117, 6000118, 6000119, 6000120, 6000121, 6000122, 6000123, 6000124, + 6000125, 6000126, 6000127, 6000291, 6000292, 6000293, 6000294, 6000295, 6000301, 6000302, + 6000303, 6000304, 6000305, 6000306, 6000307, 6000308, 6000309, 6000310, 6000311, 6000312, + 6000313, 6000314, 6000315, 6000316, 6000317, 6000318, 6000319, 6000320, 6000321, 6000322, + 6000323, 6000324, 6000325, 6000326, 6000327, 6000328, 6000329, 6000330, 6000331, 6000332, + 6000333, 6000334, 6000335, 6000336, 7000001, 7000002, 7000003, 7000004, 7000005, 7000006, + 7000007, 7000008, 7000009, 7000010, 7000011, 7000012, 7000013, 7000014, 7000015, 7000016, + 7000017, 7000018, 7000019, 7000020, 7000021, 7000022, 7099901, 7099902, 7201001, 7201002, + 7201003, 7201004, 7201005, 7201006, 7201007, 7201008, 7201009, 7201010, 7201011, 7202001, + 7202002, 7202003, 7203001, 7203002, 7203003, 7203004, 7203005, 7203006, 7203007, 7204001, + 7204002, 7204003, 7204004, 7204005, 7204006, 7204007, 7204008, 7204009, 7205001, 7205002, + 7205003, 7205004, 7205005, 7205006, 7205007, 7206001, 7206002, 7206003, 7207001, 7207002, + 7207003, 7207004, 7207005, 7207006, 1010000, 1010001, 1010002, 1010003, 1010004, 1010005, + 1010006, 1010007, 1010008, 1010009, 1010010, 1010011, 1010012, 1010013, 1010014, 1010015, + 1010016, 1010017, 1010018, 1010019, 1010020, 1010021, 1010022, 1010023, 1009900, 1009901, + 1009902, 1009903, 1009904, 1009905, 1009906, 1010024, 1010025, 1010026, 6013101, 6013102, + 6013103, 6013104, 6013105, 6013106, 6013107, 6013108, 6013109, 6013110, 6013111, 6013112, + 6013113, 6013114, 6013115, 6013116, 6013117, 6013118, 6013119, 6013120, 6013121, 6013122, + 6013123, 6013124, 6013127, 6013129, 6013133, 6013171, 6013172, 6013201, 6013202, 6013203, + 6013204, 6013205, 6013206, 6013207, 6013208, 6013209, 6013210, 6013211, 6013212, 6013213, + 6013214, 6013215, 6013216, 6013217, 6013218, 6013219, 6013220, 6013221, 6013222, 6013223, + 6013224, 6013225, 6013226, 6013227, 6013228, 6013229, 6013230, 6013231, 6013240, 6013241, + 6013242, 6013243, 6013244, 6013245, 6013246, 6013247, 6013248, 6013249, 6013260, 6013261, + 6013262, 6013263, 6013264, 6013265, 6013266, 6013267, 6013290, 6013291, 6013292, 6013293, + 6013301, 6013302, 6013303, 6013304, 6013305, 6013306, 6013307, 6013308, 6013309, 6013310, + 6013311, 6013312, 6013313, 6013314, 6014101, 6014102, 6014103, 6014104, 6014105, 6014106, + 6014107, 6014108, 6014109, 6014110, 6014111, 6014112, 6014113, 6014114, 6014115, 6014116, + 6014117, 6014118, 6014119, 6014120, 6014121, 6014122, 6014123, 6014124, 6014125, 6014126, + 6014127, 6014128, 6014201, 6014202, 6014203, 6014204, 6014205, 6014206, 6014207, 6014208, + 6014209, 6014210, 6014211, 6014212, 6014213, 6014214, 6014215, 6014216, 6014217, 6014218, + 6014219, 6014220, 6014221, 6014222, 6014223, 6014224, 6014225, 6014226, 6014227, 6014228, + 6014229, 6014230, 6014231, 6014232, 6014233, 6014234, 6014235, 6014236, 6014237, 6014238, + 6014239, 6014240, 6014241, 6014242, 6014243, 6014244, 6014245, 6014246, 6014247, 6014248, + 6014249, 6014250, 6014251, 6014301, 6014302, 6014303, 6014304, 6014305, 6014306, 6014307, + 6014308, 6014309, 6014310, 6014311, 6014312, 6014313, 6014314, 6014315, 6014316, 6014317, + 6014318, 6014319, 6014320, 6014321, 6014322, 6014323, 6014324, 6014325, 6014326, 6014327, + 6014328, 6014329, 6014330, 6014331, 6014332, 6014333, 6014334, 6014335, 6014336, 6014337, + 6014338, 6014401, 6014402, 6014403, 6014404, 6014405, 6014501, 6014502, 6014503, 6014504, + 6014505, 6014601, 6014602, 6014603, 6014604, 6014605, 6014701, 6014702, 6014703, 6014704, + 6014705, 6014801, 6014802, 6014803, 6014804, 6014805, 6014831, 6014832, 6014833, 6014834, + 6014835, 6014836, 6014841, 6014842, 6014843, 6014844, 6014845, 6014846, 6014851, 6014852, + 6014853, 6014854, 6014855, 6014856, 6014861, 6014862, 6014863, 6014864, 6014865, 6014866, + 6014867, 6014868, 6023000, 6023001, 6023002, 6023003, 6023004, 6023005, 6023006, 6023007, + 6023008, 6023009, 6023010, 6023011, 6023012, 6023013, 6023014, 6023015, 6023016, 6023017, + 6023018, 6023019, 6023100, 6023101, 6023102, 6023103, 6023104, 6023201, 6023202, 6023203, + 6023204, 6023205, 6023206, 6023207, 6023208, 6023209, 6023210, 6023211, 6023212, 6023213, + 6023214, 6023301, 6023302, 6023303, 6023304, 6023305, 6023306, 6023307, 6023308, 6023309, + 6023310, 6023311, 6023312, 6023313, 6023314, 6023315, 6023316, 6023501, 6023502, 6023601, + 6023602, 6023603, 6023604, 6023605, 6023606, 6023607, 6023608, 6023609, 6023610, 6023611, + 6023612, 6000337, 6000338, 6000339, 6000340, 6000341, 6000342, 6000343, 6000344, 6000345, + 6000346, 6000347, 6000348, 6000349, 6000350, 6000351, 6000352, 6000353, 6000354, 6000355, + 6000356, 6000357, 6000358, 6000359, 6000360, 6000361, 6000362, 6000363, 6000364, 6000365, + 6000366, 6000367, 6000368, 6000401, 6000402, 6030001, 6030002, 6030003, 6030004, 6030005, + 6030006, 6030007, 6030008, 6030009, 6030010, 6030011, 6030012, 6030013, 6030014, 6030015, + 6030016, 6030017, 6030018, 6030101, 6030102, 6030103, 6030131, 6030132, 6030133, 6031051, + 6031052, 6031053, 6031054, 6031055, 6031056, 6031057, 6031058, 6031059, 6031060, 6031061, + 6031062, 6031063, 6031064, 6031065, 6031066, 6031067, 6031068, 6031069, 6031070, 6031201, + 6031202, 6031203, 6031204, 6031205, 6031206, 6031207, 6031208, 6031209, 6031210, 6031211, + 6031212, 6031213, 6031214, 6031215, 6031216, 6031217, 6031218, 6031219, 6031220, 6032000, + 6032101, 6032102, 6032103, 6032104, 6032105, 6032209, 6032210, 6032211, 6032212, 6032201, + 6032202, 6032203, 6032204, 6032205, 6032206, 6032207, 6032208, 6032301, 6032302, 6032303, + 6032304, 6032305, 6032306, 6032401, 6032402, 6032403, 6032404, 6032411, 6032412, 6032413, + 6032414, 6032415, 6032416, 6032501, 6032502, 6040001, 6040002, 6040003, 6040004, 6040005, + 6040006, 6040007, 6040008, 6040009, 6040010, 6040011, 6040012, 6040013, 6040014, 6040015, + 6040016, 6040017, 6040018, 6040019, 6040020, 6000369, 6000370, 6000371, 6000372, 6000373, + 6000374, 6000375, 6000376, 6000377, 6000378, 6000379, 6000380, 6000381, 6000382, 6000383, + 6000384, 6000385, 6000386, 6000387, 6000388, 6000389, 6000390, 6000391, 6000392, 6000393, + 6000394, 6000395, 6000396, 6000397, 6000398, 6000399, 6000412, 6000413, 6000414, 6000405, + 6000406, 6000407, 6000408, 6000409, 6000410, 6000411, 6000415, 6000416, 6000417, 6000418, + 6000419, 6000420, 6000421, 6000422, 6000423, 6000424, 6000425, 6000426, 6000427, 6000428, + 6000429, 6000430, 6000431, 6000432, 6000433, 6000434, 6000435, 6000400, 6000500, 6000501, + 6000502, 6000503, 6000504, 6000505, 6000506, 6000507, 6000508, 6000509, 6000510, 6000511, + 6000512, 6000513, 6000514, 6000515, 6000516, 6000517, 6000518, 6000519, 6000520, 6000521, + 6000522, 6000523, 6000524, 6000525, 6050001, 1003000, 1003001, 1003002, 1003003, 1003004, + 1003005, 1003006, 1003007, 1003008, 1003009, 1003010, 1003011, 1003012, 1003013, 1003014, + 1003015, 1003100, 1003101, 1003102, 1003103, 1003104, 1003105, 1003106, 1003107, 1003108, + 1003109, 1003110, 1003111, 6016101, 6016102, 6016103, 6016111, 6016112, 6016113, 6016121, + 6016122, 6016123, 6016131, 6016132, 6016133, 6016141, 6016142, 6016143, 6016151, 6016152, + 6016153, 6016154, 6016155, 6016161, 6016162, 6016163, 6016164, 6016165, 6016166, 6016167, + 6016168, 6016169, 6016171, 6016172, 6016173, 6016180, 6016199, 6016181, 6016182, 6016183, + 6016184, 6016185, 6016186, 6016187, 6016188, 6016189, 6016190, 6017101, 6017102, 6017201, + 6017202, 6017203, 6017204, 6017205, 6017206, 6017207, 6017208, 6017209, 6017210, 6017211, + 6017212, 6017221, 6017222, 6017223, 6017224, 6017225, 6017226, 6017227, 6017228, 6017229, + 6017230, 6017240, 6018101, 6018102, 6018103, 6018104, 6018105, 6018106, 6018107, 6018108, + 6018109, 6018110, 6018111, 6018112, 6018113, 6018114, 6018115, 6018116, 6018117, 6018118, + 6018119, 6018120, 6018121, 6018122, 6018123, 6018124, 6021101, 6021102, 6021103, 6021104, + 6021105, 6021106, 6021107, 6021108, 6021109, 6021110, 6021111, 6021112, 6021113, 6021114, + 6021115, 6021116, 6021117, 6021118, 6021119, 6021120, 6021121, 6021122, 6021123, 6021124, + 6021125, 6021126, 6021127, 6021128, 6021129, 6021130, 6021131, 6021132, 6021133, 6000601, + 6000602, 6000603, 6000604, 6000605, 6000606, 6000607, 6000608, 6000609, 6000610, 6000611, + 6000612, 6000613, 6000614, 6000615, 6000616, 6000617, 6000618, 6000619, 6000620, 6000701, + 6000705, 6000706, 6000707, 6000702, 6000708, 6000709, 6000710, 6000703, 6000711, 6000712, + 6000713, 6000704, 6000714, 6000715, 6000716, 6000717, 6000718, 6000719, 6000720, 6000721, + 6000722, 6018001, 6019101, 6019102, 6019103, 6019104, 6019105, 6019106, 6019107, 6019108, + 6019109, 6019110, 6019111, 6019112, 6019113, 6019114, 6019115, 6019116, 6019117, 6019118, + 6019122, 6019123, 6019124, 6019125, 6019126, 6019127, 6019128, 6019130, 6020101, 6020102, + 6020103, 6020104, 6020105, 6020106, 6020107, 6020108, 6020100, 6020110, 6020111, 6020112, + 6020113, 6020114, 6020115, 6020116, 6020117, 6020124, 6020131, 6020118, 6020125, 6020132, + 6020119, 6020126, 6020133, 6020120, 6020127, 6020134, 6020121, 6020128, 6020135, 6020122, + 6020129, 6020136, 6020123, 6020130, 6020137, 6020138, 6020139, 6020150, 6020151, 6020152, + 6020153, 6020154, 6020155, 6020156, 6020157, 6022101, 6022102, 6022103, 6022104, 6022105, + 6022106, 6022107, 6022108, 6022109, 6022110, 6022112, 6022113, 6022114, 6022115, 6022116, + 6022117, 6022118, 6022119, 6022120, 6022121, 6022122, 6022123, 6022124, 6022125, 6022126, + 6022127, 6022128, 6022129, 6022130, 6022131, 6022132, 6022133, 6022134, 6022135, 6022136, + 6022137, 6023701, 6023702, 6023703, 6023704, 6023705, 6023706, 6023707, 6023708, 6023709, + 6023710, 6023711, 6023712, 6023713, 6023714, 6023715, 6023716, 6023717, 6023718, 6023719, + 6023720, 6023721, 6023722, 6023723, 6023724, 6023725, 6026100, 6026101, 6026102, 6026103, + 6026104, 6026105, 6026106, 6026107, 6026108, 6026109, 6026110, 6026111, 6026112, 6026113, + 6026114, 6026115, 6026116, 6026117, 6026118, 6026119, 6026120, 6026121, 6026122, 6026123, + 6026124, 6026125, 6026126, 6026127, 6026128, 6026129, 6026130, 6026131, 6026140, 6026166, + 6026132, 6026141, 6026142, 6026143, 6026144, 6026145, 6026146, 6026147, 6026148, 6026150, + 6026151, 6026152, 6026153, 6026154, 6026155, 6026156, 6026157, 6026158, 6026159, 6026160, + 6026161, 6026162, 6026163, 6026164, 6026165, 6014901, 6014902, 6014903, 6014904, 6014905, + 6014906, 6014907, 6014908, 6014909, 6014910, 6014911, 6014912, 6014913, 6014914, 6014915, + 6014916, 6014917, 6014918, 6014919, 6014920, 6014921, 6014922, 6014923, 6014924, 6014925, + 6014926, 6014927, 6014928, 6014929, 6014930, 6014931, 6014932, 6014933, 6014934, 6014935, + 6014936, 6014937, 6014938, 6014939, 6014940, 6014941, 6014942, 6014943, 6014944, 6014945, + 6014946, 6014947, 6014948, 6014949, 6014950, 6014951, 6014952, 6014953, 6014954, 6014955, + 6014956, 6014957, 6014958, 6014959, 6014960, +]; + +pub async fn on_get_quest_data_cs_req( + session: &mut PlayerSession, + _: &GetQuestDataCsReq, +) -> Result<()> { + session + .send( + CMD_GET_QUEST_DATA_SC_RSP, + GetQuestDataScRsp { + quest_list: QUEST_LIST + .iter() + .map(|v| Quest { + id: *v, + status: QuestStatus::QuestFinish.into(), + finish_time: 10000, + progress: 1, + ihmkpnpaipd: vec![], + }) + .collect::>(), + ..Default::default() + }, + ) + .await +} diff --git a/gameserver/src/net/handlers/mod.rs b/gameserver/src/net/handlers/mod.rs index 0d2dc70..8ee6c48 100644 --- a/gameserver/src/net/handlers/mod.rs +++ b/gameserver/src/net/handlers/mod.rs @@ -1,13 +1,15 @@ mod authentication; mod avatar; mod battle; +mod chat; +mod inventory; mod lineup; +mod mail; mod mission; mod player; mod scene; mod tutorial; -mod inventory; -mod chat; +mod gacha; use anyhow::Result; use paste::paste; @@ -20,13 +22,15 @@ use crate::net::NetPacket; pub use authentication::*; pub use avatar::*; pub use battle::*; +pub use chat::*; +pub use inventory::*; pub use lineup::*; +pub use mail::*; pub use mission::*; pub use player::*; pub use scene::*; pub use tutorial::*; -pub use inventory::*; -pub use chat::*; +pub use gacha::*; #[allow(unused_imports)] use proto::{ @@ -53,7 +57,6 @@ use proto::{ CmdWolfBroType::*, }; - macro_rules! dummy { ($($cmd:ident),* $(,)*) => { paste! { @@ -95,7 +98,7 @@ dummy! { // SceneEntityMove, GetLevelRewardTakenList, GetRogueScoreRewardInfo, - GetGachaInfo, + // GetGachaInfo, QueryProductInfo, GetQuestData, GetQuestRecord, @@ -136,6 +139,7 @@ dummy! { GetVideoVersionKey, GetCurBattleInfo, GetPhoneData, - PlayerLoginFinish, - InteractProp + // PlayerLoginFinish, + InteractProp, + FinishTalkMission } diff --git a/gameserver/src/net/handlers/player.rs b/gameserver/src/net/handlers/player.rs index c0d5176..56c1dcb 100644 --- a/gameserver/src/net/handlers/player.rs +++ b/gameserver/src/net/handlers/player.rs @@ -30,7 +30,7 @@ pub async fn on_get_hero_basic_type_info_cs_req( retcode: 0, gender: mc.get_gender().into(), cur_basic_type: mc.get_type().into(), - basic_type_info_list:vec![HeroBasicTypeInfo { + basic_type_info_list: vec![HeroBasicTypeInfo { basic_type: mc.get_type().into(), ..Default::default() }], @@ -60,3 +60,36 @@ pub async fn on_player_heart_beat_cs_req( ) .await } + +pub type PlayerLoginFinishCsReq = Dummy; + +pub async fn on_player_login_finish_cs_req( + session: &mut PlayerSession, + _: &PlayerLoginFinishCsReq, +) -> Result<()> { + session + .send(CMD_PLAYER_LOGIN_FINISH_SC_RSP, Dummy {}) + .await?; + session + .send(CMD_CONTENT_PACKAGE_UNLOCK_SC_RSP, Dummy {}) + .await?; + session + .send(CMD_CONTENT_PACKAGE_GET_DATA_SC_RSP, Dummy {}) + .await?; + session + .send( + CMD_CONTENT_PACKAGE_SYNC_DATA_SC_NOTIFY, + Chhopfkjmje { + data: Some(Gdafmkkhkkl { + himejaheaoj: vec![Bejmehlnpan { + status: Olngclnnaie::ContentPackageStatusFinished.into(), + jkbgighlakf: 200001, + }], + eoljolnkooh: 0, + }), + }, + ) + .await?; + + Ok(()) +} diff --git a/gameserver/src/net/handlers/scene.rs b/gameserver/src/net/handlers/scene.rs index f6259b4..054f3ac 100644 --- a/gameserver/src/net/handlers/scene.rs +++ b/gameserver/src/net/handlers/scene.rs @@ -275,10 +275,10 @@ async fn load_scene( floor_id: enterance.floor_id, plane_id: enterance.plane_id, entry_id, - pjbjelcgkof: plane.plane_type as u32, + game_mode_type: plane.plane_type as u32, nnfgkelcban: 1, lgflfajffjl: 1, - game_mode_type: 1, + world_id: plane.world_id, ..Default::default() }; diff --git a/gameserver/src/net/packet.rs b/gameserver/src/net/packet.rs index 106acd3..9ce44ab 100644 --- a/gameserver/src/net/packet.rs +++ b/gameserver/src/net/packet.rs @@ -96,38 +96,58 @@ macro_rules! trait_handler { } trait_handler! { - GetArchiveDataCsReq 2361; - Gfmigicacfn 321;// DressRelicAvatarCsReq - DressAvatarCsReq 387; // DressAvatarCsReq - Nbmofdgfejk 303;// TakeOffRelicCsReq - GetAvatarDataCsReq 361; - TakeOffEquipmentCsReq 362;// TakeOffEquipmentCsReq - PveBattleResultCsReq 161; - Dgaiigecbee 3961;// SendMsgCsReq - Pignjacjgdl 3939; // GetPrivateChatHistoryCsReq - Jhfffmnkcbf 2961;// GetFriendListInfoCsReq + PlayerGetTokenCsReq 39; // PlayerGetTokenScRsp + PlayerLoginCsReq 61; // PlayerLoginScRsp, PlayerBasicInfo + GetMissionStatusCsReq 1256; // GetMissionStatusScRsp, Mission + GetBasicInfoCsReq 90; // GetBasicInfoScRsp, PlayerSettingInfo + GetHeroBasicTypeInfoCsReq 68; // GetHeroBasicTypeInfoScRsp, HeroBasicTypeInfo + GetAvatarDataCsReq 361; // GetAvatarDataScRsp, Avatar + GetAllLineupDataCsReq 756; // GetAllLineupDataScRsp, LineupInfo, ExtraLineupType, LineupAvatar, AmountInfo + GetCurLineupDataCsReq 791; // GetCurLineupDataScRsp + GetCurSceneInfoCsReq 1430; // GetCurSceneInfoScRsp, SceneInfo + PlayerHeartBeatCsReq 42; // PlayerHeartBeatScRsp + + // Tutorial (dummy!) + GetTutorialGuideCsReq 1691; + UnlockTutorialGuideCsReq 1630; + GetTutorialCsReq 1661; + + // Entity move (dummy!) + SceneEntityMoveCsReq 1461; + + // Inventory (dummy!) GetBagCsReq 561; - GetAllLineupDataCsReq 756; + GetArchiveDataCsReq 2361; + DressAvatarCsReq 387; + TakeOffEquipmentCsReq 362; + Gfmigicacfn 321; // DressRelicAvatarCsReq + Nbmofdgfejk 303; // TakeOffRelicCsReq + + // Chat (dummy!) + Dgaiigecbee 3961; // SendMsgCsReq + Pignjacjgdl 3939; // GetPrivateChatHistoryCsReq + Jhfffmnkcbf 2961; // GetFriendListInfoCsReq + + // In-game lineup JoinLineupCsReq 739; ChangeLineupLeaderCsReq 794; ReplaceLineupCsReq 709; QuitLineupCsReq 730; - GetCurLineupDataCsReq 791; - GetMissionStatusCsReq 1256; - PlayerGetTokenCsReq 39; - PlayerLoginCsReq 61; - PlayerHeartBeatCsReq 42; - GetHeroBasicTypeInfoCsReq 68; - GetBasicInfoCsReq 90; - GetEnteredSceneCsReq 1407; // getenteredscenecsreq - // Kkbapmgmmcb 1440; //getunlockteleportcsreq - GetCurSceneInfoCsReq 1430; - SceneCastSkillCsReq 1439; // scenecastskillcsreq + + // Battle StartCocoonStageCsReq 1413; - GetSceneMapInfoCsReq 1484; //getscenemapinfocsreq - SceneEntityMoveCsReq 1461; - EnterSceneCsReq 1480; // enterscenecsreq - GetTutorialGuideCsReq 1691; - UnlockTutorialGuideCsReq 1630; - GetTutorialCsReq 1661; + PveBattleResultCsReq 161; + SceneCastSkillCsReq 1439; + + // Teleport + GetEnteredSceneCsReq 1407; + GetSceneMapInfoCsReq 1484; + EnterSceneCsReq 1480; + + // Optional + GetMailCsReq 861; + GetGachaInfoCsReq 1961; + DoGachaCsReq 1991; + GetQuestDataCsReq 961; + PlayerLoginFinishCsReq 86; } diff --git a/proto/out/_.rs b/proto/out/_.rs index e74f05f..46a2afa 100644 --- a/proto/out/_.rs +++ b/proto/out/_.rs @@ -8421,7 +8421,8 @@ pub struct Gdpmmlffckj { #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Epcdknhldgl {} +pub struct GetGachaInfoCsReq {} // GetGachaInfoCsReq + #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] @@ -8445,7 +8446,7 @@ pub struct Ldhikjljmdc { #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Dkddhjennfp { +pub struct GachaInfo { #[prost(int64, tag = "3")] pub end_time: i64, #[prost(uint32, tag = "15")] @@ -8455,7 +8456,7 @@ pub struct Dkddhjennfp { #[prost(uint32, repeated, tag = "4")] pub hjefpibalip: ::prost::alloc::vec::Vec, #[prost(uint32, tag = "9")] - pub dfdbmelhdpp: u32, + pub gacha_id: u32, #[prost(uint32, repeated, tag = "10")] pub ibomhpajoji: ::prost::alloc::vec::Vec, #[prost(string, tag = "7")] @@ -8470,7 +8471,7 @@ pub struct Dkddhjennfp { #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Kcmaooicbbb { +pub struct GetGachaInfoScRsp { #[prost(uint32, tag = "7")] pub ghihlfpaejp: u32, #[prost(uint32, tag = "12")] @@ -8482,16 +8483,16 @@ pub struct Kcmaooicbbb { #[prost(uint32, tag = "4")] pub retcode: u32, #[prost(message, repeated, tag = "2")] - pub bgigpbnbcme: ::prost::alloc::vec::Vec, + pub gacha_info_list: ::prost::alloc::vec::Vec, } #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Akphefjekam { +pub struct DoGachaCsReq { #[prost(uint32, tag = "7")] - pub dfdbmelhdpp: u32, + pub gacha_id: u32, #[prost(uint32, tag = "10")] - pub dedelghmmje: u32, + pub gacha_num: u32, #[prost(uint32, tag = "13")] pub hfjddefdkfn: u32, #[prost(uint32, tag = "9")] @@ -8500,24 +8501,24 @@ pub struct Akphefjekam { #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Afgjlphfbpn { +pub struct GachaItem { #[prost(message, optional, tag = "13")] - pub hjghnhljajl: ::core::option::Option, + pub gacha_item: ::core::option::Option, #[prost(message, optional, tag = "8")] pub fhfenbcnkei: ::core::option::Option, #[prost(bool, tag = "10")] - pub cdhekghjjce: bool, + pub is_new: bool, #[prost(message, optional, tag = "15")] pub eginhhfhbbh: ::core::option::Option, } #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Gfepbnpgejl { +pub struct DoGachaScRsp { #[prost(uint32, tag = "13")] pub giopaifpinl: u32, #[prost(uint32, tag = "10")] - pub dfdbmelhdpp: u32, + pub gacha_id: u32, #[prost(uint32, tag = "8")] pub retcode: u32, #[prost(uint32, tag = "3")] @@ -8527,13 +8528,14 @@ pub struct Gfepbnpgejl { #[prost(uint32, tag = "4")] pub pdfinfdanea: u32, #[prost(message, repeated, tag = "1")] - pub gcejognjecl: ::prost::alloc::vec::Vec, + pub gacha_item_list: ::prost::alloc::vec::Vec, #[prost(uint32, tag = "12")] - pub dedelghmmje: u32, + pub gacha_num: u32, #[prost(uint32, tag = "7")] pub mbdhnchflhc: u32, } + #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Jobkcbohhee { @@ -10117,7 +10119,7 @@ pub struct Bcggoemldfb { #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Meojjjopnaj { +pub struct GetMailCsReq { // Meojjjopnaj #[prost(uint32, tag = "4")] pub ddfoljicomi: u32, #[prost(uint32, tag = "3")] @@ -14919,18 +14921,18 @@ pub struct Opgdokfipin { #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Iifkdhanhml {} +pub struct GetQuestDataCsReq {} #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Pcminmfongb { +pub struct Quest { #[prost(int64, tag = "3")] - pub cbbdfcbniln: i64, + pub finish_time: i64, #[prost(uint32, repeated, tag = "4")] pub ihmkpnpaipd: ::prost::alloc::vec::Vec, #[prost(uint32, tag = "1")] pub id: u32, - #[prost(enumeration = "Ibcjefpmhhn", tag = "13")] + #[prost(enumeration = "QuestStatus", tag = "13")] pub status: i32, #[prost(uint32, tag = "9")] pub progress: u32, @@ -14938,11 +14940,11 @@ pub struct Pcminmfongb { #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Nahgobmjpld { +pub struct GetQuestDataScRsp { #[prost(message, repeated, tag = "2")] - pub gbpfmlkagek: ::prost::alloc::vec::Vec, + pub quest_list: ::prost::alloc::vec::Vec, #[prost(uint32, tag = "10")] - pub ppajjpccnkd: u32, + pub total_achievement_exp: u32, #[prost(uint32, tag = "8")] pub retcode: u32, } @@ -15043,7 +15045,7 @@ pub struct Almaeaofmkf { #[derive(Clone, PartialEq, ::prost::Message)] pub struct Kmoaeiakdkn { #[prost(message, repeated, tag = "6")] - pub gbpfmlkagek: ::prost::alloc::vec::Vec, + pub gbpfmlkagek: ::prost::alloc::vec::Vec, #[prost(uint32, tag = "7")] pub retcode: u32, } @@ -20097,7 +20099,7 @@ pub struct SceneInfo { #[prost(uint32, tag = "15")] pub lgflfajffjl: u32, #[prost(uint32, tag = "13")] - pub pjbjelcgkof: u32, + pub game_mode_type: u32, #[prost(message, repeated, tag = "3")] pub ijmddokpdff: ::prost::alloc::vec::Vec, #[prost(message, optional, tag = "1472")] @@ -20107,7 +20109,7 @@ pub struct SceneInfo { #[prost(map = "string, int32", tag = "211")] pub dynamic_values: ::std::collections::HashMap<::prost::alloc::string::String, i32>, #[prost(uint32, tag = "1")] - pub game_mode_type: u32, + pub world_id: u32, #[prost(message, repeated, tag = "9")] pub padggdamiam: ::prost::alloc::vec::Vec, #[prost(message, repeated, tag = "11")] @@ -21842,7 +21844,7 @@ pub struct Pkbehgpoein { #[prost(message, repeated, tag = "2")] pub basic_type_info_list: ::prost::alloc::vec::Vec, #[prost(message, repeated, tag = "15")] - pub gbpfmlkagek: ::prost::alloc::vec::Vec, + pub gbpfmlkagek: ::prost::alloc::vec::Vec, #[prost(uint32, repeated, tag = "13")] pub idgakomjiio: ::prost::alloc::vec::Vec, #[prost(message, repeated, tag = "222")] @@ -35447,25 +35449,25 @@ impl CmdQuestType { } #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)] #[repr(i32)] -pub enum Ibcjefpmhhn { +pub enum QuestStatus { QuestNone = 0, QuestDoing = 1, QuestFinish = 2, QuestClose = 3, QuestDelete = 4, } -impl Ibcjefpmhhn { +impl QuestStatus { /// String value of the enum field names used in the ProtoBuf definition. /// /// The values are not transformed in any way and thus are considered stable /// (if the ProtoBuf definition does not change) and safe for programmatic use. pub fn as_str_name(&self) -> &'static str { match self { - Ibcjefpmhhn::QuestNone => "QUEST_NONE", - Ibcjefpmhhn::QuestDoing => "QUEST_DOING", - Ibcjefpmhhn::QuestFinish => "QUEST_FINISH", - Ibcjefpmhhn::QuestClose => "QUEST_CLOSE", - Ibcjefpmhhn::QuestDelete => "QUEST_DELETE", + QuestStatus::QuestNone => "QUEST_NONE", + QuestStatus::QuestDoing => "QUEST_DOING", + QuestStatus::QuestFinish => "QUEST_FINISH", + QuestStatus::QuestClose => "QUEST_CLOSE", + QuestStatus::QuestDelete => "QUEST_DELETE", } } /// Creates an enum from field names used in the ProtoBuf definition. diff --git a/versions.json b/versions.json index 513bc12..2034baa 100644 --- a/versions.json +++ b/versions.json @@ -10,5 +10,29 @@ "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_7033392_aaca9c1b456b", "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_7050564_f05a0f949b10", "lua_version": "7050564" + }, + "CNBETAWin2.2.53": { + "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_7128256_5f77b249238a", + "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_7134377_b1f36fb2d9b8", + "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_7120090_469169697c23", + "lua_version": "7120090" + }, + "OSBETAWin2.2.53": { + "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_7128256_5f77b249238a", + "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_7134377_b1f36fb2d9b8", + "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_7120090_469169697c23", + "lua_version": "7120090" + }, + "CNBETAWin2.2.54": { + "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_7165870_7fb7dbd8a7a4", + "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_7171381_bb763a07e196", + "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_7165994_1569306165f0", + "lua_version": "7165994" + }, + "OSBETAWin2.2.54": { + "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_7165870_7fb7dbd8a7a4", + "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_7171381_bb763a07e196", + "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_7165994_1569306165f0", + "lua_version": "7165994" } }