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

Compare commits

base: ObolSquad:master
Branches Tags
ObolSquad:master
ObolSquad:1.7_beta
traffic95:1.6.12_kol
traffic95:1.7_beta
traffic95:master
ObolSquad:0.1
traffic95:0.1
..
compare: traffic95:1.6.12_kol
Branches Tags
traffic95:1.6.12_kol
traffic95:1.7_beta
traffic95:master
ObolSquad:master
ObolSquad:1.7_beta
traffic95:0.1
ObolSquad:0.1

2 commits
master ... 1.6.12_kol

Author SHA1 Message Date
traffic95
8311ad44fe Updated res_versions 2025-03-21 13:42:40 +01:00
traffic95
827596fea2 1.6.12kol support 2025-03-20 11:30:28 +01:00
17 changed files with 19 additions and 1115 deletions
Show stats Expand all files Collapse all files

1
ConfigScript/GMGroupDemo.json
View file

@ -6,7 +6,6 @@
"UnlockAllHollow",
"UnlockAllHollowBuff",
"UnlockAllCafeItem",
"UnlockAllAvatarSkin",
"finishquest 1 0",
"finishquest 3 0",
"addquest 5 4030136"

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

@ -13,7 +13,7 @@ area = 2
[bound_server]
name = "trigger_rs"
title = "Trigger-RS"
seed = "70fed6d1bdf76412"
seed = "b6b98b041bdd69ce"
addr = "127.0.0.1"
port = 20501
is_kcp = false

27
crates/game-server/src/logic/gm_util.rs
View file

