|
|
@@ -806,19 +806,15 @@ function dailyFixedRewardQuery(human)
|
|
|
local getTime = human.db.zhuanpan.dailyFixedReward.getTime
|
|
|
if getTime and Util.isSameDay(getTime) then
|
|
|
msgRet.status = 2 -- 已领取
|
|
|
- Log.write(Log.LOGID_DEBUG, "[dailyFixedRewardQuery] 今日已领取: getTime="..getTime..", status=2")
|
|
|
else
|
|
|
msgRet.status = 1 -- 可领取
|
|
|
- Log.write(Log.LOGID_DEBUG, "[dailyFixedRewardQuery] 可以领取: getTime="..(getTime or "nil")..", status=1")
|
|
|
end
|
|
|
|
|
|
-- 设置奖励物品
|
|
|
Grid.makeItem(msgRet.reward, 102, 50)
|
|
|
- Log.write(Log.LOGID_DEBUG, "[dailyFixedRewardQuery] 奖励物品已设置: itemID=102, cnt=50, status="..msgRet.status)
|
|
|
|
|
|
if human.fd then
|
|
|
Msg.send(msgRet, human.fd)
|
|
|
- Log.write(Log.LOGID_DEBUG, "[dailyFixedRewardQuery] 查询协议已发送: fd="..human.fd..", status="..msgRet.status)
|
|
|
else
|
|
|
Log.write(Log.LOGID_DEBUG, "[dailyFixedRewardQuery] 错误: human.fd为nil,无法发送协议")
|
|
|
end
|
|
|
@@ -850,7 +846,7 @@ function dailyFixedRewardGet(human, channelId)
|
|
|
|
|
|
BagLogic.updateMomentItem(BagLogic.ADDITEM_TYPE_1, 102, 50)
|
|
|
local success, err = pcall(function()
|
|
|
- BagLogic.addMomentItemList(human, "zhuanpan_get")
|
|
|
+ BagLogic.addMomentItemList(human, "zhuanpan_once_reward")
|
|
|
end)
|
|
|
if not success then
|
|
|
Log.write(Log.LOGID_DEBUG, "[dailyFixedRewardGet] 错误: 添加到背包失败: "..(err or "unknown"))
|
|
|
@@ -861,7 +857,6 @@ function dailyFixedRewardGet(human, channelId)
|
|
|
human.db.zhuanpan.dailyFixedReward.getTime = os.time()
|
|
|
|
|
|
-- 领取成功后下发查询协议
|
|
|
- Log.write(Log.LOGID_DEBUG, "[dailyFixedRewardGet] 步骤5: 准备发送查询协议")
|
|
|
local querySuccess, queryErr = pcall(function()
|
|
|
dailyFixedRewardQuery(human)
|
|
|
end)
|
|
|
@@ -888,10 +883,8 @@ function onceRewardQuery(human)
|
|
|
local getTime = human.db.zhuanpan.onceReward.getTime
|
|
|
if getTime then
|
|
|
msgRet.status = 2 -- 已领取
|
|
|
- Log.write(Log.LOGID_DEBUG, "[onceRewardQuery] 已领取: getTime="..getTime..", status=2")
|
|
|
else
|
|
|
msgRet.status = 1 -- 可领取
|
|
|
- Log.write(Log.LOGID_DEBUG, "[onceRewardQuery] 可以领取: status=1")
|
|
|
end
|
|
|
|
|
|
-- 设置奖励物品列表:[[102,500],[118,10],[111,100000]]
|
|
|
@@ -907,19 +900,8 @@ function onceRewardQuery(human)
|
|
|
return
|
|
|
end
|
|
|
|
|
|
- Log.write(Log.LOGID_DEBUG, "[onceRewardQuery] 奖励物品已设置: [102,500], [118,10], [111,100000], status="..msgRet.status)
|
|
|
-
|
|
|
if human.fd then
|
|
|
- local sendSuccess, sendErr = pcall(function()
|
|
|
- Msg.send(msgRet, human.fd)
|
|
|
- end)
|
|
|
- if sendSuccess then
|
|
|
- Log.write(Log.LOGID_DEBUG, "[onceRewardQuery] 查询协议已发送: fd="..human.fd..", status="..msgRet.status)
|
|
|
- else
|
|
|
- Log.write(Log.LOGID_DEBUG, "[onceRewardQuery] 错误: 发送协议失败: "..tostring(sendErr))
|
|
|
- end
|
|
|
- else
|
|
|
- Log.write(Log.LOGID_DEBUG, "[onceRewardQuery] 错误: human.fd为nil,无法发送协议")
|
|
|
+ Msg.send(msgRet, human.fd)
|
|
|
end
|
|
|
end
|
|
|
|
|
|
@@ -959,10 +941,7 @@ function onceRewardGet(human, channelId)
|
|
|
|
|
|
-- 记录领取时间(永久记录)
|
|
|
human.db.zhuanpan.onceReward.getTime = os.time()
|
|
|
- Log.write(Log.LOGID_DEBUG, "[onceRewardGet] 奖励已发放并记录: getTime="..human.db.zhuanpan.onceReward.getTime)
|
|
|
|
|
|
- -- 领取成功后下发查询协议
|
|
|
- Log.write(Log.LOGID_DEBUG, "[onceRewardGet] 准备发送查询协议")
|
|
|
local querySuccess, queryErr = pcall(function()
|
|
|
onceRewardQuery(human)
|
|
|
end)
|
|
|
@@ -970,5 +949,4 @@ function onceRewardGet(human, channelId)
|
|
|
Log.write(Log.LOGID_DEBUG, "[onceRewardGet] 错误: 发送查询协议失败: "..(queryErr or "unknown"))
|
|
|
-- 即使查询协议发送失败,奖励已经发放,所以不返回错误
|
|
|
end
|
|
|
- Log.write(Log.LOGID_DEBUG, "[onceRewardGet] 领取完成")
|
|
|
end
|