From 000cf441771078c5bbe60ebc6173e7df5360e54e Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 04 九月 2018 14:39:47 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py
index 3662c3e..0298efb 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py
@@ -323,7 +323,11 @@
ShareDefine.ActKey_ShopTypeList:todayShopType}
# Boss复活活动
elif actName == ShareDefine.OperationActionName_BossReborn:
- mapServerInfoDict = {ShareDefine.ActKey_ID:actID,ShareDefine.ActKey_TemplateID:ipyData.GetTemplateID()}
+ mapServerInfoDict = {ShareDefine.ActKey_ID:actID,
+ ShareDefine.ActKey_TemplateID:ipyData.GetTemplateID(),
+ ShareDefine.ActKey_StartDate:ipyData.GetStartDate(),
+ ShareDefine.ActKey_EndDate:ipyData.GetEndDate(),
+ ShareDefine.ActKey_LVLimit:ipyData.GetLVLimit(),}
# 限时礼包活动
elif actName == ShareDefine.OperationActionName_FlashGiftbag:
isDayReset = ipyData.GetIsDayReset()
@@ -343,7 +347,9 @@
# 多倍修行点活动
if actName == ShareDefine.OperationActionName_RealmPoint:
mapServerInfoDict = {ShareDefine.ActKey_LVLimit:ipyData.GetLVLimit(),
- ShareDefine.ActKey_RealmPointMulti:ipyData.GetMultiple()}
+ ShareDefine.ActKey_RealmPointMulti:ipyData.GetMultiple(),
+ ShareDefine.ActKey_StartDate:ipyData.GetStartDate(),
+ ShareDefine.ActKey_EndDate:ipyData.GetEndDate(),}
return mapServerInfoDict
def Dispose_OperationActionState(reloadRefresh=False):
--
Gitblit v1.8.0