1

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)
+{
+
+}

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();

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 {

server/gameserver/skill.cc

@@ -255,6 +255,7 @@ void Skill::InitActiveSkill()
              }
          },
          &xtimer_attacher);
+    actived_ = !owner->GetBattleContext()->IsMainSkill(this);
 }
 
 void Skill::InitPassiveSkill()