Merge branch 'cn/develop' into cn/publish/preview

jiyue
2 parents c42e3402 54b7749c
Showing 2 changed files with 5 additions and 4 deletions Show diff stats
src/actions/HeroAction.lua
src/actions/RadioAction.lua
@@ -66,7 +66,7 @@ function _M.levelUpRpc( agent, data )
 		hero_upgrade_scoreget = hero:getProperty("battleV") - oldBattleV, -- 通过英雄升级提升的评分
 	})
-	hero:mylog({desc = "levelUp", int1 = hero:getProperty("level")})
+	hero:mylog({desc = "levelUp", int1 = hero:getProperty("level"), int2 = hero:getProperty("type")})
 	role:checkTaskEnter("HeroLevelUp", {level = hero:getProperty("level")})
@@ -105,7 +105,7 @@ function _M.breakRpc( agent, data )
 		hero_break_result = getChangeAttrJson(oldAttr, hero:getTotalAttrs()), -- 英雄突破效果，可记录效果ID，或json格式记录提升效果，{攻击：20,闪避：20,……..}
 		hero_break_level = hero:getMaxLevel(), -- 英雄突破后等级上限
 	})
-	hero:mylog({desc = "break", int1 = hero:getProperty("breakL")})
+	hero:mylog({desc = "break", int1 = hero:getProperty("breakL"), int2 = hero:getProperty("type")})
 	SendPacket(actionCodes.Hero_breakRpc, '')
 	return true
@@ -1056,7 +1056,7 @@ function _M.drawHeroRpc(agent, data)
 				record["quality"] = itemData.quality
 				redisproxy:lpush("drawHeroRecord", MsgPack.pack(record))
-				redisproxy.ltrim("drawHeroRecord", 0, 10000)
+				redisproxy:ltrim("drawHeroRecord", 0, 10000)
 			end
 		end
@@ -123,7 +123,8 @@ function _M.startQuestRpc(agent, data)
     local getActIDs = function ()
         local actids = {}
         for _, v in pairs(radioTask or {}) do
-            actids[v.actid] = (actids[v.actid] or 0) + 1
+            local actid = v.actid or 0
+            actids[actid] = (actids[actid] or 0) + 1
         end
         return actids
     end