fix: 修复查询抽奖ssr记录的gm指令的bug

zhangqijia
1 parent 850c54f5
Showing 3 changed files with 24 additions and 14 deletions Show diff stats
src/actions/GmAction.lua
src/actions/HeroAction.lua
src/actions/HttpAction.lua
@@ -1101,7 +1101,8 @@ function _M.do_lua(role, pms)
     return "成功"
 end
  
-function _M.getDrawHeroPro(role, pms)
+table.insert(helpDes, {"抽英雄", "get_draw_hero_pro"})
+function _M.get_draw_hero_pro(role, pms)
 	-- 普池 10 up池 207 心愿单 20
 	local poolDict = {
 		[10] = "普通卡池",
@@ -1109,18 +1110,18 @@ function _M.getDrawHeroPro(role, pms)
 		[20] = "心愿单",
 	}
 	local result = {}
-	for k,v in poolDict do
-		local unit = csvdb["build_unit"][k]
+	for k,v in pairs(poolDict) do
+		local unit = csvdb["build_unitCsv"][k]
 		if unit then
-			local w1 = unit["rare1"] or 0
-			local w2 = unit["rare2"] or 0
-			local w3 = unit["rare3"] or 0
+			local w1 = unit["rare_1"] or 0
+			local w2 = unit["rare_2"] or 0
+			local w3 = unit["rare_3"] or 0
 			local up = unit["up_ssr_weight"] or 0
 			local total = w1 + w2 + w3
 			if total > 0 then
-				local p1 = w1 / total
-				local p2 = w2 / total
-				local p3 = w3 / total
+				local p1 = string.format("%.2f", w1 / total)
+				local p2 = string.format("%.2f",w2 / total)
+				local p3 = string.format("%.2f",w3 / total)
 				local tmp = {}
 				tmp["p1"] = p1
 				tmp["p2"] = p2
@@ -1130,10 +1131,12 @@ function _M.getDrawHeroPro(role, pms)
 			end
 		end
 	end
-
-	local ret = redisproxy:lrange("drawHeroRecord", 0, -1)
-	result["history"] = ret
-	json.encode(result)
+	result["history"] = {}
+	local ret = redisproxy:lrange("drawHeroRecord", 0, 300)
+	for _, v in ipairs(ret) do
+		table.insert(result["history"], MsgPack.unpack(v))
+	end
+	return json.encode(result)
 end
  
 return _M
 \ No newline at end of file
@@ -1055,7 +1055,8 @@ function _M.drawHeroRpc(agent, data)
 				record["hero"] = itemData.name
 				record["quality"] = itemData.quality
  
-				redisproxy:lpush("drawHeroRecord", json.encode(record))
+				redisproxy:lpush("drawHeroRecord", MsgPack.pack(record))
+				redisproxy.ltrim("drawHeroRecord", 0, 10000)
 			end
 		end
  
@@ -258,4 +258,10 @@ function _M.account_init(query, body)
 	end
 end
  
+function _M.hero_draw_pro(query)
+	local gmFuncs = require "actions.GmAction"
+	if not query.cmd or not gmFuncs[query.cmd] then return "指令不存在" end
+	return gmFuncs[query.cmd]()
+end
+
 return _M
 \ No newline at end of file