增加开启下一个循环活动的GM

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 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