合并360test分支修改

script/common/CommonDB.lua

@@ -44,6 +44,7 @@ KEY_COMMERCEACT_MIDDLE_INFO = "commerceMiddleActInfo"	-- 中心服跨服商业
 KEY_BAN_DATA = "banData"								-- 封禁数据
 KEY_REBATE_DATA = "rebateData"							-- 渠道返利数据
 KEY_ANOTHERWORLDBATTLE_START_TI = "anotherWorldBattleStart" -- 最近一轮异界之战开启时间
+KEY_LEVELGIFT_GETRECORD = "levelGiftGetRecord"			-- 送万元充值/等级礼包领取记录
 
 db = db or {
 	serverStartTime = nil,								-- 开服时间
@@ -72,6 +73,7 @@ db = db or {
 	commerceActInfo = {},								-- 跨服商业活动信息
 	jjcNewladderInfo = {},								-- 天梯赛信息
 	commerceMiddleActInfo = {},							-- 中心服跨服商业活动信息
+	levelGiftGetRecord = {},							-- 送万元充值/等级礼包领取记录
 }
 
 

script/module/absAct/CommonActMoneyTree.lua

@@ -126,6 +126,11 @@ function isRed(human, YYInfo, funcConfig)
     end
 
     local actData = getData(human)
+
+    if not actData then
+        return false
+    end
+
     if (actData.nowStage or 0) == 1 then
         return true
     end

script/module/anotherWorldBattle/AnotherWorldBattleCS.lua

@@ -1481,7 +1481,7 @@ local function challenge_Win(msg)
 
 
         -- 更新防守方公会的排行榜数据
-        AnotherWorldBattleDB.UpdateUnionRankList(groupId, pointData.unionId, cityNum, pointNum)
+        AnotherWorldBattleDB.UpdateUnionRankList(groupId, pointData.unionId, cityNum, -pointNum)
         -- 更新防守方玩家的排行榜数据
         AnotherWorldBattleDB.UpdatePlayerRankList(groupId, pointData.playerUuid, -pointNum, -pointWeight)
 

script/module/chat/Gm.lua

@@ -2297,4 +2297,11 @@ end
 function d3.delzsch(human)
 	local GodsAreaNS = require("godsArea.GodsAreaNS")
 	GodsAreaNS.GM_ClearChenghao(human)
+end
+
+
+-- 开启下一个循环活动
+function d3.cycleAct(human)
+	local CycleActivityLogic = require("yunying.CycleActivity")
+	CycleActivityLogic.GM_EnterNext(human)
 end

script/module/yunying/CycleActivity.lua

@@ -273,3 +273,37 @@ function onZero()
         end
     end
 end
+
+-- GM函数, 进入下一个循环活动
+function GM_EnterNext(human)
+    -- local nNowID = CycleActivity_GetActivityID(human)
+    -- local bRun = CycleActivity_IsRunByYunYingID(human, nNowID)
+    -- if true == bRun then
+    --     print("[CycleActivity_EnterNext] 当前活动还在进行中无法进入下一轮")
+    --     return false
+    -- end
+
+    local nNextID = CycleActivity_GetNextActivityID(human)
+    if -1 >= nNextID then
+        print("[CycleActivity_EnterNext] 获取不到下一轮的活动ID")
+        return false
+    end
+
+    local nEndTime = CycleActivity_CalEndTime()
+    local nBeginTime = os.time()
+
+    CycleActivity_SetActivityID(human, nNextID)
+    CycleActivity_SetEndTime(human, nEndTime)
+    CycleActivity_SetBeginTime(human, nBeginTime)
+    CycleActivity_SetReset(human, false)
+
+    local bReset = CycleActivity_GetReset(human)
+    if false == bReset then
+        -- print("[CycleActivity_onLogin] 开始重置数据 name = "..human.db.name)
+        CycleActivity_ResetAbsID(human)
+        CycleActivity_SetReset(human, true)
+    end
+
+    YunYingLogic.sendIcons(human)
+    YunYingLogic.sendBanner(human)
+end