From 19efcf3ff1ae8977a99213b254c714a3e05f6554 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Mon, 13 Feb 2023 18:45:55 +0800
Subject: [PATCH] 1

---
 server/gameserver/player.cc      | 5 ++++-
 server/gameserver/selfchecker.cc | 1 +
 server/gameserver/skill.cc       | 3 +++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc
index 501b2d0e..d53ca67c 100644
--- a/server/gameserver/player.cc
+++ b/server/gameserver/player.cc
@@ -35,6 +35,7 @@
 #include "mt/Buff.h"
 #include "mt/Text.h"
 #include "mt/Map.h"
+#include "mt/PveGemini.h"
 
 const int kREVIVE_BUFF_ID = 1005;
 
@@ -89,7 +90,7 @@ void Player::Initialize()
         }
 #ifdef DEBUG
         {
-            std::vector<int> present_items{30202, 30201, 30301, 30203, 30207, 30208, 30209, 30210, 30204, 30205, 30206};
+            std::vector<int> present_items{30202, 30201, 30301, 30203, 30207, 30208, 30209, 30210, 30204, 30205, 30206, 30302, 30303};
             for (int item_id : present_items) {
                 GMAddItem(item_id, 10);
             }
@@ -1372,6 +1373,8 @@ void Player::PushJoinRoomMsg()
         notifymsg.set_started(false);
         notifymsg.set_room_uuid(a8::XValue(room->GetRoomUuid()).GetString());
         notifymsg.set_match_mode(GetBattleContext()->GetMatchMode());
+        notifymsg.set_pve_instance_id(room->pve_instance ? room->pve_instance->gemini_id() : 0);
+        notifymsg.set_mapid(room->GetMapMeta()->map_id());
         GGListener::Instance()->SendToClient(socket_handle, 0, notifymsg);
         #ifdef DEBUG
         a8::XPrintf("PushJoinRooMmsg %d\n", {GetUniId()});
diff --git a/server/gameserver/selfchecker.cc b/server/gameserver/selfchecker.cc
index 11e67374..f77ba342 100644
--- a/server/gameserver/selfchecker.cc
+++ b/server/gameserver/selfchecker.cc
@@ -23,6 +23,7 @@ void SelfChecker::Init()
         AddBuff(202013);
         AddBuff(204014);
         AddBuff(209016);
+        AddBuff(208014);
     }
     auto fields = a8::GetEnumFields<SpecBuffId_e>();
     for (auto& pair : *fields) {
diff --git a/server/gameserver/skill.cc b/server/gameserver/skill.cc
index 8ab29c12..707258a3 100644
--- a/server/gameserver/skill.cc
+++ b/server/gameserver/skill.cc
@@ -439,14 +439,17 @@ void Skill::ProcJSHX()
              if (owner->GetCurrWeapon()->meta->id() != weapon_id) {
                  return;
              }
+             #if 0
              if (!owner->GetCurrWeapon()->skill_meta ||
                  owner->GetCurrWeapon()->skill_meta->GetMagicId() != MAGIC_HLYZ) {
                  return;
              }
+             #endif
              if (!owner->dead) {
                  float add_hp = SkillHelper::GetJshxHp(owner, meta);
                  float real_add_hp = std::max(0.0f, std::min(owner->GetMaxHP() - owner->GetHP(), add_hp));
                  owner->AddHp(add_hp);
+                 owner->TryAddBuff(owner, 208014);
 #ifdef DEBUG
              {
                  std::string dbg_msg = a8::Format