From 2e0842da93de50d37afc8f14dd311b1dcdc7da25 Mon Sep 17 00:00:00 2001
From: gaojie <gaojie@qq.com>
Date: Tue, 22 Jan 2019 16:13:06 +0800
Subject: [PATCH] GM

---
 protos/CommonProto.proto    | 4 ++++
 protos/GMCommandProto.proto | 7 -------
 2 files changed, 4 insertions(+), 7 deletions(-)
 delete mode 100644 protos/GMCommandProto.proto

diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto
index 89d92d9..3bfc264 100644
--- a/protos/CommonProto.proto
+++ b/protos/CommonProto.proto
@@ -91,3 +91,7 @@ option optimize_for = SPEED;
 		repeated Equip equipId = 2;
 		repeated Hero Hero = 3;
 	}
+
+	message GMCommand{
+		optional string command =1 ;	// 指令字符串  uid#type#prarm1#param2
+	}
\ No newline at end of file
diff --git a/protos/GMCommandProto.proto b/protos/GMCommandProto.proto
deleted file mode 100644
index 29909d2..0000000
--- a/protos/GMCommandProto.proto
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.ljsd.jieling.protocols;
-
-option optimize_for = SPEED;
-
-message GMCommand{
-	optional string command =1 ;	// 指令字符串  uid#type#prarm1#param2
-}
\ No newline at end of file