From bfa42833c00288b41062ca93f72daa5b9cd53145 Mon Sep 17 00:00:00 2001
From: zqj <582132116@qq.com>
Date: Wed, 12 May 2021 09:52:29 +0800
Subject: [PATCH] feat: 分解铭文返还强化所需铭文碎片的60%

---
 src/actions/CarAction.lua | 10 ++++++++++
 src/models/Daily.lua      |  7 ++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/actions/CarAction.lua b/src/actions/CarAction.lua
index c1cc56c..3aa69de 100644
--- a/src/actions/CarAction.lua
+++ b/src/actions/CarAction.lua
@@ -220,6 +220,16 @@ function _M.saleRuneRpc(agent, data )
 		for k ,v in pairs(one) do
 			reward[k] = (reward[k] or 0) + v
 		end
+
+		--分解铭文返还强化所需铭文碎片的60%
+		local level = rune:getProperty("level")
+		for i = 1, level do
+			local lvData = csvdb["rune_buildCsv"][i]
+			local cost = lvData.cost:toNumMap()
+			for k, v in pairs(cost) do
+				reward[k] = (reward[k] or 0) + v*0.6
+			end
+		end
 	end
 
 	role:delRunes(backs, {log = {desc = "saleRune"}})
diff --git a/src/models/Daily.lua b/src/models/Daily.lua
index bdaf15f..4631f2a 100644
--- a/src/models/Daily.lua
+++ b/src/models/Daily.lua
@@ -315,12 +315,9 @@ function Daily:buyTreasure(treasureList)
 	local boughtTreasurer = {}
 	local treasureBase = self:getProperty("treasureBase")
 	for id, val in pairs(treasureList) do
-		treasureBase = treasureBase - val.treasure_value
-		if treasureBase < 0 then
-			treasureBase = treasureBase + val.treasure_value
-			return
-		else
+		if treasureBase >= val.treasure_value then
 			boughtTreasurer[id] = val
+			treasureBase = treasureBase - val.treasure_value
 		end
 	end
 	self:updateProperty({field = "treasureBase", value = treasureBase})
--
libgit2 0.21.2