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

jiyue
2 parents 3127068f d1944a2b
Showing 2 changed files with 5 additions and 9 deletions Show diff stats
src/actions/DinerAction.lua
src/models/RolePlugin.lua
@@ -977,10 +977,10 @@ function _M.collectRpc(agent , data)
  
 	local id = msg.id
 	local customerData = csvdb["diner_customerCsv"][id]
-	if not id or not customerData then return end
+	if not id or not customerData then return 1 end
 	local customer = role.dinerData:getProperty("customer")
 	if customer[id] ~= 0 then
-		return
+		return 2
 	end
  
 	-- 完成前更新一波 后面 加成可能不一样
@@ -2893,11 +2893,7 @@ function RolePlugin.bind(Role)
 		end
  
 		if result[1] and value then
-			if delta == 0 then
-				delta = delta * result[1] / 100
-			else
-				delta = (delta + value )* result[1] / 100
-			end
+			delta = (delta + value )* result[1] / 100
 		end
 		return delta
 	end
@@ -2912,7 +2908,7 @@ function RolePlugin.bind(Role)
 		local levelBnous = self:getLevelBnous()
  
 		local bonus = self:bonusMerged(towerBnous[SystemBnousType.CrusadeTask], levelBnous[SystemBnousType.CrusadeTask])
-		return self:getDeltaValue(bonus, value)
+		return self:getDeltaValue(bonus, value) +(bonus[0] or 0)
 	end
  
 	function Role:getBnousDiner(type, value, flag)
@@ -3018,7 +3014,7 @@ function RolePlugin.bind(Role)
 	function Role:getBnousDismantlingImproved(value)
 		local levelBnous = self:getLevelBnous()
 		local result = levelBnous[SystemBnousType.DismantlingImproved] or {}
-		return self:getDeltaValue(result, value)
+		return self:getDeltaValue(result, value) + (result[0] or 0)
 	end
  
 	function Role:getBnousDaily()