Merge branch 'develop' into tr/cb

熊润斐
2 parents 1a5d40a6 318a7041
Showing 3 changed files with 11 additions and 1 deletions Show diff stats
src/models/Activity.lua
src/models/RoleCross.lua
src/models/Store.lua
@@ -347,6 +347,15 @@ activityFunc[Activity.ActivityType.PaySignIn] = {
 	end,
 	["close"] = function(self, actType, notify)
 		self.owner.storeData:SetActGoodsFlag("paySignIn", 0)
+		
+		local rechargeRecord = self.owner.storeData:getProperty("payR")
+		for id, cfg in pairs(csvdb["shop_rechargeCsv"]) do
+			if cfg.shop == 2 and cfg.type == CardType.PaySignCard then
+				rechargeRecord[id] = nil
+				break
+			end
+		end
+		self.owner.storeData:updateProperty({field="payR", value=rechargeRecord})
 	end,
 }
  
@@ -287,7 +287,7 @@ end
  
 function CMD.friendBattleInfo(roleId)
 	local info = CMD.getProperties(roleId, {"pvpTBC", "hangTB"})
-	return next(info.pvpTBC) and info.pvpTBC or info.hangTB
+	return (next(info.pvpTBC) and next(info.pvpTBC.heros)) and info.pvpTBC or info.hangTB
 end
  
 function CMD.pvpCInfo(roleId)
@@ -383,6 +383,7 @@ end
 -- 购买付费签到 按开服时间算奖励
 function Store:onBuyPaySignCard(dur)
     local curTs = skynet.timex()
+	curTs = getServerOpenTs()
  
     self:SetActGoodsFlag("paySignIn", curTs)