feat: Initial support for 3.3.5x

Cargo.toml

@@ -64,7 +64,7 @@ sdkserver = { path = "sdkserver/" }
 gameserver = { path = "gameserver/" }
 
 [profile.release]
-strip = true      # Automatically strip symbols from the binary.
 opt-level = "z"   # Optimize for size.
+strip = true      # Automatically strip symbols from the binary.
 lto = true
 codegen-units = 1

common/src/sr_tools.rs

@@ -106,6 +106,7 @@ impl FreesrData {
                 .map(|v| v.get_unique_id())
                 .unwrap_or_default(),
             dressed_skin_id: 0,
+            ..Default::default()
         })
     }
 
@@ -143,6 +144,7 @@ impl FreesrData {
                         .map(|v| v.get_unique_id())
                         .unwrap_or_default(),
                     dressed_skin_id: 0,
+                    ..Default::default()
                 })
             })
             .collect()

gameserver/src/net/handlers/avatar.rs

@@ -1,11 +1,13 @@
+use std::collections::HashMap;
+
 use super::*;
 
-pub static UNLOCKED_AVATARS: [u32; 65] = [
+pub static UNLOCKED_AVATARS: [u32; 68] = [
     1002, 1003, 1004, 1005, 1006, 1008, 1009, 1013, 1101, 1102, 1103, 1104, 1105, 1106, 1107, 1108,
     1109, 1110, 1111, 1112, 1201, 1202, 1203, 1204, 1205, 1206, 1207, 1208, 1209, 1210, 1211, 1212,
     1213, 1214, 1215, 1217, 1301, 1302, 1303, 1304, 1305, 1306, 1307, 1308, 1309, 1312, 1315, 1310,
-    1314, 1218, 1221, 1220, 1222, 1223, 1317, 1313, 1225, 1402, 1401, 1404, 1403, 1405, 1407, 1406, 
+    1314, 1218, 1221, 1220, 1222, 1223, 1317, 1313, 1225, 1402, 1401, 1404, 1403, 1405, 1407, 1406,
-    1409
+    1409, 1014, 1015, 1408,
 ];
 
 pub async fn on_get_avatar_data_cs_req(
@@ -60,4 +62,11 @@ pub async fn on_get_avatar_data_cs_req(
                 })
         })
         .collect();
+
+    res.current_multi_path_avatar_id = HashMap::from([
+        (8001, json.main_character.get_type().into()),
+        (1001, json.march_type.get_type().into()),
+    ]);
+
+    res.multi_path_avatar_type_info_list = json.get_multi_path_info();
 }

gameserver/src/net/handlers/gacha.rs

@@ -9,8 +9,8 @@ pub async fn on_get_gacha_info_cs_req(
         end_time: 1924992000,
         begin_time: 0,
         gacha_ceiling: Some(GachaCeiling::default()),
-        up_info: vec![23002, 1003, 1101, 1104, 23000, 23003],
+        prize_item_list: vec![23002, 1003, 1101, 1104, 23000, 23003],
-        featured: vec![
+        item_detail_list: 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,

gameserver/src/net/handlers/scene.rs

@@ -241,30 +241,30 @@ async fn load_scene(
             scene.world_id
         },
         lighten_section_list: scene.sections.clone(),
-        chest_id_list: scene
+        // chest_id_list: scene
-            .scenes
+        //     .scenes
-            .values()
+        //     .values()
-            .flat_map(|v| v.chests.clone())
+        //     .flat_map(|v| v.chests.clone())
-            .collect::<Vec<_>>(),
+        //     .collect::<Vec<_>>(),
-        scene_mission_info: Some(MissionStatusBySceneInfo {
+        // scene_mission_info: Some(MissionStatusBySceneInfo {
-            finished_mission_id_list: scene
+        //     finished_mission_id_list: scene
-                .scenes
+        //         .scenes
-                .values()
+        //         .values()
-                .flat_map(|s| s.finished_main_missions.clone())
+        //         .flat_map(|s| s.finished_main_missions.clone())
-                .collect::<Vec<_>>(),
+        //         .collect::<Vec<_>>(),
-            sub_mission_status_list: scene
+        //     sub_mission_status_list: scene
-                .scenes
+        //         .scenes
-                .values()
+        //         .values()
-                .flat_map(|s| {
+        //         .flat_map(|s| {
-                    s.finished_sub_missions.iter().map(|sm| Mission {
+        //             s.finished_sub_missions.iter().map(|sm| Mission {
-                        id: *sm,
+        //                 id: *sm,
-                        status: MissionStatus::MissionFinish.into(),
+        //                 status: MissionStatus::MissionFinish.into(),
-                        progress: 0,
+        //                 progress: 0,
-                    })
+        //             })
-                })
+        //         })
-                .collect::<Vec<_>>(),
+        //         .collect::<Vec<_>>(),
-            ..Default::default()
+        //     ..Default::default()
-        }),
+        // }),
         floor_saved_data: scene.saved_values.clone(),
         ..Default::default()
     };

gameserver/src/net/packet.rs

@@ -172,7 +172,7 @@ trait_handler! {
     PlayerLogin;
     GetMissionStatus;
     GetBasicInfo;
-    GetMultiPathAvatarInfo;
+    // GetMultiPathAvatarInfo;
     GetAvatarData;
     GetAllLineupData;
     GetCurLineupData;