Merge branch 'master_test_gn' into master_test_gn_zbh

# Conflicts:
#	protos/MessageTypeProto.proto

protos/ActivityProto.proto

@@ -106,4 +106,22 @@ import "CommonProto.proto";
 	}
 	
 	
+	// 奇门遁甲/玲珑棋局
+	message qiMenDunJiaDrawRequest{
+		optional int32 activityId = 1;
+	}
+	
+	message qiMenDunJiaDrawResponse{
+		optional Drop drop = 1;//获得的奖励列表
+		repeated int32 idList = 2;//获得奖励id
+	}
+	
+	message qiMenDunJiaHitListRequest{
+		optional int32 activityId = 1;
+	}
+	
+	message qiMenDunJiaHitListResponse{
+		repeated int32 hitList = 1;
+	}
+	
 	

protos/MessageTypeProto.proto

@@ -1035,7 +1035,8 @@ enum MessageType{
     SWEEP_DEMON_REQUEST = 12226;//心魔试炼扫荡
 	SWEEP_DEMON_RESPONSE = 12227;//心魔试炼扫荡
 
-
+	
+	
 
 // X 12300
 // Y 12400
@@ -1228,22 +1229,31 @@ enum MessageType{
 	
 	choiceDrawCardRequest = 3040108;
 	choiceDrawCardResponse = 3040109;
-	
+
 	// 心愿抽卡
 	wishDrawCardIndication = 3040123;
 
 	choiceWishHeroRequest = 3040124;
 
 	choiceWishHeroResponse = 3040125;
+
+	// 奇门遁甲
+	qiMenDunJiaDrawRequest = 3040110;
+	qiMenDunJiaDrawResponse = 3040111;
 	
-	// 乾坤宝盒-许愿魂印
+
+	qiMenDunJiaHitListRequest = 3040112;
+	qiMenDunJiaHitListResponse = 3040113;
+	
+// 乾坤宝盒-许愿魂印
 	beautyBagCardIndication = 3040126;
 
 	beautyBagWishEquipRequest = 3040127;
 
 	beautyBagWishEquipResponse = 3040128;
-	
-	
+
+
+
 	
 	//800000起为global 协议
 	GetWorldServerRequest = 800001;//获取世界服ip