From cec9bd105a26b4f18184b28c2eb3549230f51cb8 Mon Sep 17 00:00:00 2001
From: Yuuki <6851027-yukiz@users.noreply.gitlab.com>
Date: Mon, 8 Jul 2024 19:33:48 +0800
Subject: [PATCH] fix attack and ball?

---
 proto/AttackResult.proto                      |  8 ++++++++
 proto/AvatarChangeAnimHashReq.proto           | 11 ++++++-----
 proto/AvatarChangeAnimHashRsp.proto           | 11 ++++++-----
 proto/AvatarFightPropNotify.proto             |  6 +++---
 proto/AvatarFightPropUpdateNotify.proto       |  6 +++---
 proto/EntityFightPropChangeReasonNotify.proto |  2 +-
 proto/EntityFightPropUpdateNotify.proto       |  2 ++
 7 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/proto/AttackResult.proto b/proto/AttackResult.proto
index dbba3389..5a334d2f 100644
--- a/proto/AttackResult.proto
+++ b/proto/AttackResult.proto
@@ -19,4 +19,12 @@ message AttackResult {
   uint32 defense_id = 6;
   uint32 element_type = 11;
   float damage = 8;
+  uint32 KLIGFACEFPN = 23;
+  float NMBBCBBEPDA = 54;
+  float DJAEOHKJLIM = 114;
+  uint32 OAPLECACBOM = 337;
+  uint32 FCKAKKLDCJL = 507;
+  uint32 HMKBBEKDPCG = 916;
+  float PHOMPNBJFAN = 1582;
+  uint32 NJAMJODILKJ = 2032;
 }
diff --git a/proto/AvatarChangeAnimHashReq.proto b/proto/AvatarChangeAnimHashReq.proto
index 27b1abb1..e42417f3 100644
--- a/proto/AvatarChangeAnimHashReq.proto
+++ b/proto/AvatarChangeAnimHashReq.proto
@@ -1,9 +1,10 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 
-// 4.6.0
-// CmdId: 27660
+// 4.7.0
+// CmdId: 29050
+// PCBLKNOGPEC
 message AvatarChangeAnimHashReq {
-	uint64 avatar_guid = 10;
-	uint32 anim_hash = 14;
-}
\ No newline at end of file
+	uint64 avatar_guid = 6;
+	uint32 anim_hash = 7;
+}
diff --git a/proto/AvatarChangeAnimHashRsp.proto b/proto/AvatarChangeAnimHashRsp.proto
index 6a708e7f..4f95bb5b 100644
--- a/proto/AvatarChangeAnimHashRsp.proto
+++ b/proto/AvatarChangeAnimHashRsp.proto
@@ -1,10 +1,11 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 
-// 4.6.0
-// CmdId: 416
+// 4.7.0
+// CmdId: 29112
+// GJKDEOLOKPE
 message AvatarChangeAnimHashRsp {
-	uint32 anim_hash = 5;
-	uint64 avatar_guid = 11;
-	int32 retcode = 15;
+	uint32 anim_hash = 10;
+	uint64 avatar_guid = 6;
+	int32 retcode = 11;
 }
\ No newline at end of file
diff --git a/proto/AvatarFightPropNotify.proto b/proto/AvatarFightPropNotify.proto
index a0e63608..42a19f0b 100644
--- a/proto/AvatarFightPropNotify.proto
+++ b/proto/AvatarFightPropNotify.proto
@@ -2,8 +2,8 @@ syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 
 // 4.7.0
-// CmdId: 25612
+// CmdId: 7895 ?
 message AvatarFightPropNotify {
-	map<uint32, float> fight_prop_map = 4;
-	uint64 avatar_guid = 5;
+	map<uint32, float> fight_prop_map = 10;
+	uint64 avatar_guid = 9;
 }
\ No newline at end of file
diff --git a/proto/AvatarFightPropUpdateNotify.proto b/proto/AvatarFightPropUpdateNotify.proto
index e8019137..8f106fb5 100644
--- a/proto/AvatarFightPropUpdateNotify.proto
+++ b/proto/AvatarFightPropUpdateNotify.proto
@@ -2,8 +2,8 @@ syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 
 // 4.7.0
-// CmdId: 7895
+// CmdId: 25612 ?
 message AvatarFightPropUpdateNotify {
-	uint64 avatar_guid = 9;
-	map<uint32, float> fight_prop_map = 10;
+	uint64 avatar_guid = 5;
+	map<uint32, float> fight_prop_map = 4;
 }
\ No newline at end of file
diff --git a/proto/EntityFightPropChangeReasonNotify.proto b/proto/EntityFightPropChangeReasonNotify.proto
index 58081de6..d2af4c79 100644
--- a/proto/EntityFightPropChangeReasonNotify.proto
+++ b/proto/EntityFightPropChangeReasonNotify.proto
@@ -8,7 +8,7 @@ import "ChangeEnergyReason.proto";
 import "PropChangeReason.proto";
 
 // 4.7.0
-// CmdId: 26911
+// CmdId: 26911 ?
 message EntityFightPropChangeReasonNotify {
 	float HFDLKKBJNMI = 1;
 	uint32 entity_id = 3;
diff --git a/proto/EntityFightPropUpdateNotify.proto b/proto/EntityFightPropUpdateNotify.proto
index 4dbc734f..4bd3fe39 100644
--- a/proto/EntityFightPropUpdateNotify.proto
+++ b/proto/EntityFightPropUpdateNotify.proto
@@ -2,6 +2,8 @@ syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 
 // 4.7.0
+// cmdid: 24691(ok) or 20736(x)
+// JCEKOEKBLGJ or OKKBKHIGKAF?
 message EntityFightPropUpdateNotify {
   uint32 entity_id = 2;
   map<uint32, float> fight_prop_map = 12;