From c060aabfb4621e897f7b69d6e537fc3ccf59d860 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期一, 28 一月 2019 20:44:25 +0800
Subject: [PATCH] 2969 【BUG】【1.5.200】限时抢购，重新开服全服抢购次数会重置
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.py | 97 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 73 insertions(+), 24 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.py
index a4ca269..226837f 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.py
@@ -19,10 +19,12 @@
import PlayerControl
import NetPackCommon
import IpyGameDataPY
+import PlayerActivity
import ChPyNetSendPack
import CrossRealmPlayer
import FunctionNPCCommon
import DataRecordPack
+import PlayerWeekParty
import IPY_GameWorld
import ItemControler
import ItemCommon
@@ -31,9 +33,10 @@
## 是否匹配中
def SetIsCrossPKMatching(curPlayer, isMatching):
- curPlayer.SetDict(ChConfig.Def_PlayerKey_IsCrossPKMatching, isMatching)
+ PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PlayerKey_IsCrossPKMatching, isMatching)
return
-def GetIsCrossPKMatching(curPlayer): return curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_IsCrossPKMatching)
+def GetIsCrossPKMatching(curPlayer):
+ return curPlayer.NomalDictGetProperty(ChConfig.Def_PlayerKey_IsCrossPKMatching) and IsCrossRealmPKMatchState()
def DoPlayerOnDay(curPlayer):
if GameWorld.IsCrossServer():
@@ -62,6 +65,7 @@
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_CrossPK_TodayPKCount, 0)
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_CrossPK_TodayWinCount, 0)
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_CrossPK_TodayBuyCount, 0)
+ PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_CrossPK_ItemAddCount, 0)
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_CrossPK_DayPKCountAwardState, 0)
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_CrossPK_DayWinCountAwardState, 0)
SyncCrossRealmPKPlayerInfo(curPlayer)
@@ -152,7 +156,7 @@
DR_GetCrossPKAward(curPlayer, zoneID, seasonID, eventName, True, mailDetail)
# 查询 GameServer 玩家赛季排名
- if not curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_CrossPK_SeasonAwardState):
+ if not curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_CrossPK_SeasonAwardState) and playerDanLV:
OnQueryCrossPKSeasonOrderAward(curPlayer, zoneID, seasonID, True)
# 重置状态
@@ -165,6 +169,7 @@
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_CrossPK_TodayPKCount, 0)
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_CrossPK_TodayWinCount, 0)
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_CrossPK_TodayBuyCount, 0)
+ PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_CrossPK_ItemAddCount, 0)
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_CrossPK_DayPKCountAwardState, 0)
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_CrossPK_DayWinCountAwardState, 0)
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_CrossPK_DanLVAwardState, 0)
@@ -196,6 +201,10 @@
GameWorld.DebugLog("跨服服务器无法发起匹配!", playerID)
return
+ if not CrossRealmPlayer.IsCrossServerOpen():
+ PlayerControl.NotifyCode(curPlayer, "CrossMatching18")
+ return
+
if GameWorld.GetMap().GetMapFBType() != IPY_GameWorld.fbtNull:
GameWorld.DebugLog("副本中，无法进行跨服匹配!", playerID)
return
@@ -222,9 +231,11 @@
if dayFreeMatchCountMax:
todayPKCount = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_CrossPK_TodayPKCount)
todayBuyCount = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_CrossPK_TodayBuyCount)
- if todayPKCount >= (dayFreeMatchCountMax + todayBuyCount):
- GameWorld.DebugLog("PK次数不足，无法发起匹配! todayPKCount=%s >= (dayFreeMatchCountMax=%s + todayBuyCount=%s)"
- % (todayPKCount, dayFreeMatchCountMax, todayBuyCount), playerID)
+ todayItemAddCount = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_CrossPK_ItemAddCount)
+
+ if todayPKCount >= (dayFreeMatchCountMax + todayBuyCount + todayItemAddCount):
+ GameWorld.DebugLog("PK次数不足，无法发起匹配! todayPKCount=%s >= (dayFreeMatchCountMax=%s + todayBuyCount=%s + todayItemAddCount=%s)"
+ % (todayPKCount, dayFreeMatchCountMax, todayBuyCount, todayItemAddCount), playerID)
return
dataMsg = {
@@ -236,6 +247,7 @@
"playerJob":curPlayer.GetJob(),
"playerLV":curPlayer.GetLV(),
"maxHP":curPlayer.GetMaxHP(),
+ "maxProDef":PlayerControl.GetMaxProDef(curPlayer),
"fightPower":curPlayer.GetFightPower(),
"realmLV":curPlayer.GetOfficialRank(),
"pkScore":curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_CrossPK_TotalScore), # 当前积分
@@ -274,27 +286,37 @@
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_CrossPK_ZoneID, zoneID)
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_CrossPK_SeasonID, seasonID)
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_CrossPK_SeasonDanLV % seasonID, danLV)
+ PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_CrossPK_SeasonScore % seasonID, pkScore)
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_CrossPK_TotalScore, pkScore)
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_CrossPK_DanLV, danLV)
pkCount = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_CrossPK_PKCount) + 1
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_CrossPK_PKCount, pkCount)
+ GameWorld.Log(" 更新数据: danLV=%s,pkScore=%s,pkCount=%s" % (danLV, pkScore, pkCount), playerID)
if isWinner:
winCount = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_CrossPK_WinCount) + 1
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_CrossPK_WinCount, winCount)
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_CrossPK_CWinCount, cWinCount)
+ GameWorld.Log(" winner winCount=%s,cWinCount=%s" % (winCount, cWinCount), playerID)
else:
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_CrossPK_CWinCount, 0)
-
+ GameWorld.Log(" loser cWinCount=0", playerID)
+
# 同一天的话增加当日PK次数
if GameWorld.CheckTimeIsSameServerDayEx(GameWorld.ChangeTimeStrToNum(timeStr)):
todayPKCount = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_CrossPK_TodayPKCount) + 1
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_CrossPK_TodayPKCount, todayPKCount)
+ GameWorld.Log(" 同一天的PK结算增加今日PK次数: todayPKCount=%s" % todayPKCount, playerID)
if isWinner:
todayWinCount = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_CrossPK_TodayWinCount) + 1
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_CrossPK_TodayWinCount, todayWinCount)
-
+ GameWorld.Log(" 增加今日已获胜次数: todayWinCount=%s" % todayWinCount, playerID)
+ PlayerActivity.AddDailyActionFinishCnt(curPlayer, ShareDefine.DailyActionID_CrossReamPK)
+ PlayerWeekParty.AddWeekPartyActionCnt(curPlayer, ChConfig.Def_WPAct_CrossPK, 1)
+ else:
+ GameWorld.Log(" 不同天的PK结算不增加今日PK次数! ", playerID)
+
SyncCrossRealmPKPlayerInfo(curPlayer)
## 跨服已经通知过了，证明还在跨服服务器，不做以下的处理
@@ -326,6 +348,12 @@
def OnCrossRealmPKBuy(index, clientData, tick):
curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
playerID = curPlayer.GetPlayerID()
+ if not CrossRealmPlayer.IsCrossServerOpen():
+ PlayerControl.NotifyCode(curPlayer, "CrossMatching18")
+ return
+ if not IsCrossRealmPKMatchState():
+ GameWorld.DebugLog("跨服匹配未开启，不可进行购买次数！", playerID)
+ return
dayFreeMatchCountMax = IpyGameDataPY.GetFuncCfg("CrossRealmPKMatchCount", 1)
if not dayFreeMatchCountMax:
GameWorld.DebugLog("每日匹配次数没有限制，不需要购买次数！", playerID)
@@ -382,14 +410,15 @@
return
dayPKCountAwardDict = IpyGameDataPY.GetFuncEvalCfg("CrossRealmPKAward", 1, {}) # {"次数":[[物品ID,个数,是否绑定], ...], ...}
awardPKCountList = dayPKCountAwardDict.keys()
+ awardPKCountList = [int(k) for k in awardPKCountList]
awardPKCountList.sort()
- awardPKCountStr = str(awardPKCount)
- if awardPKCountStr not in awardPKCountList:
+ GameWorld.DebugLog(" awardPKCountList=%s" % awardPKCountList, playerID)
+ if awardPKCount not in awardPKCountList:
GameWorld.DebugLog(" 没有该PK次数奖励！")
return
- awardIndex = awardPKCountList.index(awardPKCountStr)
+ awardIndex = awardPKCountList.index(awardPKCount)
awardStateDictName = ChConfig.Def_PDict_CrossPK_DayPKCountAwardState
- awardItemList = dayPKCountAwardDict[awardPKCountStr]
+ awardItemList = dayPKCountAwardDict[str(awardPKCount)]
eventName = "PKCount"
drDataDict = {"awardPKCount":awardPKCount}
@@ -402,14 +431,15 @@
return
dayWinCountAwardDict = IpyGameDataPY.GetFuncEvalCfg("CrossRealmPKAward", 2, {}) # {"次数":[[物品ID,个数,是否绑定], ...], ...}
awardWinCountList = dayWinCountAwardDict.keys()
+ awardWinCountList = [int(k) for k in awardWinCountList]
awardWinCountList.sort()
- awardWinCountStr = str(awardWinCount)
- if awardWinCountStr not in awardWinCountList:
+ GameWorld.DebugLog(" awardWinCountList=%s" % awardWinCountList, playerID)
+ if awardWinCount not in awardWinCountList:
GameWorld.DebugLog(" 没有该胜利次数奖励！", playerID)
return
- awardIndex = awardWinCountList.index(awardWinCountStr)
+ awardIndex = awardWinCountList.index(awardWinCount)
awardStateDictName = ChConfig.Def_PDict_CrossPK_DayWinCountAwardState
- awardItemList = dayWinCountAwardDict[awardWinCountStr]
+ awardItemList = dayWinCountAwardDict[str(awardWinCount)]
eventName = "WinCount"
drDataDict = {"awardWinCount":awardWinCount}
@@ -431,6 +461,10 @@
elif awardType == 4:
GameWorld.DebugLog("玩家领取赛季结算奖励!", playerID)
+ totalScore = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_CrossPK_TotalScore)
+ if not totalScore:
+ GameWorld.DebugLog("无赛季积分无法领取奖励!", playerID)
+ return
if GameWorld.GetGameWorld().GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_CrossPKSeasonState) != 2:
GameWorld.DebugLog("非赛季结算阶段，不可领取!", playerID)
return
@@ -469,6 +503,9 @@
for itemID, itemCnt, isBind in awardItemList:
ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, isBind, [IPY_GameWorld.rptItem])
+ if awardType == 3:
+ PlayerControl.WorldNotify(0, "CrossMatching22", [curPlayer.GetPlayerName(), awardDanLV])
+
DR_GetCrossPKAward(curPlayer, zoneID, seasonID, eventName, False, drDataDict)
return
@@ -476,16 +513,17 @@
## 邮件发放未领取的每日奖励
playerID = curPlayer.GetPlayerID()
awardCountList = awardItemDict.keys()
+ awardCountList = [int(k) for k in awardCountList]
awardCountList.sort()
- for i, awardCountStr in enumerate(awardCountList):
- awardCount = int(awardCountStr)
+ GameWorld.DebugLog(" awardCountList=%s" % awardCountList, playerID)
+ for i, awardCount in enumerate(awardCountList):
if dataCount < awardCount:
GameWorld.DebugLog("跨服PK每日奖励次数不足: eventName=%s,i=%s,awardCount=%s > dataCount=%s" % (eventName, i, awardCount, dataCount), playerID)
break
if pow(2, i) & awardState:
GameWorld.DebugLog("已领取该跨服PK每日奖励: eventName=%s,i=%s,awardCount=%s" % (eventName, i, awardCount), playerID)
continue
- awardItemList = awardItemDict[awardCountStr]
+ awardItemList = awardItemDict[str(awardCount)]
GameWorld.Log("邮件发放跨服PK未领取的每日奖励: zoneID=%s,seasonID=%s,eventName=%s,i=%s,awardCount=%s,dataCount=%s,awardState=%s,awardItemList=%s"
% (zoneID, seasonID, eventName, i, awardCount, dataCount, awardState, awardItemList), playerID)
@@ -517,7 +555,8 @@
def DoGetPKSeasonAward(curPlayer, eventName, zoneID, seasonID, order, danLV, isMail):
## 执行发放赛季结算奖励，名次奖励与最高段位奖励互斥，优先名次奖励
-
+ isNotify = not isMail
+ notifyKey = ""
awardItemList = []
seasonAwardLV = danLV
playerID = curPlayer.GetPlayerID()
@@ -529,17 +568,20 @@
if order > 0:
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_CrossPK_SeasonOrder % seasonID, order)
seasonOrderAwardDict = IpyGameDataPY.GetFuncEvalCfg("CrossRealmPKAward", 3, {}) # {"名次":[[物品ID,个数,是否绑定], ...], ...}
+ awardOrderList = seasonOrderAwardDict.keys()
+ awardOrderList = [int(k) for k in awardOrderList]
+ awardOrderList.sort()
+ GameWorld.DebugLog(" awardOrderList=%s" % awardOrderList, playerID)
fromOrder, toOrder = 1, 1
- awardOrderList = sorted(seasonOrderAwardDict.keys())
- for i, awardOrderStr in enumerate(awardOrderList):
- awardOrder = int(awardOrderStr)
+ for i, awardOrder in enumerate(awardOrderList):
if order <= awardOrder:
toOrder = awardOrder
- awardItemList = seasonOrderAwardDict[awardOrderStr]
+ awardItemList = seasonOrderAwardDict[str(awardOrder)]
maxDanLV = IpyGameDataPY.IPY_Data().GetCrossRealmPKDanCount() - 1 # 因为段位等级从0开始，所以最大段位等级要减1
seasonAwardLV = maxDanLV + (len(awardOrderList) - i)
GameWorld.Log("获得排名奖励, 更新奖励等级: awardOrderList=%s,i=%s,maxDanLV=%s,seasonAwardLV=%s" % (awardOrderList, i, maxDanLV, seasonAwardLV), playerID)
mailTypeKey = "CrossServer4"
+ notifyKey = "CrossMatching23"
mailParamList = [seasonID, fromOrder, toOrder]
break
fromOrder = awardOrder + 1
@@ -551,6 +593,7 @@
return
awardItemList = danLVIpyData.GetSeasonDanLVAwardList()
mailTypeKey = "CrossServer5"
+ notifyKey = "CrossMatching24"
mailParamList = [seasonID, danLV]
if not awardItemList:
@@ -565,6 +608,7 @@
SyncCrossRealmPKAwardState(curPlayer)
GameWorld.Log("还是同一个赛季，设置赛季奖励已领取!")
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_CrossPK_SeasonAwardLV % seasonID, seasonAwardLV)
+ SyncCrossRealmPKHisSeasonInfo(curPlayer)
if not isMail:
needSpace = len(awardItemList)
@@ -581,6 +625,9 @@
GameWorld.Log("领取成功! awardItemList=%s" % (awardItemList), playerID)
drDataDict = {"awardItemList":awardItemList, "order":order, "danLV":danLV, "seasonAwardLV":seasonAwardLV, "isMail":isMail}
DR_GetCrossPKAward(curPlayer, zoneID, seasonID, eventName, isMail, drDataDict)
+
+ if isNotify and notifyKey:
+ PlayerControl.WorldNotify(0, notifyKey, [curPlayer.GetPlayerName()] + mailParamList + [awardItemList[0][0]])
return
def SyncCrossRealmPKPlayerInfo(curPlayer):
@@ -594,6 +641,7 @@
pkPlayerInfo.DayPKCount = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_CrossPK_TodayPKCount)
pkPlayerInfo.DayWinCount = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_CrossPK_TodayWinCount)
pkPlayerInfo.DayBuyCount = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_CrossPK_TodayBuyCount)
+ pkPlayerInfo.DayItemAddCount = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_CrossPK_ItemAddCount)
NetPackCommon.SendFakePack(curPlayer, pkPlayerInfo)
return
@@ -615,6 +663,7 @@
seasonInfo = ChPyNetSendPack.tagMCCrossRealmPKPlayerHisSeason()
seasonInfo.SeasonID = seasonID
seasonInfo.DanLV = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_CrossPK_SeasonDanLV % seasonID)
+ seasonInfo.Score = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_CrossPK_SeasonScore % seasonID)
seasonInfo.Order = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_CrossPK_SeasonOrder % seasonID)
seasonInfo.AwardLV = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_CrossPK_SeasonAwardLV % seasonID)
hisSeasonInfo.SeasonList.append(seasonInfo)
--
Gitblit v1.8.0