From e082d496795bd07657a81714bab4a5a63446e397 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期五, 12 四月 2019 16:41:10 +0800
Subject: [PATCH] 6491 子 【2.0】【开发】打宝界面和境界压制调整 / 【2.0】【后端】打宝界面和境界压制调整
---
ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py | 336 +++++++++++++++++++-------------------------------------
1 files changed, 114 insertions(+), 222 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py
index fc320e7..c1f129a 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py
@@ -7423,66 +7423,6 @@
#------------------------------------------------------
-# A5 32 购买商城物品 #tagCMBuyStoreItem
-
-class tagCMBuyStoreItem(Structure):
- _pack_ = 1
- _fields_ = [
- ("Cmd", c_ubyte),
- ("SubCmd", c_ubyte),
- ("Type", c_ubyte), #1钻石，2绑定钻石，3银子，4银票
- ("ItemID", c_int), #物品ID
- ("BuyCount", c_ushort), #购买数量
- ]
-
- def __init__(self):
- self.Clear()
- self.Cmd = 0xA5
- self.SubCmd = 0x32
- 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 = 0x32
- self.Type = 0
- self.ItemID = 0
- self.BuyCount = 0
- return
-
- def GetLength(self):
- return sizeof(tagCMBuyStoreItem)
-
- def GetBuffer(self):
- return string_at(addressof(self), self.GetLength())
-
- def OutputString(self):
- DumpString = '''// A5 32 购买商城物品 //tagCMBuyStoreItem:
- Cmd:%s,
- SubCmd:%s,
- Type:%d,
- ItemID:%d,
- BuyCount:%d
- '''\
- %(
- self.Cmd,
- self.SubCmd,
- self.Type,
- self.ItemID,
- self.BuyCount
- )
- return DumpString
-
-
-m_NAtagCMBuyStoreItem=tagCMBuyStoreItem()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMBuyStoreItem.Cmd,m_NAtagCMBuyStoreItem.SubCmd))] = m_NAtagCMBuyStoreItem
-
-
-#------------------------------------------------------
#A5 01 坐骑激活 #tagPlayerActivateHorse
class tagPlayerActivateHorse(Structure):
@@ -8055,6 +7995,62 @@
m_NAtagCMBuyCollectionCnt=tagCMBuyCollectionCnt()
ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMBuyCollectionCnt.Cmd,m_NAtagCMBuyCollectionCnt.SubCmd))] = m_NAtagCMBuyCollectionCnt
+
+
+#------------------------------------------------------
+# A5 25 购买日常活动次数 #tagCMBuyDailyActionCnt
+
+class tagCMBuyDailyActionCnt(Structure):
+ _pack_ = 1
+ _fields_ = [
+ ("Cmd", c_ubyte),
+ ("SubCmd", c_ubyte),
+ ("ActionID", c_int), # ID
+ ("AddType", c_ubyte), # 0-花仙玉 1-用物品
+ ]
+
+ def __init__(self):
+ self.Clear()
+ self.Cmd = 0xA5
+ self.SubCmd = 0x25
+ 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 = 0x25
+ self.ActionID = 0
+ self.AddType = 0
+ return
+
+ def GetLength(self):
+ return sizeof(tagCMBuyDailyActionCnt)
+
+ def GetBuffer(self):
+ return string_at(addressof(self), self.GetLength())
+
+ def OutputString(self):
+ DumpString = '''// A5 25 购买日常活动次数 //tagCMBuyDailyActionCnt:
+ Cmd:%s,
+ SubCmd:%s,
+ ActionID:%d,
+ AddType:%d
+ '''\
+ %(
+ self.Cmd,
+ self.SubCmd,
+ self.ActionID,
+ self.AddType
+ )
+ return DumpString
+
+
+m_NAtagCMBuyDailyActionCnt=tagCMBuyDailyActionCnt()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMBuyDailyActionCnt.Cmd,m_NAtagCMBuyDailyActionCnt.SubCmd))] = m_NAtagCMBuyDailyActionCnt
#------------------------------------------------------
@@ -9170,62 +9166,6 @@
m_NAtagCMExchangeMasterEXP=tagCMExchangeMasterEXP()
ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMExchangeMasterEXP.Cmd,m_NAtagCMExchangeMasterEXP.SubCmd))] = m_NAtagCMExchangeMasterEXP
-
-
-#------------------------------------------------------
-# A5 46 兑换灵力 #tagCMExchangeReiki
-
-class tagCMExchangeReiki(Structure):
- _pack_ = 1
- _fields_ = [
- ("Cmd", c_ubyte),
- ("SubCmd", c_ubyte),
- ("ExType", c_ubyte), #兑换类型0-降级兑换; 1-钻石购买
- ("ExData", c_ubyte), #兑换扩展数据(钻石购买可发送购买的消耗索引)
- ]
-
- def __init__(self):
- self.Clear()
- self.Cmd = 0xA5
- self.SubCmd = 0x46
- 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 = 0x46
- self.ExType = 0
- self.ExData = 0
- return
-
- def GetLength(self):
- return sizeof(tagCMExchangeReiki)
-
- def GetBuffer(self):
- return string_at(addressof(self), self.GetLength())
-
- def OutputString(self):
- DumpString = '''// A5 46 兑换灵力 //tagCMExchangeReiki:
- Cmd:%s,
- SubCmd:%s,
- ExType:%d,
- ExData:%d
- '''\
- %(
- self.Cmd,
- self.SubCmd,
- self.ExType,
- self.ExData
- )
- return DumpString
-
-
-m_NAtagCMExchangeReiki=tagCMExchangeReiki()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMExchangeReiki.Cmd,m_NAtagCMExchangeReiki.SubCmd))] = m_NAtagCMExchangeReiki
#------------------------------------------------------
@@ -10501,54 +10441,6 @@
#------------------------------------------------------
-# A5 47 玩家转生 #tagCMReincarnation
-
-class tagCMReincarnation(Structure):
- _pack_ = 1
- _fields_ = [
- ("Cmd", c_ubyte),
- ("SubCmd", c_ubyte),
- ]
-
- def __init__(self):
- self.Clear()
- self.Cmd = 0xA5
- self.SubCmd = 0x47
- 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 = 0x47
- return
-
- def GetLength(self):
- return sizeof(tagCMReincarnation)
-
- def GetBuffer(self):
- return string_at(addressof(self), self.GetLength())
-
- def OutputString(self):
- DumpString = '''// A5 47 玩家转生 //tagCMReincarnation:
- Cmd:%s,
- SubCmd:%s
- '''\
- %(
- self.Cmd,
- self.SubCmd
- )
- return DumpString
-
-
-m_NAtagCMReincarnation=tagCMReincarnation()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMReincarnation.Cmd,m_NAtagCMReincarnation.SubCmd))] = m_NAtagCMReincarnation
-
-
-#------------------------------------------------------
# A5 68 请求寻宝 #tagCMRequestTreasure
class tagCMRequestTreasure(Structure):
@@ -11235,6 +11127,58 @@
m_NAtagUseNewGuyCard=tagUseNewGuyCard()
ChNetPackDict[eval("0x%02x%02x"%(m_NAtagUseNewGuyCard.Head.Cmd,m_NAtagUseNewGuyCard.Head.SubCmd))] = m_NAtagUseNewGuyCard
+
+
+#------------------------------------------------------
+# A5 26 寻访仙域 #tagCMVisitFairyDomain
+
+class tagCMVisitFairyDomain(Structure):
+ _pack_ = 1
+ _fields_ = [
+ ("Cmd", c_ubyte),
+ ("SubCmd", c_ubyte),
+ ("Type", c_ubyte), #0-开始寻访 1-结束寻访
+ ]
+
+ def __init__(self):
+ self.Clear()
+ self.Cmd = 0xA5
+ self.SubCmd = 0x26
+ 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 = 0x26
+ self.Type = 0
+ return
+
+ def GetLength(self):
+ return sizeof(tagCMVisitFairyDomain)
+
+ def GetBuffer(self):
+ return string_at(addressof(self), self.GetLength())
+
+ def OutputString(self):
+ DumpString = '''// A5 26 寻访仙域 //tagCMVisitFairyDomain:
+ Cmd:%s,
+ SubCmd:%s,
+ Type:%d
+ '''\
+ %(
+ self.Cmd,
+ self.SubCmd,
+ self.Type
+ )
+ return DumpString
+
+
+m_NAtagCMVisitFairyDomain=tagCMVisitFairyDomain()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMVisitFairyDomain.Cmd,m_NAtagCMVisitFairyDomain.SubCmd))] = m_NAtagCMVisitFairyDomain
#------------------------------------------------------
@@ -12612,62 +12556,6 @@
m_NAtagCMDiceTake=tagCMDiceTake()
ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMDiceTake.Cmd,m_NAtagCMDiceTake.SubCmd))] = m_NAtagCMDiceTake
-
-
-#------------------------------------------------------
-# AB 07 领取节日登陆奖励 #tagCMGetFestivalLoginAward
-
-class tagCMGetFestivalLoginAward(Structure):
- _pack_ = 1
- _fields_ = [
- ("Cmd", c_ubyte),
- ("SubCmd", c_ubyte),
- ("FestivalType", c_ubyte), # 节日类型
- ("DayIndex", c_ubyte), # 节日天 <从节日活动开始日0天开始>
- ]
-
- def __init__(self):
- self.Clear()
- self.Cmd = 0xAB
- self.SubCmd = 0x07
- 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 = 0xAB
- self.SubCmd = 0x07
- self.FestivalType = 0
- self.DayIndex = 0
- return
-
- def GetLength(self):
- return sizeof(tagCMGetFestivalLoginAward)
-
- def GetBuffer(self):
- return string_at(addressof(self), self.GetLength())
-
- def OutputString(self):
- DumpString = '''// AB 07 领取节日登陆奖励 //tagCMGetFestivalLoginAward:
- Cmd:%s,
- SubCmd:%s,
- FestivalType:%d,
- DayIndex:%d
- '''\
- %(
- self.Cmd,
- self.SubCmd,
- self.FestivalType,
- self.DayIndex
- )
- return DumpString
-
-
-m_NAtagCMGetFestivalLoginAward=tagCMGetFestivalLoginAward()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMGetFestivalLoginAward.Cmd,m_NAtagCMGetFestivalLoginAward.SubCmd))] = m_NAtagCMGetFestivalLoginAward
#------------------------------------------------------
@@ -15620,6 +15508,7 @@
("Cmd", c_ubyte),
("SubCmd", c_ubyte),
("DataMapID", c_int),
+ ("LineID", c_ushort),
]
def __init__(self):
@@ -15637,6 +15526,7 @@
self.Cmd = 0xC1
self.SubCmd = 0x05
self.DataMapID = 0
+ self.LineID = 0
return
def GetLength(self):
@@ -15649,12 +15539,14 @@
DumpString = '''// C1 05 进入跨服地图 //tagCMEnterCrossServer:
Cmd:%s,
SubCmd:%s,
- DataMapID:%d
+ DataMapID:%d,
+ LineID:%d
'''\
%(
self.Cmd,
self.SubCmd,
- self.DataMapID
+ self.DataMapID,
+ self.LineID
)
return DumpString
--
Gitblit v1.8.0