From 9e1a93c2798990cb65932d53e0d7a744f72883f2 Mon Sep 17 00:00:00 2001
From: liuzujun <307836273@qq.com>
Date: Tue, 25 Aug 2020 11:05:49 +0800
Subject: [PATCH] 快速挂机掉落浮点数取整

---
 src/actions/HangAction.lua | 15 +++++++++------
 src/models/Activity.lua    |  1 -
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/actions/HangAction.lua b/src/actions/HangAction.lua
index e385178..4ecff0a 100644
--- a/src/actions/HangAction.lua
+++ b/src/actions/HangAction.lua
@@ -39,9 +39,9 @@ local function checkReward(role)
 
 	local items = role:getProperty("hangBag")
 	coinCount = coinCount + coinDoubleCount
-	items[ItemId.Gold] = (items[ItemId.Gold] or 0) + coinCount * carbonData.money
-	items[ItemId.Exp] = (items[ItemId.Exp] or 0) + coinCount * carbonData.exp
-	items[ItemId.PlayerExp] = (items[ItemId.PlayerExp] or 0) + coinCount * carbonData.playerExp
+	items[ItemId.Gold] = math.floor((items[ItemId.Gold] or 0) + coinCount * carbonData.money)
+	items[ItemId.Exp] = math.floor((items[ItemId.Exp] or 0) + coinCount * carbonData.exp)
+	items[ItemId.PlayerExp] = math.floor((items[ItemId.PlayerExp] or 0) + coinCount * carbonData.playerExp)
 
 	local pool = {}
 	for _, temp in pairs(carbonData.item:toArray()) do
@@ -417,8 +417,9 @@ function _M.quickRpc(agent , data)
 
 	local coinCount = math.floor(time / globalCsv.idle_money_produce_cd)
 	local itemCount = math.floor(time / globalCsv.idle_item_produce_cd)
-	reward[ItemId.Gold] = (reward[ItemId.Gold] or 0) + coinCount * carbonData.money
-	reward[ItemId.Exp] = (reward[ItemId.Exp] or 0) + coinCount * carbonData.exp
+	reward[ItemId.Gold] = math.floor((reward[ItemId.Gold] or 0) + coinCount * carbonData.money)
+	reward[ItemId.Exp] = math.floor((reward[ItemId.Exp] or 0) + coinCount * carbonData.exp)
+	reward[ItemId.PlayerExp] = math.floor((reward[ItemId.PlayerExp] or 0) + coinCount * carbonData.playerExp)
 
 	local pool = {}
 	for _, temp in pairs(carbonData.item:toArray()) do
@@ -429,11 +430,13 @@ function _M.quickRpc(agent , data)
 		reward[cur[1]] = (reward[cur[1]] or 0) + cur[2]
 	end
 
+	local doubleCoef = role.activity:isOpen("DoubleDrop") and 2 or 1
+
 	-- 特权卡获取加速获得额外道具
 	local coef = role.storeData:getProduceItemSpeedCoef()
 	if coef > 1 then
 		for k, cnt in pairs(reward) do
-			reward[k] = math.floor(cnt * coef)
+			reward[k] = math.floor(cnt * coef * doubleCoef)
 		end
 	end
 
diff --git a/src/models/Activity.lua b/src/models/Activity.lua
index aebcc9e..2831c76 100644
--- a/src/models/Activity.lua
+++ b/src/models/Activity.lua
@@ -293,7 +293,6 @@ activityFunc[Activity.ActivityType.AdvDraw] = {
 	-- ["close"] = function(self, actType, notify)
 	-- end,
 	["crossDay"] = function(self, actType, notify)
-		print("cross day act adv cost")
 		self.owner:sendMail(MailId.ActAdvDraw)
 	end,
 }
--
libgit2 0.21.2