From 5ea28aead9761406845a3bff4d663f53e800fdb6 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 19 三月 2019 19:14:53 +0800
Subject: [PATCH] 6332 【后端】【2.0】主要是拍品相关规则调整及背包优化（去除旧版设置绑定逻辑）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.py | 136 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 113 insertions(+), 23 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 eae412f..7beab65 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.py
@@ -93,6 +93,16 @@
return GameWorld.GetGameWorld().GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_CrossDailyActionState \
% ShareDefine.DailyActionID_CrossReamPK) == ChConfig.Def_Action_Open
+def GetCrossPKDanAwardIpyData(seasonID, awardDanLV, isLog):
+ ## 获取跨服段位奖励配置信息
+ crossZoneName = GameWorld.GetCrossZoneName()
+ danLVAwardIpyData = IpyGameDataPY.GetIpyGameDataNotLog("CrossRealmPKDanAward", crossZoneName, seasonID, awardDanLV)
+ if not danLVAwardIpyData:
+ danLVAwardIpyData = IpyGameDataPY.GetIpyGameDataNotLog("CrossRealmPKDanAward", "", seasonID, awardDanLV)
+ if not danLVAwardIpyData and isLog:
+ GameWorld.ErrLog("找不到段位奖励配置: seasonID=%s, awardDanLV=%s" % (seasonID, awardDanLV))
+ return danLVAwardIpyData
+
def OnCrossRealmPKSeasonChange(value):
## 赛区赛季状态变更，规定所有赛区的赛季ID都一样，且赛季ID一定是自增的，所以这里只判断赛季ID变更即可
@@ -139,10 +149,10 @@
# 邮件发放上赛季未领取的段位奖励、赛季奖励（排名或段位）
for awardDanLV in xrange(playerDanLV + 1):
- danLVIpyData = IpyGameDataPY.GetIpyGameData("CrossRealmPKDan", awardDanLV)
- if not danLVIpyData:
+ danLVAwardIpyData = GetCrossPKDanAwardIpyData(seasonID, awardDanLV, False)
+ if not danLVAwardIpyData:
continue
- awardItemList = danLVIpyData.GetDanLVAwardList()
+ awardItemList = danLVAwardIpyData.GetDanLVAwardList()
if not awardItemList:
continue
if pow(2, awardDanLV) & danLVAwardState:
@@ -274,6 +284,32 @@
isWinner = winnerID == playerID
GameWorld.Log("地图收到跨服PK结算: isWinner=%s,roomID=%s,zoneID=%s,seasonID=%s,timeStr=%s,overType=%s,winnerID=%s,roundWinnerIDList=%s,pkScore=%s,danLV=%s,cWinCount=%s,addScore=%s,tagPlayerID=%s,notifyState=%s"
% (isWinner, roomID, zoneID, seasonID, timeStr, overType, winnerID, roundWinnerIDList, pkScore, danLV, cWinCount, addScore, tagPlayerID, notifyState), playerID)
+
+ isToday = GameWorld.CheckTimeIsSameServerDayEx(GameWorld.ChangeTimeStrToNum(timeStr))
+ if not __DoAddPKOverData(curPlayer, zoneID, seasonID, danLV, pkScore, cWinCount, isWinner, isToday):
+ return
+
+ ## 跨服已经通知过了，证明还在跨服服务器，不做以下的处理
+ if notifyState:
+ return
+
+ overPack = ChPyNetSendPack.tagGCCrossRealmPKOverInfo()
+ overPack.TimeStr = timeStr
+ overPack.OverType = overType
+ overPack.WinnerID = winnerID
+ overPack.RoundWinnerID = roundWinnerIDList
+ overPack.RoundCount = len(overPack.RoundWinnerID)
+ overPack.AddScore = addScore
+ overPack.Score = pkScore
+ overPack.DanLV = danLV
+ overPack.CWinCnt = cWinCount
+ overPack.TagName = tagPlayerName
+ overPack.TagNameLen = len(overPack.TagName)
+ NetPackCommon.SendFakePack(curPlayer, overPack)
+ return
+
+def __DoAddPKOverData(curPlayer, zoneID, seasonID, danLV, pkScore, cWinCount, isWinner, isToday):
+ playerID = curPlayer.GetPlayerID()
curSeasonID = GameWorld.GetGameWorld().GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_CrossPKSeasonID)
if curSeasonID != seasonID:
GameWorld.Log(" 非本赛季的结算信息，不处理！curSeasonID=%s,seasonID=%s" % (curSeasonID, seasonID), playerID)
@@ -305,7 +341,7 @@
GameWorld.Log(" loser cWinCount=0", playerID)
# 同一天的话增加当日PK次数
- if GameWorld.CheckTimeIsSameServerDayEx(GameWorld.ChangeTimeStrToNum(timeStr)):
+ if isToday:
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)
@@ -320,24 +356,74 @@
GameWorld.Log(" 不同天的PK结算不增加今日PK次数! ", playerID)
SyncCrossRealmPKPlayerInfo(curPlayer)
-
- ## 跨服已经通知过了，证明还在跨服服务器，不做以下的处理
- if notifyState:
+ return True
+
+#// C1 08 跨服PK挑战机器人结算 #tagCMCrossRealmPKRobotOver
+#
+#struct tagCMCrossRealmPKRobotOver
+#{
+# tagHead Head;
+# BYTE IsWin; //是否获胜
+#};
+def OnCrossRealmPKRobotOver(index, clientData, tick):
+ curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
+ playerID = curPlayer.GetPlayerID()
+ isWinner = clientData.IsWin
+ billboardCfg = IpyGameDataPY.GetFuncEvalCfg("CrossRealmPKCfg", 1, [])
+ if not billboardCfg or len(billboardCfg) != 2:
+ GameWorld.ErrLog("跨服竞技场排行榜配置错误！")
+ return
+ danLVLimit = billboardCfg[1]
+ playerDanLV = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_CrossPK_DanLV)
+ #策划设计该机器人目的为了前期体验，这里只验证是否超过上榜段位即可，即使作弊也不管，只要有次数即可
+ if playerDanLV >= danLVLimit:
+ GameWorld.ErrLog("该段位不允许与机器人匹配PK!playerDanLV=%s,danLVLimit=%s" % (playerDanLV, danLVLimit), playerID)
return
+ zoneID = GameWorld.GetGameWorld().GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_CrossPKZoneID)
+ seasonID = GameWorld.GetGameWorld().GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_CrossPKSeasonID)
+ pkScore = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_CrossPK_TotalScore)
+ danLV = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_CrossPK_DanLV)
+ cWinCount = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_CrossPK_CWinCount)
+
+ ondayScore = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_CrossPK_OnDayScore)
+ dayScore = max(0, pkScore - ondayScore) # 今日已获得积分，正积分
+
+ baseScoreList = IpyGameDataPY.GetFuncEvalCfg("CrossRealmPKScore", 2) # 胜负保底分
+ wBaseScore = baseScoreList[0] if len(baseScoreList) > 0 else 0
+ lBaseScore = baseScoreList[1] if len(baseScoreList) > 1 else 0
+ wExScore = eval(IpyGameDataPY.GetFuncCompileCfg("CrossRealmPKScore", 3)) # 胜方附加分
+ lExScore = 0
+
+ if isWinner:
+ addScore = wBaseScore + wExScore
+ cWinCount += 1
+ else:
+ addScore = lBaseScore + lExScore
+ cWinCount = 0
+
+ dayMaxScore = IpyGameDataPY.GetFuncCfg("CrossRealmPKScore", 1) # 每日获得积分上限，0为不限制
+ if dayMaxScore and addScore:
+ addScore = min(dayMaxScore - dayScore, addScore)
+
+ GameWorld.Log("机器人跨服PK结算: isWinner=%s,zoneID=%s,seasonID=%s,pkScore=%s,danLV=%s,cWinCount=%s,addScore=%s"
+ % (isWinner, zoneID, seasonID, pkScore, danLV, cWinCount, addScore), playerID)
+
+ pkScore += addScore
+ winIpyData = IpyGameDataPY.GetIpyGameData("CrossRealmPKDan", danLV)
+ if winIpyData and winIpyData.GetLVUpScore() and pkScore >= winIpyData.GetLVUpScore():
+ danLV += 1
+
+ # 只同步以下信息，其他信息前端自行补全
overPack = ChPyNetSendPack.tagGCCrossRealmPKOverInfo()
- overPack.TimeStr = timeStr
- overPack.OverType = overType
- overPack.WinnerID = winnerID
- overPack.RoundWinnerID = roundWinnerIDList
- overPack.RoundCount = len(overPack.RoundWinnerID)
overPack.AddScore = addScore
overPack.Score = pkScore
overPack.DanLV = danLV
overPack.CWinCnt = cWinCount
- overPack.TagName = tagPlayerName
- overPack.TagNameLen = len(overPack.TagName)
NetPackCommon.SendFakePack(curPlayer, overPack)
+
+ isToday = True # 机器人结算的默认当天
+ __DoAddPKOverData(curPlayer, zoneID, seasonID, danLV, pkScore, cWinCount, isWinner, isToday)
return
@@ -452,12 +538,12 @@
if playerDanLV < awardDanLV:
GameWorld.DebugLog(" 段位未达标，无法领取！", playerID)
return
- danLVIpyData = IpyGameDataPY.GetIpyGameData("CrossRealmPKDan", awardDanLV)
- if not danLVIpyData:
+ danLVAwardIpyData = GetCrossPKDanAwardIpyData(seasonID, awardDanLV, True)
+ if not danLVAwardIpyData:
return
awardIndex = awardDanLV
awardStateDictName = ChConfig.Def_PDict_CrossPK_DanLVAwardState
- awardItemList = danLVIpyData.GetDanLVAwardList()
+ awardItemList = danLVAwardIpyData.GetDanLVAwardList()
eventName = "DanLV"
drDataDict = {"awardDanLV":awardDanLV}
@@ -503,7 +589,7 @@
% (awardType, awardData, awardIndex, awardState, awardItemList), playerID)
drDataDict.update({"awardIndex":awardIndex, "awardState":awardState, "awardItemList":awardItemList})
for itemID, itemCnt, isBind in awardItemList:
- ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, isBind, [IPY_GameWorld.rptItem])
+ ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem])
if awardType == 3:
PlayerControl.WorldNotify(0, "CrossMatching22", [curPlayer.GetPlayerName(), awardDanLV])
@@ -569,7 +655,11 @@
"order":order, "danLV":danLV, "mapSeasonID":mapSeasonID}
if order > 0:
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_CrossPK_SeasonOrder % seasonID, order)
- seasonOrderAwardDict = IpyGameDataPY.GetFuncEvalCfg("CrossRealmPKAward", 3, {}) # {"名次":[[物品ID,个数,是否绑定], ...], ...}
+ crossZoneName = GameWorld.GetCrossZoneName()
+ seasonOrderAwardIpyData = IpyGameDataPY.GetIpyGameDataNotLog("CrossRealmPKOrderAward", crossZoneName, seasonID)
+ if not seasonOrderAwardIpyData:
+ seasonOrderAwardIpyData = IpyGameDataPY.GetIpyGameData("CrossRealmPKOrderAward", "", seasonID)
+ seasonOrderAwardDict = {} if not seasonOrderAwardIpyData else seasonOrderAwardIpyData.GetOrderAwardInfo() # {"名次":[[物品ID,个数,是否绑定], ...], ...}
awardOrderList = seasonOrderAwardDict.keys()
awardOrderList = [int(k) for k in awardOrderList]
awardOrderList.sort()
@@ -590,10 +680,10 @@
# 没有奖励的话取段位奖励
if not awardItemList:
- danLVIpyData = IpyGameDataPY.GetIpyGameData("CrossRealmPKDan", danLV)
- if not danLVIpyData:
+ danLVAwardIpyData = GetCrossPKDanAwardIpyData(seasonID, danLV, False)
+ if not danLVAwardIpyData:
return
- awardItemList = danLVIpyData.GetSeasonDanLVAwardList()
+ awardItemList = danLVAwardIpyData.GetSeasonDanLVAwardList()
mailTypeKey = "CrossServer5"
notifyKey = "CrossMatching24"
mailParamList = [seasonID, danLV]
@@ -622,7 +712,7 @@
PlayerControl.SendMailByKey(mailTypeKey, [playerID], awardItemList, mailParamList, detail=mailDetail)
else:
for itemID, itemCnt, isBind in awardItemList:
- ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, isBind, [IPY_GameWorld.rptItem])
+ ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem])
GameWorld.Log("领取成功! awardItemList=%s" % (awardItemList), playerID)
drDataDict = {"awardItemList":awardItemList, "order":order, "danLV":danLV, "seasonAwardLV":seasonAwardLV, "isMail":isMail}
--
Gitblit v1.8.0