同步360test分支修改到0.1

script/common/Lang.lua

@@ -866,7 +866,7 @@ BG_MATCHLIST_ERR = [[匹配列表中未找到该对手]]
 BG_COMBAT_TYPE_ERR = [[战斗类型错误]]
 BG_CONDITION_ERR = [[挑战次数或挑战券不足]]
 BG_FREECNT_NOT_ENOUGH = [[免费次数不足]]
-
+BG_SP_JOB_MAXNUM_ERR = [[牧师+护卫数量不可超过{1}人]]
 
 --------------------------英雄天元系统-------------------------
 HERO_TY_POINT_MAX = [[已点亮所有天元点, 请先提升天元重数]]

script/core/ObjHuman.lua

@@ -856,7 +856,7 @@ function onLogin(human, isNew)
 	MiddleLogic.onLogin(human)
 
 	--返利
-	RebateLogic.NS_RebateQuery(human.phpChanelID, human.serverTag, human.db.account)
+	-- RebateLogic.NS_RebateQuery(human.phpChanelID, human.serverTag, human.db.account)
 end
 
 -- 这里有个潜规则，凡是使用每天都需更新的数据时，都必须先调用这个方法。by cc

script/module/anotherWorldBattle/AnotherWorldBattleCS.lua

@@ -1342,6 +1342,10 @@ function N2C_TryChallengdePoint_Req(msg)
     local targetCityId = msg.targetCityId
     local targetPointIdx = msg.targetPointIdx
 
+    if not isRunning() then
+        return errTips(msg.sourceServerId, playerUuid, AnotherWorldBattleDefine.ERR_CODE_1)
+    end
+
     local pChallengeTimes = getPlayerChallengeTimesInfo(playerUuid)
     if pChallengeTimes <= 0 then
         return errTips(msg.sourceServerId, playerUuid, AnotherWorldBattleDefine.ERR_CODE_12)

script/module/anotherWorldBattle/AnotherWorldBattleDB.lua

@@ -397,8 +397,10 @@ local function genGroupUnionRankList(unionRank, unionIdArr)
                 occupyCityNum = occupyCityNum + 1
             end
 
-            for _, _ in pairs(v.occupyPointList or {}) do
-                occupyPointNum = occupyPointNum + 1
+            for _, pointInfo in pairs(v.occupyPointList or {}) do
+                if pointInfo and pointInfo.playerUuid then
+                    occupyPointNum = occupyPointNum + 1
+                end
             end
         end
 

script/module/combat/BeSkill.lua

@@ -1114,7 +1114,7 @@ function onDie(obj, hurt, attackPos)
             if skillConfig.cmd == "revive" then
                 if reviceSkillList[k] then
                    use(obj,{},v)
-                   break
+                --    break
                 end
             else
                 use(obj,{},v)

script/module/combat/CombatPosLogic.lua

@@ -177,7 +177,7 @@ function CheckUpdatePos(human, msg)
 
 	if msg.type == CombatDefine.COMBAT_TYPE25 or  msg.type == CombatDefine.COMBAT_TYPE26 or
 		msg.type == CombatDefine.COMBAT_TYPE27 or msg.type == CombatDefine.COMBAT_TYPE28 or 
-		msg.type == CombatDefine.COMBAT_TYPE35 then
+		msg.type == CombatDefine.COMBAT_TYPE35 or msg.type == CombatDefine.COMBAT_TYPE37 then
 
 		local moduleFn = CombatLogic.getModule(msg.type)
 		if moduleFn and moduleFn.checkUpdatePos then

script/module/lostTemple/lostTempleLogic.lua

@@ -29,6 +29,7 @@ local TriggerDefine = require("trigger.TriggerDefine")
 local TriggerLogic = require("trigger.TriggerLogic")
 local HeroGrowUp = require("absAct.HeroGrowUp")
 local YunYingLogic = require("yunying.YunYingLogic")
+local Timer = require("core.Timer")
 
 local Lost_Handle_Func = { }
 
@@ -109,7 +110,11 @@ function onZero()
     -- end
 
     -- 修改: 每日刷新
-    LuaMongo.remove(DB.db_lost_temple)
+    -- LuaMongo.remove(DB.db_lost_temple)
+
+    -- 修改: 延迟30s再清除数据
+    Timer.addLater(30, LuaMongo.remove, DB.db_lost_temple)
+
     -- 已经关闭
     -- if (openDay - 7 + 1) % 2 ~= 0 then
     --     return

script/module/platform/RebateLogic.lua

@@ -115,6 +115,7 @@ end
 
 -- 收到普通服查询是否给玩家返利
 function CS_RebateQuery(msg)
