From b3251b06e19cf3385f19e8071abeb5ce9fde1393 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期一, 13 八月 2018 14:47:39 +0800
Subject: [PATCH] fix:#2415【后端】【1.0.15版本】宗门试练资源找回新加参数——玩家通关过的最高层数的历史最高评价
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRecover.py | 6 ++++++
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py | 10 +++++++---
ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py | 10 +++++++---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py | 1 +
4 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
index 35c9502..efe69f1 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
@@ -13521,7 +13521,8 @@
("Index", c_ubyte), # 找回项索引
("RecoverCnt", c_ubyte), # 可找回次数
("ExtraCnt", c_ubyte), # VIP额外次数
- ("ExtraData", c_ubyte), # 额外参数
+ ("ExtraData", c_ubyte), # 额外参数1
+ ("ExtraData2", c_ubyte), # 额外参数2
]
def __init__(self):
@@ -13538,6 +13539,7 @@
self.RecoverCnt = 0
self.ExtraCnt = 0
self.ExtraData = 0
+ self.ExtraData2 = 0
return
def GetLength(self):
@@ -13551,13 +13553,15 @@
Index:%d,
RecoverCnt:%d,
ExtraCnt:%d,
- ExtraData:%d
+ ExtraData:%d,
+ ExtraData2:%d
'''\
%(
self.Index,
self.RecoverCnt,
self.ExtraCnt,
- self.ExtraData
+ self.ExtraData,
+ self.ExtraData2
)
return DumpString
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index b4da433..816af1c 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -3425,6 +3425,7 @@
Def_PDict_RecoverFBItemAddCnt = "RecoverFBItemAddCnt_%s" # 资源找回副本普通次数 <%s-找回项索引>
Def_PDict_RecoverFBNoBuyCnt = "RecoverFBNoBuyCnt_%s" # 资源找回副本普通次数 <%s-找回项索引>
Def_PDict_RecoverGainData = "RecoverGainData_%s" # 资源找回额外数据<%s-找回项索引>
+Def_PDict_RecoverGainDataEx = "RecoverGainDataEx_%s" # 资源找回额外数据<%s-找回项索引>
Def_PDict_HaveRecover = "HaveRecover_%s" # 资源找回今日是否已找回<%s-找回项索引>
Def_PDict_RecoverGainLastTime = "RecoverGainLastTime" # 上一次资源找回时的时间
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
index 35c9502..efe69f1 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
@@ -13521,7 +13521,8 @@
("Index", c_ubyte), # 找回项索引
("RecoverCnt", c_ubyte), # 可找回次数
("ExtraCnt", c_ubyte), # VIP额外次数
- ("ExtraData", c_ubyte), # 额外参数
+ ("ExtraData", c_ubyte), # 额外参数1
+ ("ExtraData2", c_ubyte), # 额外参数2
]
def __init__(self):
@@ -13538,6 +13539,7 @@
self.RecoverCnt = 0
self.ExtraCnt = 0
self.ExtraData = 0
+ self.ExtraData2 = 0
return
def GetLength(self):
@@ -13551,13 +13553,15 @@
Index:%d,
RecoverCnt:%d,
ExtraCnt:%d,
- ExtraData:%d
+ ExtraData:%d,
+ ExtraData2:%d
'''\
%(
self.Index,
self.RecoverCnt,
self.ExtraCnt,
- self.ExtraData
+ self.ExtraData,
+ self.ExtraData2
)
return DumpString
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRecover.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRecover.py
index 81e52d8..43802b3 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRecover.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRecover.py
@@ -123,6 +123,9 @@
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_RecoverGainData % index, historyMaxLine)
+ if dataMapID == ChConfig.Def_FBMapID_MunekadoTrial:
+ historyStar = GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_Player_Dict_PlayerFBStar_MapId, historyMaxLine-1, False, [dataMapID])
+ PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_RecoverGainDataEx % index, historyStar)
#更新可找回次数
curCommonCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_RecoverFBCommonCnt % index, 0)
@@ -390,6 +393,8 @@
reExp = PlayerControl.GetPlayerReExp(curPlayer)
expRate = PlayerControl.GetLimitExpRate(curPlayer, ChConfig.ExpRateLimitType_Recover)
extraData = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_RecoverGainData % index, 0)
+ extraData2 = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_RecoverGainDataEx % index, 0)
+
tjgExp = 0 #脱机挂找回经验
exp = 0
sp = 0
@@ -453,6 +458,7 @@
numInfoPack.RecoverCnt = commonCnt
numInfoPack.ExtraCnt = vipExtraCnt
numInfoPack.ExtraData = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_RecoverGainData % index, 0)
+ numInfoPack.ExtraData2 = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_RecoverGainDataEx % index, 0)
sendPack.NumInfo.append(numInfoPack)
sendPack.Num = len(sendPack.NumInfo)
NetPackCommon.SendFakePack(curPlayer, sendPack)
--
Gitblit v1.8.0