@ -72,36 +72,9 @@ pub async fn execute_command(context: &mut CommandContext<'_>, command: &GMComma
GMCommand::UnlockAllHollow => gm_unlock_all_hollow(context).await,
GMCommand::UnlockAllHollowBuff => gm_unlock_all_hollow_buff(context).await,
GMCommand::UnlockAllCafeItem => gm_unlock_all_cafe_item(context).await,
GMCommand::UnlockAllAvatarSkin => gm_unlock_all_avatar_skin(context).await,
}
}
async fn gm_unlock_all_avatar_skin(context: &mut CommandContext<'_>) {
context
.player
.item_model
.add_or_use_materials(
&context
.state
.filecfg
.avatar_skin_base_template_tb()
.data()
.unwrap()
.iter()
.map(|tmpl| (tmpl.id() as u32, 1).into())
.collect::<Vec<_>>(),
)
.await;
context.add_notify(PlayerSyncScNotify {
item_sync: Some(ItemSync {
material_list: context.player.item_model.get_protocol_material_list(),
..Default::default()
}),
..Default::default()
});
}
async fn gm_unlock_all_hollow(context: &mut CommandContext<'_>) {
context
.player

19
crates/game-server/src/logic/player/item.rs
View file

@ -101,18 +101,7 @@ impl ItemModel {
.transaction::<_, (), DbErr>(|txn| {
Box::pin(async move {
for model in updated_models {
material::Entity::insert(model)
.on_conflict(
OnConflict::new()
.exprs([
Expr::col(material::Column::OwnerPlayerUid),
Expr::col(material::Column::Id),
])
.update_column(material::Column::Num)
.to_owned(),
)
.exec(txn)
.await?;
model.update(txn).await?;
}
Ok(())
@ -196,9 +185,3 @@ impl ItemModel {
.collect()
}
}
impl From<(u32, i32)> for MaterialDelta {
fn from((id, num): (u32, i32)) -> Self {
Self { id, num }
}
}

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

@ -2,7 +2,7 @@ use std::collections::{HashMap, HashSet};
use trigger_database::entity::avatar;
use trigger_database::prelude::*;
use trigger_logic::{skill::EAvatarSkillType, template_ext::TemplateExt};
use trigger_logic::skill::EAvatarSkillType;
use trigger_protocol::{Avatar, AvatarSkillLevel, DressedEquip};
use trigger_sv::time_util;
@ -325,36 +325,6 @@ impl RoleModel {
}
}
pub async fn dress_avatar_skin(&mut self, avatar_id: i32, avatar_skin_id: i32) -> bool {
if avatar_skin_id != 0
&& !self
.context
.filecfg
.skin_targets_avatar(avatar_skin_id, avatar_id)
{
return false;
}
if let Some(avatar) = self.avatar_map.remove(&(avatar_id as u32)) {
let model = avatar::ActiveModel {
avatar_skin_id: Set(avatar_skin_id),
..avatar.into()
};
self.avatar_map.insert(
avatar_id as u32,
model
.update(self.context.database)
.await
.expect("avatar::update failed"),
);
true
} else {
false
}
}
pub fn is_avatar_unlocked(&self, avatar_id: u32) -> bool {
self.avatar_map.contains_key(&avatar_id)
}

52
crates/game-server/src/session/message/avatar.rs
View file

@ -32,8 +32,7 @@ mod avatar_module {
.weapon_dress(
request.avatar_id,
request.weapon_uid as i32,
equip_model
.is_signature_weapon(request.weapon_uid as i32, request.avatar_id as i32),
equip_model.is_signature_weapon(request.weapon_uid as i32, request.avatar_id as i32)
)
.await
{
@ -195,53 +194,4 @@ mod avatar_module {
ToggleWeaponShowScRsp { retcode: 1 }
}
pub async fn on_dress_avatar_skin(
context: &mut MessageContext<'_, '_>,
request: DressAvatarSkinCsReq,
) -> DressAvatarSkinScRsp {
let item_model = &context.player.item_model;
if item_model.has_enough_material(request.avatar_skin_id, 1) {
let role_model = &mut context.player.role_model;
if role_model
.dress_avatar_skin(request.avatar_id as i32, request.avatar_skin_id as i32)
.await
{
let avatar_list = role_model.get_protocol_avatar_list(&[request.avatar_id]);
context.add_notify(PlayerSyncScNotify {
avatar_sync: Some(AvatarSync { avatar_list }),
..Default::default()
});
return DressAvatarSkinScRsp { retcode: 0 };
}
}
DressAvatarSkinScRsp { retcode: 1 }
}
pub async fn on_undress_avatar_skin(
context: &mut MessageContext<'_, '_>,
request: UndressAvatarSkinCsReq,
) -> UndressAvatarSkinScRsp {
// Why separate packet, retards?
let role_model = &mut context.player.role_model;
if role_model
.dress_avatar_skin(request.avatar_id as i32, 0)
.await
{
let avatar_list = role_model.get_protocol_avatar_list(&[request.avatar_id]);
context.add_notify(PlayerSyncScNotify {
avatar_sync: Some(AvatarSync { avatar_list }),
..Default::default()
});
return UndressAvatarSkinScRsp { retcode: 0 };
}
UndressAvatarSkinScRsp { retcode: 1 }
}
}

1
crates/trigger-database/src/lib.rs
View file

@ -14,7 +14,6 @@ pub mod prelude {
pub use sea_orm::entity::ActiveValue::*;
pub use sea_orm::entity::prelude::*;
pub use sea_orm::query::Condition;
pub use sea_orm::sea_query::OnConflict;
}
#[derive(Debug, Deserialize)]

33
crates/trigger-fileconfig/fbs/tables.fbs
View file

@ -558,33 +558,6 @@ table EquipmentLevelTemplate {
unk_6: int;
}
table AvatarSkinBaseTemplate {
id: int;
server_only_0: int;
DLFHPHCLIBA: string;
NFIEGMLEEFE: string;
avatar_id: int;
server_only_1: int;
server_only_2: int;
server_only_3: int;
GMBBOEGOEPH: string;
HMIOIBHJGCM: [string];
server_only_4: int;
OEMHKAENMHN: int;
FGJJELBGBBC: string;
FKBJLMBAPDI: int;
server_only_5: int;
server_only_6: int;
server_only_7: int;
server_only_8: int;
server_only_9: int;
DIGLJDFKAMN: string;
BKFKIDCLHKL: int;
FHJDONJMNKP: string;
AHHLKMJEEAE: string;
HPMCPJGPKJB: int;
}
table AvatarBaseTemplateTb {
data: [AvatarBaseTemplate];
}
@ -683,8 +656,4 @@ table AvatarPassiveSkillTemplateTb {
table EquipmentLevelTemplateTb {
data: [EquipmentLevelTemplate];
}
table AvatarSkinBaseTemplateTb {
data: [AvatarSkinBaseTemplate];
}
}

810
crates/trigger-fileconfig/gen_flatbuffers/tables_generated.rs
View file

@ -14292,696 +14292,6 @@ impl core::fmt::Debug for EquipmentLevelTemplate<'_> {
ds.finish()
}
}
pub enum AvatarSkinBaseTemplateOffset {}
#[derive(Copy, Clone, PartialEq)]
pub struct AvatarSkinBaseTemplate<'a> {
pub _tab: flatbuffers::Table<'a>,
}
impl<'a> flatbuffers::Follow<'a> for AvatarSkinBaseTemplate<'a> {
type Inner = AvatarSkinBaseTemplate<'a>;
#[inline]
unsafe fn follow(buf: &'a [u8], loc: usize) -> Self::Inner {
Self {
_tab: flatbuffers::Table::new(buf, loc),
}
}
}
impl<'a> AvatarSkinBaseTemplate<'a> {
pub const VT_ID: flatbuffers::VOffsetT = 4;
pub const VT_SERVER_ONLY_0: flatbuffers::VOffsetT = 6;
pub const VT_DLFHPHCLIBA: flatbuffers::VOffsetT = 8;
pub const VT_NFIEGMLEEFE: flatbuffers::VOffsetT = 10;
pub const VT_AVATAR_ID: flatbuffers::VOffsetT = 12;
pub const VT_SERVER_ONLY_1: flatbuffers::VOffsetT = 14;
pub const VT_SERVER_ONLY_2: flatbuffers::VOffsetT = 16;
pub const VT_SERVER_ONLY_3: flatbuffers::VOffsetT = 18;
pub const VT_GMBBOEGOEPH: flatbuffers::VOffsetT = 20;
pub const VT_HMIOIBHJGCM: flatbuffers::VOffsetT = 22;
pub const VT_SERVER_ONLY_4: flatbuffers::VOffsetT = 24;
pub const VT_OEMHKAENMHN: flatbuffers::VOffsetT = 26;
pub const VT_FGJJELBGBBC: flatbuffers::VOffsetT = 28;
pub const VT_FKBJLMBAPDI: flatbuffers::VOffsetT = 30;
pub const VT_SERVER_ONLY_5: flatbuffers::VOffsetT = 32;
pub const VT_SERVER_ONLY_6: flatbuffers::VOffsetT = 34;
pub const VT_SERVER_ONLY_7: flatbuffers::VOffsetT = 36;
pub const VT_SERVER_ONLY_8: flatbuffers::VOffsetT = 38;
pub const VT_SERVER_ONLY_9: flatbuffers::VOffsetT = 40;
pub const VT_DIGLJDFKAMN: flatbuffers::VOffsetT = 42;
pub const VT_BKFKIDCLHKL: flatbuffers::VOffsetT = 44;
pub const VT_FHJDONJMNKP: flatbuffers::VOffsetT = 46;
pub const VT_AHHLKMJEEAE: flatbuffers::VOffsetT = 48;
pub const VT_HPMCPJGPKJB: flatbuffers::VOffsetT = 50;
#[inline]
pub unsafe fn init_from_table(table: flatbuffers::Table<'a>) -> Self {
AvatarSkinBaseTemplate { _tab: table }
}
#[allow(unused_mut)]
pub fn create<'bldr: 'args, 'args: 'mut_bldr, 'mut_bldr, A: flatbuffers::Allocator + 'bldr>(
_fbb: &'mut_bldr mut flatbuffers::FlatBufferBuilder<'bldr, A>,
args: &'args AvatarSkinBaseTemplateArgs<'args>,
) -> flatbuffers::WIPOffset<AvatarSkinBaseTemplate<'bldr>> {
let mut builder = AvatarSkinBaseTemplateBuilder::new(_fbb);
builder.add_HPMCPJGPKJB(args.HPMCPJGPKJB);
if let Some(x) = args.AHHLKMJEEAE {
builder.add_AHHLKMJEEAE(x);
}
if let Some(x) = args.FHJDONJMNKP {
builder.add_FHJDONJMNKP(x);
}
builder.add_BKFKIDCLHKL(args.BKFKIDCLHKL);
if let Some(x) = args.DIGLJDFKAMN {
builder.add_DIGLJDFKAMN(x);
}
builder.add_server_only_9(args.server_only_9);
builder.add_server_only_8(args.server_only_8);
builder.add_server_only_7(args.server_only_7);
builder.add_server_only_6(args.server_only_6);
builder.add_server_only_5(args.server_only_5);
builder.add_FKBJLMBAPDI(args.FKBJLMBAPDI);
if let Some(x) = args.FGJJELBGBBC {
builder.add_FGJJELBGBBC(x);
}
builder.add_OEMHKAENMHN(args.OEMHKAENMHN);
builder.add_server_only_4(args.server_only_4);
if let Some(x) = args.HMIOIBHJGCM {
builder.add_HMIOIBHJGCM(x);
}
if let Some(x) = args.GMBBOEGOEPH {
builder.add_GMBBOEGOEPH(x);
}
builder.add_server_only_3(args.server_only_3);
builder.add_server_only_2(args.server_only_2);
builder.add_server_only_1(args.server_only_1);
builder.add_avatar_id(args.avatar_id);
if let Some(x) = args.NFIEGMLEEFE {
builder.add_NFIEGMLEEFE(x);
}
if let Some(x) = args.DLFHPHCLIBA {
builder.add_DLFHPHCLIBA(x);
}
builder.add_server_only_0(args.server_only_0);
builder.add_id(args.id);
builder.finish()
}
#[inline]
pub fn id(&self) -> i32 {
// Safety:
// Created from valid Table for this object
// which contains a valid value in this slot
unsafe {
self._tab
.get::<i32>(AvatarSkinBaseTemplate::VT_ID, Some(0))
.unwrap()
}
}
#[inline]
pub fn server_only_0(&self) -> i32 {
// Safety:
// Created from valid Table for this object
// which contains a valid value in this slot
unsafe {
self._tab
.get::<i32>(AvatarSkinBaseTemplate::VT_SERVER_ONLY_0, Some(0))
.unwrap()
}
}
#[inline]
pub fn DLFHPHCLIBA(&self) -> Option<&'a str> {
// Safety:
// Created from valid Table for this object
// which contains a valid value in this slot
unsafe {
self._tab.get::<flatbuffers::ForwardsUOffset<&str>>(
AvatarSkinBaseTemplate::VT_DLFHPHCLIBA,
None,
)
}
}
#[inline]
pub fn NFIEGMLEEFE(&self) -> Option<&'a str> {
// Safety:
// Created from valid Table for this object
// which contains a valid value in this slot
unsafe {
self._tab.get::<flatbuffers::ForwardsUOffset<&str>>(
AvatarSkinBaseTemplate::VT_NFIEGMLEEFE,
None,
)
}
}
#[inline]
pub fn avatar_id(&self) -> i32 {
// Safety:
// Created from valid Table for this object
// which contains a valid value in this slot
unsafe {
self._tab
.get::<i32>(AvatarSkinBaseTemplate::VT_AVATAR_ID, Some(0))
.unwrap()
}
}
#[inline]
pub fn server_only_1(&self) -> i32 {
// Safety:
// Created from valid Table for this object
// which contains a valid value in this slot
unsafe {
self._tab
.get::<i32>(AvatarSkinBaseTemplate::VT_SERVER_ONLY_1, Some(0))
.unwrap()
}
}
#[inline]
pub fn server_only_2(&self) -> i32 {
// Safety:
// Created from valid Table for this object
// which contains a valid value in this slot
unsafe {
self._tab
.get::<i32>(AvatarSkinBaseTemplate::VT_SERVER_ONLY_2, Some(0))
.unwrap()
}
}
#[inline]
pub fn server_only_3(&self) -> i32 {
// Safety:
// Created from valid Table for this object
// which contains a valid value in this slot
unsafe {
self._tab
.get::<i32>(AvatarSkinBaseTemplate::VT_SERVER_ONLY_3, Some(0))
.unwrap()
}
}
#[inline]
pub fn GMBBOEGOEPH(&self) -> Option<&'a str> {
// Safety:
// Created from valid Table for this object
// which contains a valid value in this slot
unsafe {
self._tab.get::<flatbuffers::ForwardsUOffset<&str>>(
AvatarSkinBaseTemplate::VT_GMBBOEGOEPH,
None,
)
}
}
#[inline]
pub fn HMIOIBHJGCM(
&self,
) -> Option<flatbuffers::Vector<'a, flatbuffers::ForwardsUOffset<&'a str>>> {
// Safety:
// Created from valid Table for this object
// which contains a valid value in this slot
unsafe {
self._tab.get::<flatbuffers::ForwardsUOffset<
flatbuffers::Vector<'a, flatbuffers::ForwardsUOffset<&'a str>>,
>>(AvatarSkinBaseTemplate::VT_HMIOIBHJGCM, None)
}
}
#[inline]
pub fn server_only_4(&self) -> i32 {
// Safety:
// Created from valid Table for this object
// which contains a valid value in this slot
unsafe {
self._tab
.get::<i32>(AvatarSkinBaseTemplate::VT_SERVER_ONLY_4, Some(0))
.unwrap()
}
}
#[inline]
pub fn OEMHKAENMHN(&self) -> i32 {
// Safety:
// Created from valid Table for this object
// which contains a valid value in this slot
unsafe {
self._tab
.get::<i32>(AvatarSkinBaseTemplate::VT_OEMHKAENMHN, Some(0))
.unwrap()
}
}
#[inline]
pub fn FGJJELBGBBC(&self) -> Option<&'a str> {
// Safety:
// Created from valid Table for this object
// which contains a valid value in this slot
unsafe {
self._tab.get::<flatbuffers::ForwardsUOffset<&str>>(
AvatarSkinBaseTemplate::VT_FGJJELBGBBC,
None,
)
}
}
#[inline]
pub fn FKBJLMBAPDI(&self) -> i32 {
// Safety:
// Created from valid Table for this object
// which contains a valid value in this slot
unsafe {
self._tab
.get::<i32>(AvatarSkinBaseTemplate::VT_FKBJLMBAPDI, Some(0))
.unwrap()
}
}
#[inline]
pub fn server_only_5(&self) -> i32 {
// Safety:
// Created from valid Table for this object
// which contains a valid value in this slot
unsafe {
self._tab
.get::<i32>(AvatarSkinBaseTemplate::VT_SERVER_ONLY_5, Some(0))
.unwrap()
}
}
#[inline]
pub fn server_only_6(&self) -> i32 {
// Safety:
// Created from valid Table for this object
// which contains a valid value in this slot
unsafe {
self._tab
.get::<i32>(AvatarSkinBaseTemplate::VT_SERVER_ONLY_6, Some(0))
.unwrap()
}
}
#[inline]
pub fn server_only_7(&self) -> i32 {
// Safety:
// Created from valid Table for this object
// which contains a valid value in this slot
unsafe {
self._tab
.get::<i32>(AvatarSkinBaseTemplate::VT_SERVER_ONLY_7, Some(0))
.unwrap()
}
}
#[inline]
pub fn server_only_8(&self) -> i32 {
// Safety:
// Created from valid Table for this object
// which contains a valid value in this slot
unsafe {
self._tab
.get::<i32>(AvatarSkinBaseTemplate::VT_SERVER_ONLY_8, Some(0))
.unwrap()
}
}
#[inline]
pub fn server_only_9(&self) -> i32 {
// Safety:
// Created from valid Table for this object
// which contains a valid value in this slot
unsafe {
self._tab
.get::<i32>(AvatarSkinBaseTemplate::VT_SERVER_ONLY_9, Some(0))
.unwrap()
}
}
#[inline]
pub fn DIGLJDFKAMN(&self) -> Option<&'a str> {
// Safety:
// Created from valid Table for this object
// which contains a valid value in this slot
unsafe {
self._tab.get::<flatbuffers::ForwardsUOffset<&str>>(
AvatarSkinBaseTemplate::VT_DIGLJDFKAMN,
None,
)
}
}
#[inline]
pub fn BKFKIDCLHKL(&self) -> i32 {
// Safety:
// Created from valid Table for this object
// which contains a valid value in this slot
unsafe {
self._tab
.get::<i32>(AvatarSkinBaseTemplate::VT_BKFKIDCLHKL, Some(0))
.unwrap()
}
}
#[inline]
pub fn FHJDONJMNKP(&self) -> Option<&'a str> {
// Safety:
// Created from valid Table for this object
// which contains a valid value in this slot
unsafe {
self._tab.get::<flatbuffers::ForwardsUOffset<&str>>(
AvatarSkinBaseTemplate::VT_FHJDONJMNKP,
None,
)
}
}
#[inline]
pub fn AHHLKMJEEAE(&self) -> Option<&'a str> {
// Safety:
// Created from valid Table for this object
// which contains a valid value in this slot
unsafe {
self._tab.get::<flatbuffers::ForwardsUOffset<&str>>(
AvatarSkinBaseTemplate::VT_AHHLKMJEEAE,
None,
)
}
}
#[inline]
pub fn HPMCPJGPKJB(&self) -> i32 {
// Safety:
// Created from valid Table for this object
// which contains a valid value in this slot
unsafe {
self._tab
.get::<i32>(AvatarSkinBaseTemplate::VT_HPMCPJGPKJB, Some(0))
.unwrap()
}
}
}
impl flatbuffers::Verifiable for AvatarSkinBaseTemplate<'_> {
#[inline]
fn run_verifier(
v: &mut flatbuffers::Verifier,
pos: usize,
) -> Result<(), flatbuffers::InvalidFlatbuffer> {
use self::flatbuffers::Verifiable;
v.visit_table(pos)?
.visit_field::<i32>("id", Self::VT_ID, false)?
.visit_field::<i32>("server_only_0", Self::VT_SERVER_ONLY_0, false)?
.visit_field::<flatbuffers::ForwardsUOffset<&str>>(
"DLFHPHCLIBA",
Self::VT_DLFHPHCLIBA,
false,
)?
.visit_field::<flatbuffers::ForwardsUOffset<&str>>(
"NFIEGMLEEFE",
Self::VT_NFIEGMLEEFE,
false,
)?
.visit_field::<i32>("avatar_id", Self::VT_AVATAR_ID, false)?
.visit_field::<i32>("server_only_1", Self::VT_SERVER_ONLY_1, false)?
.visit_field::<i32>("server_only_2", Self::VT_SERVER_ONLY_2, false)?
.visit_field::<i32>("server_only_3", Self::VT_SERVER_ONLY_3, false)?
.visit_field::<flatbuffers::ForwardsUOffset<&str>>(
"GMBBOEGOEPH",
Self::VT_GMBBOEGOEPH,
false,
)?
.visit_field::<flatbuffers::ForwardsUOffset<
flatbuffers::Vector<'_, flatbuffers::ForwardsUOffset<&'_ str>>,
>>("HMIOIBHJGCM", Self::VT_HMIOIBHJGCM, false)?
.visit_field::<i32>("server_only_4", Self::VT_SERVER_ONLY_4, false)?
.visit_field::<i32>("OEMHKAENMHN", Self::VT_OEMHKAENMHN, false)?
.visit_field::<flatbuffers::ForwardsUOffset<&str>>(
"FGJJELBGBBC",
Self::VT_FGJJELBGBBC,
false,
)?
.visit_field::<i32>("FKBJLMBAPDI", Self::VT_FKBJLMBAPDI, false)?
.visit_field::<i32>("server_only_5", Self::VT_SERVER_ONLY_5, false)?
.visit_field::<i32>("server_only_6", Self::VT_SERVER_ONLY_6, false)?
.visit_field::<i32>("server_only_7", Self::VT_SERVER_ONLY_7, false)?
.visit_field::<i32>("server_only_8", Self::VT_SERVER_ONLY_8, false)?
.visit_field::<i32>("server_only_9", Self::VT_SERVER_ONLY_9, false)?
.visit_field::<flatbuffers::ForwardsUOffset<&str>>(
"DIGLJDFKAMN",
Self::VT_DIGLJDFKAMN,
false,
)?
.visit_field::<i32>("BKFKIDCLHKL", Self::VT_BKFKIDCLHKL, false)?
.visit_field::<flatbuffers::ForwardsUOffset<&str>>(
"FHJDONJMNKP",
Self::VT_FHJDONJMNKP,
false,
)?
.visit_field::<flatbuffers::ForwardsUOffset<&str>>(
"AHHLKMJEEAE",
Self::VT_AHHLKMJEEAE,
false,
)?
.visit_field::<i32>("HPMCPJGPKJB", Self::VT_HPMCPJGPKJB, false)?
.finish();
Ok(())
}
}
pub struct AvatarSkinBaseTemplateArgs<'a> {
pub id: i32,
pub server_only_0: i32,
pub DLFHPHCLIBA: Option<flatbuffers::WIPOffset<&'a str>>,
pub NFIEGMLEEFE: Option<flatbuffers::WIPOffset<&'a str>>,
pub avatar_id: i32,
pub server_only_1: i32,
pub server_only_2: i32,
pub server_only_3: i32,
pub GMBBOEGOEPH: Option<flatbuffers::WIPOffset<&'a str>>,
pub HMIOIBHJGCM: Option<
flatbuffers::WIPOffset<flatbuffers::Vector<'a, flatbuffers::ForwardsUOffset<&'a str>>>,
>,
pub server_only_4: i32,
pub OEMHKAENMHN: i32,
pub FGJJELBGBBC: Option<flatbuffers::WIPOffset<&'a str>>,
pub FKBJLMBAPDI: i32,
pub server_only_5: i32,
pub server_only_6: i32,
pub server_only_7: i32,
pub server_only_8: i32,
pub server_only_9: i32,
pub DIGLJDFKAMN: Option<flatbuffers::WIPOffset<&'a str>>,
pub BKFKIDCLHKL: i32,
pub FHJDONJMNKP: Option<flatbuffers::WIPOffset<&'a str>>,
pub AHHLKMJEEAE: Option<flatbuffers::WIPOffset<&'a str>>,
pub HPMCPJGPKJB: i32,
}
impl<'a> Default for AvatarSkinBaseTemplateArgs<'a> {
#[inline]
fn default() -> Self {
AvatarSkinBaseTemplateArgs {
id: 0,
server_only_0: 0,
DLFHPHCLIBA: None,
NFIEGMLEEFE: None,
avatar_id: 0,
server_only_1: 0,
server_only_2: 0,
server_only_3: 0,
GMBBOEGOEPH: None,
HMIOIBHJGCM: None,
server_only_4: 0,
OEMHKAENMHN: 0,
FGJJELBGBBC: None,
FKBJLMBAPDI: 0,
server_only_5: 0,
server_only_6: 0,
server_only_7: 0,
server_only_8: 0,
server_only_9: 0,
DIGLJDFKAMN: None,
BKFKIDCLHKL: 0,
FHJDONJMNKP: None,
AHHLKMJEEAE: None,
HPMCPJGPKJB: 0,
}
}
}
pub struct AvatarSkinBaseTemplateBuilder<'a: 'b, 'b, A: flatbuffers::Allocator + 'a> {
fbb_: &'b mut flatbuffers::FlatBufferBuilder<'a, A>,
start_: flatbuffers::WIPOffset<flatbuffers::TableUnfinishedWIPOffset>,
}
impl<'a: 'b, 'b, A: flatbuffers::Allocator + 'a> AvatarSkinBaseTemplateBuilder<'a, 'b, A> {
#[inline]
pub fn add_id(&mut self, id: i32) {
self.fbb_
.push_slot::<i32>(AvatarSkinBaseTemplate::VT_ID, id, 0);
}
#[inline]
pub fn add_server_only_0(&mut self, server_only_0: i32) {
self.fbb_
.push_slot::<i32>(AvatarSkinBaseTemplate::VT_SERVER_ONLY_0, server_only_0, 0);
}
#[inline]
pub fn add_DLFHPHCLIBA(&mut self, DLFHPHCLIBA: flatbuffers::WIPOffset<&'b str>) {
self.fbb_.push_slot_always::<flatbuffers::WIPOffset<_>>(
AvatarSkinBaseTemplate::VT_DLFHPHCLIBA,
DLFHPHCLIBA,
);
}
#[inline]
pub fn add_NFIEGMLEEFE(&mut self, NFIEGMLEEFE: flatbuffers::WIPOffset<&'b str>) {
self.fbb_.push_slot_always::<flatbuffers::WIPOffset<_>>(
AvatarSkinBaseTemplate::VT_NFIEGMLEEFE,
NFIEGMLEEFE,
);
}
#[inline]
pub fn add_avatar_id(&mut self, avatar_id: i32) {
self.fbb_
.push_slot::<i32>(AvatarSkinBaseTemplate::VT_AVATAR_ID, avatar_id, 0);
}
#[inline]
pub fn add_server_only_1(&mut self, server_only_1: i32) {
self.fbb_
.push_slot::<i32>(AvatarSkinBaseTemplate::VT_SERVER_ONLY_1, server_only_1, 0);
}
#[inline]
pub fn add_server_only_2(&mut self, server_only_2: i32) {
self.fbb_
.push_slot::<i32>(AvatarSkinBaseTemplate::VT_SERVER_ONLY_2, server_only_2, 0);
}
#[inline]
pub fn add_server_only_3(&mut self, server_only_3: i32) {
self.fbb_
.push_slot::<i32>(AvatarSkinBaseTemplate::VT_SERVER_ONLY_3, server_only_3, 0);
}
#[inline]
pub fn add_GMBBOEGOEPH(&mut self, GMBBOEGOEPH: flatbuffers::WIPOffset<&'b str>) {
self.fbb_.push_slot_always::<flatbuffers::WIPOffset<_>>(
AvatarSkinBaseTemplate::VT_GMBBOEGOEPH,
GMBBOEGOEPH,
);
}
#[inline]
pub fn add_HMIOIBHJGCM(
&mut self,
HMIOIBHJGCM: flatbuffers::WIPOffset<
flatbuffers::Vector<'b, flatbuffers::ForwardsUOffset<&'b str>>,
>,
) {
self.fbb_.push_slot_always::<flatbuffers::WIPOffset<_>>(
AvatarSkinBaseTemplate::VT_HMIOIBHJGCM,
HMIOIBHJGCM,
);
}
#[inline]
pub fn add_server_only_4(&mut self, server_only_4: i32) {
self.fbb_
.push_slot::<i32>(AvatarSkinBaseTemplate::VT_SERVER_ONLY_4, server_only_4, 0);
}
#[inline]
pub fn add_OEMHKAENMHN(&mut self, OEMHKAENMHN: i32) {
self.fbb_
.push_slot::<i32>(AvatarSkinBaseTemplate::VT_OEMHKAENMHN, OEMHKAENMHN, 0);
}
#[inline]
pub fn add_FGJJELBGBBC(&mut self, FGJJELBGBBC: flatbuffers::WIPOffset<&'b str>) {
self.fbb_.push_slot_always::<flatbuffers::WIPOffset<_>>(
AvatarSkinBaseTemplate::VT_FGJJELBGBBC,
FGJJELBGBBC,
);
}
#[inline]
pub fn add_FKBJLMBAPDI(&mut self, FKBJLMBAPDI: i32) {
self.fbb_
.push_slot::<i32>(AvatarSkinBaseTemplate::VT_FKBJLMBAPDI, FKBJLMBAPDI, 0);
}
#[inline]
pub fn add_server_only_5(&mut self, server_only_5: i32) {
self.fbb_
.push_slot::<i32>(AvatarSkinBaseTemplate::VT_SERVER_ONLY_5, server_only_5, 0);
}
#[inline]
pub fn add_server_only_6(&mut self, server_only_6: i32) {
self.fbb_
.push_slot::<i32>(AvatarSkinBaseTemplate::VT_SERVER_ONLY_6, server_only_6, 0);
}
#[inline]
pub fn add_server_only_7(&mut self, server_only_7: i32) {
self.fbb_
.push_slot::<i32>(AvatarSkinBaseTemplate::VT_SERVER_ONLY_7, server_only_7, 0);
}
#[inline]
pub fn add_server_only_8(&mut self, server_only_8: i32) {
self.fbb_
.push_slot::<i32>(AvatarSkinBaseTemplate::VT_SERVER_ONLY_8, server_only_8, 0);
}
#[inline]
pub fn add_server_only_9(&mut self, server_only_9: i32) {
self.fbb_
.push_slot::<i32>(AvatarSkinBaseTemplate::VT_SERVER_ONLY_9, server_only_9, 0);
}
#[inline]
pub fn add_DIGLJDFKAMN(&mut self, DIGLJDFKAMN: flatbuffers::WIPOffset<&'b str>) {
self.fbb_.push_slot_always::<flatbuffers::WIPOffset<_>>(
AvatarSkinBaseTemplate::VT_DIGLJDFKAMN,
DIGLJDFKAMN,
);
}
#[inline]
pub fn add_BKFKIDCLHKL(&mut self, BKFKIDCLHKL: i32) {
self.fbb_
.push_slot::<i32>(AvatarSkinBaseTemplate::VT_BKFKIDCLHKL, BKFKIDCLHKL, 0);
}
#[inline]
pub fn add_FHJDONJMNKP(&mut self, FHJDONJMNKP: flatbuffers::WIPOffset<&'b str>) {
self.fbb_.push_slot_always::<flatbuffers::WIPOffset<_>>(
AvatarSkinBaseTemplate::VT_FHJDONJMNKP,
FHJDONJMNKP,
);
}
#[inline]
pub fn add_AHHLKMJEEAE(&mut self, AHHLKMJEEAE: flatbuffers::WIPOffset<&'b str>) {
self.fbb_.push_slot_always::<flatbuffers::WIPOffset<_>>(
AvatarSkinBaseTemplate::VT_AHHLKMJEEAE,
AHHLKMJEEAE,
);
}
#[inline]
pub fn add_HPMCPJGPKJB(&mut self, HPMCPJGPKJB: i32) {
self.fbb_
.push_slot::<i32>(AvatarSkinBaseTemplate::VT_HPMCPJGPKJB, HPMCPJGPKJB, 0);
}
#[inline]
pub fn new(
_fbb: &'b mut flatbuffers::FlatBufferBuilder<'a, A>,
) -> AvatarSkinBaseTemplateBuilder<'a, 'b, A> {
let start = _fbb.start_table();
AvatarSkinBaseTemplateBuilder {
fbb_: _fbb,
start_: start,
}
}
#[inline]
pub fn finish(self) -> flatbuffers::WIPOffset<AvatarSkinBaseTemplate<'a>> {
let o = self.fbb_.end_table(self.start_);
flatbuffers::WIPOffset::new(o.value())
}
}
impl core::fmt::Debug for AvatarSkinBaseTemplate<'_> {
fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
let mut ds = f.debug_struct("AvatarSkinBaseTemplate");
ds.field("id", &self.id());
ds.field("server_only_0", &self.server_only_0());
ds.field("DLFHPHCLIBA", &self.DLFHPHCLIBA());
ds.field("NFIEGMLEEFE", &self.NFIEGMLEEFE());
ds.field("avatar_id", &self.avatar_id());
ds.field("server_only_1", &self.server_only_1());
ds.field("server_only_2", &self.server_only_2());
ds.field("server_only_3", &self.server_only_3());
ds.field("GMBBOEGOEPH", &self.GMBBOEGOEPH());
ds.field("HMIOIBHJGCM", &self.HMIOIBHJGCM());
ds.field("server_only_4", &self.server_only_4());
ds.field("OEMHKAENMHN", &self.OEMHKAENMHN());
ds.field("FGJJELBGBBC", &self.FGJJELBGBBC());
ds.field("FKBJLMBAPDI", &self.FKBJLMBAPDI());
ds.field("server_only_5", &self.server_only_5());
ds.field("server_only_6", &self.server_only_6());
ds.field("server_only_7", &self.server_only_7());
ds.field("server_only_8", &self.server_only_8());
ds.field("server_only_9", &self.server_only_9());
ds.field("DIGLJDFKAMN", &self.DIGLJDFKAMN());
ds.field("BKFKIDCLHKL", &self.BKFKIDCLHKL());
ds.field("FHJDONJMNKP", &self.FHJDONJMNKP());
ds.field("AHHLKMJEEAE", &self.AHHLKMJEEAE());
ds.field("HPMCPJGPKJB", &self.HPMCPJGPKJB());
ds.finish()
}
}
pub enum AvatarBaseTemplateTbOffset {}
#[derive(Copy, Clone, PartialEq)]
@ -17994,123 +17304,3 @@ impl core::fmt::Debug for EquipmentLevelTemplateTb<'_> {
ds.finish()
}
}
pub enum AvatarSkinBaseTemplateTbOffset {}
#[derive(Copy, Clone, PartialEq)]
pub struct AvatarSkinBaseTemplateTb<'a> {
pub _tab: flatbuffers::Table<'a>,
}
impl<'a> flatbuffers::Follow<'a> for AvatarSkinBaseTemplateTb<'a> {
type Inner = AvatarSkinBaseTemplateTb<'a>;
#[inline]
unsafe fn follow(buf: &'a [u8], loc: usize) -> Self::Inner {
Self {
_tab: flatbuffers::Table::new(buf, loc),
}
}
}
impl<'a> AvatarSkinBaseTemplateTb<'a> {
pub const VT_DATA: flatbuffers::VOffsetT = 4;
#[inline]
pub unsafe fn init_from_table(table: flatbuffers::Table<'a>) -> Self {
AvatarSkinBaseTemplateTb { _tab: table }
}
#[allow(unused_mut)]
pub fn create<'bldr: 'args, 'args: 'mut_bldr, 'mut_bldr, A: flatbuffers::Allocator + 'bldr>(
_fbb: &'mut_bldr mut flatbuffers::FlatBufferBuilder<'bldr, A>,
args: &'args AvatarSkinBaseTemplateTbArgs<'args>,
) -> flatbuffers::WIPOffset<AvatarSkinBaseTemplateTb<'bldr>> {
let mut builder = AvatarSkinBaseTemplateTbBuilder::new(_fbb);
if let Some(x) = args.data {
builder.add_data(x);
}
builder.finish()
}
#[inline]
pub fn data(
&self,
) -> Option<flatbuffers::Vector<'a, flatbuffers::ForwardsUOffset<AvatarSkinBaseTemplate<'a>>>>
{
// Safety:
// Created from valid Table for this object
// which contains a valid value in this slot
unsafe {
self._tab.get::<flatbuffers::ForwardsUOffset<
flatbuffers::Vector<'a, flatbuffers::ForwardsUOffset<AvatarSkinBaseTemplate>>,
>>(AvatarSkinBaseTemplateTb::VT_DATA, None)
}
}
}
impl flatbuffers::Verifiable for AvatarSkinBaseTemplateTb<'_> {
#[inline]
fn run_verifier(
v: &mut flatbuffers::Verifier,
pos: usize,
) -> Result<(), flatbuffers::InvalidFlatbuffer> {
use self::flatbuffers::Verifiable;
v.visit_table(pos)?
.visit_field::<flatbuffers::ForwardsUOffset<
flatbuffers::Vector<'_, flatbuffers::ForwardsUOffset<AvatarSkinBaseTemplate>>,
>>("data", Self::VT_DATA, false)?
.finish();
Ok(())
}
}
pub struct AvatarSkinBaseTemplateTbArgs<'a> {
pub data: Option<
flatbuffers::WIPOffset<
flatbuffers::Vector<'a, flatbuffers::ForwardsUOffset<AvatarSkinBaseTemplate<'a>>>,
>,
>,
}
impl<'a> Default for AvatarSkinBaseTemplateTbArgs<'a> {
#[inline]
fn default() -> Self {
AvatarSkinBaseTemplateTbArgs { data: None }
}
}
pub struct AvatarSkinBaseTemplateTbBuilder<'a: 'b, 'b, A: flatbuffers::Allocator + 'a> {
fbb_: &'b mut flatbuffers::FlatBufferBuilder<'a, A>,
start_: flatbuffers::WIPOffset<flatbuffers::TableUnfinishedWIPOffset>,
}
impl<'a: 'b, 'b, A: flatbuffers::Allocator + 'a> AvatarSkinBaseTemplateTbBuilder<'a, 'b, A> {
#[inline]
pub fn add_data(
&mut self,
data: flatbuffers::WIPOffset<
flatbuffers::Vector<'b, flatbuffers::ForwardsUOffset<AvatarSkinBaseTemplate<'b>>>,
>,
) {
self.fbb_
.push_slot_always::<flatbuffers::WIPOffset<_>>(AvatarSkinBaseTemplateTb::VT_DATA, data);
}
#[inline]
pub fn new(
_fbb: &'b mut flatbuffers::FlatBufferBuilder<'a, A>,
) -> AvatarSkinBaseTemplateTbBuilder<'a, 'b, A> {
let start = _fbb.start_table();
AvatarSkinBaseTemplateTbBuilder {
fbb_: _fbb,
start_: start,
}
}
#[inline]
pub fn finish(self) -> flatbuffers::WIPOffset<AvatarSkinBaseTemplateTb<'a>> {
let o = self.fbb_.end_table(self.start_);
flatbuffers::WIPOffset::new(o.value())
}
}
impl core::fmt::Debug for AvatarSkinBaseTemplateTb<'_> {
fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
let mut ds = f.debug_struct("AvatarSkinBaseTemplateTb");
ds.field("data", &self.data());
ds.finish()
}
}

