Merge branch 'tr/develop' into tr/bugfix-qa

熊润斐
2 parents 7a0dc1cf 3dbe0d5d
Showing 2 changed files with 3 additions and 3 deletions Show diff stats
src/models/HeroPlugin.lua
src/shared/ModelBase.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
@@ -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,