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

熊润斐
2 parents 7b813e21 9cf14ecd
Showing 3 changed files with 5 additions and 4 deletions Show diff stats
src/actions/StoreAction.lua
src/models/Activity.lua
src/models/RoleTimeReset.lua
@@ -24,7 +24,7 @@ function _M.rechargeRpc(agent , data)
 	skynet.timeout(10, function ()
 		role:handlePurchase({
 			order = partnerOrderId,
-			amount = dataSet.rmb,
+			amount = dataSet.rmb * 100,
 			game_money = dataSet.diamond,
 			product_id = dataSet.productId,
 			pay_time = skynet.timex(),
@@ -1000,9 +1000,10 @@ activityFunc[Activity.ActivityType.CommonSignIn] = {
 	["init"] = function(self, actType, isCrossDay, notify, actId)
 		if not isCrossDay then
 			activityFunc[Activity.ActivityType.CommonSignIn]["crossDay"](self, actType, notify, actId)
+
+			local taskStatus = self.owner:getProperty("dTask")
+			activityFunc[Activity.ActivityType.CommonSignIn]["check"](self, actType, notify, 0, (taskStatus["a"] or 0))
 		end
-		local taskStatus = self.owner:getProperty("dTask")
-		activityFunc[Activity.ActivityType.CommonSignIn]["check"](self, actType, notify, 0, (taskStatus["a"] or 0))
 	end,
 	["crossDay"] = function(self, actType, notify, actId)
 		local actCfg = csvdb["activity_ctrlCsv"][actId]
@@ -5,6 +5,7 @@ RoleTimeReset.bind = function (Role)
 -- 重置内容 对应 GlobalVar TimeReset
 local ResetFunc = {}
 ResetFunc["CrossDay"] = function(self, notify, response, now)
+	self:setProperty("dTask", {})
 	self.activity:checkActivityStatus(now, true, notify)
 	self.dailyData:refreshDailyData(notify)
@@ -12,7 +13,6 @@ ResetFunc[&quot;CrossDay&quot;] = function(self, notify, response, now)
 	self.activity:refreshDailyData(notify)
 	self.storeData:onCrossDay()
-	self:setProperty("dTask", {})
 	self:incrProperty("lday", 1)
 	self:advRandomSupportEffect(not notify)