Merge branch 'master_test_gn' into 开发/dev_dh

# Conflicts:
#	protos/MessageTypeProto.proto

protos/MapInfoProto.proto

@@ -441,3 +441,10 @@ import "CommonProto.proto";
 	message  EndlessTakeTreasureResponse{
 		optional Drop drop =1;
 	}
+	
+	//森罗幻境自动挂机奖励展示
+	message TowerGetRewardInfoShowRequest{
+	}
+	message TowerGetRewardInfoShowResponse{
+		optional Drop drop = 1;//奖励
+	}

protos/MessageTypeProto.proto

@@ -1404,6 +1404,11 @@ enum MessageType{
 	ArchitectureUnlockIndication = 3050112;
 	
 
+	//森罗幻境自动挂机奖励展示
+    TowerGetRewardInfoShowRequest = 3050050;
+	TowerGetRewardInfoShowResponse = 3050051;
+
+	
 	//800000起为global 协议
 	GetWorldServerRequest = 800001;//获取世界服ip
 	GetWorldServerResponse = 800002;