From f230ee1b52803a358c29d679cff8450952c9563e Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Tue, 23 May 2023 11:02:02 +0800
Subject: [PATCH] 1

---
 server/gameserver/constant.h           | 12 +++++++++---
 server/gameserver/human.cc             |  4 +++-
 server/gameserver/room.cc              |  3 +++
 server/tools/protobuild/cs_proto.proto |  7 +++++++
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/server/gameserver/constant.h b/server/gameserver/constant.h
index c4b6dd25..79322ab2 100644
--- a/server/gameserver/constant.h
+++ b/server/gameserver/constant.h
@@ -182,10 +182,8 @@ enum EquipType_e
     EQUIP_TYPE_SPOILS = 12,
     EQUIP_TYPE_SINGAL_EMITTER = 13,
     EQUIP_TYPE_GIFT_PACKAGE = 14,
-    EQUIP_TYPE_YELLOW_STONE = 15,
+    EQUIP_TYPE_GEMSTONE = 15,
     EQUIP_TYPE_LOVE = 16,
-    EQUIP_TYPE_BLUE_STONE = 17,
-    EQUIP_TYPE_PURPLE_STONE = 18,
     EQUIP_TYPE_End
 };
 
@@ -195,6 +193,14 @@ enum GunSubEquipType_e
     GUN_SUB_EQUIP_TYPE_End
 };
 
+enum GemStoneSubEquipType_e
+{
+    GEMSTONE_SUB_EQUIP_ENERGY = 1,
+    GEMSTONE_SUB_EQUIP_SKILL = 2,
+    GEMSTONE_SUB_EQUIP_SHIELD = 3,
+    GEMSTONE_SUB_EQUIP_TYPE_End
+};
+
 enum ThrowSubEquipType_e
 {
     THROW_EQUIP_TYPE_ADD_BUFF = 3,
diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc
index 4f0fc7e0..5b460369 100644
--- a/server/gameserver/human.cc
+++ b/server/gameserver/human.cc
@@ -2770,7 +2770,7 @@ void Human::ProcAddItemDto(AddItemDTO& dto)
             ProcGiftPackage(dto);
         }
         break;
-    case EQUIP_TYPE_YELLOW_STONE:
+    case EQUIP_TYPE_GEMSTONE:
         {
             ProcYellowStoneItem(dto);
         }
@@ -2780,6 +2780,7 @@ void Human::ProcAddItemDto(AddItemDTO& dto)
             ProcLoveItem(dto);
         }
         break;
+#if 0
     case EQUIP_TYPE_BLUE_STONE:
         {
             ProcBlueStoneItem(dto);
@@ -2790,6 +2791,7 @@ void Human::ProcAddItemDto(AddItemDTO& dto)
             ProcPurpleStoneItem(dto);
         }
         break;
+#endif
     default:
         {
             ProcLootSpecItem(dto);
diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index f8147dda..64bf06fe 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -2259,6 +2259,9 @@ void Room::NotifyGameStart()
 
 long long Room::GetGasInactiveTime()
 {
+#ifdef DEBUG
+    return 30;
+#endif
     if (IsPveRoom()) {
         return 10;
     } else {
diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto
index 59105897..7e5d6440 100755
--- a/server/tools/protobuild/cs_proto.proto
+++ b/server/tools/protobuild/cs_proto.proto
@@ -361,6 +361,10 @@ message MFPlayerFull
     optional int32 hero_level = 72; //hero等级
 
     optional int32 team_member_num = 70 [default = 0]; //队伍成员数
+
+    optional int32 armor_shield = 73; //能量护甲
+    optional int32 max_armor_shield = 74; //最大能量护甲
+
 }
 
 //阻挡物-部分
@@ -625,6 +629,9 @@ message MFActivePlayerData
     optional int32 dive_oxygen_curr = 64; //下潜时氧气当前量
 
     optional int32 gemstone = 68; //宝石
+
+    optional int32 armor_shield = 73; //能量护甲
+    optional int32 max_armor_shield = 74; //最大能量护甲
 }
 
 //毒圈数据