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

* cn/develop: fix: 设置 onlineCount 全局变量 fix: 一番赏修复消耗票兑换不增加消耗票的bug

Merge branch 'cn/develop' into cn/publish/release
* cn/develop: fix: 设置 onlineCount 全局变量 fix: 一番赏修复消耗票兑换不增加消耗票的bug
liuzujun
2 parents a18c7fd0 cf32785a
Showing 3 changed files with 3 additions and 3 deletions Show diff stats
src/actions/CapsuleAction.lua
src/models/RoleCross.lua
src/services/agent_ctrl.lua
@@ -187,7 +187,8 @@ function _M.convertCapsuleRpc(agent, data)
     if not role:checkItemEnough(cost) then return 1 end
     role:costItems(cost, {log = {desc = "CapsuleConvert", int1 = convert[1], int2 = cost[convert[1]]}})
  
-    local reward, change = role:award({coin = count}, {log = {desc = "CapsuleConvert"}})
+
+    local reward, change = role:award({[coin]= count}, {log = {desc = "CapsuleConvert"}})
     SendPacket(actionCodes.Capsule_convertCapsuleRpc, MsgPack.pack(role:packReward(reward, change)))
     return true
 end
@@ -385,7 +385,6 @@ function CMD.redPTag(roleId, tag, pms)
 end
  
 function CMD.paySpecialReward(roleId, notify)
-	dump(notify)
 	if notify and next(notify) then
 		local reward = {}
 		for key, val in pairs(notify) do
@@ -141,10 +141,10 @@ function _M:check_agent_status()
 		end
 	end
  
+	local count = table_nums(self.u2f)
     datacenter.set("onlineCount", count)
 	if now >= next_log_time and now % 60 == 0 then
 		next_log_time = now + 60
-		local count = table_nums(self.u2f)
 		--datacenter.set("onlineCount", count)
 		logproxy:log({["@type"] = "online", count = count}, "log")
 	end