fix: 额外宝藏删除藏宝图字段treasureMapCount，用道具itemId=861作为藏宝图

zhangqijia
1 parent aca85b6f
Showing 5 changed files with 18 additions and 19 deletions Show diff stats
src/GlobalVar.lua
src/actions/GmAction.lua
src/actions/HangAction.lua
src/models/Daily.lua
src/models/RoleLog.lua
@@ -156,6 +156,7 @@ ItemId = {
 	AdvPower = 4701, -- 拾荒体力
 	CrisisScore = 8010, -- 积分
 	MonthCard = 31000, --兑换月卡的物品
+	TreasureMap = 861, --藏宝图
 }
 TimeReset = {
@@ -1191,22 +1191,21 @@ end
 table.insert(helpDes, {"抓取额外宝藏", "treasure_extra"})
 function _M.treasure_extra(role, pms)
 	local extraCount = role.dailyData:getProperty("treasureExtraCount") --每日发现额外宝藏使用次数(累计)，隔天清零
-	local mapCount = role.dailyData:getProperty("treasureMapCount")
 	local baseExtra = role.dailyData:getProperty("treasureBaseExtra")
 	if extraCount >= globalCsv.idle_treasure_extra_limie then return 1 end
-	if mapCount <= 0 then return 2 end
-	baseExtra =  baseExtra + globalCsv.idle_treasure_base_extra
+	local cost ={[ItemId.TreasureMap] = 1}
+	if not role:checkItemEnough(cost) then return 2 end
+	baseExtra =  baseExtra + globalCsv.idle_treasure_base_extra
 	local tmpTreasure, treasureListExtra = role.dailyData:getTreasureExtra(baseExtra)
-
-	dump(tmpTreasure)
-	dump(treasureListExtra)
 	if not tmpTreasure then return 3 end
+	if not role:costItems(cost,  {log = {desc = "TreasureMap", int1 = ItemId.TreasureMap, int2 = 1}}) then return 4 end
+
+    dump(treasureListExtra)
 	role.dailyData:updateProperty({field = "treasureExtraCount", delta = 1})
-	role.dailyData:updateProperty({field = "treasureMapCount", value = mapCount - 1})
 	role.dailyData:updateProperty({field = "treasureBaseExtra", value = baseExtra})
     return "成功"
@@ -1218,10 +1217,9 @@ function _M.treasure_map(role, pms)
 	local cost ={[ItemId.Jade] = globalCsv.idle_treasure_buy * count}
 	if not role:checkItemEnough(cost) then return -1 end
 	if not role:costItems(cost,  {log = {desc = "treasureMap", int1 = count}}) then return -2 end
-	role.dailyData:updateProperty({field = "treasureMapCount", delta = 1*count})
-	local treasureMapCount = role.dailyData:getProperty("treasureMapCount")
-	return treasureMapCount
+	local reward, change = role:award({[ItemId.TreasureMap] = count}, {log = {desc = "TreasureMap", int1 = ItemId.TreasureMap, int2 = count}})
+    return "兑换成功"
 end
 table.insert(helpDes, {"清空", "treasure_clear"})
@@ -1200,19 +1200,20 @@ end
 function _M.takeTreasureRpc(agent, data)
 	local role = agent.role
 	local extraCount = role.dailyData:getProperty("treasureExtraCount") --每日发现额外宝藏使用次数(累计)，隔天清零
-	local mapCount = role.dailyData:getProperty("treasureMapCount")
 	local baseExtra = role.dailyData:getProperty("treasureBaseExtra")
 	if extraCount >= globalCsv.idle_treasure_extra_limie then return 1 end
-	if mapCount <= 0 then return 2 end
-	baseExtra =  baseExtra + globalCsv.idle_treasure_base_extra
+	local cost ={[ItemId.TreasureMap] = 1}
+	if not role:checkItemEnough(cost) then return 2 end
+	baseExtra =  baseExtra + globalCsv.idle_treasure_base_extra
 	local tmpTreasure, treasureListExtra = role.dailyData:getTreasureExtra(baseExtra)
 	if not tmpTreasure then return 3 end
+	if not role:costItems(cost,  {log = {desc = "TreasureMap", int1 = ItemId.TreasureMap, int2 = 1}}) then return 4 end
+
 	role.dailyData:updateProperty({field = "treasureExtraCount", delta = 1})
-	role.dailyData:updateProperty({field = "treasureMapCount", value = mapCount - 1})
 	role.dailyData:updateProperty({field = "treasureBaseExtra", value = baseExtra})
 	SendPacket(actionCodes.Hang_takeTreasureRpc, MsgPack.pack({treasureListExtra = treasureListExtra, treasure = tmpTreasure}))
@@ -1226,10 +1227,9 @@ function _M.treasureMapRpc(agent,data)
 	local cost ={[ItemId.Jade] = globalCsv.idle_treasure_buy * count}
 	if not role:checkItemEnough(cost) then return 1 end
 	if not role:costItems(cost,  {log = {desc = "treasureMap", int1 = count}}) then return 2 end
-	role.dailyData:updateProperty({field = "treasureMapCount", delta = count})
-	local treasureMapCount = role.dailyData:getProperty("treasureMapCount")
-	SendPacket(actionCodes.Hang_treasureMapRpc, MsgPack.pack({mapCount = treasureMapCount}))
+	local reward, change = role:award({[ItemId.TreasureMap] = count}, {log = {desc = "TreasureMap", int1 = ItemId.TreasureMap, int2 = count}})
+	SendPacket(actionCodes.Hang_treasureMapRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
 end
@@ -38,7 +38,6 @@ Daily.schema = {
 	treasureList 	= {"table", {}}, 		--挂机图鉴
 	treasureListExtra 	= {"table", {}}, 	--额外宝藏，挂机图鉴扩展功能
-	treasureMapCount 	= {"number", 0}, 	--宝藏图，消耗一张宝藏图可以发现一次额外宝藏
 	treasureExtraCount 	= {"number", 0}, 	--每日发现额外宝藏使用次数(累计)，隔天清零
 	treasureBaseExtra 	= {"number", 0}, 	--额外宝藏资源值
@@ -131,7 +130,6 @@ function Daily:data()
 		treasureBase = self:getProperty("treasureBase"),
 		treasureList = self:getProperty("treasureList"),
 		treasureListExtra = self:getProperty("treasureListExtra"),
-		treasureMapCount = self:getProperty("treasureMapCount"),
 		treasureExtraCount = self:getProperty("treasureExtraCount"),
 		treasureBaseExtra = self:getProperty("treasureBaseExtra"),
 		chatTimes = self:getProperty("chatTimes"),
@@ -179,6 +179,8 @@ local ItemReason = {
 	CapsuleCoinCost = 1413, --抽扭蛋机消耗
 	worldLine = 1500, --世界线积分
+
+	TreasureMap = 1600, --藏宝图
 }