From b53700bb121070912bf5c9efd337dd20f9ce6822 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Mon, 22 May 2023 14:56:18 +0800
Subject: [PATCH] 1

---
 server/gameserver/netdata.cc | 6 ++++++
 server/gameserver/netdata.h  | 2 ++
 server/gameserver/room.cc    | 3 ---
 server/gameserver/skill.cc   | 1 +
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/server/gameserver/netdata.cc b/server/gameserver/netdata.cc
index e8c592be..a63761c8 100644
--- a/server/gameserver/netdata.cc
+++ b/server/gameserver/netdata.cc
@@ -49,6 +49,7 @@ public:
     const mt::Hero* hero_meta = nullptr;
     std::shared_ptr<a8::XObject> hero_dto;
     int spec_skill_id = 0;
+    int main_skill_id = 0;
 
     float GetHP()
     {
@@ -1045,3 +1046,8 @@ int BattleDataContext::GetHeroLevel()
 {
     return std::max(hero_lv_, 1);
 }
+
+bool BattleDataContext::IsMainSkill(Skill* skill)
+{
+
+}
diff --git a/server/gameserver/netdata.h b/server/gameserver/netdata.h
index 70ba0e68..fd2dab8e 100644
--- a/server/gameserver/netdata.h
+++ b/server/gameserver/netdata.h
@@ -14,6 +14,7 @@ class Weapon;
 struct PlayerStats;
 class HeroAbility;
 class WeaponAbility;
+class Skill;
 struct BattleDataContext
 {
     std::shared_ptr<cs::CMJoin> join_msg;
@@ -79,6 +80,7 @@ struct BattleDataContext
     int GetSkinId();
     int GetLevel();
     int GetHeroLevel();
+    bool IsMainSkill(Skill* skill);
 
 private:
     void Clear();
diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index 264b760f..604dd1df 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -2259,9 +2259,6 @@ void Room::NotifyGameStart()
 
 long long Room::GetGasInactiveTime()
 {
-#ifdef DEBUG
-    return IsSandTableRoom() ? 30 : 10;
-#endif
     if (IsPveRoom()) {
         return 10;
     } else {
diff --git a/server/gameserver/skill.cc b/server/gameserver/skill.cc
index 92ff1d58..4c917094 100644
--- a/server/gameserver/skill.cc
+++ b/server/gameserver/skill.cc
@@ -255,6 +255,7 @@ void Skill::InitActiveSkill()
              }
          },
          &xtimer_attacher);
+    actived_ = !owner->GetBattleContext()->IsMainSkill(this);
 }
 
 void Skill::InitPassiveSkill()