diff --git a/server/gameserver/attrdefine.h b/server/gameserver/attrdefine.h index 26897d8e..385a3196 100644 --- a/server/gameserver/attrdefine.h +++ b/server/gameserver/attrdefine.h @@ -126,5 +126,7 @@ enum HumanVirtualAttrType_e kHVAT_WeaponExplosionRange = 1012, kHVAT_SkillTime = 1013, kHVAT_DirectAtk = 1014, + kHVAT_Volume = 1015, + kHVAT_FireRate = 1016, kHVAT_End }; diff --git a/server/gameserver/bullet.cc b/server/gameserver/bullet.cc index b9bdc195..0be55bda 100644 --- a/server/gameserver/bullet.cc +++ b/server/gameserver/bullet.cc @@ -505,16 +505,7 @@ float Bullet::GetAtk() atk *= android->ai->GetAttackRate(); #endif } - #if 0 - //888 - float attr_rate = 1 + ability_->GetAttrRate(kXHAT_Atk); - if (IsCurrWeapon()) { - attr_rate += ability_->GetAttrRate(kHVAT_WeaponDmg); - } - return atk * attr_rate; - #else return atk; - #endif } float Bullet::GetExplosionRange() diff --git a/server/gameserver/mt/Buff.cc b/server/gameserver/mt/Buff.cc index 22db6390..15d749a1 100644 --- a/server/gameserver/mt/Buff.cc +++ b/server/gameserver/mt/Buff.cc @@ -10,29 +10,6 @@ IMPL_TABLE(mt::Buff) -static std::map> attr_buffs; -static std::set ok_buffs{kXHAT_Hp, - kXHAT_Atk, - kXHAT_Def, - kXHAT_Speed, - kXHAT_ShotRange, - kXHAT_FireRate, - kXHAT_Volume, - kXHAT_CRIT, - kXHAT_CRIT_DAMAGE_RATE, - kHVAT_Dmg, - kHVAT_BulletAngle}; - -static void AddCheckAttrBuff(int attr_id, mt::Buff* buff_meta) -{ - auto itr = attr_buffs.find(attr_id); - if (itr == attr_buffs.end()) { - attr_buffs[attr_id] = std::vector({buff_meta}); - } else { - itr->second.push_back(buff_meta); - } -} - namespace mt { @@ -358,32 +335,6 @@ namespace mt void Buff::Init2() { - { - /* -2024-01-04 15:44:27 check attr_buffs: 1 //kHAT_Hp = 1, -2024-01-04 15:44:27 check attr_buffs: 3 //kHAT_Atk = 3, -2024-01-04 15:44:27 check attr_buffs: 4 //kHAT_Def = 4, -2024-01-04 15:44:27 check attr_buffs: 5 //kHAT_Speed -2024-01-04 15:44:27 check attr_buffs: 6 //kHAT_ShotRange = 6, -2024-01-04 15:44:27 check attr_buffs: 9 //kHAT_FireRate = 9, -2024-01-04 15:44:27 check attr_buffs: 10 //kHAT_Volume = 10, -2024-01-04 15:44:27 check attr_buffs: 42 //kHAT_CRIT = 42, -2024-01-04 15:44:27 check attr_buffs: 43 //kHAT_CRIT_DAMAGE_RATE = 43, -2024-01-04 15:44:27 check attr_buffs: 1001 //kHVAT_Dmg = 1001, -2024-01-04 15:44:27 check attr_buffs: 1002 //kHVAT_BulletAngle = 1002, - */ - switch (buff_effect()) { - case kBET_ModifyAttr: - { - AddCheckAttrBuff(_int_buff_param1, this); - } - break; - default: - { - } - break; - } - } if (buff_effect() == 7 && (_int_buff_param1 == 2 || _int_buff_param1 == 6 || @@ -454,13 +405,6 @@ namespace mt void Buff::StaticPostInit() { -#ifdef NEW_NUM - a8::XPrintf("----------------------------------------------------------------\n", {}); - for (auto& pair : attr_buffs) { - a8::XPrintf("check attr_buffs: %d\n", {pair.first}); - } - a8::XPrintf("----------------------------------------------------------------\n", {}); -#endif } bool Buff::EffectCanStack() const