From 632c44b036968406f2fa97e2de282c3c148a936f Mon Sep 17 00:00:00 2001
From: DragonAura <dragonaurapvp@gmail.com>
Date: Sun, 5 Mar 2023 15:45:43 +0800
Subject: [PATCH 1/2] feat(proto): :sparkles: add message of all

---
 dependency/proto/Message2Clients.proto | 25 ++++++++++++++++++-------
 dependency/proto/MessageType.proto     |  5 ++---
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/dependency/proto/Message2Clients.proto b/dependency/proto/Message2Clients.proto
index bfcd0a1..82238c1 100755
--- a/dependency/proto/Message2Clients.proto
+++ b/dependency/proto/Message2Clients.proto
@@ -24,7 +24,10 @@ message MessageOfStudent
     int32 radius = 17; // 半径
     int32 damage = 18;
     int32 danger_alert = 19; // 危险警报，在捣蛋鬼靠近时会有预警
-    repeated StudentBuffType buff = 20;
+    int32 score = 20;
+    int32 treat_progress = 21; // 治疗进度
+    int32 rescue_progress = 22; // 救援进度
+    repeated StudentBuffType buff = 23;
 }
 
 message MessageOfTricker
@@ -42,9 +45,7 @@ message MessageOfTricker
     int64 player_id = 11;
     int32 view_range = 12; // 视野距离
     int32 radius = 13; // 半径
-    int32 treat_progress = 14; // 治疗进度
-    int32 rescue_progress = 15; // 救援进度
-    repeated TrickerBuffType buff = 16;
+    repeated TrickerBuffType buff = 14;
 }
 
 message MessageOfBullet
@@ -144,14 +145,24 @@ message MessageOfObj
     }
 }
 
+message MessageOfAll
+{
+    int32 game_time = 1;
+    int32 subject_left = 2; // 剩余的科目数
+    int32 student_graduated = 3; // 已经毕业的学生数
+    int32 student_quited = 4; // 已经退学的学生数
+    int32 student_score = 5;
+    int32 tricker_score = 6;
+    bool gate_opened = 7;
+    bool hidden_gate_refreshed = 8;
+    bool hidden_gate_opened = 9;
+}
+
 message MessageToClient
 {
     repeated MessageOfObj obj_message = 1;
     MessageOfMap map_message = 2;
     GameState game_state = 3;
-    int32 finished_num = 4; // 完成的科目数
-    int32 student_score = 5;
-    int32 tricker_score = 6;
 }
 
 message MoveRes // 如果打算设计撞墙保留平行速度分量，且需要返回值则可用这个（大概没啥用）
diff --git a/dependency/proto/MessageType.proto b/dependency/proto/MessageType.proto
index b2ac017..805ccbe 100755
--- a/dependency/proto/MessageType.proto
+++ b/dependency/proto/MessageType.proto
@@ -111,7 +111,6 @@ enum GameState
 {
     NULL_GAME_STATE = 0;
     GAME_START = 1;
-    STAGE_1 = 2; // 第一阶段：大门没有开
-    STAGE_2 = 3; // 第二阶段：大门已经开了
-    GAME_END = 4;
+    GAME_RUNNING = 2;
+    GAME_END = 3;
 }

From 5bada7789f732661feebb72cc49d0dde84f3e413 Mon Sep 17 00:00:00 2001
From: DragonAura <dragonaurapvp@gmail.com>
Date: Sun, 5 Mar 2023 15:46:40 +0800
Subject: [PATCH 2/2] fix(proto): :bug: fix typo

---
 dependency/proto/Message2Clients.proto | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dependency/proto/Message2Clients.proto b/dependency/proto/Message2Clients.proto
index 82238c1..df8dc04 100755
--- a/dependency/proto/Message2Clients.proto
+++ b/dependency/proto/Message2Clients.proto
@@ -163,6 +163,7 @@ message MessageToClient
     repeated MessageOfObj obj_message = 1;
     MessageOfMap map_message = 2;
     GameState game_state = 3;
+    MessageOfAll all_message = 4;
 }
 
 message MoveRes // 如果打算设计撞墙保留平行速度分量，且需要返回值则可用这个（大概没啥用）