From 215a4edca77b43f1a60cf43c07049eb0a133d43a Mon Sep 17 00:00:00 2001 From: hxp <ale99527@vip.qq.com> Date: 星期三, 13 二月 2019 14:42:06 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode --- ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/FunctionNPCCommon.py | 201 ++++++++++++++++++++++++++++++++----------------- 1 files changed, 130 insertions(+), 71 deletions(-) diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/FunctionNPCCommon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/FunctionNPCCommon.py index 11882e1..24e6d1c 100644 --- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/FunctionNPCCommon.py +++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/FunctionNPCCommon.py @@ -64,11 +64,13 @@ import PlayerRune import GameFuncComm import PlayerFairyCeremony +import PlayerNewFairyCeremony import PlayerSpringSale import PyGameData import random import math +import time #--------------------------------------------------------------------- ##开始交易 # @param curPlayer 玩家实例 @@ -191,6 +193,14 @@ ## 登录 def ShopItemOnLogin(curPlayer): + if not GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_Player_Dict_VersionFix, ChConfig.Def_VerFix_SuperGift): + GameWorld.SetDictValueByBit(curPlayer, ChConfig.Def_Player_Dict_VersionFix, ChConfig.Def_VerFix_SuperGift, 1) + isGet = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_GoldGiftFirstRecord) + if isGet:#首充奖励已领取则代表超值礼包已开启过, + PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_SuperGiftHasOpen, 1) + + + SyncMysticalShopInfo(curPlayer) SyncShopItemTodayBuyCount(curPlayer) SyncSuperGiftInfo(curPlayer) return @@ -201,7 +211,6 @@ def ShopItemOnDay(curPlayer, onEventType): if onEventType == ShareDefine.Def_OnEventType: UpdataSuperGiftTime(curPlayer, True) - SyncSuperGiftInfo(curPlayer) OSSaleOpenMail(curPlayer) refreshType = [3] elif onEventType == ShareDefine.Def_OnEventTypeEx: @@ -234,8 +243,14 @@ __ResetShopItemBuyCount(curPlayer, [refreshType]) return +def ShopItemOnCrossPKSeasonChange(curPlayer): + ## 按跨服PK赛季重置 + refreshType = 8 + __ResetShopItemBuyCount(curPlayer, [refreshType]) + return + def __ResetShopItemBuyCount(curPlayer, onEventTypeList): - #重置商店物品购买次数 1:周一0点刷新 2:周一5点刷新 3:每日0点刷新 4:每日5点刷新 5每月0点 6每月5点 + #重置商店物品购买次数 1:周一0点刷新 2:周一5点刷新 3:每日0点刷新 4:每日5点刷新 5每月0点 6每月5点 7每3天5点 8每赛季 syncIndexList = [] ipyDataMgr = IpyGameDataPY.IPY_Data() for i in xrange(ipyDataMgr.GetStoreCount()): @@ -272,6 +287,49 @@ syncIndexList.append(shopItem.GetID()) if syncIndexList: SyncShopItemTodayBuyCount(curPlayer, syncIndexList, True) + return + +def MysticalShopOpen(curPlayer, befLV, aftLV): + ##神秘限购开启 + ipyDataList = IpyGameDataPY.GetIpyGameDataByCondition('Store', {'ShopType':16}, True) + if not ipyDataList: + return + curTime = int(time.time()) + syncGoodsList = [] + for ipyData in ipyDataList: + limitLV = ipyData.GetLimitLV() + if befLV < limitLV and aftLV >= limitLV: + goodsID = ipyData.GetID() + PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_ShopItemStartTime % goodsID, curTime) + syncGoodsList.append(goodsID) + GameWorld.DebugLog('神秘限购商品%s 开卖'%goodsID, curPlayer.GetID()) + if syncGoodsList: + SyncMysticalShopInfo(curPlayer) + return + +def SyncMysticalShopInfo(curPlayer): + ##神秘限购通知 + packData = ChPyNetSendPack.tagMCMysticalShopTimeInfo() + packData.ShopTimeList = [] + ipyDataList = IpyGameDataPY.GetIpyGameDataByCondition('Store', {'ShopType':16}, True) + curTime = int(time.time()) + for ipyData in ipyDataList: + goodsID = ipyData.GetID() + startTime = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_ShopItemStartTime % goodsID) + if not startTime: + continue + if curTime - startTime >= ipyData.GetLimitValue(): + #超时的重置 + PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_ShopItemStartTime % goodsID, 0) + else: + goodsTime = ChPyNetSendPack.tagMCMysticalShopTime() + goodsTime.GoodsID = goodsID + goodsTime.StartTime = startTime + packData.ShopTimeList.append(goodsTime) + if not packData.ShopTimeList: + return + packData.Count = len(packData.ShopTimeList) + NetPackCommon.SendFakePack(curPlayer, packData) return ## 回购物品 @@ -326,7 +384,10 @@ # @param tick 时间戳 # @return 返回值真, 逻辑运行成功 def BuyItem(curPlayer, tick): - + + if GameWorld.IsCrossServer(): + return + buyItemList = IPY_GameWorld.IPY_CBuyItemList() itemIndex = buyItemList.GetBuyItemIndex() if itemIndex < 0: @@ -347,7 +408,7 @@ if not state: GameWorld.DebugLog("限时特惠非活动中!state=%s" % (state), curPlayer.GetPlayerID()) return - shopTypeList = PlayerSpringSale.GetShopTypeList(actInfo.get(ShareDefine.ActKey_CfgID, 0), actInfo.get(ShareDefine.ActKey_DayIndex, 0)) + shopTypeList = PlayerSpringSale.GetShopTypeList(actInfo.get(ShareDefine.ActKey_CfgID, 0), actInfo.get(ShareDefine.ActKey_DayIndex, 0), actInfo.get(ShareDefine.ActKey_WorldLV, 0)) if not shopTypeList: return actShopType = shopTypeList[-1] if state > len(shopTypeList) else shopTypeList[state - 1] @@ -361,7 +422,7 @@ if not state: GameWorld.DebugLog("限时抢购非活动中!state=%s" % (state), curPlayer.GetPlayerID()) return - shopTypeList = PlayerFlashSale.GetShopTypeList(actInfo.get(ShareDefine.ActKey_CfgID, 0), actInfo.get(ShareDefine.ActKey_DayIndex, 0), state) + shopTypeList = PlayerFlashSale.GetShopTypeList(actInfo.get(ShareDefine.ActKey_CfgID, 0), actInfo.get(ShareDefine.ActKey_DayIndex, 0), state, actInfo.get(ShareDefine.ActKey_WorldLV, 0)) if not shopTypeList: return actShopType = shopTypeList[0] @@ -421,10 +482,10 @@ jobItemList = ipyData.GetJobItem() totalItemList = [] if itemID: - jobItemID = __GetShopJobItem(job, itemID, jobItemList) + jobItemID = GetShopJobItem(job, itemID, jobItemList) totalItemList.append([jobItemID, itemCount * clientBuyCount, isBind]) for itemIDEx, itemCountEx, isBindEx in itemListEx: - jobItemID = __GetShopJobItem(job, itemIDEx, jobItemList) + jobItemID = GetShopJobItem(job, itemIDEx, jobItemList) totalItemList.append([jobItemID, itemCountEx * clientBuyCount, isBindEx]) #允许价钱配置0,用来免费购买 if not totalItemList: @@ -452,12 +513,18 @@ GameWorld.DebugLog("购买物品: shopType=%s,itemIndex=%s,clientBuyCount=%s,totalItemList=%s,mainItemID=%s,needPackSpaceDict=%s" % (shopType, itemIndex, clientBuyCount, totalItemList, mainItemID, needPackSpaceDict), curPlayer.GetPlayerID()) - + mailKey = ipyData.GetMailKey() + isLackPack = False #是否背包不足 for packType, needSpace in needPackSpaceDict.items(): if needSpace > ItemCommon.GetItemPackSpace(curPlayer, packType, needSpace): - curPlayer.ShopResult(itemIndex, IPY_GameWorld.tsrNoPlace) - PlayerControl.NotifyCode(curPlayer, "GeRen_chenxin_676165", [packType]) - return + isLackPack = True + if mailKey: + break + else: + curPlayer.ShopResult(itemIndex, IPY_GameWorld.tsrNoPlace) + PlayerControl.NotifyCode(curPlayer, "GeRen_chenxin_676165", [packType]) + return + sendMailKey = mailKey if isLackPack and mailKey else '' #背包不足且配置了mailKey的才发邮件 # 购买限制条件扩展 if CheckBuyItemLimitEx(curPlayer, shopType, itemIndex, mainItemID, ipyData.GetLimitValue()): @@ -473,21 +540,22 @@ #已经在查询中, 不重复查询 GameWorld.DebugLog("全服购买次数已经在查询中, 不重复查询 itemIndex=%s" % itemIndex) return - cmdStr = '%s' % ([itemIndex, serverLimitCnt, clientBuyCount, totalItemList, mainItemID, limitBuyCnt]) + cmdStr = '%s' % ([itemIndex, serverLimitCnt, clientBuyCount, totalItemList, mainItemID, limitBuyCnt, sendMailKey]) GameWorld.GetPlayerManager().GameServer_QueryPlayerResult(curPlayer.GetID(), 0, 0, "GetStoreServerBuyCnt", cmdStr, len(cmdStr)) #设置状态查询中 curPlayer.SetDict(ChConfig.Def_PlayerKey_StoreQueryState, 1) return #-------------------------开始购买物品----------------------------- - DoBuyStoreItem(curPlayer, itemIndex, clientBuyCount, totalItemList, mainItemID, limitBuyCnt, ipyData) + DoBuyStoreItem(curPlayer, itemIndex, clientBuyCount, totalItemList, mainItemID, limitBuyCnt, sendMailKey, ipyData) return -def DoBuyStoreItem(curPlayer, itemIndex, clientBuyCount, totalItemList, mainItemID, limitBuyCnt, ipyData=None): +def DoBuyStoreItem(curPlayer, itemIndex, clientBuyCount, totalItemList, mainItemID, limitBuyCnt, sendMailKey, ipyData=None): if not ipyData: ipyData = IpyGameDataPY.GetIpyGameData("Store", itemIndex) priceType, itemPrice = ipyData.GetMoneyType(), ipyData.GetMoneyNum() + itemPrice *= clientBuyCount shopType = ipyData.GetShopType() beforeMoney = PlayerControl.GetMoney(curPlayer, priceType) @@ -508,34 +576,38 @@ "ItemPrice":itemPrice, "MoneyType":priceType, "BeforeMoney":beforeMoney, "AfterMoney":afterMoney} isForceEvent = priceType not in [IPY_GameWorld.TYPE_Price_Silver_Money] - + itemControl = ItemControler.PlayerItemControler(curPlayer) for itemID, itemCount, isBind in totalItemList: curItemObj = ItemControler.GetOutPutItemObj(itemID, itemCount, isBind) if not curItemObj: continue userData = curItemObj.GetUserData() - packType = ChConfig.GetItemPackType(curItemObj.GetType()) - if not itemControl.PutInItem(packType, curItemObj, event=[ChConfig.ItemGive_BuyItem, isForceEvent, dataDict]): + if not sendMailKey: + packType = ChConfig.GetItemPackType(curItemObj.GetType()) + if not itemControl.PutInItem(packType, curItemObj, event=[ChConfig.ItemGive_BuyItem, isForceEvent, dataDict]): + curItemObj.Clear() + continue + else: curItemObj.Clear() - continue - EventShell.EventRespons_BuyItem(curPlayer, itemID, itemCount) if ipyData.GetNotifyMark() and itemID == mainItemID: PlayerControl.WorldNotify(0, ipyData.GetNotifyMark(), [curPlayer.GetName(), mainItemID, userData]) - + if sendMailKey: + PlayerControl.SendMailByKey(sendMailKey, [curPlayer.GetID()], totalItemList, detail=dataDict) #触发任务购买物品 EventShell.EventRespons_ShopBuy(curPlayer, shopType) #curPlayer.ShopResult(itemIndex, IPY_GameWorld.tsrShopOK) SyncShoppingResult(curPlayer, itemIndex, clientBuyCount) if itemIndex in IpyGameDataPY.GetFuncEvalCfg('CeremonyFireParty', 1, {}).values(): PlayerFairyCeremony.AddFCPartyActionCnt(curPlayer, ChConfig.Def_PPAct_Fireworks, clientBuyCount) - if itemIndex in dict(IpyGameDataPY.GetFuncEvalCfg('SuperGiftTimeList')): - UpdataSuperGiftTime(curPlayer) + if itemIndex in IpyGameDataPY.GetFuncEvalCfg('NewCeremonyFireParty', 1, {}).values(): + PlayerNewFairyCeremony.AddFCPartyActionCnt(curPlayer, ChConfig.Def_PPAct_Fireworks, clientBuyCount) + return -def __GetShopJobItem(job, itemID, jobItemList): +def GetShopJobItem(job, itemID, jobItemList): ## 获取商城物品对应的职业物品, 职业从1开始 for jobItemIDList in jobItemList: if type(jobItemIDList) not in [list, tuple]: @@ -577,9 +649,15 @@ #烟花狂欢 if itemIndex in IpyGameDataPY.GetFuncEvalCfg('CeremonyFireParty', 1, {}).values(): return not PlayerFairyCeremony.IsCanBuyFireworks(curPlayer, itemIndex) - - if itemIndex in dict(IpyGameDataPY.GetFuncEvalCfg('SuperGiftTimeList')): - return not CheckSuperGiftBuy(curPlayer, itemIndex) + if itemIndex in IpyGameDataPY.GetFuncEvalCfg('NewCeremonyFireParty', 1, {}).values(): + return not PlayerNewFairyCeremony.IsCanBuyFireworks(curPlayer, itemIndex) +# if itemIndex in dict(IpyGameDataPY.GetFuncEvalCfg('SuperGiftTimeList')): +# return not CheckSuperGiftBuy(curPlayer, itemIndex) + if shopNPCID == 16:#神秘限购 + startTime = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_ShopItemStartTime % itemIndex) + curTime = int(time.time()) + return not startTime or curTime - startTime >= limitValue + # # limitPlusDict = {shopItem.GetLimitPlusType1():shopItem.GetLimitPlusValue1(), # shopItem.GetLimitPlusType2():shopItem.GetLimitPlusValue2(), @@ -619,67 +697,48 @@ #超值礼包购买时间 def UpdataSuperGiftTime(curPlayer, isOnday=False): - superGiftData = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_SuperGiftData) - giftIndex, startDay = superGiftData%10, superGiftData/10 - superGiftTimeList = IpyGameDataPY.GetFuncEvalCfg('SuperGiftTimeList') - if giftIndex >= len(superGiftTimeList): - return - if isOnday and not giftIndex: - return - openServerDay = GameWorld.GetGameWorld().GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_ServerDay)+1 - newIndex = giftIndex + curTime = int(time.time()) if isOnday: - lastDays = 0 - pastDay = openServerDay - startDay - for i in xrange(giftIndex-1, len(superGiftTimeList)): - lastDays += superGiftTimeList[i][1] - if pastDay < lastDays: - break - if pastDay >= lastDays: - newIndex = i+2 - + startTime = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_SuperGiftStartTime) + if not startTime: + return + superGiftTimeList = IpyGameDataPY.GetFuncEvalCfg('SuperGiftTimeList') + maxDay = max([info[1] for info in superGiftTimeList]) + if curTime - startTime >= maxDay * 86400: + #活动结束 重置 + PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_SuperGiftStartTime, 0) else: - newIndex = min(len(superGiftTimeList), giftIndex+1) + if curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_SuperGiftHasOpen): + #老号已开启过超值礼包则不再开启 + return - if newIndex == giftIndex: - return - - PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_SuperGiftData, openServerDay*10+newIndex) - #通知 - if not isOnday: - SyncSuperGiftInfo(curPlayer) - if newIndex == 1: + PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_SuperGiftStartTime, curTime) addItemList = IpyGameDataPY.GetFuncEvalCfg('SuperGiftTimeList', 2) PlayerControl.SendMailByKey('SellMail2', [curPlayer.GetID()], addItemList) + SyncSuperGiftInfo(curPlayer) return True def SyncSuperGiftInfo(curPlayer): - superGiftData = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_SuperGiftData) - giftIndex, startDay = superGiftData%10, superGiftData/10 - superGiftTimeList = IpyGameDataPY.GetFuncEvalCfg('SuperGiftTimeList') - if giftIndex == 0 or giftIndex > len(superGiftTimeList): + startTime = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_SuperGiftStartTime) + if not startTime: return - giftID, day = superGiftTimeList[giftIndex-1] - openServerDay = GameWorld.GetGameWorld().GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_ServerDay)+1 - remainDay = max(0, day - openServerDay+startDay)-1 - packData = ChPyNetSendPack.tagMCSuperGiftInfo() - packData.GiftID = giftID - packData.EndtDate = str(GameWorld.GetDatetimeByDiffDays(remainDay))[:10] + packData.StartTime = startTime NetPackCommon.SendFakePack(curPlayer, packData) return def CheckSuperGiftBuy(curPlayer, giftID): #超值礼包是否可购买 - superGiftData = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_SuperGiftData) - giftIndex, startDay = superGiftData%10, superGiftData/10 - superGiftTimeList = IpyGameDataPY.GetFuncEvalCfg('SuperGiftTimeList') - if giftIndex == 0 or giftIndex > len(superGiftTimeList): + startTime = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_SuperGiftStartTime) + if not startTime: return - curGiftID, day = superGiftTimeList[giftIndex-1] - if giftID != curGiftID: + + superGiftTimeDict = dict(IpyGameDataPY.GetFuncEvalCfg('SuperGiftTimeList')) + totalDay = superGiftTimeDict.get(giftID, 0) + if not totalDay: return - openServerDay = GameWorld.GetGameWorld().GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_ServerDay)+1 - if not max(0, day - openServerDay+startDay): + curTime = int(time.time()) + if (curTime - startTime)/86400 >= totalDay: + #已结束 return return True -- Gitblit v1.8.0