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

# Conflicts: # src/actions/GmAction.lua # src/actions/HangAction.lua # src/models/Daily.lua

Merge branch 'cn/develop' into cn/publish/zhaolu
# Conflicts: # src/actions/GmAction.lua # src/actions/HangAction.lua # src/models/Daily.lua
zhangqijia
2 parents 25ec4b29 e28973d5
Showing 5 changed files with 80 additions and 36 deletions Show diff stats
src/GlobalVar.lua
src/actions/HangAction.lua
src/models/Daily.lua
src/models/DailyPlugin.lua
src/models/RoleLog.lua
@@ -156,6 +156,7 @@ ItemId = {
 	AdvPower = 4701, -- 拾荒体力
 	CrisisScore = 8010, -- 积分
 	MonthCard = 31000, --兑换月卡的物品
+	TreasureMap = 861, --藏宝图
 }
 TimeReset = {
@@ -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"),
@@ -20,26 +20,31 @@ function DailyPlugin.bind(Daily)
     end
     --CD
-    function Daily:checkTreasureExpired(treasureAttr, treasureList)
+    function Daily:checkTreasureExpired(treasureAttr, treasureList, isExtra)
         local curInfo = treasureList[treasureAttr.id]
+        local now = skynet.timex()
         if curInfo then
             -- check finish
             if curInfo["expire_time"] then
                 if curInfo.cool_time > 1 then
-                    if skynet.timex() >= curInfo["expire_time"] then
+                    if now >= curInfo["expire_time"] then
                         treasureList[treasureAttr.id] = nil
                         curInfo = clone(treasureAttr)
-                    elseif skynet.timex() >= curInfo["expire_time"] -  curInfo.cool_time * oneDay then --未冷却
+                    elseif now >= curInfo["expire_time"] -  curInfo.cool_time * oneDay then --未冷却
                         curInfo = nil
                     else
                         curInfo = clone(treasureAttr)
                     end
                 else
-                    if skynet.timex() >= curInfo["expire_time"] then
+                    if now >= curInfo["expire_time"] then
                         treasureList[treasureAttr.id] = nil
                     end
                     curInfo = clone(treasureAttr)
                 end
+            else
+                if isExtra then
+                    curInfo = nil
+                end
             end
         else
             curInfo = clone(treasureAttr)
@@ -48,19 +53,23 @@ function DailyPlugin.bind(Daily)
         return curInfo
     end
-    --绑定通关关卡
+    --绑定通关关卡 每日宝藏
     function Daily:checkChapters(treasureList, treasureListOther)
         local chapters = {}
         local tmp_chapters = {}
+        --不可以绑定的关卡
+        --1. 正在挖宝，未挖到
+        --2. 已经挖到宝藏，但未领取
+        --3. 正在挂机
         for _, curInfo in pairs(treasureList or {}) do
-            if curInfo["expire_time"] or not curInfo["end_time"] then
+            if (not curInfo["expire_time"] and curInfo["end_time"]) then
                 tmp_chapters[curInfo.chapter_id] = curInfo
             end
         end
         for _, curInfo in pairs(treasureListOther or {}) do
-            if curInfo["expire_time"] or not curInfo["end_time"] then
+            if (not curInfo["expire_time"] and curInfo["end_time"]) then
                 tmp_chapters[curInfo.chapter_id] = curInfo
             end
         end
@@ -69,10 +78,42 @@ function DailyPlugin.bind(Daily)
         for chapter_id, val in pairs(csvdb["idle_battleCsv"]) do
             if chapter_id ~= hangInfo.carbonId then
                 if self.owner:checkHangPass(chapter_id) then
-                    if next(tmp_chapters) and not tmp_chapters[chapter_id] then
-                        chapters[chapter_id] = val
-                    else
-                        chapters[chapter_id] = val
+                    if not tmp_chapters[chapter_id] then
+                        chapters[chapter_id] = {treasure_weight=val.treasure_weight}
+                    end
+                end
+            end
+
+        end
+        return chapters
+    end
+
+    --绑定通关关卡 额外宝藏
+    function Daily:checkChaptersExtra(treasureList, treasureListOther)
+        local chapters = {}
+        local tmp_chapters = {}
+
+        --不可以绑定的关卡
+        --1. 未过期(未挖，在挖，未领)
+        --2. 正在挂机
+        for _, curInfo in pairs(treasureList or {}) do
+            if not curInfo["expire_time"] then
+                tmp_chapters[curInfo.chapter_id] = curInfo
+            end
+        end
+
+        for _, curInfo in pairs(treasureListOther or {}) do
+            if not curInfo["expire_time"] then
+                tmp_chapters[curInfo.chapter_id] = curInfo
+            end
+        end
+
+        local hangInfo = self.owner:getProperty("hangInfo") or {}
+        for chapter_id, val in pairs(csvdb["idle_battleCsv"]) do
+            if chapter_id ~= hangInfo.carbonId then
+                if self.owner:checkHangPass(chapter_id) then
+                    if not tmp_chapters[chapter_id] then
+                        chapters[chapter_id] = {treasure_weight=val.treasure_weight}
                     end
                 end
             end
@@ -130,7 +171,7 @@ function DailyPlugin.bind(Daily)
     --只抓一个 额外宝藏
     function Daily:getOneTreasureExtra(treasureList, tmpTreasure, treasureBase, treasureListOther)
-        local chapters = self:checkChapters(treasureList, treasureListOther)
+        local chapters = self:checkChaptersExtra(treasureList, treasureListOther)
         if not chapters or not next(chapters) then return end
         --扣除在挖宝列表里未过期宝藏的资源值
@@ -177,14 +218,15 @@ function DailyPlugin.bind(Daily)
     function Daily:checkTreasureChapterId(curInfo, treasureList, chapterId, treasureBase)
         if not curInfo then return nil end
+        local now = skynet.timex()
         local treasure = nil
         --开始挖宝关卡ID=挂机关卡ID
         if chapterId == curInfo.chapter_id then
             --开始挖宝
             if not curInfo["end_time"] then
-                curInfo["end_time"] = skynet.timex() + curInfo.working_time
+                curInfo["end_time"] = now + curInfo.working_time
             else
-                if skynet.timex() >= curInfo["end_time"] then
+                if now >= curInfo["end_time"] then
                     if curInfo.cool_time > 1 then
                         --宝藏冷却时间
                         if not curInfo["expire_time"] then
@@ -192,11 +234,11 @@ function DailyPlugin.bind(Daily)
                                 treasureBase = treasureBase - curInfo["treasure_value"]
                                 treasure = treasureList[curInfo.id]
-                                curInfo["expire_time"] = skynet.timex() + curInfo.cool_time * oneDay
+                                curInfo["expire_time"] = now + curInfo.cool_time * oneDay
                             end
                         else
                             --已经领取宝藏 检索宝藏冷却时间
-                            if skynet.timex() >= curInfo["expire_time"] then
+                            if now >= curInfo["expire_time"] then
                                 treasureList[curInfo.id] = nil
                             end
                         end
@@ -213,7 +255,7 @@ function DailyPlugin.bind(Daily)
         else
             --已经开始挖宝
             if curInfo["end_time"] then
-                if skynet.timex() >= curInfo["end_time"] then
+                if now >= curInfo["end_time"] then
                     if curInfo.cool_time > 1 then
                         --宝藏冷却时间
                         if not curInfo["expire_time"] then
@@ -221,12 +263,12 @@ function DailyPlugin.bind(Daily)
                                 treasureBase = treasureBase - curInfo["treasure_value"]
                                 treasure = treasureList[curInfo.id]
-                                curInfo["expire_time"] = skynet.timex() + curInfo.cool_time * oneDay
+                                curInfo["expire_time"] = now + curInfo.cool_time * oneDay
                             end
                         else
                             --已经领取宝藏 检索宝藏冷却时间
-                            if skynet.timex() >= curInfo["expire_time"] then
+                            if now >= curInfo["expire_time"] then
                                 treasureList[curInfo.id] = nil
                             end
                         end
@@ -267,13 +309,14 @@ function DailyPlugin.bind(Daily)
     --宝藏图鉴
     function Daily:getTreasureList()
-        local tmpcsv = csvdb["idle_treasureCsv"]
         local treasureList = self:getProperty("treasureList") or {} --挖宝列表 过期删除 领取奖励删除 跨天更新
         local treasureListExtra = self:getProperty("treasureListExtra") or {} --额外宝藏列表 过期删除 领取奖励删除 跨天更新
+
+        --获取宝藏列表(与额外宝藏逻辑不同) 进行随机获取宝藏
         local tmpTreasure = {}
         local treasureBase = globalCsv.idle_treasure_base + self.owner:getBnousTreasureBaseMaximum()
-        for _, val in pairs(tmpcsv) do
-            if self:checkUnlock(val) == true then
+        for _, val in pairs(csvdb["idle_treasureCsv"]) do
+            if self:checkUnlock(val) then
                 local treasure = self:checkTreasureExpired(val, treasureList)
                 if treasure then
                     table.insert(tmpTreasure, treasure)
@@ -328,26 +371,26 @@ function DailyPlugin.bind(Daily)
     --宝藏功能优化——增加"发现宝藏"功能
     function Daily:buyTreasureExtra(treasureList)
         local boughtTreasure = {}
-        local treasureBase = self:getProperty("treasureExtraBase")
+        local treasureBase = self:getProperty("treasureBaseExtra")
         for id, val in pairs(treasureList) do
             if treasureBase >= val.treasure_value then
                 boughtTreasure[id] = val
                 treasureBase = treasureBase - val.treasure_value
             end
         end
-        self:updateProperty({field = "treasureExtraBase", value = treasureBase})
+        self:updateProperty({field = "treasureBaseExtra", value = treasureBase})
         return boughtTreasure
     end
     function Daily:getTreasureExtra(tmpBaseExtra)
-        local tmpcsv = csvdb["idle_treasureCsv"]
         local treasureList = self:getProperty("treasureList") or {} --挖宝列表 过期删除 领取奖励删除 跨天更新
         local treasureListExtra = self:getProperty("treasureListExtra") or {} --额外宝藏 过期删除 领取奖励删除 跨天更新
+        --获取宝藏列表(排除未过期的宝藏) 进行随机获取宝藏
         local tmpTreasure = {}
-        for _, val in pairs(tmpcsv) do
+        for _, val in pairs(csvdb["idle_treasureCsv"]) do
             if self:checkUnlock(val) then
-                local treasure = self:checkTreasureExpired(val, treasureListExtra)
+                local treasure = self:checkTreasureExpired(val, treasureListExtra, true)
                 if treasure then
                     table.insert(tmpTreasure, treasure)
                 end
@@ -179,6 +179,8 @@ local ItemReason = {
 	CapsuleCoinCost = 1413, --抽扭蛋机消耗
 	worldLine = 1500, --世界线积分
+
+	TreasureMap = 1600, --藏宝图
 }