ObolSquad/trigger-rs
1
0
Fork 1
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Protobuf and asset updates for 1.6.2

Browse source
This commit is contained in:
xeon 2025-02-27 00:18:13 +03:00
parent 98a587dfc5
commit 45efe72040
10 changed files with 33772 additions and 35836 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
1321691809.blk → 3271423389.blk
View file

Binary file not shown.

2
crates/battle-server/src/main.rs
View file

@ -18,7 +18,7 @@ mod logic;
mod server_message_handler;
mod session;
const BLK_ASSET_FILE: &str = "1321691809.blk";
const BLK_ASSET_FILE: &str = "3271423389.blk";
const CONFIG_FILE: &str = "battleserver.toml";
const SERVER_TYPE: ServerType = ServerType::BattleServer;

2
crates/dispatch-server/dispatch.default.toml
View file

@ -13,7 +13,7 @@ area = 2
[bound_server]
name = "trigger_rs"
title = "Trigger-RS"
seed = "95dedfc7cf06cdc2"
seed = "423c41ab50796679"
addr = "127.0.0.1"
port = 20501
is_kcp = false

20
crates/dispatch-server/src/query_gateway.rs
View file

@ -139,21 +139,21 @@ fn internal_process(
cdn_conf_ext: Some(CdnConfExt {
// TODO: unhardcode this
design_data: CdnDesignData {
base_url: Borrowed("https://autopatchcn.juequling.com/design_data/beta_live/output_6567607_45953cc7be/client/"),
data_revision: Borrowed("6564324"),
md5_files: Borrowed(r#"[{"fileName": "data_version", "fileSize": 4312, "fileMD5": "7566724726121829372"}]"#),
base_url: Borrowed("https://autopatchcn.juequling.com/design_data/beta_live/output_6898716_37ab305294/client/"),
data_revision: Borrowed("6898716"),
md5_files: Borrowed(r#"[{"fileName": "data_version", "fileSize": 4309, "fileMD5": "3201644681691708675"}]"#),
},
game_res: CdnGameRes {
audio_revision: Borrowed("6549139"),
base_url: Borrowed("https://autopatchcn.juequling.com/game_res/beta_live/output_6567607_45953cc7be/client/"),
audio_revision: Borrowed("6867652"),
base_url: Borrowed("https://autopatchcn.juequling.com/game_res/beta_live/output_6898716_37ab305294/client/"),
branch: Borrowed("beta_live"),
md5_files: Borrowed(r#"[{"fileName": "res_version", "fileSize": 2348948, "fileMD5": "3373372231805782958"}, {"fileName": "audio_version", "fileSize": 30433, "fileMD5": "9430105181932353351"}, {"fileName": "base_revision", "fileSize": 18, "fileMD5": "14955177794877370186"}]"#),
res_revision: Borrowed("6567607"),
md5_files: Borrowed(r#"[{"fileName": "res_version", "fileSize": 2364164, "fileMD5": "14977183523459896145"}, {"fileName": "audio_version", "fileSize": 30439, "fileMD5": "12961491308958500450"}, {"fileName": "base_revision", "fileSize": 18, "fileMD5": "2380106343152280666"}]"#),
res_revision: Borrowed("6898716"),
},
silence_data: CdnSilenceData {
base_url: Borrowed("https://autopatchcn.juequling.com/design_data/beta_live/output_6567607_45953cc7be/client_silence/"),
md5_files: Borrowed(r#"[{"fileName": "silence_version", "fileSize": 467, "fileMD5": "10455524392801028815"}]"#),
silence_revision: Borrowed("6567607"),
base_url: Borrowed("https://autopatchcn.juequling.com/design_data/beta_live/output_6898716_37ab305294/client_silence/"),
md5_files: Borrowed(r#"[{"fileName": "silence_version", "fileSize": 232, "fileMD5": "17401509085851157138"}]"#),
silence_revision: Borrowed("6867652"),
},
pre_download: None,
}),

3
crates/game-server/src/logic/player/role.rs
View file

@ -23,6 +23,8 @@ pub struct AvatarPropertyChanges {
}
impl RoleModel {
const PIDORS: &[i32] = &[1331, 1291];
pub async fn init(context: NapContext) -> Self {
let avatar_map = Self::load_or_create_avatar_map(&context).await;
@ -297,6 +299,7 @@ impl RoleModel {
pub async fn unlock_avatars(&mut self, avatar_id_list: &[i32]) -> Vec<u32> {
let models = avatar_id_list
.iter()
.filter(|id| !Self::PIDORS.contains(*id))
.filter(|id| !self.is_avatar_unlocked(**id as u32))
.map(|id| {
self.context

2
crates/game-server/src/main.rs
View file

@ -25,7 +25,7 @@ mod session;
const GM_DEMO_SCRIPT_PATH: &str = "ConfigScript/GMGroupDemo.json";
const GM_BLACKLIST_PATH: &str = "ConfigScript/Gm_Item_Black_List.json";
const BLK_ASSET_FILE: &str = "1321691809.blk";
const BLK_ASSET_FILE: &str = "3271423389.blk";
const CONFIG_FILE: &str = "gameserver.toml";
const SERVER_TYPE: ServerType = ServerType::GameServer;

2
crates/hall-server/src/main.rs
View file

@ -21,7 +21,7 @@ mod logic;
mod server_message_handler;
mod session;
const BLK_ASSET_FILE: &str = "1321691809.blk";
const BLK_ASSET_FILE: &str = "3271423389.blk";
const MAIN_CITY_SCRIPT_PATH: &str = "ConfigScript/MainCity_1.json";
const CONFIG_FILE: &str = "hallserver.toml";
const SERVER_TYPE: ServerType = ServerType::HallServer;

58984
crates/trigger-protobuf/out/_.rs
View file

File diff suppressed because it is too large Load diff

10591
crates/trigger-protobuf/out/protocol_map.rs
View file

File diff suppressed because it is too large Load diff

2
crates/trigger-protobuf/src/lib.rs
View file

@ -22,7 +22,7 @@ include!("../out/_.rs");
include!("../out/protocol_map.rs");
#[derive(trigger_protobuf_derive::CmdID)]
#[cmdid(5688)]
#[cmdid(8128)]
#[derive(trigger_protobuf_derive::XorFields, Clone, Copy, PartialEq, ::prost::Message)]
pub struct FallbackRsp {}