diff --git a/protos/ActivityProto.proto b/protos/ActivityProto.proto
index cb503e2..24ebb3e 100644
--- a/protos/ActivityProto.proto
+++ b/protos/ActivityProto.proto
@@ -34,4 +34,25 @@ import "CommonProto.proto";
 	message SpecicalMonsterChooseRequest{
 		optional int32 activityId = 1;
 		optional int32 selectId = 2;
+	}
+	
+	// 新将来袭
+	message NewGeneralAttackRequest{
+		// 活动id
+		optional int32 activityId = 1;
+		// 使用次数类型id
+		optional int32 privilageTypeId = 2;
+	}
+	
+	message NewGeneralAttackResponse{
+		// 战斗属性
+		optional FightData fightData = 1;
+		// 道具
+		optional Drop drop = 2;
+	}
+	
+	// 建木神树
+	message UpgradeGodTreeRequest{
+	}
+	message UpgradeGodTreeResponse{
 	}
\ No newline at end of file
diff --git a/protos/ArenaInfoProto.proto b/protos/ArenaInfoProto.proto
index d25b96a..1dbe2d0 100644
--- a/protos/ArenaInfoProto.proto
+++ b/protos/ArenaInfoProto.proto
@@ -27,6 +27,7 @@ import "CommonProto.proto";
 		repeated ArenaEnemy arenaEnemys = 3; //新的一批对手信息
 		optional  FightData fightData =4;  // 战斗数据 
 		optional int32 fightResult = 5 ;// 战斗结果
+		optional Drop drop = 6;
 	}
 
 	message GetArenaRankInfoResponse{
diff --git a/protos/ChatProto.proto b/protos/ChatProto.proto
index a249cbc..c53c381 100644
--- a/protos/ChatProto.proto
+++ b/protos/ChatProto.proto
@@ -17,6 +17,7 @@ message ChatInfo{
     //跑马灯用
     optional int32 messageType = 13; // 消息类型 1:吉运,2:勤勉
     optional int32 itemId =14; // 查看道具id
+	//optional string item = 14; // 物品信息，用#分割
     optional int32 type = 15;  //0:系统 1:其他
     optional int32 startTime = 16 ; // 开始时间
     optional int32 endTime = 17;  //结束时间
diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto
index 72c3c0b..a89bc4d 100644
--- a/protos/CommonProto.proto
+++ b/protos/CommonProto.proto
@@ -40,6 +40,7 @@ option optimize_for = SPEED;
 		optional int32 ride = 22;//坐骑
 		optional int32 rideLevel = 23;//坐骑等级
 		optional int32 sex = 24;//玩家性别 0男1女
+		optional int32 treeLevel = 25;// 神树等级
 	}
 
 	 message Privilege{
@@ -457,6 +458,7 @@ option optimize_for = SPEED;
 		optional int32 force = 8;//战力
 		optional int32 guildSign = 9 ;//公会图腾
 		optional int32 sex = 10;//性别
+		optional string serverName = 11;//所在区服
 	}
 	
 
@@ -867,4 +869,5 @@ option optimize_for = SPEED;
 		optional int32 overTime = 2;
 	}
 	
+	
 	
\ No newline at end of file
diff --git a/protos/Family.proto b/protos/Family.proto
index 4ceef9d..e5d9354 100644
--- a/protos/Family.proto
+++ b/protos/Family.proto
@@ -431,6 +431,7 @@ import "CommonProto.proto";
 		optional int32 pathId = 1;
 		optional string guildName = 2;
 		optional int32 gid = 3;
+		optional string serverName = 4;
 	}
 	
 	message GetDeathPathStatusResponse{
diff --git a/protos/HeroInfoProto.proto b/protos/HeroInfoProto.proto
index da05422..4abc34c 100644
--- a/protos/HeroInfoProto.proto
+++ b/protos/HeroInfoProto.proto
@@ -134,6 +134,10 @@ import "CommonProto.proto";
 		optional bool isSendFinish =2; //是否发送完成
 	}
 
