Merge branch 'tr/bugfix' into tr/publish/qa-out

熊润斐
2 parents 85def47e 39aebe0b
Showing 3 changed files with 8 additions and 8 deletions Show diff stats
src/actions/ActivityAction.lua
src/models/HeroPlugin.lua
src/shared/ModelBase.lua
@@ -1391,6 +1391,9 @@ function _M.returnerTaskRpc(agent, data)
 	local status = returner.status or {}
 	if status[taskId] then return 3 end
+	status[taskId] = 1
+	returner.status = status
+
 	local done = true
 	for _, data in pairs(TaskCsv) do
 		if not status[data.id] then
@@ -1399,15 +1402,12 @@ function _M.returnerTaskRpc(agent, data)
 		end
 	end
-	status[taskId] = 1
-	returner.status = status
-
-	local reward, change = role:award(taskData.reward, {log = {desc = "returner", int1 = taskData.day, int2 = taskId}})
-
 	if done then
 		returner = {}
 	end
+	local reward, change = role:award(taskData.reward, {log = {desc = "returner", int1 = taskData.day, int2 = taskId}})
+
 	local pack = globalCsv.returner_pack:toArray(true,"=")
 	if pack[1] == taskData.id then
 		role:checkTaskEnter("Appoint", {id = pack[2]})
@@ -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,