Merge branch '开发/dev_dh' into master_test_gn

# Conflicts:
#	protos/MessageTypeProto.proto

protos/CommonProto.proto

@@ -79,6 +79,7 @@ option optimize_for = SPEED;
 		optional int32 exp = 9; //字段可选 魂印传入经验（对应宝器强化等级）
 		optional int32 treeLv = 10;// 神树等级
 		optional int32 fourSpirit = 11;//四灵试炼层数
+		repeated int32 homeEquipLv = 12;//家园装备强化，1强化，2突破
 	}
 
 	message SoulPos{
@@ -1110,6 +1111,7 @@ option optimize_for = SPEED;
 		repeated Equip jewels = 7;//英雄的魂宝灵宝
 		optional int32 treeLevel = 8;//神树等级
 		optional int32 fourTotal = 9;//四灵总层数
+		repeated Equip equips = 10;//英雄装备详细信息
 	}
 
 	// 七界试炼，遗物信息
@@ -1205,7 +1207,24 @@ option optimize_for = SPEED;
 		optional int32 time = 5; //占领或者被抢夺发生的时间
 		optional int32 practiceLevel = 6; //修行等级
 		optional string defServerName = 7;//对方服务器名字
-		
+	}
+
+	// 浮生门建筑信息
+	message ArchitectureInfo{
+		optional int32 id = 1;
+		optional int32 productionStartTime = 2;//开始生产时间
+		optional int32 upLvEndTime = 3;//升级结束时间
+	}
+	// 栖云阁地块信息
+	message LandInfo{
+		optional int32 id = 1;
+		optional int32 endTime = 2;//探索结束时间
+		optional int32 heroTid = 3;//英雄模板id，0为未探索状态
+	}
+	// 家园装备强化信息
+	message EquipIntensifyInfo{
+		optional int32 location = 1;//装备位置，看equipConfig表
+		optional int32 lvId = 2;//等级id
 	}
 	//键值对 key-val
 	message CommKeyVal{

protos/MessageTypeProto.proto

@@ -1381,8 +1381,30 @@ enum MessageType{
 	WeekCardRewardRequest = 3050032;
 	WeekCardRewardResponse = 3050033;
 	WeekCardIndicationInfoResponse = 3050034;
+
+
+	// 浮生门
+	HomeInfoRequest = 3050101;
+	HomeInfoResponse = 3050102;
+	// 建筑升级
+	ArchitectureOperateRequest = 3050103;
+	// 一键收获
+	HomeAllGainRequset = 3050104;
+	HomeAllGainResponse = 3050105;
+	// 栖云阁
+	WanderInfoRequset = 3050106;
+	WanderInfoResponse = 3050107;
+	// 派遣
+	WanderDispatchRequest = 3050108;
+	WanderDispatchResponse = 3050109;
+	// 家园装备强化
+	EquipIntensifyRequset = 3050110;
+	EquipIntensifyResponse = 3050111;
+	// 建筑解锁推送
+	ArchitectureUnlockIndication = 3050112;
 	
 
+<<<<<<< HEAD
 	//探索地图
 	ExplorerMapInfoRequest = 3050040;
 	ExplorerMapInfoResponse = 3050041;
@@ -1394,6 +1416,8 @@ enum MessageType{
 	ExplorerMapRewardResponse = 3050047;
 	ExplorerMapIndicationResponse = 3050048;
 	
+=======
+>>>>>>> 开发/dev_dh
 	//森罗幻境自动挂机奖励展示
     TowerGetRewardInfoShowRequest = 3050050;
 	TowerGetRewardInfoShowResponse = 3050051;

protos/PlayerInfoProto.proto

@@ -689,7 +689,6 @@ import "CommonProto.proto";
 		repeated SpecialEffects SpecialEffects = 3;//属性信息
 		optional int32 force = 4 ; //战力
 		optional int32 guildSkill = 5;//公会技能
-		optional int32 treeLevel = 6;//神树等级
 	}
 	message RankRequest{
 		optional int32 type = 1;//排行榜类型
@@ -1088,4 +1087,59 @@ import "CommonProto.proto";
 	   optional ExplorerMapInfo exploreInfo = 1;//探索地图信息
 	}
 
-	
+	// 浮生门
+	message HomeInfoRequest{
+	}
+	message ArchitectureOperateRequest{
+		repeated int32 ids = 1;
+		optional int32 type = 2;//1：升级，2：立即完成
+		optional int32 privilageTypeId = 3;//升级用，特权id
+	}
+	message HomeInfoResponse{
+		repeated ArchitectureInfo infos = 1;
+	}
+	
+	message HomeAllGainRequset{
+		optional int32 id = 1;//0为一键领取，其他为建筑单个领取
+	}
+
+	message HomeAllGainResponse{
+		optional Drop drop = 1;
+	}
+
+	// 栖云阁
+	message WanderInfoRequset{
+	}
+
+	message WanderInfoResponse{
+		repeated LandInfo lands = 1;
+		repeated int32 heroTids = 2;
+	}
+
+	message WanderDispatchRequest{
+		optional int32 id = 1;//地块id
+		optional int32 type = 2;//1：普通派遣，2：立即完成，3：领取
+		optional int32 heroTid = 3;//派遣的英雄模板id
+		optional int32 privilageTypeId = 4;//特权id，领取不用
+	}
+
+	message WanderDispatchResponse{
+		optional LandInfo land = 1;
+		repeated int32 heroTids = 2;
+		optional Drop drop = 3;
+	}
+	
+	// 摘星阁，装备强化
+	message EquipIntensifyRequset{
+		optional int32 type = 1;// -1：获取装备新 0：突破 1-4：强化对应位置
+	}
+
+	message EquipIntensifyResponse{
+		repeated EquipIntensifyInfo infos = 1;
+		optional int32 equipRankUp = 2;//装备突破
+	}
+
+	// 建筑解锁推送
+	message ArchitectureUnlockIndication{
+		repeated ArchitectureInfo infos = 1;
+	}