Merge branch 'develop' into qa

zhouhaihai
2 parents 8bbfdd03 aa5cbb54
Showing 2 changed files with 9 additions and 4 deletions Show diff stats
src/actions/StoreAction.lua
src/adv/Adv.lua
@@ -63,7 +63,11 @@ function _M.dailyBuyRpc(agent , data)
 		dailySDC[id] = (dailySDC[id] or 0) + count
 		role.dailyData:updateProperty({field = "dailySDC", value = dailySDC})
 	end
-	local reward = role:award(dataSet.gift, {log = {desc = "dailyShop", int1 = id, int2 = count}})
+	local gift = {}
+	for itemId, count_ in pairs(dataSet.gift:toNumMap()) do
+		gift[itemId] = count_ * count
+	end
+	local reward = role:award(gift, {log = {desc = "dailyShop", int1 = id, int2 = count}})
  
 	role:log("role_action", {desc = "dailyShop", int1 = id, int2 = count})
  
@@ -459,8 +459,9 @@ function Adv:awardArtifact(id, params)
 	else
 		print("awardArtifact no log ", debug.traceback())
 	end
-
-	self:pushBackEvent(AdvBackEventType.Artifact, {id = id})
+	if not params.isChoose then
+		self:pushBackEvent(AdvBackEventType.Artifact, {id = id})
+	end
 end
  
  
@@ -650,7 +651,7 @@ end
  
 function Adv:chooseArtifact(index)
 	if not self.waitArtifact or not self.waitArtifact[index] then return end
-	self:award({[self.waitArtifact[index]] = 1}, {log = {desc = "chooseArtifact"}})
+	self:award({[self.waitArtifact[index]] = 1}, {log = {desc = "chooseArtifact"}, isChoose = true})
  
 	self:log({desc = "chooseArtifact", int1 = self.waitArtifact[index]})