From 12e7379012be4dd9f61ab02cf30459ce3b9359e3 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 6 Sep 2022 13:10:19 +0800 Subject: [PATCH] 1 --- server/gameserver/battledatacontext.h | 9 +++++++++ server/tools/protobuild/metatable.proto | 12 +++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/server/gameserver/battledatacontext.h b/server/gameserver/battledatacontext.h index b6066016..f23e29e9 100644 --- a/server/gameserver/battledatacontext.h +++ b/server/gameserver/battledatacontext.h @@ -13,6 +13,12 @@ */ +namespace MetaData +{ + struct Player; + struct Equip; +} + class Creature; struct PlayerStats; struct BattleDataContext @@ -63,6 +69,9 @@ private: long long hero_uniid_ = 0; long long weapon_uniid1_ = 0; long long weapon_uniid2_ = 0; + MetaData::Player* hero_meta = nullptr; + MetaData::Equip* weapon1_meta = nullptr; + MetaData::Equip* weapon2_meta = nullptr; std::array hero_attr_abs_ = {}; std::array hero_attr_rate_ = {}; diff --git a/server/tools/protobuild/metatable.proto b/server/tools/protobuild/metatable.proto index 57757d72..feebda6c 100755 --- a/server/tools/protobuild/metatable.proto +++ b/server/tools/protobuild/metatable.proto @@ -240,10 +240,16 @@ message Player optional int32 skinlist = 48; optional string pre_appear_effect = 50; - optional int32 damage = 51; - optional int32 defence = 52; + optional string pve_score = 51; + + optional int32 hp = 52; + optional int32 damage = 53; + optional int32 defence = 54; + optional float crit_atk = 55; + optional float crit_atk_ratio = 56; + optional float miss = 57; + optional float miss_damage_ruduce = 58; - optional string pve_score = 53; } message Robot