From ff72d1ebb30b4d689bebe4c4bbac6be1a6ef33b5 Mon Sep 17 00:00:00 2001
From: zqj <582132116@qq.com>
Date: Wed, 21 Jul 2021 16:40:56 +0800
Subject: [PATCH] fix: 商店商品购买折扣bug

---
 src/actions/StoreAction.lua |  9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/actions/StoreAction.lua b/src/actions/StoreAction.lua
index 4fe5539..b7953c8 100644
--- a/src/actions/StoreAction.lua
+++ b/src/actions/StoreAction.lua
@@ -290,15 +290,12 @@ function _M.shopBuyRpc(agent , data)
 		return 1 
 	end
 
-	local cost = {[dataSet.icon] = dataSet.cost * count}
+	local cost = {[dataSet.icon] = dataSet.cost * count * ((dataSet.disount or 10) / 10)}
+
 
 	local desc = "unknowShop"
 	if dataSet.shop == 1 then		-- 普通商店
 		desc = "dailyShop"
-		local dailySDD = role.dailyData:getProperty("dailySDD")
-		if dailySDD[id] then -- 折扣
-			cost = math.ceil(dataSet.cost * (1 - dataSet.disount / 100))
-		end
 	elseif dataSet.shop == 2 then		-- 美食商店
 		desc = "dinerShop"
 	elseif dataSet.shop == 3 then		-- 竞技场商店
@@ -313,7 +310,7 @@ function _M.shopBuyRpc(agent , data)
 		role.storeData:updateProperty({field = "buyR", value = buyRecord})
         limitStr = string.format("%s/%s", buyRecord[id], dataSet.limit)
 	end
-	role:costItems(cost, {log = {desc = desc, int1 = id, int2 = count, short1 = dataSet.shop}})
+	role:costItems(cost, {log = {desc = desc, int1 = id, int2 = count, cint1= dataSet.shop}})
 
 	local gift = {}
 	for _id, _count in pairs(dataSet.gift:toNumMap()) do
--
libgit2 0.21.2