From 04643ea031c7434a7bb019aa1c05aa283ed7372d Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期六, 29 九月 2018 03:19:38 +0800
Subject: [PATCH] 3928 【后端】增加多倍经验活动在活动期间的循环广播

---
 ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py
index 77674c2..7ee030f 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py
@@ -179,7 +179,7 @@
                 
             notifyInfoDictStart = ipyData.GetNotifyInfoStart() if hasattr(ipyData, "GetNotifyInfoStart") else {}
             notifyInfoDictEnd = ipyData.GetNotifyInfoEnd() if hasattr(ipyData, "GetNotifyInfoEnd") else {}
-            notifyInfoLoopInfo = ipyData.GetNotifyInfoLoop() if hasattr(ipyData, "GetNotifyInfoLoop") else {} # [循环分钟, 广播key]
+            notifyInfoLoopInfo = ipyData.GetNotifyInfoLoop() if hasattr(ipyData, "GetNotifyInfoLoop") else {} # [循环分钟, 广播key, [广播参数列表可选]]
             
             if len(startHMStrList) != len(endHMStrList):
                 GameWorld.ErrLog("        活动配置开始及结束时间个数不匹配! actName=%s,cfgID=%s,startHMStrList=%s,endHMStrList=%s" 
@@ -267,9 +267,10 @@
                         isNotify = True
                         
                 # 广播 - 循环广播
-                if notifyInfoLoopInfo and len(notifyInfoLoopInfo) == 2:
-                    loopMinutes, loopNotifyKey = notifyInfoLoopInfo
-                    notifyInfo = [loopNotifyKey, []] # 循环广播的默认无参数,不做支持
+                if notifyInfoLoopInfo and len(notifyInfoLoopInfo) >= 2:
+                    loopMinutes, loopNotifyKey = notifyInfoLoopInfo[:2]
+                    loopNotifyParamList = notifyInfoLoopInfo[2] if len(notifyInfoLoopInfo) > 2 else []
+                    notifyInfo = [loopNotifyKey, loopNotifyParamList] # 循环广播的默认无参数
                     loopCount, loopMaxCount = 0, 100
                     while loopMinutes and loopNotifyKey and loopCount < loopMaxCount:
                         loopCount += 1

--
Gitblit v1.8.0