diff --git a/src/actions/HeroAction.lua b/src/actions/HeroAction.lua index 7a56809..59ecd5f 100644 --- a/src/actions/HeroAction.lua +++ b/src/actions/HeroAction.lua @@ -499,7 +499,7 @@ function _M.referEquipsRpc(agent, data) local curAttr = hero:getTotalAttrs() local attrChange = getChangeAttrJson(oldAttr, curAttr) for typ, data in pairs(wear) do - role:log("hero_jewel", { + role:log("equip_wear", { hero_id = hero:getProperty("type"), --英雄ID equip_id = data.id, --装备ID equip_wear_action = data.act, --装备操作类型:装备:0,卸载:1 @@ -671,9 +671,26 @@ function _M.getResetRewardRpc(agent, data) end end - hero:updateProperty({field = "level", value = level}) - hero:updateProperty({field = "breakL", value = breakL}) - hero:updateProperty({field = "talent", value = ""}) + local equip = hero:getProperty("equip") + for k, v in pairs(equip:toNumMap()) do + role:addEquip(k, v, 1, {log = {desc = "resetHero", int1 = msg.id, int2 = hero:getProperty("type")}}) + end + + local rune = hero:getProperty("rune") + for _, id in pairs(rune:toNumMap()) do + local curRune = role.runeBag[id] + if curRune then + curRune:updateProperty({field = "refer", value = 0}) + end + end + + hero:updateProperties({ + level = level, + breakL = breakL, + talent = "", + equip = "", + rune = "", + }) for itemId, count in pairs(reward) do reward[itemId] = math.floor(count * globalCsv.unit_back_discount) @@ -682,7 +699,7 @@ function _M.getResetRewardRpc(agent, data) reward, change = role:award(reward, {log = {desc = "resetHero", int1 = msg.id, int2 = hero:getProperty("type")}}) role:log("hero_recycle", { - hero_recycle_list = hero:getProperty("type"), -- 回收的英雄id列表,建议使用json格式记录。示例:{ "XX": "1", "XXX": "3"} + hero_recycle_list = {[hero:getProperty("type")] = 1}, -- 回收的英雄id列表,建议使用json格式记录。示例:{ "XX": "1", "XXX": "3"} hero_recycle_reward = reward, -- 回收后获得的奖励,建议使用json格式记录。示例:{ "XX": "1", "XXX": "3"} hero_recycle_cnt = 1, -- 总回收英雄量 }) diff --git a/src/models/RoleLog.lua b/src/models/RoleLog.lua index eba9cec..58473d0 100644 --- a/src/models/RoleLog.lua +++ b/src/models/RoleLog.lua @@ -98,6 +98,7 @@ local ItemReason = { resetHero = 1207, -- 重置养成 unlockPool = 1208, -- 解锁英雄定向抽卡池 downloadCv = 1209, -- 下载 cv包奖励 + refer = 1210, -- 穿戴 } diff --git a/src/models/Rune.lua b/src/models/Rune.lua index 98739db..98ccc16 100644 --- a/src/models/Rune.lua +++ b/src/models/Rune.lua @@ -27,15 +27,15 @@ function Rune:notifyUpdateProperty(field, newValue, oldValue) end function Rune:log(contents) - contents = contents or {} - if contents["cint1"] or contents["cint2"] or contents["cint3"] then - print("heroLog error log have cint1 or cint2 or cint3 ", debug.traceback()) - end - contents["cint1"] = self:getProperty("uid") - contents["cint2"] = self:getProperty("type") - contents["cint3"] = self:getProperty("id") + -- contents = contents or {} + -- if contents["cint1"] or contents["cint2"] or contents["cint3"] then + -- print("heroLog error log have cint1 or cint2 or cint3 ", debug.traceback()) + -- end + -- contents["cint1"] = self:getProperty("uid") + -- contents["cint2"] = self:getProperty("type") + -- contents["cint3"] = self:getProperty("id") - self.owner:log("rune_action", contents) + -- self.owner:log("rune_action", contents) end function Rune:notifyUpdateProperties(params) -- libgit2 0.21.2