From c6eda45ce726796d523c6a6f624fc60c30b4b40b Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 28 十二月 2018 22:07:36 +0800
Subject: [PATCH] 5424 【后端】【1.4】跨服竞技场开发（匹配成功增加对手最大护盾值通知；增加天梯每日修行点支持）
---
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.py | 6 +++++-
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py | 11 +++++++++--
ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py | 11 +++++++++--
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.py | 3 +++
4 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
index 3857fe0..eb2dee0 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
@@ -8226,6 +8226,7 @@
Job = 0 #(BYTE Job)
LV = 0 #(WORD LV)
MaxHP = 0 #(DWORD MaxHP)// 默认满血
+ MaxProDef = 0 #(DWORD MaxProDef)// 最大护盾
data = None
def __init__(self):
@@ -8240,6 +8241,7 @@
self.Job,_pos = CommFunc.ReadBYTE(_lpData, _pos)
self.LV,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.MaxHP,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+ self.MaxProDef,_pos = CommFunc.ReadDWORD(_lpData, _pos)
return _pos
def Clear(self):
@@ -8249,6 +8251,7 @@
self.Job = 0
self.LV = 0
self.MaxHP = 0
+ self.MaxProDef = 0
return
def GetLength(self):
@@ -8258,6 +8261,7 @@
length += len(self.PlayerName)
length += 1
length += 2
+ length += 4
length += 4
return length
@@ -8270,6 +8274,7 @@
data = CommFunc.WriteBYTE(data, self.Job)
data = CommFunc.WriteWORD(data, self.LV)
data = CommFunc.WriteDWORD(data, self.MaxHP)
+ data = CommFunc.WriteDWORD(data, self.MaxProDef)
return data
def OutputString(self):
@@ -8279,7 +8284,8 @@
PlayerName:%s,
Job:%d,
LV:%d,
- MaxHP:%d
+ MaxHP:%d,
+ MaxProDef:%d
'''\
%(
self.PlayerID,
@@ -8287,7 +8293,8 @@
self.PlayerName,
self.Job,
self.LV,
- self.MaxHP
+ self.MaxHP,
+ self.MaxProDef
)
return DumpString
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.py
index 39b927b..fded022 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.py
@@ -46,6 +46,7 @@
self.playerJob = 0
self.playerLV = 0
self.maxHP = 0
+ self.maxProDef = 0
self.fightPower = 0
self.realmLV = 0
self.pkScore = 0
@@ -850,6 +851,7 @@
job = playerInfoDict["playerJob"] # 职业
playerLV = playerInfoDict["playerLV"] # 职业
maxHP = playerInfoDict["maxHP"] # 职业
+ maxProDef = playerInfoDict["maxProDef"] # 护盾
fightPower = playerInfoDict["fightPower"] # 战斗力
realmLV = playerInfoDict["realmLV"] # 境界
pkScore = playerInfoDict["pkScore"] # 当前积分
@@ -874,6 +876,7 @@
pkPlayer.playerJob = job
pkPlayer.playerLV = playerLV
pkPlayer.maxHP = maxHP
+ pkPlayer.maxProDef = maxProDef
pkPlayer.pkScore = pkScore
pkPlayer.danLV = danLV
pkPlayer.fightPower = fightPower
@@ -1015,7 +1018,7 @@
pkZoneID = roomPlayer.pkZoneID
roomGroupIDList.append(roomPlayer.serverGroupID)
readyMemberDict[roomPlayerID] = {"ServerGroupID":roomPlayer.serverGroupID, "Name":roomPlayer.playerName, "Number":num,
- "Job":roomPlayer.playerJob, "LV":roomPlayer.playerLV, "MaxHP":roomPlayer.maxHP}
+ "Job":roomPlayer.playerJob, "LV":roomPlayer.playerLV, "MaxHP":roomPlayer.maxHP, "MaxProDef":roomPlayer.maxProDef}
if not isAllReady:
continue
@@ -1729,6 +1732,7 @@
matchPlayer.Job = readyPlayerInfo["Job"]
matchPlayer.LV = readyPlayerInfo["LV"]
matchPlayer.MaxHP = readyPlayerInfo["MaxHP"]
+ matchPlayer.MaxProDef = readyPlayerInfo["MaxProDef"]
break
PlayerControl.SetCrossRealmState(player, 1)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
index 3857fe0..eb2dee0 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
@@ -8226,6 +8226,7 @@
Job = 0 #(BYTE Job)
LV = 0 #(WORD LV)
MaxHP = 0 #(DWORD MaxHP)// 默认满血
+ MaxProDef = 0 #(DWORD MaxProDef)// 最大护盾
data = None
def __init__(self):
@@ -8240,6 +8241,7 @@
self.Job,_pos = CommFunc.ReadBYTE(_lpData, _pos)
self.LV,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.MaxHP,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+ self.MaxProDef,_pos = CommFunc.ReadDWORD(_lpData, _pos)
return _pos
def Clear(self):
@@ -8249,6 +8251,7 @@
self.Job = 0
self.LV = 0
self.MaxHP = 0
+ self.MaxProDef = 0
return
def GetLength(self):
@@ -8258,6 +8261,7 @@
length += len(self.PlayerName)
length += 1
length += 2
+ length += 4
length += 4
return length
@@ -8270,6 +8274,7 @@
data = CommFunc.WriteBYTE(data, self.Job)
data = CommFunc.WriteWORD(data, self.LV)
data = CommFunc.WriteDWORD(data, self.MaxHP)
+ data = CommFunc.WriteDWORD(data, self.MaxProDef)
return data
def OutputString(self):
@@ -8279,7 +8284,8 @@
PlayerName:%s,
Job:%d,
LV:%d,
- MaxHP:%d
+ MaxHP:%d,
+ MaxProDef:%d
'''\
%(
self.PlayerID,
@@ -8287,7 +8293,8 @@
self.PlayerName,
self.Job,
self.LV,
- self.MaxHP
+ self.MaxHP,
+ self.MaxProDef
)
return DumpString
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 b8d1eba..c55e59c 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.py
@@ -19,6 +19,7 @@
import PlayerControl
import NetPackCommon
import IpyGameDataPY
+import PlayerActivity
import ChPyNetSendPack
import CrossRealmPlayer
import FunctionNPCCommon
@@ -237,6 +238,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), # 当前积分
@@ -301,6 +303,7 @@
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)
else:
GameWorld.Log(" 不同天的PK结算不增加今日PK次数! ", playerID)
--
Gitblit v1.8.0