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

jiyue
2 parents 943755d2 3945affc
Showing 3 changed files with 14 additions and 2 deletions Show diff stats
src/actions/RoleAction.lua
src/models/RoleTimeReset.lua
src/models/Store.lua
@@ -173,7 +173,6 @@ function _M.loginRpc( agent, data )
 		role.activity:checkActivityStatus(now, false, false)
 		role:log("onLogin")
 	end
-	role:checkTaskEnter("Login", {})
 	redisproxy:zadd(FRIEND_RECOMMEND, now, roleId)
@@ -68,6 +68,7 @@ ResetFunc[&quot;CrossDay&quot;] = function(self, notify, response, now)
 	response.dTask = {}
 	response.advSup = self:getProperty("advSup")
 	self:log("onLogin")
+
 end
 ResetFunc["CrossWeek"] = function(self, notify, response)
@@ -151,6 +152,13 @@ function Role:updateTimeReset(now, notify)
 	if notify then
 		self:notifyUpdateProperties(response)
 	end
+
+	-- 1. 如果放到CrossDay中，新号创建会触发CrossWeek，会清空 bcTask字段
+	-- 2. 如果CrossDay跟CrossWeek互换调用顺序，则会导致周任务不重置。
+	-- 3. 放到这里虽然不好看，但是没办法。只能放这了。
+	if resetMode and resetMode["CrossDay"] then -- 跨天
+		self:checkTaskEnter("Login", {})
+	end
 	return resetMode
 end
@@ -498,12 +498,17 @@ function Store:onBuyCard(type, duration, id, actid)
         info["flag"] = 1
         bpInfo[index] = info
         self:updateProperty({field = "bpInfo", value = bpInfo})
+        return {}
     elseif type == CardType.ActBattleCommandCard then
         if not self.owner.activity:isOpenById(actid, "ActShopGoods") then
+            skynet.error("not open, actid: " .. (actid or 0) .. "; id: " .. (id or 0) .. "; roleId: " .. self.owner:getProperty("id"))
             return nil
         end
         local actCfg = csvdb["activity_ctrlCsv"][actid]
-        if not actCfg then return end
+        if not actCfg then
+            skynet.error("actCfg is nil, actid: " .. (actid or 0) .. "; id: " .. (id or 0) .. "; roleId: " .. self.owner:getProperty("id"))
+            return nil
+        end
         local actData = self.owner.activity:getActData("BattleCommand") or {}
         actData["unlock"] = 1
         if actCfg.condition ~= 0 then