From e22ca247b7ec972e7647c827dc023c8e89e8c389 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期二, 11 九月 2018 19:31:47 +0800
Subject: [PATCH] fix:3459 【后端】【1.0.15】【主干】符印新增仙玉开启新符印孔位
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRune.py | 46 ++++++++++++---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini | 6 +
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py | 52 +++++++++++++++++
ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py | 52 +++++++++++++++++
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py | 4 +
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerViewCacheTube.py | 4
6 files changed, 150 insertions(+), 14 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py
index a919a41..9976369 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py
@@ -10299,6 +10299,58 @@
#------------------------------------------------------
+# A5 13 解锁符印孔 #tagCMUnlockRuneHole
+
+class tagCMUnlockRuneHole(Structure):
+ _pack_ = 1
+ _fields_ = [
+ ("Cmd", c_ubyte),
+ ("SubCmd", c_ubyte),
+ ("HoleIndex", c_ubyte), # 孔索引
+ ]
+
+ def __init__(self):
+ self.Clear()
+ self.Cmd = 0xA5
+ self.SubCmd = 0x13
+ return
+
+ def ReadData(self, stringData, _pos=0, _len=0):
+ self.Clear()
+ memmove(addressof(self), stringData[_pos:], self.GetLength())
+ return _pos + self.GetLength()
+
+ def Clear(self):
+ self.Cmd = 0xA5
+ self.SubCmd = 0x13
+ self.HoleIndex = 0
+ return
+
+ def GetLength(self):
+ return sizeof(tagCMUnlockRuneHole)
+
+ def GetBuffer(self):
+ return string_at(addressof(self), self.GetLength())
+
+ def OutputString(self):
+ DumpString = '''// A5 13 解锁符印孔 //tagCMUnlockRuneHole:
+ Cmd:%s,
+ SubCmd:%s,
+ HoleIndex:%d
+ '''\
+ %(
+ self.Cmd,
+ self.SubCmd,
+ self.HoleIndex
+ )
+ return DumpString
+
+
+m_NAtagCMUnlockRuneHole=tagCMUnlockRuneHole()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMUnlockRuneHole.Cmd,m_NAtagCMUnlockRuneHole.SubCmd))] = m_NAtagCMUnlockRuneHole
+
+
+#------------------------------------------------------
#A5 10 使用新手卡 #tagUseNewGuyCard
class tagUseNewGuyCard(Structure):
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
index 7a8b725..7945d0c 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
@@ -500,7 +500,7 @@
Writer = xdh
Releaser = xdh
RegType = 0
-RegisterPackCount = 4
+RegisterPackCount = 5
PacketCMD_1=0xA5
PacketSubCMD_1=0x65
@@ -518,6 +518,10 @@
PacketSubCMD_4=0x78
PacketCallFunc_4=OnRuneCompound
+PacketCMD_5=0xA5
+PacketSubCMD_5=0x13
+PacketCallFunc_5=OnUnlockRuneHole
+
;领地争夺战
[GameLogic_ManorWar]
ScriptName = GameWorldLogic\FBProcess\GameLogic_ManorWar.py
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index f40c664..8f86ba1 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -4430,6 +4430,7 @@
Def_Cost_GameServer, # GameServer 30
Def_Cost_FreeGoods, # 极品白拿
Def_Cost_DogzEquipPlus, # 神兽装备强化
+Def_Cost_RuneHole, # 符印孔解锁
#-----------以下为暂时没用的，先不删除，如有新增消费点则放在这些之前------------
Def_Cost_RefreshArrestTask, # 刷新悬赏任务
Def_Cost_OffLineExp, # 兑换离线经验
@@ -4451,7 +4452,7 @@
Def_Cost_Trade, # 交易
Def_Cost_Rename, # 改名
Def_Cost_SkillLvUp, # 技能升级
-) = range(2000, 2000 + 53)
+) = range(2000, 2000 + 54)
Def_Cost_Reason_SonKey = "reason_name_son" # 消费点原因子类说明key
@@ -4532,6 +4533,7 @@
Def_Cost_FamilyRedPacket:"FamilyRedPacket",
Def_Cost_FreeGoods:"FreeGoods",
Def_Cost_DogzEquipPlus:"DogzEquipPlus",
+Def_Cost_RuneHole:"RuneHole",
}
## -----------------------------------------------------
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py
index a919a41..9976369 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py
@@ -10299,6 +10299,58 @@
#------------------------------------------------------
+# A5 13 解锁符印孔 #tagCMUnlockRuneHole
+
+class tagCMUnlockRuneHole(Structure):
+ _pack_ = 1
+ _fields_ = [
+ ("Cmd", c_ubyte),
+ ("SubCmd", c_ubyte),
+ ("HoleIndex", c_ubyte), # 孔索引
+ ]
+
+ def __init__(self):
+ self.Clear()
+ self.Cmd = 0xA5
+ self.SubCmd = 0x13
+ return
+
+ def ReadData(self, stringData, _pos=0, _len=0):
+ self.Clear()
+ memmove(addressof(self), stringData[_pos:], self.GetLength())
+ return _pos + self.GetLength()
+
+ def Clear(self):
+ self.Cmd = 0xA5
+ self.SubCmd = 0x13
+ self.HoleIndex = 0
+ return
+
+ def GetLength(self):
+ return sizeof(tagCMUnlockRuneHole)
+
+ def GetBuffer(self):
+ return string_at(addressof(self), self.GetLength())
+
+ def OutputString(self):
+ DumpString = '''// A5 13 解锁符印孔 //tagCMUnlockRuneHole:
+ Cmd:%s,
+ SubCmd:%s,
+ HoleIndex:%d
+ '''\
+ %(
+ self.Cmd,
+ self.SubCmd,
+ self.HoleIndex
+ )
+ return DumpString
+
+
+m_NAtagCMUnlockRuneHole=tagCMUnlockRuneHole()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMUnlockRuneHole.Cmd,m_NAtagCMUnlockRuneHole.SubCmd))] = m_NAtagCMUnlockRuneHole
+
+
+#------------------------------------------------------
#A5 10 使用新手卡 #tagUseNewGuyCard
class tagUseNewGuyCard(Structure):
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRune.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRune.py
index 797241a..06b876f 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRune.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRune.py
@@ -27,6 +27,7 @@
import IpyGameDataPY
import PlayerSuccess
import PlayerMagicWeapon
+import IPY_GameWorld
g_runeLVExpDict = {}
@@ -114,6 +115,32 @@
runeMaxLV = runeMaxLVDict.get(itemColor, 0)
return runeMaxLV
+#// A5 13 解锁符印孔 #tagCMUnlockRuneHole
+#
+#struct tagCMUnlockRuneHole
+#{
+# tagHead Head;
+# BYTE HoleIndex; // 孔索引
+#};
+def OnUnlockRuneHole(index, clientData, tick):
+ curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
+ holeIndex = clientData.HoleIndex
+ runeUnlockDict = IpyGameDataPY.GetFuncEvalCfg("RuneUnlock", 2, {})
+ if holeIndex not in runeUnlockDict:
+ return
+ runeOpenState = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_Rune_HoleOpenState, 0)
+ if runeOpenState & pow(2, holeIndex):
+ return
+ if curPlayer.GetLV() < IpyGameDataPY.GetFuncEvalCfg("RuneUnlock", 3, {}).get(holeIndex, 0):
+ return
+ costMoney = runeUnlockDict[holeIndex]
+ if not PlayerControl.PayMoney(curPlayer, IPY_GameWorld.TYPE_Price_Gold_Money, costMoney, ChConfig.Def_Cost_RuneHole, {'holeIndex':holeIndex}):
+ return
+ PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_Rune_HoleOpenState, runeOpenState |pow(2, holeIndex))
+ Sync_RuneInfo(curPlayer)
+ PlayerControl.WorldNotify(0, 'RuneSpecialHoleGet', [curPlayer.GetName(), costMoney])
+ return
+
def DoUnlockRuneHole(curPlayer, isSycn=True):
# 解锁符印孔, 符印塔过关时调用
runeUnlockList = IpyGameDataPY.GetFuncEvalCfg("RuneUnlock")
@@ -158,9 +185,8 @@
or (srcBackpack == ShareDefine.rptRune and desBackPack == ShareDefine.rptTempSwap)):
return False
-
- runeUnlockList = IpyGameDataPY.GetFuncEvalCfg("RuneUnlock")
- maxRuneHole = len(runeUnlockList)
+
+ maxRuneHole = IpyGameDataPY.GetFuncCfg("RuneUnlock", 4)
# 穿
if desBackPack == ShareDefine.rptTempSwap:
desRuneNum = destIndex + 1
@@ -325,8 +351,8 @@
#清掉#镶嵌X枚X品质符印的成就信息
PlayerSuccess.ResetSuccessByType(curPlayer, ShareDefine.SuccType_InlayRune)
totalLV = 0
- runeUnlockList = IpyGameDataPY.GetFuncEvalCfg("RuneUnlock")
- for holeNum in xrange(1, len(runeUnlockList) + 1):
+ runeHoleCnt = IpyGameDataPY.GetFuncCfg("RuneUnlock", 4)
+ for holeNum in xrange(1, runeHoleCnt + 1):
runeData = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_Rune_Data % holeNum, 0)
if not runeData:
continue
@@ -550,8 +576,8 @@
## 刷符印属性
def RefreshRuneAttr(curPlayer):
allAttrList = [{} for _ in range(4)]
- runeUnlockList = IpyGameDataPY.GetFuncEvalCfg("RuneUnlock")
- for holeNum in xrange(1, len(runeUnlockList) + 1):
+ runeHoleCnt = IpyGameDataPY.GetFuncCfg("RuneUnlock", 4)
+ for holeNum in xrange(1, runeHoleCnt + 1):
runeData = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_Rune_Data % holeNum, 0)
if not runeData:
continue
@@ -574,14 +600,14 @@
## 同步客户端
def Sync_RuneInfo(curPlayer):
- runeUnlockList = IpyGameDataPY.GetFuncEvalCfg("RuneUnlock")
- if not runeUnlockList:
+ runeHoleCnt = IpyGameDataPY.GetFuncCfg("RuneUnlock", 4)
+ if not runeHoleCnt:
return
RuneInfoPack = ChPyNetSendPack.tagMCRuneInfo()
RuneInfoPack.Clear()
RuneInfoPack.RuneHoleOpenState = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_Rune_HoleOpenState, 0)
RuneInfoPack.RuneDataList = []
- for RuneNum in xrange(1, len(runeUnlockList) + 1):
+ for RuneNum in xrange(1, runeHoleCnt + 1):
RuneData = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_Rune_Data % RuneNum, 0)
RuneInfoPack.RuneDataList.append(RuneData)
RuneInfoPack.Count = len(RuneInfoPack.RuneDataList)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerViewCacheTube.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerViewCacheTube.py
index 16167c8..ee5d972 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerViewCacheTube.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerViewCacheTube.py
@@ -269,8 +269,8 @@
## 符印信息
def __GetRuneInfo(curPlayer):
runeDict = {}
- runeUnlockList = IpyGameDataPY.GetFuncEvalCfg("RuneUnlock", 1)
- for holeNum in xrange(1, len(runeUnlockList) + 1):
+ runeHoleCnt = IpyGameDataPY.GetFuncCfg("RuneUnlock", 4)
+ for holeNum in xrange(1, runeHoleCnt + 1):
runeData = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_Rune_Data % holeNum, 0)
if not runeData:
continue
--
Gitblit v1.8.0