From 103ae695bbee47f201c651d0b5bdc59c1b04e025 Mon Sep 17 00:00:00 2001
From: Yuuki <6851027-yukiz@users.noreply.gitlab.com>
Date: Wed, 21 Aug 2024 21:27:38 +0800
Subject: [PATCH] monster event stuff
---
proto/CutSceneBeginNotify.proto | 8 +++-----
proto/CutSceneExtraParam.proto | 5 ++---
proto/MonsterForceAlertNotify.proto | 23 ++++-----------------
proto/MonsterSummonTagNotify.proto | 25 +++++------------------
proto/ServerGlobalValueChangeNotify.proto | 9 ++++----
5 files changed, 19 insertions(+), 51 deletions(-)
diff --git a/proto/CutSceneBeginNotify.proto b/proto/CutSceneBeginNotify.proto
index bccf49b6..1aec0740 100644
--- a/proto/CutSceneBeginNotify.proto
+++ b/proto/CutSceneBeginNotify.proto
@@ -1,12 +1,10 @@
syntax = "proto3";
-
option java_package = "emu.grasscutter.net.proto";
-
import "CutSceneExtraParam.proto";
-
// 4.7.0
+// CmdId: 305
message CutSceneBeginNotify {
- uint32 cutscene_id = 11;
- bool is_wait_others = 8;
+ uint32 cutscene_id = 5;
+ bool is_wait_others = 3;
repeated CutSceneExtraParam extra_param_list = 15;
}
\ No newline at end of file
diff --git a/proto/CutSceneExtraParam.proto b/proto/CutSceneExtraParam.proto
index fbce94b2..152896c6 100644
--- a/proto/CutSceneExtraParam.proto
+++ b/proto/CutSceneExtraParam.proto
@@ -1,8 +1,7 @@
syntax = "proto3";
-
option java_package = "emu.grasscutter.net.proto";
-
// 4.7.0
+// ?
message CutSceneExtraParam {
- repeated double detail_param_list = 14;
+ repeated double detail_param_list = 1;
}
diff --git a/proto/MonsterForceAlertNotify.proto b/proto/MonsterForceAlertNotify.proto
index 267e1e3c..8c08655b 100644
--- a/proto/MonsterForceAlertNotify.proto
+++ b/proto/MonsterForceAlertNotify.proto
@@ -1,23 +1,8 @@
-// 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: 3111
-// Obf: PKIMGJKJMFE
+// 4.7.0
+// CmdId: 5287
+// Obf: EFNEGOBNLHF
message MonsterForceAlertNotify {
- uint32 monster_entity_id = 8;
+ uint32 monster_entity_id = 14;
}
diff --git a/proto/MonsterSummonTagNotify.proto b/proto/MonsterSummonTagNotify.proto
index 540f86eb..9bdd35e4 100644
--- a/proto/MonsterSummonTagNotify.proto
+++ b/proto/MonsterSummonTagNotify.proto
@@ -1,24 +1,9 @@
-// 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: 26800
-// Obf: NAILAGKGLBA
+// 4.7.0
+// CmdId: 7831
+// Obf: APONHDKOLKA
message MonsterSummonTagNotify {
- map summon_tag_map = 11;
- uint32 monster_entity_id = 12;
+ map summon_tag_map = 1;
+ uint32 monster_entity_id = 7;
}
diff --git a/proto/ServerGlobalValueChangeNotify.proto b/proto/ServerGlobalValueChangeNotify.proto
index bb598816..7f6dd314 100644
--- a/proto/ServerGlobalValueChangeNotify.proto
+++ b/proto/ServerGlobalValueChangeNotify.proto
@@ -1,9 +1,10 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
-
// 4.7.0
+// CmdId: 22099
+// ?
message ServerGlobalValueChangeNotify {
- float value = 6;
- uint32 key_hash = 2;
- uint32 entity_id = 14;
+ float value = 12;
+ uint32 key_hash = 6;
+ uint32 entity_id = 9;
}
\ No newline at end of file