From f48f2a6baecfc4a64c9d3a36642269c530f83f6b Mon Sep 17 00:00:00 2001
From: duhui <d1769111741@163.com>
Date: Mon, 5 Sep 2022 13:34:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BB=BA=E6=9C=A8=E7=A5=9E=E6=A0=91=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 protos/ActivityProto.proto |  7 -------
 protos/CommonProto.proto   | 14 ++++----------
 protos/HeroInfoProto.proto |  9 ++++++++-
 3 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/protos/ActivityProto.proto b/protos/ActivityProto.proto
index e04b03c..47ccb75 100644
--- a/protos/ActivityProto.proto
+++ b/protos/ActivityProto.proto
@@ -51,13 +51,6 @@ import "CommonProto.proto";
 		optional Drop drop = 2;
 	}
 	
-	// 建木神树
-	message UpgradeGodTreeRequest{
-		optional int32 count = 1;
-	}
-	message UpgradeGodTreeResponse{
-	}
-	
 	//扭转乾坤
 	message GoodLuckRequest{
 		optional int32 activityId = 1;
diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto
index f61a437..345ad88 100644
--- a/protos/CommonProto.proto
+++ b/protos/CommonProto.proto
@@ -39,7 +39,6 @@ option optimize_for = SPEED;
 		optional int32 ride = 22;//坐骑
 		optional int32 rideLevel = 23;//坐骑等级
 		optional int32 sex = 24;//玩家性别 0男1女
-		optional int32 treeLevel = 25;// 神树等级
 	}
 
 	 message Privilege{
@@ -70,15 +69,10 @@ option optimize_for = SPEED;
 	message Equip{
 		optional string id = 1; 
 		optional int32 equipId = 2;
-		optional SpecialEffects mainAttribute = 3;
-		repeated SpecialEffects secondAttribute = 4;
-		optional int32 rebuildLevel = 5; //重铸等级（对应宝器精炼等级）
-		optional int32 createTime = 6;//入手时间
-		optional int32 skillId = 7;//装备附带技能
-		optional int32 isLocked = 8; //是否被锁定 1：被锁定 0:未锁定
-		optional int32 exp = 9; //字段可选 魂印传入经验（对应宝器强化等级）
-		optional int32 treeLv = 10;// 神树等级
-		optional int32 fourSpirit = 11;//四灵试炼层数
+		optional int32 rebuildLevel = 3; //重铸等级（对应宝器精炼等级）
+		optional int32 exp = 4; //字段可选 魂印传入经验（对应宝器强化等级）
+		optional int32 treeLv = 5;// 神树等级
+		optional int32 fourSpirit = 6;//四灵试炼层数
 	}
 
 	message SoulPos{
diff --git a/protos/HeroInfoProto.proto b/protos/HeroInfoProto.proto
index 7110e00..3d7db83 100644
--- a/protos/HeroInfoProto.proto
+++ b/protos/HeroInfoProto.proto
@@ -607,4 +607,11 @@ import "CommonProto.proto";
 	message HomeEquipStrongResetResponse{
 		optional Drop drop = 1;
 	}
-	
\ No newline at end of file
+	
+	// 建木神树升级
+	message UpgradeGodTreeRequest{
+		optional string jewelId = 1;//魂灵宝id
+		optional int32 count = 2;//升几级
+	}
+	message UpgradeGodTreeResponse{
+	}
\ No newline at end of file