8848 【主干】【BT2】【后端】所有活动中，不能配置活动开启等级的，补充该配置(每日礼包AA25、充值返利AA27、累计充值返利仙玉AA29、成长...

hxp

2021-03-10 2e677ecbfa2408d951e25bcadb22123e0375233c

8848 【主干】【BT2】【后端】所有活动中，不能配置活动开启等级的，补充该配置(每日礼包AA25、充值返利AA27、累计充值返利仙玉AA29、成长必买AA31、节日登录AA42、节日祝福AA43、节日游历AA46);

# Conflicts:
#	PySysDB/PySysDBPY.h
#	ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
#	ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
#	ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
#	ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActRechargeRebateGold.py

 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActGrowupBuy.py

@@ -161,6 +161,7 @@
    actPack = ChPyNetSendPack.tagMCActGrowupBuyInfo()

    actPack.StartDate = GameWorld.GetOperationActionDateStr(ipyData.GetStartDate(), openServerDay)

    actPack.EndtDate = GameWorld.GetOperationActionDateStr(ipyData.GetEndDate(), openServerDay)

    actPack.LimitLV = ipyData.GetLVLimit()

    actPack.GroupList = []

    for i, ctgIDList in enumerate(ctgIDGroupList):

        groupInfo = ChPyNetSendPack.tagMCActGrowupBuyGroup()


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActRechargePrize.py

@@ -169,6 +169,7 @@
    actInfo = ChPyNetSendPack.tagMCActRechargePrizeInfo()

    actInfo.StartDate = GameWorld.GetOperationActionDateStr(ipyData.GetStartDate(), openServerDay)

    actInfo.EndtDate = GameWorld.GetOperationActionDateStr(ipyData.GetEndDate(), openServerDay)

    actInfo.LimitLV = ipyData.GetLVLimit()

    actInfo.IsDayReset = ipyData.GetIsDayReset()

    actInfo.PrizeDayInfo = []

    for templateID in templateIDList:


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDailyGiftbag.py

@@ -203,7 +203,7 @@
    

    packInfo = ChPyNetSendPack.tagMCDailyGiftbagInfo()

    packInfo.GiftbagInfo = []

    
    packInfo.LimitLV = cfgIpyData.GetLVLimit()

    for giftIpyData in giftbagIpyDataList:

        giftbagID = giftIpyData.GetGiftbagID()

        orderIpyData = GetGiftbagIDOrderInfoIpyData(giftbagID, appID)


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFeastLogin.py

@@ -194,6 +194,7 @@
    actPack.Clear()

    actPack.StartDate = GameWorld.GetOperationActionDateStr(ipyData.GetStartDate(), openServerDay)

    actPack.EndtDate = GameWorld.GetOperationActionDateStr(ipyData.GetEndDate(), openServerDay)

    actPack.LimitLV = ipyData.GetLVLimit()

    actPack.DayAwardList = []

    for dayIpyData in dayIpyDataList:

        dayInfo = ChPyNetSendPack.tagMCFeastLoginDayAward()


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFeastTravel.py

@@ -274,6 +274,7 @@
    actPack.Clear()

    actPack.StartDate = GameWorld.GetOperationActionDateStr(ipyData.GetStartDate(), openServerDay)

    actPack.EndtDate = GameWorld.GetOperationActionDateStr(ipyData.GetEndDate(), openServerDay)

    actPack.LimitLV = ipyData.GetLVLimit()

    actPack.ResetType = ipyData.GetResetType()

    

    actPack.TravelTaskList = []


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFeastWish.py

@@ -448,6 +448,7 @@
    actPack.Clear()

    actPack.StartDate = GameWorld.GetOperationActionDateStr(ipyData.GetStartDate(), openServerDay)

    actPack.EndtDate = GameWorld.GetOperationActionDateStr(ipyData.GetEndDate(), openServerDay)

    actPack.LimitLV = ipyData.GetLVLimit()

    actPack.ResetType = ipyData.GetResetType()

    actPack.WishPoolShowItemList = poolIpyData.GetWishPoolClientItemShow() if poolIpyData else []

    actPack.WishPoolShowCount = len(actPack.WishPoolShowItemList)