From 3dbe0d5d42d22c3b8b7443c381ed9a9798cc32ca Mon Sep 17 00:00:00 2001 From: zhouhaihai Date: Wed, 24 Mar 2021 11:28:59 +0800 Subject: [PATCH] #fxtr_10186 修复两个bug --- src/models/HeroPlugin.lua | 4 ++-- src/shared/ModelBase.lua | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/models/HeroPlugin.lua b/src/models/HeroPlugin.lua index aefd200..c811a36 100644 --- a/src/models/HeroPlugin.lua +++ b/src/models/HeroPlugin.lua @@ -232,8 +232,8 @@ function HeroPlugin.bind(Hero) for _, attName in pairs(AttsEnumEx) do attrs[attName] = 0 end - for _, data in pairs(self.spark or {}) do - for k, v in pairs(data.attrs:toNumMap()) do + for _, data in pairs(self:getProperty("spark") or {}) do + for k, v in pairs(data.attrs) do attrs[AttsEnumEx[k]] = attrs[AttsEnumEx[k]] + v end end diff --git a/src/shared/ModelBase.lua b/src/shared/ModelBase.lua index e699bc3..8f53b15 100644 --- a/src/shared/ModelBase.lua +++ b/src/shared/ModelBase.lua @@ -178,7 +178,7 @@ function ModelBase:loadProperties(properties) properties[field] = MsgPack.unpack(properties[field]) end - local val = properties[field] or def + local val = properties[field] or clone(def) if val ~= nil then if typ == "number" then val = tonumber(val) end assert(type(val) == typ, -- libgit2 0.21.2