From 84cbf3411a1bdf9f9cfa5dab73d62f01402de044 Mon Sep 17 00:00:00 2001
From: Yuuki <6851027-yukiz@users.noreply.gitlab.com>
Date: Wed, 21 Aug 2024 13:31:37 +0800
Subject: [PATCH] for coop mode but not work yet
---
proto/AbilityInvokeEntry.proto | 3 +--
proto/CanUseSkillNotify.proto | 2 +-
...ientAbilitiesInitFinishCombineNotify.proto | 9 +++----
proto/ClientAbilityInitFinishNotify.proto | 4 +--
proto/EntityAbilityInvokeEntry.proto | 9 +++----
proto/EvtAvatarEnterFocusNotify.proto | 22 +++++++--------
proto/EvtAvatarExitFocusNotify.proto | 3 ++-
proto/EvtBulletDeactiveNotify.proto | 2 +-
proto/EvtBulletHitNotify.proto | 6 ++---
proto/EvtBulletMoveNotify.proto | 3 ++-
proto/EvtEntityRenderersChangedNotify.proto | 3 +--
proto/HomeAvatarTalkFinishInfo.proto | 5 ++--
proto/HomeGroupPlayerInfo.proto | 2 +-
proto/MassiveEntityElementOpBatchNotify.proto | 25 +++++++++--------
proto/OnlinePlayerInfo.proto | 4 +--
proto/PlatformChangeRouteNotify.proto | 25 ++++-------------
proto/PlatformStartRouteNotify.proto | 23 +++-------------
proto/PlatformStopRouteNotify.proto | 27 +++++--------------
proto/SceneEntityAppearNotify.proto | 6 ++---
proto/SceneEntityDisappearNotify.proto | 4 +--
proto/SceneEntityMoveNotify.proto | 4 +--
proto/SceneEntityUpdateNotify.proto | 10 +++----
proto/SceneForceLockNotify.proto | 5 ++--
proto/SceneForceUnlockNotify.proto | 2 +-
proto/ShapeBox.proto | 14 +++++-----
proto/ShapeSphere.proto | 5 ++--
proto/UnionCmdNotify.proto | 4 +--
27 files changed, 90 insertions(+), 141 deletions(-)
diff --git a/proto/AbilityInvokeEntry.proto b/proto/AbilityInvokeEntry.proto
index 44448e4a..449cb74c 100644
--- a/proto/AbilityInvokeEntry.proto
+++ b/proto/AbilityInvokeEntry.proto
@@ -1,11 +1,10 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-
import "AbilityInvokeEntryHead.proto";
import "ForwardType.proto";
import "AbilityInvokeArgument.proto";
-
// 4.7.0
+// ?
message AbilityInvokeEntry {
uint32 event_id = 1;
uint32 forward_peer = 2;
diff --git a/proto/CanUseSkillNotify.proto b/proto/CanUseSkillNotify.proto
index 914f6245..3b705160 100644
--- a/proto/CanUseSkillNotify.proto
+++ b/proto/CanUseSkillNotify.proto
@@ -1,7 +1,7 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
// Version: 4.7.0
-// CmdId: 5279
+// CmdId: 21073 or 2728?
// ?
message CanUseSkillNotify {
bool is_can_use_skill = 13;
diff --git a/proto/ClientAbilitiesInitFinishCombineNotify.proto b/proto/ClientAbilitiesInitFinishCombineNotify.proto
index 8f47ad3a..1c3d09ed 100644
--- a/proto/ClientAbilitiesInitFinishCombineNotify.proto
+++ b/proto/ClientAbilitiesInitFinishCombineNotify.proto
@@ -1,10 +1,9 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-
import "EntityAbilityInvokeEntry.proto";
-
-//obf: KNDIDFOJEJD
-// CmdId: 22401
+// 4.7.0
+// CmdId: 4338
+// obf: ?
message ClientAbilitiesInitFinishCombineNotify {
- repeated EntityAbilityInvokeEntry entity_invoke_list = 2;
+ repeated EntityAbilityInvokeEntry entity_invoke_list = 1;
}
diff --git a/proto/ClientAbilityInitFinishNotify.proto b/proto/ClientAbilityInitFinishNotify.proto
index 12f89ac8..f0ff40c2 100644
--- a/proto/ClientAbilityInitFinishNotify.proto
+++ b/proto/ClientAbilityInitFinishNotify.proto
@@ -1,9 +1,9 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-
import "AbilityInvokeEntry.proto";
-
// 4.7.0
+// CmdId: 4679
+// ?
message ClientAbilityInitFinishNotify {
repeated AbilityInvokeEntry invokes = 11;
uint32 entity_id = 14;
diff --git a/proto/EntityAbilityInvokeEntry.proto b/proto/EntityAbilityInvokeEntry.proto
index 02c7355a..81426b07 100644
--- a/proto/EntityAbilityInvokeEntry.proto
+++ b/proto/EntityAbilityInvokeEntry.proto
@@ -1,10 +1,9 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-
import "AbilityInvokeEntry.proto";
-
-//obf: PONAMDDLEBN
+// 4.7.0
+// obf: ?
message EntityAbilityInvokeEntry {
- repeated AbilityInvokeEntry invokes = 10;
- uint32 entity_id = 13;
+ repeated AbilityInvokeEntry invokes = 15;
+ uint32 entity_id = 13; // ok
}
diff --git a/proto/EvtAvatarEnterFocusNotify.proto b/proto/EvtAvatarEnterFocusNotify.proto
index a2033aa7..8cd9303d 100644
--- a/proto/EvtAvatarEnterFocusNotify.proto
+++ b/proto/EvtAvatarEnterFocusNotify.proto
@@ -6,16 +6,16 @@ import "ForwardType.proto";
// Obf: FOCOJPAIMIG
message EvtAvatarEnterFocusNotify {
Vector focus_forward = 4;
- ForwardType forward_type = 12;
- //bool CCKKABKJJGP = 12;
- //bool MDMOIMDCOPF = 7;
+ ForwardType forward_type = 12;
uint32 entity_id = 3;
- //bool MCNECDNCLCJ = 1;
- //bool GMLEBIHPOKD = 5;
- //bool OGOLKMLFFHE = 2;
- //bool OEMKCENFMIM = 10;
- //bool DBPHFOKBNCP = 9;
- //bool PBHFFGHHPMA = 15;
- //bool EGBLCMOLOMC = 8;
- //bool NACMCGNGDLN = 6;
+ bool bt1 = 1;
+ bool bt2 = 2;
+ bool bt3 = 5;
+ bool bt4 = 6;
+ bool bt5 = 8;
+ bool bt6 = 9;
+ bool bt7 = 10;
+ bool bt8 = 13;
+ bool bt9 = 14;
+ bool bt110 = 15;
}
diff --git a/proto/EvtAvatarExitFocusNotify.proto b/proto/EvtAvatarExitFocusNotify.proto
index dda89aca..a5a80d40 100644
--- a/proto/EvtAvatarExitFocusNotify.proto
+++ b/proto/EvtAvatarExitFocusNotify.proto
@@ -2,7 +2,8 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "Vector.proto";
import "ForwardType.proto";
-// CmdId: 24809 or 28844x or 24493(lock)
+// 4.7.0
+// CmdId: 24809,28844,24493(lock)
// Obf: DLDCLNJJBFG
message EvtAvatarExitFocusNotify {
Vector finish_forward = 12;
diff --git a/proto/EvtBulletDeactiveNotify.proto b/proto/EvtBulletDeactiveNotify.proto
index 08cfb57b..7dcf7537 100644
--- a/proto/EvtBulletDeactiveNotify.proto
+++ b/proto/EvtBulletDeactiveNotify.proto
@@ -3,7 +3,7 @@ option java_package = "emu.grasscutter.net.proto";
import "ForwardType.proto";
import "Vector.proto";
// 4.7.0
-// CmdId: 28844 sus
+// CmdId: 28844
// Obf: OIFFIANHCNK
message EvtBulletDeactiveNotify {
ForwardType forward_type = 14;
diff --git a/proto/EvtBulletHitNotify.proto b/proto/EvtBulletHitNotify.proto
index d0811b7f..fccb2611 100644
--- a/proto/EvtBulletHitNotify.proto
+++ b/proto/EvtBulletHitNotify.proto
@@ -5,12 +5,12 @@ import "HitColliderType.proto";
import "Vector.proto";
// 4.7.0
// CmdId: 5735
-// Obf: ?
+// Obf: ??
message EvtBulletHitNotify {
ForwardType forward_type = 1;
HitColliderType hit_collider_type = 7;
- Vector hit_point = 5; // sus
- Vector hit_normal = 11; // sus
+ Vector hit_point = 11; // sus
+ Vector hit_normal = 5; // sus
uint32 entity_id = 6;
int32 hit_box_index = 14;
uint32 forward_peer = 9;
diff --git a/proto/EvtBulletMoveNotify.proto b/proto/EvtBulletMoveNotify.proto
index fe6da4c9..2e56828d 100644
--- a/proto/EvtBulletMoveNotify.proto
+++ b/proto/EvtBulletMoveNotify.proto
@@ -2,7 +2,8 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "Vector.proto";
import "ForwardType.proto";
-// CmdId: 24809
+// 4.7.0
+// CmdId: 24493x,28844x,24809?,3013x?
// Obf: BKFCEHKJCCA
message EvtBulletMoveNotify {
uint32 entity_id = 10;
diff --git a/proto/EvtEntityRenderersChangedNotify.proto b/proto/EvtEntityRenderersChangedNotify.proto
index e72005d5..b78f5d51 100644
--- a/proto/EvtEntityRenderersChangedNotify.proto
+++ b/proto/EvtEntityRenderersChangedNotify.proto
@@ -1,10 +1,9 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-
import "EntityRendererChangedInfo.proto";
import "ForwardType.proto";
// 4.7.0
-// CmdId: 28488
+// CmdId: 28488 (lock)
// CNPJNNLOPCL
message EvtEntityRenderersChangedNotify {
bool is_server_cache = 5;
diff --git a/proto/HomeAvatarTalkFinishInfo.proto b/proto/HomeAvatarTalkFinishInfo.proto
index 211e4127..7e4b09ce 100644
--- a/proto/HomeAvatarTalkFinishInfo.proto
+++ b/proto/HomeAvatarTalkFinishInfo.proto
@@ -1,8 +1,7 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-
-// 4.6.0
-// Obf: PLMLBCAEFDB
+// 4.7.0 ?
+// Obf: ??
message HomeAvatarTalkFinishInfo {
uint32 avatar_id = 11;
repeated uint32 finish_talk_id_list = 13;
diff --git a/proto/HomeGroupPlayerInfo.proto b/proto/HomeGroupPlayerInfo.proto
index 3e57358b..69c0b82f 100644
--- a/proto/HomeGroupPlayerInfo.proto
+++ b/proto/HomeGroupPlayerInfo.proto
@@ -5,7 +5,7 @@ import "ProfilePicture.proto";
// Obf: PCAPDLBGOMG?PBFPMADNALI
message HomeGroupPlayerInfo {
string nickname = 14;
- uint32 player_level = 5; // sus
+ uint32 player_level = 5;
ProfilePicture profile_picture = 1;
uint32 uid = 15; // ok
string psn_id = 11;
diff --git a/proto/MassiveEntityElementOpBatchNotify.proto b/proto/MassiveEntityElementOpBatchNotify.proto
index c420e95c..6f751f4f 100644
--- a/proto/MassiveEntityElementOpBatchNotify.proto
+++ b/proto/MassiveEntityElementOpBatchNotify.proto
@@ -1,21 +1,20 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-
import "ShapeSphere.proto";
import "ShapeBox.proto";
// 4.7.0
-//obf: IHJGCPGECHK
+// obf: IHJGCPGECHK
// CmdId: 25032
message MassiveEntityElementOpBatchNotify {
- //int32 NOMMJMBBCGJ = 3;
- uint32 op_idx = 12;
- uint32 user_id = 7;
- uint32 attacker_id = 2; // TODO: or defense_id?
- int32 entity_type = 3;
- float attack_element_durability = 6;
- //int32 DDPJBEMDEEM = 14;
- oneof shape {
- ShapeSphere shape_sphere = 4;
- ShapeBox shape_box = 8;
- }
+ uint32 op_idx = 12; // 1?
+ uint32 user_id = 7; // OK
+ uint32 attacker_id = 2; // OK
+ int32 entity_type = 3; // OK
+ float attack_element_durability = 6; // OK
+ int32 uk1 = 5;
+ int32 uk2 = 11;
+ oneof shape {
+ ShapeSphere shape_sphere = 4;
+ ShapeBox shape_box = 8;
+ }
}
diff --git a/proto/OnlinePlayerInfo.proto b/proto/OnlinePlayerInfo.proto
index 025af0b2..8ae2ce81 100644
--- a/proto/OnlinePlayerInfo.proto
+++ b/proto/OnlinePlayerInfo.proto
@@ -8,10 +8,10 @@ import "ProfilePicture.proto";
message OnlinePlayerInfo {
uint32 uid = 1;
string nickname = 2;
- uint32 cur_player_num_in_world = 3;
+ uint32 cur_player_num_in_world = 6;
uint32 avatar_id = 4;
MpSettingType mp_setting_type = 5;
- uint32 player_level = 6;
+ uint32 player_level = 3;
uint32 world_level = 7;
string online_id = 8;
uint32 name_card_id = 9;
diff --git a/proto/PlatformChangeRouteNotify.proto b/proto/PlatformChangeRouteNotify.proto
index 7b9c84bd..55f65c8b 100644
--- a/proto/PlatformChangeRouteNotify.proto
+++ b/proto/PlatformChangeRouteNotify.proto
@@ -1,26 +1,11 @@
-// https://github.com/SlushinPS/beach-simulator
-// Copyright (C) 2023 Slushy Team
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program. If not, see .
-
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "PlatformInfo.proto";
-// CmdId: 8048
-// Obf: CIGDJCNIJNN
+// 4.7.0
+// CmdId: 28607
+// Obf: PNNLCKEICNA
message PlatformChangeRouteNotify {
- PlatformInfo platform = 5;
- uint32 entity_id = 13;
+ PlatformInfo platform = 12;
+ uint32 entity_id = 7;
uint32 scene_time = 8;
}
diff --git a/proto/PlatformStartRouteNotify.proto b/proto/PlatformStartRouteNotify.proto
index 3bd9bb42..3f709aa5 100644
--- a/proto/PlatformStartRouteNotify.proto
+++ b/proto/PlatformStartRouteNotify.proto
@@ -1,26 +1,11 @@
-// https://github.com/SlushinPS/beach-simulator
-// Copyright (C) 2023 Slushy Team
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program. If not, see .
-
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "PlatformInfo.proto";
-// CmdId: 7427
-// Obf: PPPKGDJOODM
+// 4.7.0
+// CmdId: 25562?
+// Obf: PDPFPMMKOMC
message PlatformStartRouteNotify {
- uint32 entity_id = 14;
+ uint32 entity_id = 3;
uint32 scene_time = 4;
PlatformInfo platform = 10;
}
diff --git a/proto/PlatformStopRouteNotify.proto b/proto/PlatformStopRouteNotify.proto
index a52aba40..466d3c73 100644
--- a/proto/PlatformStopRouteNotify.proto
+++ b/proto/PlatformStopRouteNotify.proto
@@ -1,26 +1,11 @@
-// https://github.com/SlushinPS/beach-simulator
-// Copyright (C) 2023 Slushy Team
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program. If not, see .
-
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "PlatformInfo.proto";
-// CmdId: 27462
-// Obf: CIMJKKNLBCO
+// 4.7.0
+// CmdId: 25803
+// Obf: KLLCCCBJCDL?
message PlatformStopRouteNotify {
- uint32 scene_time = 1;
- PlatformInfo platform = 8;
- uint32 entity_id = 5;
+ uint32 scene_time = 2;
+ PlatformInfo platform = 5;
+ uint32 entity_id = 12;
}
diff --git a/proto/SceneEntityAppearNotify.proto b/proto/SceneEntityAppearNotify.proto
index 54ba948f..6b8f93aa 100644
--- a/proto/SceneEntityAppearNotify.proto
+++ b/proto/SceneEntityAppearNotify.proto
@@ -1,12 +1,10 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-
import "SceneEntityInfo.proto";
import "VisionType.proto";
-
// 4.7.0
-// cmdid: 21463? or 24635a or 27183u
-// EIIOKNPBJGC or
+// cmdid: 24635?
+// EIIOKNPBJGC
message SceneEntityAppearNotify {
repeated SceneEntityInfo entity_list = 13;
VisionType appear_type = 10;
diff --git a/proto/SceneEntityDisappearNotify.proto b/proto/SceneEntityDisappearNotify.proto
index 7789cf9b..4273edbc 100644
--- a/proto/SceneEntityDisappearNotify.proto
+++ b/proto/SceneEntityDisappearNotify.proto
@@ -1,9 +1,9 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-
import "VisionType.proto";
-
// 4.7.0
+// CmdId: 7872
+// ?
message SceneEntityDisappearNotify {
repeated uint32 entity_list = 6;
VisionType disappear_type = 5;
diff --git a/proto/SceneEntityMoveNotify.proto b/proto/SceneEntityMoveNotify.proto
index 99361269..b60ba714 100644
--- a/proto/SceneEntityMoveNotify.proto
+++ b/proto/SceneEntityMoveNotify.proto
@@ -2,8 +2,8 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "MotionInfo.proto";
// 4.7.0
-// CmdId: 28352, 6446X
-// Obf: CNFNMBHLHEK
+// CmdId:28352?,6446
+// Obf: ?
message SceneEntityMoveNotify {
MotionInfo motion_info = 1;
uint32 entity_id = 15; // OK
diff --git a/proto/SceneEntityUpdateNotify.proto b/proto/SceneEntityUpdateNotify.proto
index 155afabd..85fd3088 100644
--- a/proto/SceneEntityUpdateNotify.proto
+++ b/proto/SceneEntityUpdateNotify.proto
@@ -3,10 +3,10 @@ option java_package = "emu.grasscutter.net.proto";
import "SceneEntityInfo.proto";
import "VisionType.proto";
// 4.7.0
-// cmdid: 27183 or 21463
-// AMPAJBECEIJ or EIIOKNPBJGC
+// cmdid: 21463?
+// ?
message SceneEntityUpdateNotify {
- repeated SceneEntityInfo entity_list = 11;
- VisionType appear_type = 9;
- uint32 param = 13;
+ repeated SceneEntityInfo entity_list = 8;
+ VisionType appear_type = 11;
+ uint32 param = 4;
}
diff --git a/proto/SceneForceLockNotify.proto b/proto/SceneForceLockNotify.proto
index 6ae1833c..10d3c84a 100644
--- a/proto/SceneForceLockNotify.proto
+++ b/proto/SceneForceLockNotify.proto
@@ -1,6 +1,7 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-
+// CmdId: 23746
+// 4.7.0
message SceneForceLockNotify {
- repeated uint32 force_id_list = 6;
+ repeated uint32 force_id_list = 8;
}
diff --git a/proto/SceneForceUnlockNotify.proto b/proto/SceneForceUnlockNotify.proto
index baa4a851..3ba7b4c0 100644
--- a/proto/SceneForceUnlockNotify.proto
+++ b/proto/SceneForceUnlockNotify.proto
@@ -1,7 +1,7 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-
// 4.7.0
+// CmdId: 8454?,27604
message SceneForceUnlockNotify {
bool is_add = 3;
repeated uint32 force_id_list = 6;
diff --git a/proto/ShapeBox.proto b/proto/ShapeBox.proto
index de0eda64..b9ac7d65 100644
--- a/proto/ShapeBox.proto
+++ b/proto/ShapeBox.proto
@@ -1,13 +1,13 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-
import "Vector.proto";
// 4.7.0
-//obf: IEIAEKDEKPH
+// obf: IEIAEKDEKPH
message ShapeBox {
- Vector center = 1;
- Vector axis0 = 2;
- Vector axis1 = 3;
- Vector axis4 = 4;
- Vector extents = 5;
+ Vector center = 1;
+ Vector extents = 5;
+ // sus
+ Vector axis0 = 2;
+ Vector axis1 = 3;
+ Vector axis4 = 4;
}
diff --git a/proto/ShapeSphere.proto b/proto/ShapeSphere.proto
index 012ed6ec..a4b86910 100644
--- a/proto/ShapeSphere.proto
+++ b/proto/ShapeSphere.proto
@@ -1,9 +1,8 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-
import "Vector.proto";
-
-//obf: KKGNEFILAFP
+// 4.7.0
+// obf: ?
message ShapeSphere {
Vector center = 1;
float radius = 2;
diff --git a/proto/UnionCmdNotify.proto b/proto/UnionCmdNotify.proto
index 2212a037..830c2439 100644
--- a/proto/UnionCmdNotify.proto
+++ b/proto/UnionCmdNotify.proto
@@ -1,9 +1,9 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-
import "UnionCmd.proto";
-
// 4.7.0
+// CmdId: 6564
+// ?
message UnionCmdNotify {
repeated UnionCmd cmd_list = 1;
}
\ No newline at end of file