diff --git a/server/gameserver/battledatacontext.cc b/server/gameserver/battledatacontext.cc index fee10685..d75a73d7 100644 --- a/server/gameserver/battledatacontext.cc +++ b/server/gameserver/battledatacontext.cc @@ -52,6 +52,16 @@ public: return hero_meta->i->miss_damage_ruduce(); } +private: + + float hp_ = 0.0f; + float atk_ = 0.0f; + float def = 0.0f; + float crit_atk_ = 0.0f; + float crit_atk_ratio_ = 0.0f; + float dodge_ = 0.0f; + float dodge_damage_ruduce_ = 0.0f; + }; class WeaponAbility @@ -64,6 +74,17 @@ public: { return weapon_meta->i->atk(); } + + float GetCritAtk() + { + return weapon_meta->i->critical(); + } + + float GetCritAtkRatio() + { + return weapon_meta->i->cri_damage(); + } + }; BattleDataContext::BattleDataContext() diff --git a/server/tools/protobuild/metatable.proto b/server/tools/protobuild/metatable.proto index d8258475..0956d209 100755 --- a/server/tools/protobuild/metatable.proto +++ b/server/tools/protobuild/metatable.proto @@ -189,8 +189,11 @@ message Equip optional int32 explosion_damage_delay = 67; optional int32 bullet_consume_type = 68; - optional string inventory_slot = 31; //库存槽位 - optional int32 _inventory_slot = 32; //库存槽位 + optional string inventory_slot = 31; + optional int32 _inventory_slot = 32; + + optional float critical = 70; + optional float cri_damage = 71; } message EquipUpgrade