diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto
index 290eba1..4fea174 100644
--- a/protos/CommonProto.proto
+++ b/protos/CommonProto.proto
@@ -62,17 +62,19 @@ message Common{
 	}
 
 
-	message Map{
-		optional int32 mapId = 1;
-		repeated Cell cellList = 2;
+	message CellEvent{
+		// s_c_map_event id
+		optional int32 eventId = 1;
+		// 状态，0:未完成 1:已完成
+		optional int32 state = 2;
 	}
 
-
+	// 地图每个格子的信息
 	message Cell{
+		// 格子id
 		optional int32 cellId = 1;
-		optional bool canGo = 2;
-		optional bool isFoggy = 3;
-		repeated int32 eventList = 4;
+		// 支持一个格子放多个事件
+		repeated CellEvent cellEvents = 2;
 	}
 
 
diff --git a/protos/MapInfoProto.proto b/protos/MapInfoProto.proto
index 357dd17..9cbacc1 100644
--- a/protos/MapInfoProto.proto
+++ b/protos/MapInfoProto.proto
@@ -6,13 +6,22 @@ import "CommonProto.proto";
 
 message MapInfo{
 
-	message GetMapInfoRequest{
-  		optional int32 num = 1;
-		optional string str = 2;
+	// 登录获取地图信息
+	message MapGetInfoResponse{
+		// 当前所在地图id
+		optional int32 mapId = 1;
 	}
 
-	message GetMapInfoResponse{
-		repeated Common.Map mapList = 1;		
+	// 进入地图
+	message MapEnterRequest{
+		// 需要进入的地图id
+		optional int32 mapId = 1;
+	}
+	message MapEnterResponse{
+		// 地图信息
+		repeated Common.Cell mapList = 1;	
+		// 当前所在坐标
+		optional int32 curXY = 2;
 	}
 
 }
\ No newline at end of file
diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto
index b0d31a7..3faa112 100644
--- a/protos/MessageTypeProto.proto
+++ b/protos/MessageTypeProto.proto
@@ -12,31 +12,56 @@ enum MessageType{
 	HEART_BEAT_RESPONSE   = 1001; // 
 
 // 正式协议从10000开始
-    LOGIN_REQUEST   = 10000; // 登陆或注册
-    LOGIN_RESPONSE  = 10001;
-
-    GET_PLAYERINFO_REQUEST   = 10002; //
-    GET_PLAYERINFO_RESPONSE  = 10003;
-
-    GET_HEROINFO_REQUEST   = 10004; //
-    GET_HEROINFO_RESPONSE  = 10005;
-
-    GET_ITEMINFO_REQUEST   = 10006; //
-    GET_ITEMINFO_RESPONSE  = 10007;
-
-    ENTER_MAP_REQUEST   = 10008; //
-    ENTER_MAP_RESPONSE  = 10009;
-
-    START_FIGHT_REQUEST   = 10010; //
-    START_FIGHT_RESPONSE  = 10011;
+// A 10000
+// B 10100
+// C 10200
+// D 10300
+// E 10400
+// F 10500
+    FIGHT_START_REQUEST   = 10500; //
+    FIGHT_START_RESPONSE  = 10501;
     
-    END_FIGHT_REQUEST   = 10012; //
-    END_FIGHT_RESPONSE  = 10013;
+    FIGHT_END_REQUEST   = 10502; //
+    FIGHT_END_RESPONSE  = 10503;
+// G 10600
+    GET_PLAYERINFO_REQUEST   = 10600; //
+    GET_PLAYERINFO_RESPONSE  = 10601;
 
-    TRIGGER_EVENT_REQUEST   = 10014; //
-    TRIGGER_EVENT_RESPONSE  = 10015;
+    GET_HEROINFO_REQUEST   = 10602; //
+    GET_HEROINFO_RESPONSE  = 10603;
 
-    OUT_MAP_REQUEST   = 10016; //
-    OUT_MAP_RESPONSE  = 10017;
+    GET_ITEMINFO_REQUEST   = 10604; //
+    GET_ITEMINFO_RESPONSE  = 10605;
+// H 10700
+// I 10800
+// J 10900
+// K 11000
+// L 11100
+    LOGIN_REQUEST   = 11100; // 登陆或注册
+    LOGIN_RESPONSE  = 11101;
+// M 11200
+    MAP_ENTER_REQUEST   = 11200; // 进入地图
+    MAP_ENTER_RESPONSE  = 11201;
+
+    MAP_OUT_REQUEST   = 11202; //
+    MAP_OUT_RESPONSE  = 11203;
+
+    MAP_GET_INFO_REQUEST   = 11204; //
+    MAP_GET_INFO_RESPONSE  = 11205;
+// N 11300
+// O 11400
+// P 11500
+// Q 11600
+// R 11700
+// S 11800
+// T 11900
+    TRIGGER_EVENT_REQUEST   = 11900; //
+    TRIGGER_EVENT_RESPONSE  = 11901;
+// U 12000
+// V 12100
+// W 12200
+// X 12300
+// Y 12400
+// Z 12500
 
 }