From 8d3b32a9c0771db929f7fc9060f76065597a8e12 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 14 Mar 2023 17:26:04 +0800 Subject: [PATCH] 1 --- server/gameserver/android.cc | 2 ++ server/gameserver/battledatacontext.cc | 12 ++++++++++++ server/gameserver/buff/callfunc.cc | 4 +++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/server/gameserver/android.cc b/server/gameserver/android.cc index 97a4b94c..5c7f0658 100644 --- a/server/gameserver/android.cc +++ b/server/gameserver/android.cc @@ -114,7 +114,9 @@ void Android::InternalUpdate(int delta_time) return; } } + #if 0 agent_->Exec(); + #endif } void Android::GiveEquip() diff --git a/server/gameserver/battledatacontext.cc b/server/gameserver/battledatacontext.cc index 29dde3c7..d84e1cf1 100644 --- a/server/gameserver/battledatacontext.cc +++ b/server/gameserver/battledatacontext.cc @@ -138,6 +138,12 @@ private: AttrHelper::ParseAttr(attr_base_xobj, base_attr_abs, base_attr_rate); } } + { + std::shared_ptr attr_base_xobj = hero_dto->At("rand_attr"); + if (attr_base_xobj && attr_base_xobj->IsArray()) { + AttrHelper::ParseAttr(attr_base_xobj, base_attr_abs, base_attr_rate); + } + } { std::shared_ptr attr_pro_xobj = hero_dto->At("attr_pro"); if (attr_pro_xobj && attr_pro_xobj->IsArray()) { @@ -283,6 +289,12 @@ private: AttrHelper::ParseAttr(attr_base_xobj, base_attr_abs, base_attr_rate); } } + { + std::shared_ptr attr_base_xobj = weapon_dto->At("rand_attr"); + if (attr_base_xobj && attr_base_xobj->IsArray()) { + AttrHelper::ParseAttr(attr_base_xobj, base_attr_abs, base_attr_rate); + } + } { std::shared_ptr attr_pro_xobj = weapon_dto->At("attr_pro"); if (attr_pro_xobj && attr_pro_xobj->IsArray()) { diff --git a/server/gameserver/buff/callfunc.cc b/server/gameserver/buff/callfunc.cc index 214fd531..738b6331 100644 --- a/server/gameserver/buff/callfunc.cc +++ b/server/gameserver/buff/callfunc.cc @@ -294,5 +294,7 @@ void CallFuncBuff::ProcFlashMoveToPos() void CallFuncBuff::ProcLightCircle() { - + if (!skill_meta) { + return; + } }