+    do return end -- 屏蔽返利功能
     local channelId = msg.channelId
     local serverId = msg.serverId
     local account = msg.account

script/module/serverCommerce/ServerCommerceActBattleGroundCS.lua

@@ -473,14 +473,24 @@ function BG_N2C_Act_End(msg)
         return
     end
 
-    local logData = {
-        joinList = battleGroundData.joinList,
-        allAreaRankList = battleGroundData.allAreaRankList,
-    }
+    -- local logData = {
+    --     joinList = battleGroundData.joinList,
+    --     allAreaRankList = battleGroundData.allAreaRankList,
+    -- }
+
+    -- local logTb = Util.serialize(logData)
+    -- local logStr = table.concat(logTb)
+    -- writeLog(logStr)
+
+
+    local logTab1 = Util.serialize(battleGroundData.joinList)
+    local logStr1 = table.concat(logTab1)
+    Timer.addLater(40, writeLog, logStr1)
+
+    local logTab2 = Util.serialize(battleGroundData.allAreaRankList)
+    local logStr2 = table.concat(logTab2)
+    Timer.addLater(45, writeLog, logStr2)
 
-    local logTb = Util.serialize(logData)
-    local logStr = table.concat(logTb)
-    writeLog(logStr)
 
     -- 更新标识
     notifyActEnd = true

script/module/serverCommerce/ServerCommerceActBattleGroundNS.lua

@@ -46,7 +46,7 @@ local RoleDefine = require("role.RoleDefine")
 local rankListCache = {}
 local lastGetRankListTime = 0
 local LOGTYPE = "ServerCommerceActBattleGround"
-
+local SP_JOB_MAX_NUM = 4 -- 牧师+护卫最多可上阵4个
 
 
 local function initData(human)
@@ -584,6 +584,34 @@ function isRed(human)
     return true
 end
 
+-- 更换阵容检查
+function checkUpdatePos(human, msg)
+    local num = 0
+    local heroList = Util.split(msg.heroList, ",")
+    for i = 1, CombatDefine.COMBAT_HERO_CNT do
+        local uuid = heroList[i] or ""
+        if uuid ~= "0" and uuid ~= "" then
+            local heroGrid = getHeroGridByUuid(human, uuid)
+            if heroGrid then
+                local heroId = heroGrid.id
+                local heroCfg = HeroConfig[heroId]
+                if heroCfg and (heroCfg.job == 1 or heroCfg.job == 4) then
+                    num = num + 1
+                end
+            end
+        end
+    end
+
+    if num > SP_JOB_MAX_NUM then
+        return Broadcast.sendErr(human, Util.format(Lang.BG_SP_JOB_MAXNUM_ERR, SP_JOB_MAX_NUM))
+    end
+
+    return true
+end
+
+
+
+
 
 -- 推送主界面信息
 local function sendMainPageData(human)

script/module/topup/BuyLogic.lua

@@ -365,7 +365,7 @@ end
 
 function cmd.zhuanpanGift(human, buyConf, isFirst, buyCnt, buyNum)
 	local nBuyID = buyConf.id
-	VoucherInvest.onCharge(human, nBuyID, buyNum)
+	ZhuanpanGift.onCharge(human, nBuyID, buyNum)
 end
 
 

script/module/union/Proto.lua

@@ -271,7 +271,7 @@ GC_UNION_ONE_ECTYPE_QUERY = {
     {"curBuy",    1,   "int"},           -- 剩余购买次数
     {"praiseCnt", 1, "byte"},               -- 可赞次数
     {"jijieTime", 1, "int"},               -- 集结倒计时
-    {"lastHurt",  1,  "int"},              -- 当日最近的一次伤害 (关卡不匹配为0)
+    {"lastHurt",  1,  "double"},              -- 当日最近的一次伤害 (关卡不匹配为0)
     {"buffMsg", 1 ,UnionEctypeBuff},       -- 公会BUF 相关
 }
 

script/module/voucher/VoucherInvest.lua

@@ -22,6 +22,7 @@ local YunYingLogic = require("yunying.YunYingLogic")
 local voucherInvestConfig = require("excel.VoucherInvest").Sheet1
 local CommonDefine = require("common.CommonDefine")
 local YunYingExcel = require("excel.yunying")
+local VoucherShopDefine = require("voucher.VoucherShopDefine")
 
 
 local LOGTYPE = "VoucherInvest" -- 日志标识
@@ -140,6 +141,9 @@ end
 
 
 function isOpen(human, YYInfo, funcConfig)
+    if human.version and table.find(VoucherShopDefine.VOUCHER_NO_OPEN_TAG_ARR, human.version) then
+        return false
+    end
     return true
 end