From 9e63e79023175c5d6bac23b1f1baa9fc2ef52edd Mon Sep 17 00:00:00 2001
From: zqj <582132116@qq.com>
Date: Thu, 1 Dec 2022 15:59:58 +0800
Subject: [PATCH] fix: proto协议号恢复到10月，新增协议号放到末尾

---
 game.proto      | 182 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------
 protocode.proto |  58 +++++++++++++++++++++++++++++-----------------------------
 2 files changed, 120 insertions(+), 120 deletions(-)

diff --git a/game.proto b/game.proto
index b910f69..d5b055b 100644
--- a/game.proto
+++ b/game.proto
@@ -54,14 +54,6 @@ message HeroEquipReferRar {
   bool refer = 3; //true 穿戴， false 脱下
 }
 
-message HeroFragmentCovertReq {
-  string hero_id = 1;
-}
-
-message HeroFragmentCovertRsp {
-  models.Hero hero = 1;
-}
-
 message RoleUpdatePropertyNty {
   repeated string keys = 1;
   models.Role role = 2;
@@ -142,67 +134,6 @@ message RoleCostRsp {
   int32 cur = 1;
 }
 
-message RoleLogOutRar {
-}
-
-message RoleDrawCardReq {
-  int32 group_id = 1;
-  int32 pool_id = 2;
-  int32 draw_count = 3;
-}
-
-message RoleDrawCardRsp {
-  string reward = 1;
-}
-
-message RoleCdKeyReq {
-  string cdkey = 1;
-}
-
-message RoleCdKeyRsp {
-  string reward = 1;
-}
-
-message RoleStartClimbReq {
-  int32 chapter_id = 1;
-  int32 carbon_id = 2;
-  string team_id = 3;
-}
-
-message RoleStartClimbRsp {
-}
-
-message RoleMiddleClimbReq {
-  int32 chapter_id = 1;
-  int32 carbon_id = 2;
-  string team_id = 3;
-}
-
-message RoleMiddleClimbRsp {
-  string reward = 1;
-  int64 timestamp = 2;
-}
-
-message RoleEndClimbReq {
-  int32 chapter_id = 1;
-  int32 carbon_id = 2;
-  string team_id = 3;
-}
-
-message RoleEndClimbRsp {
-  string reward = 1;
-  int32 hishigh = 2;
-  int64 timestamp = 3;
-}
-
-message RoleRankClimbReq {
-  int32 chapter_id = 1;
-}
-
-message RoleRankClimbRsp {
-  repeated models.RankClimb rank = 1;
-}
-
 message EquipmentDelReq {
   repeated string id = 1;
 }
@@ -223,27 +154,6 @@ message EquipmentEnhanceRsp {
   models.Equipment equip = 1;
 }
 
-message EquipmentSetGemReq {
-  string equip_id = 1;
-  string gem_id = 2;
-}
-
-message EquipmentSetGemRsp {
-  string equip_id = 1;
-  string gem_ids = 2;
-}
-
-message EquipmentDelGemReq {
-  string equip_id = 1;
-  string gem_id = 2;
-}
-
-message EquipmentDelGemRsp {
-  string equip_id = 1;
-  string gem_ids = 2;
-  string reward = 3;
-}
-
 message HeroUpLevelReq {
   string heroId = 1;
   string items = 2; // [itemId1=count1, itemId2=count2]
@@ -320,6 +230,97 @@ message StoreUpdatePropertyNty {
   models.Store store = 2;
 }
 
+message HeroFragmentCovertReq {
+  string hero_id = 1;
+}
+
+message HeroFragmentCovertRsp {
+  models.Hero hero = 1;
+}
+
+message RoleLogOutRar {
+}
+
+message RoleDrawCardReq {
+  int32 group_id = 1;
+  int32 pool_id = 2;
+  int32 draw_count = 3;
+}
+
+message RoleDrawCardRsp {
+  string reward = 1;
+}
+
+message RoleCdKeyReq {
+  string cdkey = 1;
+}
+
+message RoleCdKeyRsp {
+  string reward = 1;
+}
+
+message RoleStartClimbReq {
+  int32 chapter_id = 1;
+  int32 carbon_id = 2;
+  string team_id = 3;
+}
+
+message RoleStartClimbRsp {
+}
+
+message RoleMiddleClimbReq {
+  int32 chapter_id = 1;
+  int32 carbon_id = 2;
+  string team_id = 3;
+}
+
+message RoleMiddleClimbRsp {
+  string reward = 1;
+  int64 timestamp = 2;
+}
+
+message RoleEndClimbReq {
+  int32 chapter_id = 1;
+  int32 carbon_id = 2;
+  string team_id = 3;
+}
+
+message RoleEndClimbRsp {
+  string reward = 1;
+  int32 hishigh = 2;
+  int64 timestamp = 3;
+}
+
+message RoleRankClimbReq {
+  int32 chapter_id = 1;
+}
+
+message RoleRankClimbRsp {
+  repeated models.RankClimb rank = 1;
+}
+
+message EquipmentSetGemReq {
+  string equip_id = 1;
+  string gem_id = 2;
+}
+
+message EquipmentSetGemRsp {
+  string equip_id = 1;
+  string gem_ids = 2;
+}
+
+message EquipmentDelGemReq {
+  string equip_id = 1;
+  string gem_id = 2;
+}
+
+message EquipmentDelGemRsp {
+  string equip_id = 1;
+  string gem_ids = 2;
+  string reward = 3;
+}
+
+
 message ItemGemCompoundReq {
   int32 gem_id = 1;
   int32 gem_count = 2;
@@ -364,4 +365,3 @@ message GemSliceRewardReq {
 message GemSliceRewardRsp {
   string reward = 1;
 }
-
diff --git a/protocode.proto b/protocode.proto
index a9ec168..1482642 100644
--- a/protocode.proto
+++ b/protocode.proto
@@ -11,35 +11,35 @@ enum ProtoCode
 	CreateRpc = 503;
 	ChangeTeamRpc = 504;
 	HeroEquipReferRpc = 505;
-	HeroFragmentCovertRpc = 506;
-	RoleClearItemsRpc = 507;
-	RoleStartBattleRpc = 508;
-	RoleEndBattleRpc = 509;
-	RoleGuideRpc = 510;
-	RoleTaskRpc = 511;
-	RoleOpenBoxRpc = 512;
-	RoleBuffRpc = 513;
-	RoleResetChapterRpc = 514;
-	RoleCostRpc = 515;
-	RoleLogOutRpc = 516;
-	RoleDrawCardRpc = 517;
-	RoleCdKeyRpc = 518;
-	RoleStartClimbRpc = 519;
-	RoleMiddleClimbRpc = 520;
-	RoleEndClimbRpc = 521;
-	RoleRankClimbRpc = 522;
-	EquipmentDelRpc = 523;
-	EquipmentEnhanceRpc = 524;
-	EquipmentSetGemRpc = 525;
-	EquipmentDelGemRpc = 526;
-	HeroUpLevelRpc = 527;
-	HeroReinRpc = 528;
-	HeroSkillUpLevelRpc = 529;
-	EmailListRpc = 530;
-	EmailDrawRpc = 531;
-	EmailCheckRpc = 532;
-	EmailDelRpc = 533;
-	StoreBuyRpc = 534;
+	RoleClearItemsRpc = 506;
+	RoleStartBattleRpc = 507;
+	RoleEndBattleRpc = 508;
+	RoleGuideRpc = 509;
+	RoleTaskRpc = 510;
+	RoleOpenBoxRpc = 511;
+	RoleBuffRpc = 512;
+	RoleResetChapterRpc = 513;
+	RoleCostRpc = 514;
+	EquipmentDelRpc = 515;
+	EquipmentEnhanceRpc = 516;
+	HeroUpLevelRpc = 517;
+	HeroReinRpc = 518;
+	HeroSkillUpLevelRpc = 519;
+	EmailListRpc = 520;
+	EmailDrawRpc = 521;
+	EmailCheckRpc = 522;
+	EmailDelRpc = 523;
+	StoreBuyRpc = 524;
+	HeroFragmentCovertRpc = 525;
+	RoleLogOutRpc = 526;
+	RoleDrawCardRpc = 527;
+	RoleCdKeyRpc = 528;
+	RoleStartClimbRpc = 529;
+	RoleMiddleClimbRpc = 530;
+	RoleEndClimbRpc = 531;
+	RoleRankClimbRpc = 532;
+	EquipmentSetGemRpc = 533;
+	EquipmentDelGemRpc = 534;
 	ItemGemCompoundRpc = 535;
 	GemSliceRpc = 536;
 	GemSliceStopRpc = 537;
--
libgit2 0.21.2