+	message GetAllPokemonRequest{
+		optional int32 start = 1;//从哪开始，每次20个
+	}
+	
 	message GetAllPokemonResponse{
 		repeated PokemonInfo pokemonInfo =1;
 		repeated TeamPokemonInfo teamPokemonInfos = 2; // 异妖编队
diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto
index 53aaecc..bf4ac66 100644
--- a/protos/MessageTypeProto.proto
+++ b/protos/MessageTypeProto.proto
@@ -1100,6 +1100,14 @@ enum MessageType{
 	WorldLevelIndication= 303673;//世界等级推送
 	
 	
+	//303691 - 303692 新将来袭
+	NewGeneralAttackRequest = 303691;
+	NewGeneralAttackResponse = 303692;
+	
+	// 303701 - 303702 建木神树
+	UpgradeGodTreeRequest = 303701;
+	UpgradeGodTreeResponse = 303702;
+		
 	//800000起为global 协议
 	GetWorldServerRequest = 800001;//获取世界服ip
 	GetWorldServerResponse = 800002;
@@ -1127,6 +1135,12 @@ enum MessageType{
 	
 	GetRankRequest = 900011;
 	
+	AddDeathPathRankRequest = 900012;
+	
+	GetDeathPathFirstRequest = 900013;
+	
+	GetDeathPathRewardRequest = 900014;
+
 	
 }
 
diff --git a/protos/PlayerInfoProto.proto b/protos/PlayerInfoProto.proto
index e879a73..b0fce06 100644
--- a/protos/PlayerInfoProto.proto
+++ b/protos/PlayerInfoProto.proto
@@ -405,6 +405,7 @@ import "CommonProto.proto";
 	message UpdateBagIndication{
 		optional int32 type =1; //更新背包类型 0： 普通背包 1： 临时背包
 		repeated Item item =2;
+		optional int32 isMax = 3;//本次更新是否有物品超过了限制
 	}
 
 	message ModifyDecorationRequest{
diff --git a/protos/gtwprotos/WorldProto.proto b/protos/gtwprotos/WorldProto.proto
index 4bed7c5..ccf0be4 100644
--- a/protos/gtwprotos/WorldProto.proto
+++ b/protos/gtwprotos/WorldProto.proto
@@ -92,9 +92,62 @@ import "CommonProto.proto";
 		optional int32 type = 1;//种类id
 		optional int32 acitvityId = 2;//活动id
 		optional int32 crossId =3;//大区id
+		optional int32 uid = 4;//用户id
 	}
 	message GetRankResponse{
 		repeated rpc.protocols.UserRank ranks = 1;
 		optional rpc.protocols.RankInfo myRankInfo = 2;
 	}
+	message CrossUser{
+		optional int32 uid = 1;
+		optional string username = 2;
+	}
+	message AddDeathPathRankRequest{
+		optional int32 uid = 1;
+		optional CrossUser crossUserInfo = 2;
+		optional int32 guildId = 3;
+		optional int32 damage = 4;
+		optional int32 pathId = 5;
+		optional int32 groupId = 6;
+	}
+	message AddDeathPathRankResponse{
+	
+	}
+	message EvertDeathPath{
+		optional int32 gid = 1;
+		optional string guildName = 2;
+		optional int32 pathId = 3;
+		optional string serverName =4;
+	}
+	message GetDeathPathFirstRequest{
+		optional int32 groupId = 1;
+	}
+	message GetDeathPathFirstResponse{
+		repeated EvertDeathPath deathPathInfo = 1;
+	}
+	message GetDeathPathRewardRequest{
+		optional int32 groupId =1;
+		optional int32 guildId = 2;
+	}
+	message GetDeathPathRewardResponse{
+		optional int32 rankTotal = 1;
+	}
+	
+	message GuildRank{
+		optional int32 guildId = 1;
+		optional int32 rank = 2;
+	}
+	//服务器整个结算
+	message DeathPathWorldRewardRequest{
+		optional int32 groupId =1;
+	}
+	message DeathPathWorldRewardResponse{
+		repeated GuildRank ranks = 1;//所有需要发奖的公会id
+	}
+	
+	
+	
+	
+	
+	
 	
\ No newline at end of file