From f3abfbe5530be0b4dffe7997b1c26adac9645236 Mon Sep 17 00:00:00 2001
From: Yuuki <6851027-yukiz@users.noreply.gitlab.com>
Date: Thu, 4 Jul 2024 19:29:24 +0800
Subject: [PATCH] WeaponAwaken (need check),Promot(work),Upgrade(work)
---
proto/WeaponAwakenReq.proto | 28 ++++++++--------------------
proto/WeaponAwakenRsp.proto | 16 +++++++++-------
proto/WeaponPromoteReq.proto | 7 ++++---
proto/WeaponPromoteRsp.proto | 13 +++++++------
proto/WeaponUpgradeReq.proto | 12 ++++++------
proto/WeaponUpgradeRsp.proto | 15 ++++++++-------
6 files changed, 42 insertions(+), 49 deletions(-)
diff --git a/proto/WeaponAwakenReq.proto b/proto/WeaponAwakenReq.proto
index d02419f7..0eba6008 100644
--- a/proto/WeaponAwakenReq.proto
+++ b/proto/WeaponAwakenReq.proto
@@ -1,25 +1,13 @@
-// 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";
-// CmdId: 23146
-// Obf: AFPFPKMLIPD
+// 4.7.0
+// CmdId: 25056
+// Obf: PDGEAGKHCPG
message WeaponAwakenReq {
- uint64 target_weapon_guid = 2;
- map affix_level_map = 4;
- uint64 item_guid = 15;
+ uint64 target_weapon_guid = 13;
+ //map affix_level_map = 4; // old
+ //uint64 item_guid = 15; // old
+ uint32 NEHLGIOLBJA = 9; // maybe item_guid ?
+ repeated uint64 HICOIODAHGK = 15; // list item wp
}
diff --git a/proto/WeaponAwakenRsp.proto b/proto/WeaponAwakenRsp.proto
index 9ab4cd62..a3e371ea 100644
--- a/proto/WeaponAwakenRsp.proto
+++ b/proto/WeaponAwakenRsp.proto
@@ -2,12 +2,14 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-
+// 4.7.0
+// CmdId: 1182
+// OLAEGBJMEFL
message WeaponAwakenRsp {
- map old_affix_level_map = 3;
- map cur_affix_level_map = 12;
- int32 retcode = 10;
- uint32 target_weapon_awaken_level = 14;
- uint64 target_weapon_guid = 7;
- uint64 avatar_guid = 9;
+ map old_affix_level_map = 2; // sus
+ map cur_affix_level_map = 13; // sus
+ int32 retcode = 6;
+ uint32 target_weapon_awaken_level = 1;
+ uint64 target_weapon_guid = 15;
+ uint64 avatar_guid = 7;
}
\ No newline at end of file
diff --git a/proto/WeaponPromoteReq.proto b/proto/WeaponPromoteReq.proto
index 4ef40055..67a100c8 100644
--- a/proto/WeaponPromoteReq.proto
+++ b/proto/WeaponPromoteReq.proto
@@ -1,8 +1,9 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-// 4.6.0
-// CmdId: 27774
+// 4.7.0
+// CmdId: 9611
+// MMKGKFCNNFJ
message WeaponPromoteReq {
- uint64 target_weapon_guid = 14;
+ uint64 target_weapon_guid = 6;
}
\ No newline at end of file
diff --git a/proto/WeaponPromoteRsp.proto b/proto/WeaponPromoteRsp.proto
index 384a2e76..db8a8923 100644
--- a/proto/WeaponPromoteRsp.proto
+++ b/proto/WeaponPromoteRsp.proto
@@ -1,11 +1,12 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-// 4.6.0
-// CmdId: 27473
+// 4.7.0
+// CmdId: 23521
+// GDCMEIJPPOP
message WeaponPromoteRsp {
- uint64 target_weapon_guid = 5;
- uint32 cur_promote_level = 7; //cur_promote_level or old_promote_level
- int32 retcode = 12;
- uint32 old_promote_level = 15; //cur_promote_level or old_promote_level
+ uint64 target_weapon_guid = 13;
+ uint32 cur_promote_level = 8; // 2 sus
+ int32 retcode = 4;
+ uint32 old_promote_level = 2; // 8 sus
}
\ No newline at end of file
diff --git a/proto/WeaponUpgradeReq.proto b/proto/WeaponUpgradeReq.proto
index b9bc39af..4814a121 100644
--- a/proto/WeaponUpgradeReq.proto
+++ b/proto/WeaponUpgradeReq.proto
@@ -3,11 +3,11 @@ option java_package = "emu.grasscutter.net.proto";
import "ItemParam.proto";
-// 4.6.0
-// CmdId: 28307
-// sus
+// 4.7.0
+// CmdId: 24162
+// LEDEEIJMAJN
message WeaponUpgradeReq {
- repeated ItemParam item_param_list = 3;
- uint64 target_weapon_guid = 6;
- repeated uint64 food_weapon_guid_list = 13;
+ repeated ItemParam item_param_list = 13;
+ uint64 target_weapon_guid = 10;
+ repeated uint64 food_weapon_guid_list = 3;
}
\ No newline at end of file
diff --git a/proto/WeaponUpgradeRsp.proto b/proto/WeaponUpgradeRsp.proto
index 9dac96de..6323862f 100644
--- a/proto/WeaponUpgradeRsp.proto
+++ b/proto/WeaponUpgradeRsp.proto
@@ -3,12 +3,13 @@ option java_package = "emu.grasscutter.net.proto";
import "ItemParam.proto";
-// 4.6.0
-// CmdId: 22828
+// 4.7.0
+// CmdId: 3294
+// LHEIDHIFFGK
message WeaponUpgradeRsp {
- repeated ItemParam item_param_list = 5;
- uint32 cur_level = 8;
- uint32 old_level = 9;
- int32 retcode = 11;
- uint64 target_weapon_guid = 12;
+ repeated ItemParam item_param_list = 13;
+ uint32 cur_level = 3;
+ uint32 old_level = 14;
+ int32 retcode = 12;
+ uint64 target_weapon_guid = 7;
}
\ No newline at end of file