From 7953508f8a480067b9585308ba8176a107908f6b Mon Sep 17 00:00:00 2001
From: jiahuiwen <jiahuiwen@qq.com>
Date: Tue, 20 Oct 2020 17:26:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E5=BC=82=E5=A6=96=E7=BC=96?=
 =?UTF-8?q?=E9=98=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 protos/CommonProto.proto      | 3 +--
 protos/FightInfoProto.proto   | 7 +++++++
 protos/HeroInfoProto.proto    | 6 ++++++
 protos/MessageTypeProto.proto | 3 +++
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto
index fa75000..6fc05ed 100644
--- a/protos/CommonProto.proto
+++ b/protos/CommonProto.proto
@@ -188,14 +188,13 @@ option optimize_for = SPEED;
 
 	message TeamPokemonInfo{
 		optional int32 position =1;
-		optional int32 pokemonId = 2;
+		optional string pokemonId = 2;
 	}
 
 	message TeamPosInfo{
 		optional int32 teamId = 1; //第几编队
 		optional string teamName =2; //编码名称
 		repeated TeamHeroInfo teamHeroInfos = 3; //队伍英雄id
-		repeated TeamPokemonInfo teamPokemonInfos = 4; // 异妖id
 	}
 
 	message Pokemoncomonpent{
diff --git a/protos/FightInfoProto.proto b/protos/FightInfoProto.proto
index 170c524..b71df01 100644
--- a/protos/FightInfoProto.proto
+++ b/protos/FightInfoProto.proto
@@ -232,5 +232,12 @@ import "CommonProto.proto";
 		optional FightData fightData = 3;
 	}
 
+	// 通关开启礼包
+	message RechargeInfoIndication{
+		optional int32 rechargeId = 1;	// RechargeCommodityConfig id
+		optional int32 buyCount = 2; 	// 已购买次数
+		optional int32 leftTime = 3; 	// 礼包剩余购买时间
+	}
+
 
 
diff --git a/protos/HeroInfoProto.proto b/protos/HeroInfoProto.proto
index c21dbde..ecc2140 100644
--- a/protos/HeroInfoProto.proto
+++ b/protos/HeroInfoProto.proto
@@ -136,6 +136,12 @@ import "CommonProto.proto";
 
 	message GetAllPokemonResponse{
 		repeated PokemonInfo pokemonInfo =1;
+		repeated TeamPokemonInfo teamPokemonInfos = 2; // 异妖编队
+	}
+
+	// 替换异妖编队
+	message ReplaceTeamPokemonInfoRequest {
+		repeated TeamPokemonInfo teamPokemonInfos = 1; // 异妖编队
 	}
 
 	message PokenmonUpLevelRequest{//灵兽升级
diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto
index 76321c4..ffed372 100644
--- a/protos/MessageTypeProto.proto
+++ b/protos/MessageTypeProto.proto
@@ -674,6 +674,9 @@ enum MessageType{
     PLAY_WITH_SB_REQUEST = 11505; //切磋
     PLAY_WITH_SB_RESPONSE = 11506;
 	PRIVILLEGE_ADD_INDICATION = 11507;//特权添加推送
+
+	POKEMON_REPLACE_REQUEST = 11508;  // 替换异妖编队
+	POKEMON_REPLACE_RESPONSE = 11509;
 	
 // Q 11600
 	QUESTION_INDICATION = 11600;//问卷推送