From 384983c641bd2dc8ee897cac16988b1f7aefa441 Mon Sep 17 00:00:00 2001
From: zhangshanxue <zhangshanxue@lanjinshidai.com.cn>
Date: Thu, 5 Sep 2019 10:18:14 +0800
Subject: [PATCH] =?UTF-8?q?=E9=AD=82=E5=8D=B0=E5=8D=8F=E8=AE=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 protos/CommonProto.proto      |  2 ++
 protos/HeroInfoProto.proto    | 48 +++++++++++++++++++++++++++++++++--
 protos/MessageTypeProto.proto | 17 +++++++++++++
 protos/PlayerInfoProto.proto  |  2 +-
 4 files changed, 66 insertions(+), 3 deletions(-)

diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto
index 5dbc9dc..4e3a404 100644
--- a/protos/CommonProto.proto
+++ b/protos/CommonProto.proto
@@ -64,6 +64,7 @@ option optimize_for = SPEED;
 		optional int32 createTime = 6;//入手时间
 		optional int32 skillId = 7;//装备附带技能
 		optional int32 isLocked = 8; //是否被锁定 1：被锁定 0:未锁定
+		optional int32 exp = 9; //字段可选 魂印传入经验
 	}
 
 
@@ -82,6 +83,7 @@ option optimize_for = SPEED;
 		optional int32 starBreakId = 10 ;//升星对应的breakId
 		
 		repeated string especialEquip = 11;//所穿戴法宝
+		repeated string soulEquipIdList = 12;//魂印
 	}
 
 	message FightUnitInfo {
diff --git a/protos/HeroInfoProto.proto b/protos/HeroInfoProto.proto
index 08ba3b5..937537a 100644
--- a/protos/HeroInfoProto.proto
+++ b/protos/HeroInfoProto.proto
@@ -58,12 +58,45 @@ import "CommonProto.proto";
 		optional int32 type = 3;//1为英雄进阶 2为法宝进阶
 	}
 
+	message UpSoulEquipRequest{
+		optional string pos = 1; //升级槽位
+		optional string equipId = 2; //升级魂印id
+	}
+	
+	message UpQuickSoulEquipRequest{
+		optional string pos = 1; //升级槽位
+		optional string equipId = 2; //升级魂印id
+		repeated string soulEquipIds= 3; //消耗信息
+	}
+	
+	message UpSoulEquipResponse{
+		optional string pos = 1; //升级槽位、
+		optional string equipId = 2; //升级魂印id
+		optional int32 leve =3;//经验
+		optional int32 exp =4;//等级
+		repeated string soulEquipIds= 5; //消耗信息
+	}
 	
 	message EquipWearRequest{
 		optional string heroId =1 ; //所穿英雄id
 		repeated string equipId =2 ; //装备id
 		optional int32 type = 3;//1、装备 ；2、法宝
 	}
+	
+	
+	message SoulEquipWearRequest{
+		optional string heroId =1 ; //所穿英雄id
+		repeated SoulEquipPos soulEquipIds =2 ; //装备id
+	}
+	message SoulEquipUnLoadWearRequest{
+		optional string heroId =1 ; //所穿英雄id
+		repeated SoulEquipPos soulEquipIds =2 ; //装备id
+	}
+
+	message SoulEquipPos{
+		optional string equipId =1 ; //装备id
+		optional int32 position= 2; //卡槽位置
+	}
 
 	message EquipUnLoadOptRequest{
 		optional string heroId = 1;
@@ -79,7 +112,7 @@ import "CommonProto.proto";
 	}
 	message GetAllEquipRequest{
 		optional int32 index = 1; //第一次请求索引为0, 第二次:第一次索引+每页的数量
-		optional int32 type = 2;//1、装备 ；2、法宝
+		optional int32 type = 2;//1、装备 ；2、法宝、3魂印
 		
 	}
 	message GetAllEquipResponse{
@@ -113,5 +146,16 @@ import "CommonProto.proto";
 		repeated RingFireInfo ringFireInfo =1;
 	}
 
-
+	message SoulRandRequest{
+		optional int32 time =1; //次数
+	}
+	message SoulRandResponse{
+		optional Drop drop = 1;//掉落
+		optional int32 pos = 2;
+	}
 	
+	message SoulForceRandRequest{
+	}
+	message SoulForceRandResponse{
+		optional int32 pos = 1;
+	}
diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto
index 4b96498..d8803dc 100644
--- a/protos/MessageTypeProto.proto
+++ b/protos/MessageTypeProto.proto
@@ -153,6 +153,7 @@ enum MessageType{
 	
 	ENDLESS_MIN_MAP_INFO_REQUEST = 10421;//无尽副本小地图信息
 	ENDLESS_MIN_MAP_INFO_RESPONSE = 10422;
+	
 		
 // F 10500
     FIGHT_START_REQUEST   = 10500; //
@@ -553,6 +554,16 @@ enum MessageType{
 
     SCENE_GAME_OVER_INDICATION = 11830; // 场景结算
 	
+	SOUL_EQUIP_WEAR_REQUEST = 11831; // 安装魂印
+    SOUL_EQUIP_WEAR_RESPONSE = 11832;
+
+    SOUL_EQUIP_UNLOAD_OPT_REQUEST = 11833; //卸下魂印
+    SOUL_EQUIP_UNLOAD_OPT_RESPONSE = 11834;
+	
+	SOUL_RAND_EQUIP_REQUEST = 11835; //抽魂印
+    SOUL_RAND_EQUIP_RESPONSE = 11836;
+	SOUL_FORCE_RAND_EQUIP_REQUEST = 11837; //抽魂印
+    SOUL_FORCE_RAND_EQUIP_RESPONSE = 11838;
 
 // T 11900
     TRIGGER_EVENT_REQUEST   = 11900; //
@@ -606,6 +617,12 @@ enum MessageType{
 	
 	UPDATE_QUESTION_REQUEST = 12015; //问卷
 	UPDATE_QUESTION_RESPONSE = 12016;
+	
+	
+	UP_SOUL_EQUIP_REQUEST = 12017; // 升一级
+    UP_SOUL_EQUIP_QUICK_REQUEST = 12018;
+    UP_SOUL_UNLOAD_RESPONSE = 12019; //快速升级
+
 
 // V 12100
     VIEW_FIGHTREPLAY_REQUEST = 12100; // 查看战斗回放
diff --git a/protos/PlayerInfoProto.proto b/protos/PlayerInfoProto.proto
index a084ca7..e7b7f39 100644
--- a/protos/PlayerInfoProto.proto
+++ b/protos/PlayerInfoProto.proto
@@ -77,7 +77,7 @@ import "CommonProto.proto";
 	}
 
 	message UseAndPriceItemRequest{
-		optional int32 type = 1; //0:使用 1:分解物品 2：分解装备3:分解妖灵师 4：分解法宝
+		optional int32 type = 1; //0:使用 1:分解物品 2：分解装备3:分解妖灵师 4：分解法宝 5:分解魂印
 		optional int32 itemId = 2;
 		repeated Item items = 3;
 		repeated string equipIds = 4;