3
crates/trigger-fileconfig/src/lib.rs
View file

@ -1,4 +1,4 @@
#[allow(dead_code, unused_imports, unsafe_op_in_unsafe_fn, non_snake_case)]
#[allow(dead_code, unused_imports, unsafe_op_in_unsafe_fn)]
#[path = "../gen_flatbuffers/tables_generated.rs"]
mod data;
pub mod main_city_script;
@ -65,5 +65,4 @@ file_cfg! {
WeaponStarTemplateTb;
AvatarPassiveSkillTemplateTb;
EquipmentLevelTemplateTb;
AvatarSkinBaseTemplateTb;
}

11
crates/trigger-logic/src/template_ext.rs
View file

@ -2,7 +2,6 @@ use trigger_fileconfig::NapFileCfg;
pub trait TemplateExt {
fn is_player_avatar(&self, avatar_id: i32) -> bool;
fn skin_targets_avatar(&self, avatar_skin_id: i32, avatar_id: i32) -> bool;
fn procedure_allows_select_role(&self, procedure_id: i32) -> bool;
fn is_last_procedure(&self, procedure_id: i32) -> bool;
}
@ -17,16 +16,6 @@ impl TemplateExt for NapFileCfg {
.unwrap_or(false)
}
fn skin_targets_avatar(&self, avatar_skin_id: i32, avatar_id: i32) -> bool {
self.avatar_skin_base_template_tb()
.data()
.unwrap()
.iter()
.find(|tmpl| tmpl.id() == avatar_skin_id)
.map(|tmpl| tmpl.avatar_id() == avatar_id)
.unwrap_or(false)
}
fn procedure_allows_select_role(&self, procedure_id: i32) -> bool {
self.procedure_config_template_tb()
.data()

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

@ -647,15 +647,6 @@ pub struct BeginnerbattleRebeginScRsp {
pub retcode: i32,
}
#[derive(trigger_protobuf_derive::CmdID)]
#[cmdid(7562)]
#[derive(trigger_protobuf_derive::XorFields)]
#[derive(Clone, Copy, PartialEq, ::prost::Message)]
pub struct UndressAvatarSkinCsReq {
#[xor(4218)]
#[prost(uint32, tag = "12")]
pub avatar_id: u32,
}
#[derive(trigger_protobuf_derive::CmdID)]
#[derive(trigger_protobuf_derive::XorFields)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct RallySceneInfo {
@ -1939,18 +1930,6 @@ pub struct GetBattlePassDataCsReq {}
#[derive(Clone, Copy, PartialEq, ::prost::Message)]
pub struct PostEnterWorldCsReq {}
#[derive(trigger_protobuf_derive::CmdID)]
#[cmdid(8883)]
#[derive(trigger_protobuf_derive::XorFields)]
#[derive(Clone, Copy, PartialEq, ::prost::Message)]
pub struct DressAvatarSkinCsReq {
#[xor(6961)]
#[prost(uint32, tag = "7")]
pub avatar_id: u32,
#[xor(59)]
#[prost(uint32, tag = "12")]
pub avatar_skin_id: u32,
}
#[derive(trigger_protobuf_derive::CmdID)]
#[derive(trigger_protobuf_derive::XorFields)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct PublicVariable {

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

@ -315,14 +315,6 @@ pub fn pb_to_common_protocol_unit(
);
Ok(Some(common_protocol_message.into()))
}
UndressAvatarSkinCsReq::CMD_ID => {
let mut pb_message = UndressAvatarSkinCsReq::decode(pb)?;
pb_message.xor_fields();
let common_protocol_message = ::trigger_protocol::UndressAvatarSkinCsReq::from(
pb_message,
);
Ok(Some(common_protocol_message.into()))
}
GetPlayerInfoCsReq::CMD_ID => {
let mut pb_message = GetPlayerInfoCsReq::decode(pb)?;
pb_message.xor_fields();
@ -1043,14 +1035,6 @@ pub fn pb_to_common_protocol_unit(
);
Ok(Some(common_protocol_message.into()))
}
DressAvatarSkinCsReq::CMD_ID => {
let mut pb_message = DressAvatarSkinCsReq::decode(pb)?;
pb_message.xor_fields();
let common_protocol_message = ::trigger_protocol::DressAvatarSkinCsReq::from(
pb_message,
);
Ok(Some(common_protocol_message.into()))
}
GetNewsStandDataCsReq::CMD_ID => {
let mut pb_message = GetNewsStandDataCsReq::decode(pb)?;
pb_message.xor_fields();
@ -1566,14 +1550,6 @@ pub fn common_protocol_unit_to_pb(
pb_message.xor_fields();
Ok(Some((BeginnerbattleRebeginScRsp::CMD_ID, pb_message.encode_to_vec())))
}
::trigger_protocol::UndressAvatarSkinCsReq::CMD_ID => {
let common_protocol_message = ::trigger_protocol::UndressAvatarSkinCsReq::decode(
&mut ::std::io::Cursor::new(&unit.blob),
)?;
let mut pb_message = UndressAvatarSkinCsReq::from(common_protocol_message);
pb_message.xor_fields();
Ok(Some((UndressAvatarSkinCsReq::CMD_ID, pb_message.encode_to_vec())))
}
::trigger_protocol::GetPlayerInfoCsReq::CMD_ID => {
let common_protocol_message = ::trigger_protocol::GetPlayerInfoCsReq::decode(
&mut ::std::io::Cursor::new(&unit.blob),
@ -2337,14 +2313,6 @@ pub fn common_protocol_unit_to_pb(
pb_message.xor_fields();
Ok(Some((PostEnterWorldCsReq::CMD_ID, pb_message.encode_to_vec())))
}
::trigger_protocol::DressAvatarSkinCsReq::CMD_ID => {
let common_protocol_message = ::trigger_protocol::DressAvatarSkinCsReq::decode(
&mut ::std::io::Cursor::new(&unit.blob),
)?;
let mut pb_message = DressAvatarSkinCsReq::from(common_protocol_message);
pb_message.xor_fields();
Ok(Some((DressAvatarSkinCsReq::CMD_ID, pb_message.encode_to_vec())))
}
::trigger_protocol::GetNewsStandDataCsReq::CMD_ID => {
let common_protocol_message = ::trigger_protocol::GetNewsStandDataCsReq::decode(
&mut ::std::io::Cursor::new(&unit.blob),
@ -3669,24 +3637,6 @@ for BeginnerbattleRebeginScRsp {
}
}
#[allow(unused)]
impl From<UndressAvatarSkinCsReq> for ::trigger_protocol::UndressAvatarSkinCsReq {
fn from(value: UndressAvatarSkinCsReq) -> Self {
Self {
avatar_id: value.avatar_id.into(),
..Default::default()
}
}
}
#[allow(unused)]
impl From<::trigger_protocol::UndressAvatarSkinCsReq> for UndressAvatarSkinCsReq {
fn from(value: ::trigger_protocol::UndressAvatarSkinCsReq) -> Self {
Self {
avatar_id: value.avatar_id.into(),
..Default::default()
}
}
}
#[allow(unused)]
impl From<RallySceneInfo> for ::trigger_protocol::RallySceneInfo {
fn from(value: RallySceneInfo) -> Self {
Self {
@ -5915,26 +5865,6 @@ impl From<::trigger_protocol::PostEnterWorldCsReq> for PostEnterWorldCsReq {
}
}
#[allow(unused)]
impl From<DressAvatarSkinCsReq> for ::trigger_protocol::DressAvatarSkinCsReq {
fn from(value: DressAvatarSkinCsReq) -> Self {
Self {
avatar_id: value.avatar_id.into(),
avatar_skin_id: value.avatar_skin_id.into(),
..Default::default()
}
}
}
#[allow(unused)]
impl From<::trigger_protocol::DressAvatarSkinCsReq> for DressAvatarSkinCsReq {
fn from(value: ::trigger_protocol::DressAvatarSkinCsReq) -> Self {
Self {
avatar_id: value.avatar_id.into(),
avatar_skin_id: value.avatar_skin_id.into(),
..Default::default()
}
}
}
#[allow(unused)]
impl From<PublicVariable> for ::trigger_protocol::PublicVariable {
fn from(value: PublicVariable) -> Self {
Self {

25
crates/trigger-protocol/src/lib.rs
View file

@ -1052,31 +1052,6 @@ pub struct GetAvatarRecommendEquipScRsp {
pub retcode: i32,
}
#[derive(Default, Debug, Clone, Encodeable, Decodeable, ClientCmdID)]
#[id(842)]
pub struct DressAvatarSkinCsReq {
pub avatar_id: u32,
pub avatar_skin_id: u32,
}
#[derive(Default, Debug, Clone, Encodeable, Decodeable, ClientCmdID)]
#[id(843)]
pub struct DressAvatarSkinScRsp {
pub retcode: i32,
}
#[derive(Default, Debug, Clone, Encodeable, Decodeable, ClientCmdID)]
#[id(844)]
pub struct UndressAvatarSkinCsReq {
pub avatar_id: u32,
}
#[derive(Default, Debug, Clone, Encodeable, Decodeable, ClientCmdID)]
#[id(845)]
pub struct UndressAvatarSkinScRsp {
pub retcode: i32,
}
// Bangboo
#[derive(Default, Debug, Clone, Encodeable, Decodeable, ClientCmdID)]

1
crates/trigger-sv/src/gm_command.rs
View file

@ -43,7 +43,6 @@ pub enum GMCommand {
UnlockAllHollow = 302,
UnlockAllHollowBuff = 400,
UnlockAllCafeItem = 401,
UnlockAllAvatarSkin = 402,
}
#[derive(thiserror::Error, Debug)]

2
environment.toml
View file

@ -30,7 +30,7 @@ user = "root"
password = "root"
[security]
static_key = "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"
static_key = "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"
[[security.rsa_versions]]
version = 3

24
res_versions.toml
View file

@ -1,13 +1,13 @@
["OSPRODWin1.6.0"]
design_data_url = "https://autopatchos.zenlesszonezero.com/design_data/1.6_live/output_7108077_40d564da66/client/"
design_data_revision = "7108077"
design_data_files = '[{"fileName":"data_version","fileSize":4304,"fileMD5":"941245265336071363"}]'
game_res_url = "https://autopatchos.zenlesszonezero.com/game_res/1.6_live/output_7108077_40d564da66/client/"
game_res_branch = "1.6_live"
game_audio_revision = "7036823"
game_res_revision = "7108077"
game_res_files = '[{"fileName":"res_version","fileSize":2487933,"fileMD5":"16738022146290696861"},{"fileName":"audio_version","fileSize":32246,"fileMD5":"718221674779072830"},{"fileName":"base_revision","fileSize":18,"fileMD5":"3467029748880207404"}]'
silence_url = "https://autopatchos.zenlesszonezero.com/design_data/1.6_live/output_7108077_40d564da66/client_silence/"
silence_revision = "7036823"
silence_files = '[{"fileName":"silence_version","fileSize":467,"fileMD5":"2392489994088458280"}]'
["CNBetaWin1.6.12"]
design_data_url = "https://autopatchcn.juequling.com/design_data/beta_kol/output_7247349_4cbc8d695e/client/"
design_data_revision = "7247349"
design_data_files = '[{"fileName": "data_version", "fileSize": 4319, "fileMD5": "4162842427382134305"}]'
game_res_url = "https://autopatchcn.juequling.com/game_res/beta_kol/output_7247349_4cbc8d695e/client/"
game_res_branch = "beta_kol"
game_audio_revision = "6875355"
game_res_revision = "7247349"
game_res_files = '[{"fileName": "res_version", "fileSize": 2364423, "fileMD5": "15246385091905668838"}, {"fileName": "audio_version", "fileSize": 30439, "fileMD5": "12961491308958500450"}, {"fileName": "base_revision", "fileSize": 18, "fileMD5": "11299704650151793139"}]'
silence_url = "https://autopatchcn.juequling.com/design_data/beta_kol/output_7247349_4cbc8d695e/client_silence/"
silence_revision = "6922922"
silence_files = '[{"fileName": "silence_version", "fileSize": 466, "fileMD5": "14787794596730887612"}]'