From 0a7c9af217897b8910f7558fbf46cddfeab03a1c Mon Sep 17 00:00:00 2001
From: NorthLan <6995syu@163.com>
Date: Wed, 15 Jun 2022 21:18:22 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E6=B5=8B=E8=AF=95han?=
 =?UTF-8?q?dler=EF=BC=8Cdanmaku=E5=8E=9F=E6=A0=B7=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 game/live_logic/test_handler.go |  2 +-
 game/pb/room/Room.cs            | 10 +++++++---
 game/pb/room/room.pb.go         | 27 +++++++++++++++------------
 game/pb/room/room.proto         |  1 +
 4 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/game/live_logic/test_handler.go b/game/live_logic/test_handler.go
index 0389d15..bee09ce 100644
--- a/game/live_logic/test_handler.go
+++ b/game/live_logic/test_handler.go
@@ -13,7 +13,7 @@ type TestGameLogic struct {
 func NewTestLiveGameLogic(svcCtx *svc.ServiceContext) *LiveGameLogic {
 	resp := &TestGameLogic{
 		svcCtx:        svcCtx,
-		LiveGameLogic: NewLiveGameLogic(pbRoom.GameType_ZHG, nil),
+		LiveGameLogic: NewLiveGameLogic(pbRoom.GameType_TEST, nil),
 	}
 	return resp.LiveGameLogic
 }
diff --git a/game/pb/room/Room.cs b/game/pb/room/Room.cs
index 2f1b207..f48ae02 100644
--- a/game/pb/room/Room.cs
+++ b/game/pb/room/Room.cs
@@ -28,9 +28,9 @@ namespace Pb.Room {
             "TGl2ZVJvb21JZBgBIAEoAxIjCghHYW1lVHlwZRgCIAEoDjIRLnBiLnJvb20u",
             "R2FtZVR5cGUiLAoMSm9pblJvb21SZXNwEgwKBENvZGUYASABKAMSDgoGUmVz",
             "dWx0GAIgASgJIjkKBkNsaWVudBIKCgJJZBgBIAEoAxIjCghHYW1lVHlwZRgC",
-            "IAEoDjIRLnBiLnJvb20uR2FtZVR5cGUqNAoIR2FtZVR5cGUSBwoDWkhHEAAS",
-            "CQoFWkhHSFoQARIJCgVaSEdGQhACEgkKBVpIR1pEEANCGVoXZGNnL2dhbWUv",
-            "cGIvcm9vbTtwYlJvb21iBnByb3RvMw=="));
+            "IAEoDjIRLnBiLnJvb20uR2FtZVR5cGUqPgoIR2FtZVR5cGUSBwoDWkhHEAAS",
+            "CQoFWkhHSFoQARIJCgVaSEdGQhACEgkKBVpIR1pEEAMSCAoEVEVTVBAKQhla",
+            "F2RjZy9nYW1lL3BiL3Jvb207cGJSb29tYgZwcm90bzM="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { },
           new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Pb.Room.GameType), }, null, new pbr::GeneratedClrTypeInfo[] {
@@ -63,6 +63,10 @@ namespace Pb.Room {
     /// 指挥官-阵地
     /// </summary>
     [pbr::OriginalName("ZHGZD")] Zhgzd = 3,
+    /// <summary>
+    /// 测试
+    /// </summary>
+    [pbr::OriginalName("TEST")] Test = 10,
   }
 
   #endregion
diff --git a/game/pb/room/room.pb.go b/game/pb/room/room.pb.go
index f25692b..cce3f2a 100644
--- a/game/pb/room/room.pb.go
+++ b/game/pb/room/room.pb.go
@@ -24,25 +24,28 @@ const (
 type GameType int32
 
 const (
-	GameType_ZHG   GameType = 0 // 指挥官
-	GameType_ZHGHZ GameType = 1 // 指挥官-海战
-	GameType_ZHGFB GameType = 2 // 指挥官-副本
-	GameType_ZHGZD GameType = 3 // 指挥官-阵地
+	GameType_ZHG   GameType = 0  // 指挥官
+	GameType_ZHGHZ GameType = 1  // 指挥官-海战
+	GameType_ZHGFB GameType = 2  // 指挥官-副本
+	GameType_ZHGZD GameType = 3  // 指挥官-阵地
+	GameType_TEST  GameType = 10 // 测试
 )
 
 // Enum value maps for GameType.
 var (
 	GameType_name = map[int32]string{
-		0: "ZHG",
-		1: "ZHGHZ",
-		2: "ZHGFB",
-		3: "ZHGZD",
+		0:  "ZHG",
+		1:  "ZHGHZ",
+		2:  "ZHGFB",
+		3:  "ZHGZD",
+		10: "TEST",
 	}
 	GameType_value = map[string]int32{
 		"ZHG":   0,
 		"ZHGHZ": 1,
 		"ZHGFB": 2,
 		"ZHGZD": 3,
+		"TEST":  10,
 	}
 )
 
@@ -256,13 +259,13 @@ var file_room_room_proto_rawDesc = []byte{
 	0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x49, 0x64, 0x12, 0x2d,
 	0x0a, 0x08, 0x47, 0x61, 0x6d, 0x65, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e,
 	0x32, 0x11, 0x2e, 0x70, 0x62, 0x2e, 0x72, 0x6f, 0x6f, 0x6d, 0x2e, 0x47, 0x61, 0x6d, 0x65, 0x54,
-	0x79, 0x70, 0x65, 0x52, 0x08, 0x47, 0x61, 0x6d, 0x65, 0x54, 0x79, 0x70, 0x65, 0x2a, 0x34, 0x0a,
+	0x79, 0x70, 0x65, 0x52, 0x08, 0x47, 0x61, 0x6d, 0x65, 0x54, 0x79, 0x70, 0x65, 0x2a, 0x3e, 0x0a,
 	0x08, 0x47, 0x61, 0x6d, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x07, 0x0a, 0x03, 0x5a, 0x48, 0x47,
 	0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x5a, 0x48, 0x47, 0x48, 0x5a, 0x10, 0x01, 0x12, 0x09, 0x0a,
 	0x05, 0x5a, 0x48, 0x47, 0x46, 0x42, 0x10, 0x02, 0x12, 0x09, 0x0a, 0x05, 0x5a, 0x48, 0x47, 0x5a,
-	0x44, 0x10, 0x03, 0x42, 0x19, 0x5a, 0x17, 0x64, 0x63, 0x67, 0x2f, 0x67, 0x61, 0x6d, 0x65, 0x2f,
-	0x70, 0x62, 0x2f, 0x72, 0x6f, 0x6f, 0x6d, 0x3b, 0x70, 0x62, 0x52, 0x6f, 0x6f, 0x6d, 0x62, 0x06,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x44, 0x10, 0x03, 0x12, 0x08, 0x0a, 0x04, 0x54, 0x45, 0x53, 0x54, 0x10, 0x0a, 0x42, 0x19, 0x5a,
+	0x17, 0x64, 0x63, 0x67, 0x2f, 0x67, 0x61, 0x6d, 0x65, 0x2f, 0x70, 0x62, 0x2f, 0x72, 0x6f, 0x6f,
+	0x6d, 0x3b, 0x70, 0x62, 0x52, 0x6f, 0x6f, 0x6d, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/game/pb/room/room.proto b/game/pb/room/room.proto
index 4d5e36d..76a14f5 100644
--- a/game/pb/room/room.proto
+++ b/game/pb/room/room.proto
@@ -10,6 +10,7 @@ enum GameType {
   ZHGHZ = 1; // 指挥官-海战
   ZHGFB = 2; // 指挥官-副本
   ZHGZD = 3; // 指挥官-阵地
+  TEST = 10; // 测试
 }
 
 message JoinRoomReq {