From 36d2a039e8fc31fd212ed381d843fafc43aa054b Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 30 五月 2025 11:27:44 +0800
Subject: [PATCH] 16 卡牌服务端（删除旧版交易所、拍卖行、答题等部分不需要内容；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script.ini | 26 -
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py | 57 ---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py | 526 -----------------------------
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py | 168 ---------
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/GameServerPyPack.ini | 28 -
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.py | 8
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/ChNPC.py | 59 ---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ReadChConfig.py | 3
/dev/null | 81 ----
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipStar.py | 3
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.py | 4
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini | 62 ---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.py | 1
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_AllFamilyBoss.py | 3
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py | 8
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py | 23 -
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py | 9
17 files changed, 6 insertions(+), 1,063 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/GameServerPyPack.ini b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/GameServerPyPack.ini
index fc8cc16..4b2373d 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/GameServerPyPack.ini
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/GameServerPyPack.ini
@@ -2,34 +2,6 @@
;类名注册的时候, ClassName必须唯一
;FuncName是类名注册的时候, 被调用到的函数名
-
-
-;交易所
-[PlayerBourse]
-ScriptName = Player\PlayerBourseTube.py
-Writer = xmnathan
-Releaser = xmnathan
-RegType = 0
-RegisterPackCount = 4
-
-PacketCMD_1=0x02
-PacketSubCMD_1=0x01
-PacketCallFunc_1=OnGMCheckAddPlayerBourseItemResult
-
-
-PacketCMD_2=0x02
-PacketSubCMD_2=0x02
-PacketCallFunc_2=OnGMCheckBuyBourseItemResult
-
-PacketCMD_3=0x02
-PacketSubCMD_3=0x03
-PacketCallFunc_3=OnGMGiveBourseItem
-
-
-PacketCMD_4=0x02
-PacketSubCMD_4=0x04
-PacketCallFunc_4=OnGMGivePlayerBourseGains
-
[PlayerFriend]
ScriptName = Player\PlayerFriend.py
Writer = Alee
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
index 1b74e06..3baff6f 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
@@ -1212,44 +1212,6 @@
PacketSubCMD_1=0x0D
PacketCallFunc_1=OnYinji
-
-
-;交易所
-[PlayerBourseTube]
-ScriptName = Player\PlayerBourseTube.py
-Writer = xdh
-Releaser = xdh
-RegType = 0
-RegisterPackCount = 2
-
-PacketCMD_1=0xB5
-PacketSubCMD_1=0x01
-PacketCallFunc_1=OnPlayerSellBourseItem
-
-PacketCMD_2=0xB5
-PacketSubCMD_2=0x02
-PacketCallFunc_2=OnPlayerBuyBourseItem
-
-;拍卖行
-[PlayerAuctionHouse]
-ScriptName = Player\PlayerAuctionHouse.py
-Writer = hxp
-Releaser = hxp
-RegType = 0
-RegisterPackCount = 3
-
-PacketCMD_1=0xB5
-PacketSubCMD_1=0x13
-PacketCallFunc_1=OnSellAuctionItem
-
-PacketCMD_2=0xB5
-PacketSubCMD_2=0x14
-PacketCallFunc_2=OnBiddingAuctionItem
-
-PacketCMD_3=0xB5
-PacketSubCMD_3=0x15
-PacketCallFunc_3=OnUnsellAuctionItem
-
;法宝
[PlayerMagicWeapon]
ScriptName = Player\PlayerMagicWeapon.py
@@ -1349,18 +1311,6 @@
PacketCMD_2=0xB4
PacketSubCMD_2=0x08
PacketCallFunc_2=OnPassivePage
-
-;我要太极摇骰子
-[PlayerDiceEx]
-ScriptName = Player\PlayerDiceEx.py
-Writer = xdh
-Releaser = xdh
-RegType = 0
-RegisterPackCount = 1
-
-PacketCMD_1=0xAB
-PacketSubCMD_1=0x0C
-PacketCallFunc_1=OnDice
;仙魔之争
[GameLogic_XMZZ]
@@ -1493,18 +1443,6 @@
PacketCMD_1=0xA5
PacketSubCMD_1=0x11
PacketCallFunc_1=OnTryFirstGoldItem
-
-;绑玉转盘
-[PlayerBindJadeWheel]
-ScriptName = Player\PlayerBindJadeWheel.py
-Writer = xdh
-Releaser = xdh
-RegType = 0
-RegisterPackCount = 1
-
-PacketCMD_1=0xA5
-PacketSubCMD_1=0x17
-PacketCallFunc_1=OnStartBindJadeWheel
;限时抢购
[PlayerFlashSale]
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script.ini b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script.ini
index af0c36a..a61f4ff 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script.ini
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script.ini
@@ -584,19 +584,6 @@
PacketSubCMD_2=0x30
PacketCallFunc_2=UpdateFineSoulSlot
-;答题
-[Exam]
-ScriptName = Player\PlayerExam.py
-Writer = panwei
-Releaser = panwei
-RegType = 0
-RegisterPackCount = 1
-
-PacketCMD_1=0x01
-PacketSubCMD_1=0x1B
-PacketCallFunc_1=Client_JoinAction
-
-
;玩家防外挂验证
[NetPackCommon]
ScriptName = NetPackCommon.py
@@ -624,19 +611,6 @@
PacketCMD_2=0x3
PacketSubCMD_2=0x37
PacketCallFunc_2=OnCPlayerChangeDienstgrad
-
-;交易所
-[PlayerBourse]
-ScriptName = Player\PlayerBourseTube.py
-Writer = xmnathan
-Releaser = xmnathan
-RegType = 0
-RegisterPackCount = 1
-
-PacketCMD_1=0x1B
-PacketSubCMD_1=0x03
-PacketCallFunc_1=OnPlayerRecaptureBourseItem
-
;任务
[QuestLogic]
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index 89ba876..38ae491 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -801,7 +801,6 @@
Def_SkillID_DoubleExp = -1 # 双倍经验系统中的双倍经验ID
Def_SkillID_Justice = 11504 # 正义阵营
Def_SkillID_Evil = 11505 # 黑道阵营
-Def_SkillID_JoinExam = -1 # 答题Buff
Def_SkillID_ActionWuDi = -1 # 活动无敌Buff
Def_SkillID_ZhenQiRestore = -1 # 真气恢复加成BUFF
Def_SkillTypeID_EfficientBattle = -1 #高效战斗类型ID,高效战斗buffID:49001~49008
@@ -3870,10 +3869,6 @@
Def_PDict_NewFCPartyAwardRecord = "NewFCPartyAwardRecord" #全民来嗨活动领奖记录
Def_PDict_NewFCCostGold = "NewFCCostGold" # 绝版降临总累计消费仙玉
-#绑玉转盘
-Def_PDict_BindJadeWheelCurCnt = "BindJadeWheelCurCnt" # 今日已转次数
-Def_PDict_BindJadeWheelHistoryCnt = "BindJadeWheelHistoryCnt" # 历史已转次数
-
#限时抢购活动
Def_PDict_FlashSaleID = "FlashSaleID_%s" # 玩家身上的限时抢购活动ID，唯一标识，取活动开始日期time，参数（活动编号）
Def_PDict_FlashSaleState = "FlashSaleState_%s" # 玩家身上的限时抢购活动state，参数（活动编号）
@@ -4307,10 +4302,6 @@
Def_PDict_GFPassiveIndex = "GFP_%s_%s" # 被动功法 页数-索引
Def_PDict_GFPassivePage = "GFPPage" # 被动功法选中页数
-
-# 我要太极
-Def_PDict_Dice_Result = "DiceResult" # 我要太极结果
-Def_PDict_Dice_FreeChangeCnt = "DiceFreeChangeCnt" # 我要太极免费改投次数
# 挂机收益
Def_PDict_GuajiCalcTime = "GuajiCalcTime" # 上次统计收益时间戳
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py
index 5d07bd5..d2e2a50 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py
@@ -14109,54 +14109,6 @@
#------------------------------------------------------
-# A5 17 绑玉转盘开始 #tagCMStartBindJadeWheel
-
-class tagCMStartBindJadeWheel(Structure):
- _pack_ = 1
- _fields_ = [
- ("Cmd", c_ubyte),
- ("SubCmd", c_ubyte),
- ]
-
- def __init__(self):
- self.Clear()
- self.Cmd = 0xA5
- self.SubCmd = 0x17
- 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 = 0x17
- return
-
- def GetLength(self):
- return sizeof(tagCMStartBindJadeWheel)
-
- def GetBuffer(self):
- return string_at(addressof(self), self.GetLength())
-
- def OutputString(self):
- DumpString = '''// A5 17 绑玉转盘开始 //tagCMStartBindJadeWheel:
- Cmd:%s,
- SubCmd:%s
- '''\
- %(
- self.Cmd,
- self.SubCmd
- )
- return DumpString
-
-
-m_NAtagCMStartBindJadeWheel=tagCMStartBindJadeWheel()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMStartBindJadeWheel.Cmd,m_NAtagCMStartBindJadeWheel.SubCmd))] = m_NAtagCMStartBindJadeWheel
-
-
-#------------------------------------------------------
# A5 21 境界修为池提取 #tagCMTakeOutRealmExp
class tagCMTakeOutRealmExp(Structure):
@@ -17830,54 +17782,6 @@
#------------------------------------------------------
-# AB 0B 购买天神经验 #tagCMBuySkyGodExp
-
-class tagCMBuySkyGodExp(Structure):
- _pack_ = 1
- _fields_ = [
- ("Cmd", c_ubyte),
- ("SubCmd", c_ubyte),
- ]
-
- def __init__(self):
- self.Clear()
- self.Cmd = 0xAB
- self.SubCmd = 0x0B
- 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 = 0x0B
- return
-
- def GetLength(self):
- return sizeof(tagCMBuySkyGodExp)
-
- def GetBuffer(self):
- return string_at(addressof(self), self.GetLength())
-
- def OutputString(self):
- DumpString = '''// AB 0B 购买天神经验 //tagCMBuySkyGodExp:
- Cmd:%s,
- SubCmd:%s
- '''\
- %(
- self.Cmd,
- self.SubCmd
- )
- return DumpString
-
-
-m_NAtagCMBuySkyGodExp=tagCMBuySkyGodExp()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMBuySkyGodExp.Cmd,m_NAtagCMBuySkyGodExp.SubCmd))] = m_NAtagCMBuySkyGodExp
-
-
-#------------------------------------------------------
# AB 12 抢红包 #tagCMGrabFamilyRedPacket
class tagCMGrabFamilyRedPacket(Structure):
@@ -17990,58 +17894,6 @@
#------------------------------------------------------
-# AB 0A 骰子投掷 #tagCMDiceTake
-
-class tagCMDiceTake(Structure):
- _pack_ = 1
- _fields_ = [
- ("Cmd", c_ubyte),
- ("SubCmd", c_ubyte),
- ("IsAutoBuy", c_ubyte), # 是否自动购买 0-否 1-是
- ]
-
- def __init__(self):
- self.Clear()
- self.Cmd = 0xAB
- self.SubCmd = 0x0A
- 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 = 0x0A
- self.IsAutoBuy = 0
- return
-
- def GetLength(self):
- return sizeof(tagCMDiceTake)
-
- def GetBuffer(self):
- return string_at(addressof(self), self.GetLength())
-
- def OutputString(self):
- DumpString = '''// AB 0A 骰子投掷 //tagCMDiceTake:
- Cmd:%s,
- SubCmd:%s,
- IsAutoBuy:%d
- '''\
- %(
- self.Cmd,
- self.SubCmd,
- self.IsAutoBuy
- )
- return DumpString
-
-
-m_NAtagCMDiceTake=tagCMDiceTake()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMDiceTake.Cmd,m_NAtagCMDiceTake.SubCmd))] = m_NAtagCMDiceTake
-
-
-#------------------------------------------------------
# AB 11 开服活动奖励 #tagCMOpenServerCampaignAward
class tagCMOpenServerCampaignAward(Structure):
@@ -18099,58 +17951,6 @@
m_NAtagCMOpenServerCampaignAward=tagCMOpenServerCampaignAward()
ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMOpenServerCampaignAward.Cmd,m_NAtagCMOpenServerCampaignAward.SubCmd))] = m_NAtagCMOpenServerCampaignAward
-
-
-#------------------------------------------------------
-# AB 0C 摇骰子 #tagCMDiceEx
-
-class tagCMDiceEx(Structure):
- _pack_ = 1
- _fields_ = [
- ("Cmd", c_ubyte),
- ("SubCmd", c_ubyte),
- ("Type", c_ubyte), # 0-投骰子 1-改投 2-见好就收
- ]
-
- def __init__(self):
- self.Clear()
- self.Cmd = 0xAB
- self.SubCmd = 0x0C
- 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 = 0x0C
- self.Type = 0
- return
-
- def GetLength(self):
- return sizeof(tagCMDiceEx)
-
- def GetBuffer(self):
- return string_at(addressof(self), self.GetLength())
-
- def OutputString(self):
- DumpString = '''// AB 0C 摇骰子 //tagCMDiceEx:
- Cmd:%s,
- SubCmd:%s,
- Type:%d
- '''\
- %(
- self.Cmd,
- self.SubCmd,
- self.Type
- )
- return DumpString
-
-
-m_NAtagCMDiceEx=tagCMDiceEx()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMDiceEx.Cmd,m_NAtagCMDiceEx.SubCmd))] = m_NAtagCMDiceEx
#------------------------------------------------------
@@ -22160,332 +21960,6 @@
m_NAtagCMTurnFight=tagCMTurnFight()
ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMTurnFight.Head.Cmd,m_NAtagCMTurnFight.Head.SubCmd))] = m_NAtagCMTurnFight
-
-
-#------------------------------------------------------
-# B5 14 拍卖行竞价物品 #tagCMBiddingAuctionItem
-
-class tagCMBiddingAuctionItem(Structure):
- Head = tagHead()
- ItemGUID = "" #(char ItemGUID[40])
- BiddingPrice = 0 #(DWORD BiddingPrice)//竞价价格
- data = None
-
- def __init__(self):
- self.Clear()
- self.Head.Cmd = 0xB5
- self.Head.SubCmd = 0x14
- return
-
- def ReadData(self, _lpData, _pos=0, _Len=0):
- self.Clear()
- _pos = self.Head.ReadData(_lpData, _pos)
- self.ItemGUID,_pos = CommFunc.ReadString(_lpData, _pos,40)
- self.BiddingPrice,_pos = CommFunc.ReadDWORD(_lpData, _pos)
- return _pos
-
- def Clear(self):
- self.Head = tagHead()
- self.Head.Clear()
- self.Head.Cmd = 0xB5
- self.Head.SubCmd = 0x14
- self.ItemGUID = ""
- self.BiddingPrice = 0
- return
-
- def GetLength(self):
- length = 0
- length += self.Head.GetLength()
- length += 40
- length += 4
-
- return length
-
- def GetBuffer(self):
- data = ''
- data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
- data = CommFunc.WriteString(data, 40, self.ItemGUID)
- data = CommFunc.WriteDWORD(data, self.BiddingPrice)
- return data
-
- def OutputString(self):
- DumpString = '''
- Head:%s,
- ItemGUID:%s,
- BiddingPrice:%d
- '''\
- %(
- self.Head.OutputString(),
- self.ItemGUID,
- self.BiddingPrice
- )
- return DumpString
-
-
-m_NAtagCMBiddingAuctionItem=tagCMBiddingAuctionItem()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMBiddingAuctionItem.Head.Cmd,m_NAtagCMBiddingAuctionItem.Head.SubCmd))] = m_NAtagCMBiddingAuctionItem
-
-
-#------------------------------------------------------
-# B5 02 交易所购买物品#tagCMPYBuyBourseItem
-
-class tagCMPYBuyBourseItem(Structure):
- Head = tagHead()
- ItemGUID = "" #(char ItemGUID[40])
- Pwd = "" #(char Pwd[8])//交易密码
- data = None
-
- def __init__(self):
- self.Clear()
- self.Head.Cmd = 0xB5
- self.Head.SubCmd = 0x02
- return
-
- def ReadData(self, _lpData, _pos=0, _Len=0):
- self.Clear()
- _pos = self.Head.ReadData(_lpData, _pos)
- self.ItemGUID,_pos = CommFunc.ReadString(_lpData, _pos,40)
- self.Pwd,_pos = CommFunc.ReadString(_lpData, _pos,8)
- return _pos
-
- def Clear(self):
- self.Head = tagHead()
- self.Head.Clear()
- self.Head.Cmd = 0xB5
- self.Head.SubCmd = 0x02
- self.ItemGUID = ""
- self.Pwd = ""
- return
-
- def GetLength(self):
- length = 0
- length += self.Head.GetLength()
- length += 40
- length += 8
-
- return length
-
- def GetBuffer(self):
- data = ''
- data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
- data = CommFunc.WriteString(data, 40, self.ItemGUID)
- data = CommFunc.WriteString(data, 8, self.Pwd)
- return data
-
- def OutputString(self):
- DumpString = '''
- Head:%s,
- ItemGUID:%s,
- Pwd:%s
- '''\
- %(
- self.Head.OutputString(),
- self.ItemGUID,
- self.Pwd
- )
- return DumpString
-
-
-m_NAtagCMPYBuyBourseItem=tagCMPYBuyBourseItem()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMPYBuyBourseItem.Head.Cmd,m_NAtagCMPYBuyBourseItem.Head.SubCmd))] = m_NAtagCMPYBuyBourseItem
-
-
-#------------------------------------------------------
-# B5 01 交易所玩家上架物品#tagCMPYPlayerSellBourseItem
-
-class tagCMPYPlayerSellBourseItem(Structure):
- Head = tagHead()
- ItemIndex = 0 #(BYTE ItemIndex)//物品在背包中索引
- Count = 0 #(WORD Count)//出售数量
- PriceType = 0 #(BYTE PriceType)//出售价格类型
- PriceCount = 0 #(DWORD PriceCount)//出售价格
- Pwd = "" #(char Pwd[8])//交易密码
- data = None
-
- def __init__(self):
- self.Clear()
- self.Head.Cmd = 0xB5
- self.Head.SubCmd = 0x01
- return
-
- def ReadData(self, _lpData, _pos=0, _Len=0):
- self.Clear()
- _pos = self.Head.ReadData(_lpData, _pos)
- self.ItemIndex,_pos = CommFunc.ReadBYTE(_lpData, _pos)
- self.Count,_pos = CommFunc.ReadWORD(_lpData, _pos)
- self.PriceType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
- self.PriceCount,_pos = CommFunc.ReadDWORD(_lpData, _pos)
- self.Pwd,_pos = CommFunc.ReadString(_lpData, _pos,8)
- return _pos
-
- def Clear(self):
- self.Head = tagHead()
- self.Head.Clear()
- self.Head.Cmd = 0xB5
- self.Head.SubCmd = 0x01
- self.ItemIndex = 0
- self.Count = 0
- self.PriceType = 0
- self.PriceCount = 0
- self.Pwd = ""
- return
-
- def GetLength(self):
- length = 0
- length += self.Head.GetLength()
- length += 1
- length += 2
- length += 1
- length += 4
- length += 8
-
- return length
-
- def GetBuffer(self):
- data = ''
- data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
- data = CommFunc.WriteBYTE(data, self.ItemIndex)
- data = CommFunc.WriteWORD(data, self.Count)
- data = CommFunc.WriteBYTE(data, self.PriceType)
- data = CommFunc.WriteDWORD(data, self.PriceCount)
- data = CommFunc.WriteString(data, 8, self.Pwd)
- return data
-
- def OutputString(self):
- DumpString = '''
- Head:%s,
- ItemIndex:%d,
- Count:%d,
- PriceType:%d,
- PriceCount:%d,
- Pwd:%s
- '''\
- %(
- self.Head.OutputString(),
- self.ItemIndex,
- self.Count,
- self.PriceType,
- self.PriceCount,
- self.Pwd
- )
- return DumpString
-
-
-m_NAtagCMPYPlayerSellBourseItem=tagCMPYPlayerSellBourseItem()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMPYPlayerSellBourseItem.Head.Cmd,m_NAtagCMPYPlayerSellBourseItem.Head.SubCmd))] = m_NAtagCMPYPlayerSellBourseItem
-
-
-#------------------------------------------------------
-# B5 13 拍卖行上架拍品 #tagCMSellAuctionItem
-
-class tagCMSellAuctionItem(Structure):
- _pack_ = 1
- _fields_ = [
- ("Cmd", c_ubyte),
- ("SubCmd", c_ubyte),
- ("ItemIndex", c_ubyte), #物品在背包中索引
- ("SellCount", c_ushort), #上架个数，0代表全部上架
- ]
-
- def __init__(self):
- self.Clear()
- self.Cmd = 0xB5
- 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 = 0xB5
- self.SubCmd = 0x13
- self.ItemIndex = 0
- self.SellCount = 0
- return
-
- def GetLength(self):
- return sizeof(tagCMSellAuctionItem)
-
- def GetBuffer(self):
- return string_at(addressof(self), self.GetLength())
-
- def OutputString(self):
- DumpString = '''// B5 13 拍卖行上架拍品 //tagCMSellAuctionItem:
- Cmd:%s,
- SubCmd:%s,
- ItemIndex:%d,
- SellCount:%d
- '''\
- %(
- self.Cmd,
- self.SubCmd,
- self.ItemIndex,
- self.SellCount
- )
- return DumpString
-
-
-m_NAtagCMSellAuctionItem=tagCMSellAuctionItem()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMSellAuctionItem.Cmd,m_NAtagCMSellAuctionItem.SubCmd))] = m_NAtagCMSellAuctionItem
-
-
-#------------------------------------------------------
-# B5 15 拍卖行下架拍品 #tagCMUnsellAuctionItem
-
-class tagCMUnsellAuctionItem(Structure):
- Head = tagHead()
- ItemGUID = "" #(char ItemGUID[40])
- data = None
-
- def __init__(self):
- self.Clear()
- self.Head.Cmd = 0xB5
- self.Head.SubCmd = 0x15
- return
-
- def ReadData(self, _lpData, _pos=0, _Len=0):
- self.Clear()
- _pos = self.Head.ReadData(_lpData, _pos)
- self.ItemGUID,_pos = CommFunc.ReadString(_lpData, _pos,40)
- return _pos
-
- def Clear(self):
- self.Head = tagHead()
- self.Head.Clear()
- self.Head.Cmd = 0xB5
- self.Head.SubCmd = 0x15
- self.ItemGUID = ""
- return
-
- def GetLength(self):
- length = 0
- length += self.Head.GetLength()
- length += 40
-
- return length
-
- def GetBuffer(self):
- data = ''
- data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
- data = CommFunc.WriteString(data, 40, self.ItemGUID)
- return data
-
- def OutputString(self):
- DumpString = '''
- Head:%s,
- ItemGUID:%s
- '''\
- %(
- self.Head.OutputString(),
- self.ItemGUID
- )
- return DumpString
-
-
-m_NAtagCMUnsellAuctionItem=tagCMUnsellAuctionItem()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMUnsellAuctionItem.Head.Cmd,m_NAtagCMUnsellAuctionItem.Head.SubCmd))] = m_NAtagCMUnsellAuctionItem
#------------------------------------------------------
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
index dfe7086..3a5a7e5 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
@@ -23693,62 +23693,6 @@
#------------------------------------------------------
-# A3 24 通知绑玉转盘结果 #tagMCBindJadeWheelResult
-
-class tagMCBindJadeWheelResult(Structure):
- _pack_ = 1
- _fields_ = [
- ("Cmd", c_ubyte),
- ("SubCmd", c_ubyte),
- ("Index", c_ubyte), # 格子
- ("Cnt", c_ubyte), #今日已转次数
- ]
-
- def __init__(self):
- self.Clear()
- self.Cmd = 0xA3
- self.SubCmd = 0x24
- 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 = 0xA3
- self.SubCmd = 0x24
- self.Index = 0
- self.Cnt = 0
- return
-
- def GetLength(self):
- return sizeof(tagMCBindJadeWheelResult)
-
- def GetBuffer(self):
- return string_at(addressof(self), self.GetLength())
-
- def OutputString(self):
- DumpString = '''// A3 24 通知绑玉转盘结果 //tagMCBindJadeWheelResult:
- Cmd:%s,
- SubCmd:%s,
- Index:%d,
- Cnt:%d
- '''\
- %(
- self.Cmd,
- self.SubCmd,
- self.Index,
- self.Cnt
- )
- return DumpString
-
-
-m_NAtagMCBindJadeWheelResult=tagMCBindJadeWheelResult()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCBindJadeWheelResult.Cmd,m_NAtagMCBindJadeWheelResult.SubCmd))] = m_NAtagMCBindJadeWheelResult
-
-
-#------------------------------------------------------
#A3 B7 当日累计攻击boss次数 #tagMCBOSSAttactCnt
class tagMCBossCntInfo(Structure):
@@ -53812,58 +53756,6 @@
#------------------------------------------------------
-# AB 23 摇骰子奖励回包 #tagMCDiceAward
-
-class tagMCDiceAward(Structure):
- _pack_ = 1
- _fields_ = [
- ("Cmd", c_ubyte),
- ("SubCmd", c_ubyte),
- ("AwardCnt", c_ubyte), # 太极数量
- ]
-
- def __init__(self):
- self.Clear()
- self.Cmd = 0xAB
- self.SubCmd = 0x23
- 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 = 0x23
- self.AwardCnt = 0
- return
-
- def GetLength(self):
- return sizeof(tagMCDiceAward)
-
- def GetBuffer(self):
- return string_at(addressof(self), self.GetLength())
-
- def OutputString(self):
- DumpString = '''// AB 23 摇骰子奖励回包 //tagMCDiceAward:
- Cmd:%s,
- SubCmd:%s,
- AwardCnt:%d
- '''\
- %(
- self.Cmd,
- self.SubCmd,
- self.AwardCnt
- )
- return DumpString
-
-
-m_NAtagMCDiceAward=tagMCDiceAward()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCDiceAward.Cmd,m_NAtagMCDiceAward.SubCmd))] = m_NAtagMCDiceAward
-
-
-#------------------------------------------------------
# AB 25 节日红包信息 #tagMCFeastRedPackInfo
class tagMCFeastRedPackInfo(Structure):
@@ -54161,66 +54053,6 @@
m_NAtagMCRefineGiftInfo=tagMCRefineGiftInfo()
ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCRefineGiftInfo.Cmd,m_NAtagMCRefineGiftInfo.SubCmd))] = m_NAtagMCRefineGiftInfo
-
-
-#------------------------------------------------------
-# AB 22 摇骰子结果 #tagMCDiceExResult
-
-class tagMCDiceExResult(Structure):
- _pack_ = 1
- _fields_ = [
- ("Cmd", c_ubyte),
- ("SubCmd", c_ubyte),
- ("ResultNum", c_int), # 骰子结果
- ("DiceType", c_ubyte), # 0-正常 1-改投 2-重置
- ("UseFreeCnt", c_ubyte), # 改投使用次数
- ]
-
- def __init__(self):
- self.Clear()
- self.Cmd = 0xAB
- self.SubCmd = 0x22
- 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 = 0x22
- self.ResultNum = 0
- self.DiceType = 0
- self.UseFreeCnt = 0
- return
-
- def GetLength(self):
- return sizeof(tagMCDiceExResult)
-
- def GetBuffer(self):
- return string_at(addressof(self), self.GetLength())
-
- def OutputString(self):
- DumpString = '''// AB 22 摇骰子结果 //tagMCDiceExResult:
- Cmd:%s,
- SubCmd:%s,
- ResultNum:%d,
- DiceType:%d,
- UseFreeCnt:%d
- '''\
- %(
- self.Cmd,
- self.SubCmd,
- self.ResultNum,
- self.DiceType,
- self.UseFreeCnt
- )
- return DumpString
-
-
-m_NAtagMCDiceExResult=tagMCDiceExResult()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCDiceExResult.Cmd,m_NAtagMCDiceExResult.SubCmd))] = m_NAtagMCDiceExResult
#------------------------------------------------------
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipStar.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipStar.py
index 2bbc6df..a498fae 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipStar.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipStar.py
@@ -22,7 +22,6 @@
import PlayerControl
import IPY_GameWorld
import DataRecordPack
-import PlayerAuctionHouse
import PlayerTongTianLing
import PlayerWeekParty
import IpyGameDataPY
@@ -94,7 +93,7 @@
if curRate < 100:
playerGoldPaper = curPlayer.GetGoldPaper()
queryData = [classLV, equipPlace, curPartStar, equipPackIndex, isAutoBuyPreview, curRate, delEquipGUIDDict, delItemInfoDict, lackItemCostMoney, playerGoldPaper]
- PlayerAuctionHouse.QueryGameServer_AuctionHouse(playerID, "EquipStarAutoBuy", queryData)
+ #拍卖行删除
return
if lackItemCostMoney:
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/AuctionItem.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/AuctionItem.py
deleted file mode 100644
index f6a38cd..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/AuctionItem.py
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#-------------------------------------------------------------------------------
-#
-##@package GM.Commands.AuctionItem
-#
-# @todo:拍卖行
-# @author hxp
-# @date 2019-03-04
-# @version 1.0
-#
-# 详细描述: 拍卖行
-#
-#-------------------------------------------------------------------------------
-#"""Version = 2019-03-04 17:00"""
-#-------------------------------------------------------------------------------
-
-import GameWorld
-import ItemControler
-import PlayerAuctionHouse
-import IpyGameDataPY
-
-
-#逻辑实现
-## GM命令执行入口
-# @param curPlayer 当前玩家
-# @param msgList 参数列表
-# @return None
-# @remarks 函数详细说明.
-def OnExec(curPlayer, msgList):
- GameWorld.DebugAnswer(curPlayer, "--------- %s" % GameWorld.GetCurrentDataTimeStr())
- if not msgList:
- __Help(curPlayer)
- return
-
- paramA = msgList[0]
- paramCount = len(msgList)
- playerID = curPlayer.GetPlayerID()
- isAuctionItem = True
-
- # 清空拍品
- if paramA == 0:
- PlayerAuctionHouse.QueryGameServer_AuctionHouse(playerID, "ClearAuctionItem", [])
- return
-
- # 打印拍品信息
- if paramA == 3:
- PlayerAuctionHouse.QueryGameServer_AuctionHouse(playerID, "PrintAuctionItem", [])
- return
-
- # 添加个人拍品
- elif paramA == 1 and paramCount >= 2:
- itemID = msgList[1]
- itemCount = max(1, msgList[2] if paramCount > 2 else 1)
- auctionGroup = max(1, msgList[3] if paramCount > 3 else 1)
- ipyData = IpyGameDataPY.GetIpyGameData("AuctionItem", itemID)
- if not ipyData:
- GameWorld.DebugAnswer(curPlayer, "非拍卖物品无法上架")
- return
- auctionItemList = []
- for _ in xrange(auctionGroup):
- curItem = ItemControler.GetOutPutItemObj(itemID, itemCount, isAuctionItem)
- auctionItemList.append([curItem])
- PlayerAuctionHouse.__DoAddAuctionItem(curPlayer, auctionItemList)
-
- # 添加仙盟拍品
- elif paramA == 2 and paramCount >= 2:
- familyID = curPlayer.GetFamilyID()
- if not familyID:
- GameWorld.DebugAnswer(curPlayer, "没有仙盟无法上架仙盟拍品")
- return
-
- itemID = msgList[1]
- itemCount = max(1, msgList[2] if paramCount > 2 else 1)
- auctionGroup = max(1, msgList[3] if paramCount > 3 else 1)
- ipyData = IpyGameDataPY.GetIpyGameData("AuctionItem", itemID)
- if not ipyData:
- GameWorld.DebugAnswer(curPlayer, "非拍卖物品无法上架")
- return
-
- familyPlayerIDList = msgList[4:] if paramCount > 4 else []
- if playerID not in familyPlayerIDList:
- familyPlayerIDList.append(playerID)
-
- familyAuctionItemList = [[itemID, itemCount]] * auctionGroup
- familyAuctionItemDict = {familyID:[familyPlayerIDList, familyAuctionItemList]}
- PlayerAuctionHouse.DoAddFamilyAuctionItem(familyAuctionItemDict)
-
- else:
- __Help(curPlayer)
- return
-
- return
-
-def __Help(curPlayer):
- GameWorld.DebugAnswer(curPlayer, "清空所有拍品: AuctionItem 0")
- GameWorld.DebugAnswer(curPlayer, "添加个人拍品: AuctionItem 1 物品ID 个数 几组")
- GameWorld.DebugAnswer(curPlayer, "添加仙盟拍品: AuctionItem 2 物品ID 个数 几组 受益玩家IDA 玩家IDB...")
- return
-
-
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameDataControl.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameDataControl.py
deleted file mode 100644
index 5559aa6..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameDataControl.py
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#---------------------------------------------------------------------
-#
-#---------------------------------------------------------------------
-##@package GameDataControl
-# @todo: 游戏数据库
-#
-# @author: panwei
-# @date 2010-09-01
-# @version 1.1
-#
-# @note: 用于缓存游戏中需要的一些数据库列表, 不用每次都遍历
-# @change: "2014-07-18 22:22" Alee 筛选物品添加过滤套装装备
-#---------------------------------------------------------------------
-"""Version = 2014-07-18 22:22"""
-#---------------------------------------------------------------------
-import GameWorld
-import ChConfig
-import ItemCommon
-#---------------------------------------------------------------------
-#物品数据字典(根据物品类型筛选)
-#{itemType:[itemData,itemData,itemData,...]}
-g_itemData_ByType_Dist = {}
-
-
-#---------------------------------------------------------------------
-##通过物品类型获取物品数据列表
-# @param findItemType 查找的物品类型
-# @return 物品数据列表[ItemData,ItemData,ItemData,ItemData....]
-# @remarks 通过物品类型获取物品数据列表
-def GetItemDataListByType(findItemType):
- global g_itemData_ByType_Dist
-
- #g_itemData_ByType_Dist {itemType:[itemData,itemData,itemData,...], itemType:[itemData,itemData,itemData,...]}
- findList = g_itemData_ByType_Dist.get(findItemType)
-
- #---找到了就返回---
- if findList != None:
- return findList
-
- #---未找到, 初始化---
- findList = __GetItemDataListInDB_ByType(findItemType)
-
- #更新字典
- g_itemData_ByType_Dist.update({findItemType:findList})
- return findList
-
-#---------------------------------------------------------------------
-##查找数据库, 获得指定类型的物品数据列表
-# @param itemType 查找的物品类型
-# @return 物品数据列表[ItemData,ItemData,ItemData,ItemData....]
-# @remarks 查找数据库, 获得指定类型的物品数据列表
-def __GetItemDataListInDB_ByType(itemType):
- #游戏数据类
- gameData = GameWorld.GetGameData()
- #筛选数据
- gameData.FilterItemByType(itemType)
- #返回的数据列表
- saveItemList = []
-
- for i in range(0, gameData.GetFilterItemCount()):
- findItemData = gameData.GetFilterItem(i)
-
- #过滤套装装备
- if ItemCommon.GetItemEffectByEffectID(findItemData, ChConfig.Def_Effect_SuiteMark):
- continue
-
- saveItemList.append(findItemData)
-
- return saveItemList
-#---------------------------------------------------------------------
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameLogInfo.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameLogInfo.py
deleted file mode 100644
index 826e90d..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameLogInfo.py
+++ /dev/null
@@ -1,162 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-
-##@package GameLogInfo
-# 服务器端信息记录
-#
-# @author Mark
-# @date 2010-4-28
-# @version 1.0
-#
-# 修改时间 修改人 修改内容
-# VER = "2010-05-12 18:30" zhengyang 添加注释
-#
-# 模块详细说明
-#服务器端信息记录
-#---------------------------------------------------------------------
-#导入
-import GameWorld
-import time
-#---------------------------------------------------------------------
-#全局变量
-#---------------------------------------------------------------------
-
-#---------------------------------------------------------------------
-#逻辑实现
-#===============================================================================
-# MapServer参数统计(每个mapServer独立记录)
-# 每日NPC处理逻辑处理总耗时ms 'NPCLogicTime'
-# 每日任务处理逻辑总耗时ms 'MissionTime'
-# 每日玩家逻辑处理总耗时ms 'PlayerLogicTime'
-# 任务的请求次数 'MissionCount'
-#===============================================================================
-Def_LogInfo_NPCLogicTime = 'NPCLogicTime'
-Def_LogInfo_MissionTime = 'MissionTime'
-Def_LogInfo_PlayerLogicTime = 'PlayerLogicTime'
-Def_LogInfo_MissionCount = 'MissionCount'
-Def_LogInfo_PlayerSight = 'PlayerSightRefresh' #这个C++保存的
-
-#总表，需要记录所有的key
-Def_LogInfo_Key_List = [
- Def_LogInfo_NPCLogicTime , Def_LogInfo_MissionTime ,
- Def_LogInfo_PlayerLogicTime , Def_LogInfo_MissionCount,
- Def_LogInfo_PlayerSight ,
- ]
-
-## 获得记录管理器
-# @param 无
-# @return None
-# @remarks 函数详细说明.
-def GetLogInfoManager():
- return GameWorld.GetGameWorld().GetDBMapServerInfoManager()
-
-## 每日NPC处理逻辑处理总耗时ms
-# @param startClock 时间
-# @return None
-# @remarks 函数详细说明.
-def LogInfo_NPCLogicTime( startClock ):
- return
- __DoLogic_LogInfo_MS( Def_LogInfo_NPCLogicTime , startClock )
- return
-
-## 每日任务处理逻辑总耗时ms
-# @param startClock 时间
-# @return None
-# @remarks 函数详细说明.
-def LogInfo_MissionTime( startClock ):
- return
- __DoLogic_LogInfo_MS( Def_LogInfo_MissionTime , startClock )
- return
-
-## 每日玩家逻辑处理总耗时ms
-# @param startClock 时间
-# @return None
-# @remarks 函数详细说明.
-def LogInfo_PlayerLogicTime( startClock ):
- return
- __DoLogic_LogInfo_MS( Def_LogInfo_PlayerLogicTime , startClock )
- return
-
-## 任务的请求次数
-# @param value 请求次数
-# @return None
-# @remarks 函数详细说明.
-def LogInfo_MissionCount( value ):
- return
- __DoLogic_LogInfo_Count( Def_LogInfo_MissionCount , value )
- return
-
-## 执行记录逻辑,(毫秒)
-# @param key
-# @param startClock 时间
-# @return None
-# @remarks 函数详细说明.
-def __DoLogic_LogInfo_MS( key , startClock ):
- lastClock = __GetLastClock( key , startClock )
- __SaveLogInfo( key , lastClock )
- return
-
-## 执行记录逻辑,(次数)
-# @param key
-# @param value 次数
-# @return None
-# @remarks 函数详细说明.
-def __DoLogic_LogInfo_Count( key , value ):
- __SaveLogInfo( key , value )
- return
-
-## 获得持续时间
-# @param key
-# @param timeClock 时间
-# @return None
-# @remarks 函数详细说明.
-def __GetLastClock( key , timeClock ):
- lastClock = time.clock() - timeClock
-
- if lastClock < 0 :
- GameWorld.Log('###记录key = %s , tick = %s , 异常'%( key , timeClock ))
- return 0
-
- #记录为毫秒
- return int( lastClock * 1000 )
-
-## 执行记录逻辑
-# @param key
-# @param addValue 记录附加值
-# @return None
-# @remarks 函数详细说明.
-def __SaveLogInfo( key , addValue ):
- return
- if addValue <= 0:
- return
-
- info = GetLogInfoManager().GetDBMapServerInfo( GameWorld.GetMap().GetMapID() , key )
- info.SetValue( info.GetValue() + addValue )
- return
-
-## 清空所有记录信息
-# @param 无
-# @return None
-# @remarks 函数详细说明.
-def ClearGameLogInfo():
- #获得信息管理器
- infoManager = GetLogInfoManager()
-
- for key in Def_LogInfo_Key_List:
- __DoLogic_ClearGameLogInfo( key , infoManager )
-
- #GameWorld.Log('SaveAndClearGameLogInfo_Success')
- return
-
-## 清空游戏log信息
-# @param key
-# @param infoManager log管理器
-# @return None
-# @remarks 函数详细说明.
-def __DoLogic_ClearGameLogInfo( key , infoManager ):
- info = infoManager.GetDBMapServerInfo( GameWorld.GetGameWorld().GetRealMapID() , key )
- #先保存
- #info.DataServer_SaveInfo()
- #在清空
- info.SetValue( 0 )
- return
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_AllFamilyBoss.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_AllFamilyBoss.py
index e01ad7a..6993e3c 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_AllFamilyBoss.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_AllFamilyBoss.py
@@ -26,7 +26,6 @@
import PlayerControl
import ShareDefine
import NPCCustomRefresh
-import PlayerAuctionHouse
import ItemControler
import PlayerFeastTravel
import PlayerWeekParty
@@ -436,7 +435,7 @@
PlayerControl.SendMailBatch("LeagueBOSS2", batchPlayerIDList, batchAddItemList, batchParamList, batchDetail=batchDetailList)
if familyAuctionItemDict:
GameWorld.Log('familyAuctionItemDict=%s' % familyAuctionItemDict)
- PlayerAuctionHouse.DoAddFamilyAuctionItem(familyAuctionItemDict)
+ #拍卖行删除
else:
playerCount = playerManager.GetPlayerCount()
for index in xrange(playerCount):
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.py
index 6a80703..c1508fb 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.py
@@ -24,7 +24,6 @@
import ChConfig
import ReadChConfig
import ShareDefine
-import GameDataControl
import ItemControler
import DataRecordPack
import EventReport
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/MapConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/MapConfig.py
deleted file mode 100644
index bcec81d..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/MapConfig.py
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#-------------------------------------------------------------------------------
-#
-#-------------------------------------------------------------------------------
-#
-##@package OnServerCMD
-# 配置文件读取
-#
-# @author wdb
-# @date 2012-10-23
-# @version 1.3
-#
-# @note
-#
-# @change: "2012-11-27 11:11" xrc 增加韩国防沉迷开关
-# @change: "2012-11-30 09:42" xrc 去除韩国防沉迷开关，已移至GameServer
-# @change: "2012-12-03 10:00" wdb 修改重读配置
-#---------------------------------------------------------------------
-"""Version = 2012-12-03 10:00"""
-#---------------------------------------------------------------------
-import traceback
-import ConfigParser
-import os
-import GameWorld
-import ChConfig
-import ReadChConfig
-import ShareDefine
-#---------------------------------------------------------------------
-
-#配置项
-ConfigSet ={
-"VIPClubOn":[0, "config"], # vip贵宾俱乐部申请是否开启
-"IsMergeWarServe":[0, "config"], # 本服是否时跨服服务器
-}
-
-## 读取配表
-# @param None
-# @return
-def ReadConfig():
- global g_config
-
- try:
- #self_module = __import__(__name__)
- g_config = {}
- configFile = ConfigParser.ConfigParser()
-
- #读取数据库配置文件config.ini
- configPath = os.path.join(ChConfig.MapServerPath, 'config.ini')
- if os.path.isfile(configPath):
- configFile.read(configPath)
-
- # 获得配置值
- for key, value in ConfigSet.items():
- value = ReadCongfigValue(configFile, value[1], key, value[0])
-
- if value == None:
- return False
- g_config[key] = value
-
- except:
- GameWorld.ErrLog('%s'%traceback.format_exc())
- return False
- return True
-
-
-## 获得配置值
-# @param config 配置文件
-# @param secname 段落名
-# @param keyname 键名
-# @param defvalue 默认值
-# @return
-def ReadCongfigValue(config, secname, keyname, defvalue):
- try:
- if config.has_option(secname, keyname):
- value = config.get(secname, keyname)
-
- if type(defvalue) == bool:
- value = type(defvalue)(int(value))
- else:
- value = type(defvalue)(value)
- else:
- return defvalue
- except:
- msg = 'config secname = %s, keyname = %s, defvalue = %s\n%s'%(secname, keyname, defvalue,
- traceback.format_exc())
- GameWorld.ErrLog(msg)
- return None
- return value
-
-
-# 配置字典
-g_config = None
-
-## 初始化配置
-# @param None
-# @return
-def GetConfig():
- global g_config
-
- #是否重读所有的配置表
- if GameWorld.GetGameWorld().GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_ReloadConfig):
- ReadChConfig.ClearAllConfig()
-
- elif g_config != None:
- return g_config
-
- if not ReadConfig():
- GameWorld.ErrLog("Init config failed.")
- return g_config
-
-
-## 删除配置
-# @param None
-# @return
-def ClearConfig():
- global g_config
-
- g_config = None
- return
-
-
\ No newline at end of file
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/ChNPC.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/ChNPC.py
index d11e851..7ccb093 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/ChNPC.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/ChNPC.py
@@ -35,13 +35,9 @@
import ChConfig
import NPCCommon
import NPCCustomRefresh
-import GameLogInfo
import time
import math
-import ReadChConfig
import PlayerActivity
-import SkillCommon
-import BuffSkill
import GameObj
import SkillShell
import FBLogic
@@ -458,61 +454,6 @@
# GameWorld.Log('功能或AI不存在： %s'%curNPC.GetAIType())
return
-
-#===============================================================================
-# def OnUndeathBossHurt(curNPC, hurtHP):
-# npcID = curNPC.GetNPCID()
-# UndeathBossDict = ReadChConfig.GetEvalChConfig("UndeathBoss")
-# if npcID not in UndeathBossDict:
-# return False
-# unitLostHP = UndeathBossDict[npcID] # 叠加一层buff所需掉血量
-#
-# curLayerLostHP = curNPC.GetDictByKey(ChConfig.Def_NPC_Dict_Undeath_LayerLostHP)
-# updLostHP = curLayerLostHP + hurtHP
-# addLayer = updLostHP / unitLostHP # 增加buff层数, 攻击高的可能一次性加多层
-# #GameWorld.DebugLog("不死boss掉血: curLayerLostHP=%s,hurtHP=%s,updLostHP=%s,unitLostHP=%s,addLayer=%s"
-# # % (curLayerLostHP, hurtHP, updLostHP, unitLostHP, addLayer), npcID)
-# if addLayer > 0:
-# curBuffLayer = curNPC.GetDictByKey(ChConfig.Def_NPC_Dict_Undeath_BuffLayer)
-# updBuffLyaer = curBuffLayer + addLayer
-# curNPC.SetDict(ChConfig.Def_NPC_Dict_Undeath_BuffLayer, updBuffLyaer)
-# updLostHP = updLostHP % unitLostHP # 更新层累加后剩余的伤害值
-# #GameWorld.DebugLog(" 增加NPC字典buff层: curBuffLayer=%s,updBuffLyaer=%s,updLostHP=%s"
-# # % (curBuffLayer, updBuffLyaer, updLostHP), npcID)
-# __UpdBossLayerBuff(curNPC, updBuffLyaer)
-#
-# curNPC.SetDict(ChConfig.Def_NPC_Dict_Undeath_LayerLostHP, updLostHP)
-# return True
-#
-# def __UpdBossLayerBuff(curNPC, updBuffLyaer):
-# ''' 更新boss层buff层级 '''
-# buffType = IPY_GameWorld.bfBuff
-# buffTuple = SkillCommon.GetBuffManagerByBuffType(curNPC, buffType)
-# if buffTuple == ():
-# return
-#
-# tick = GameWorld.GetGameWorld().GetTick()
-# buffState = buffTuple[0]
-# for i in range(0,buffState.GetBuffCount()):
-# curBuff = buffState.GetBuff(i)
-# curSkill = curBuff.GetSkill()
-# skillID = curSkill.GetSkillID()
-# if not skillID:
-# continue
-#
-# for j in range(0, curSkill.GetEffectCount()):
-# curEffect = curSkill.GetEffect(j)
-# effectID = curEffect.GetEffectID()
-# # 层级buff效果
-# if effectID in ChConfig.Def_BuffLayerEffectList:
-# BuffSkill.AddBuffNoRefreshState(curNPC, buffType, curSkill, tick, updBuffLyaer, curNPC)
-# #GameWorld.DebugLog(" 更新层级buff效果层数: isOK=%s,skillID=%s,effID=%s,updBuffLyaer=%s"
-# # % (isOK, skillID, effectID, updBuffLyaer), curNPC.GetNPCID())
-# break
-#
-# NPCCommon.NPCControl(curNPC).RefreshNPCAttrState()
-# return
-#===============================================================================
def OnUndeathBossAttacked(curNPC):
npcID = curNPC.GetNPCID()
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
index 61daa51..07fb987 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
@@ -55,7 +55,6 @@
import PlayerGoldInvest
import PlayerActivity
import FBCommon
-import PlayerBindJadeWheel
import BossHurtMng
import PlayerWishingWell
import PlayerAttrFruit
@@ -95,7 +94,6 @@
import PlayerVip
import PlayerRefineStove
import PassiveBuffEffMng
-import PlayerDiceEx
import GameLogic_XMZZ
import PlayerFlashSale
import PlayerFlashGiftbag
@@ -524,8 +522,6 @@
#通知玩家技能信息
__Sync_ClientSkill(curPlayer)
- #清除国家答题Buff
- #PlayerExam.DoLogic_ExitExam(curPlayer, tick, needRefresh = False)
#清除VIPbuff
#BuffSkill.DelBuffBySkillID(curPlayer, ChConfig.Def_VIPExp_SkillTypeID, tick)
@@ -738,8 +734,6 @@
FunctionNPCCommon.ShopItemOnLogin(curPlayer)
# 通知设置的被动功法
#PassiveBuffEffMng.OnLoginGFPassive(curPlayer)
- #我要太极
- PlayerDiceEx.DiceExOnLogin(curPlayer)
#仙魔之争
GameLogic_XMZZ.OnXMZZLogin(curPlayer)
PlayerOnlinePrize.OnPlayerLogin(curPlayer)
@@ -809,8 +803,6 @@
PlayerDogz.OnPlayerLogin(curPlayer)
# 骑宠
FamilyRobBoss.OnPlayerLogin(curPlayer)
- # 绑玉转盘
- PlayerBindJadeWheel.OnLogin(curPlayer)
# 许愿池
PlayerWishingWell.OnLogin(curPlayer)
#幸运鉴宝
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAuctionHouse.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAuctionHouse.py
deleted file mode 100644
index d993595..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAuctionHouse.py
+++ /dev/null
@@ -1,299 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#-------------------------------------------------------------------------------
-#
-##@package Player.PlayerAuctionHouse
-#
-# @todo:玩家拍卖行处理
-# @author hxp
-# @date 2019-03-04
-# @version 1.0
-#
-# 详细描述: 玩家拍卖行处理
-#
-#-------------------------------------------------------------------------------
-#"""Version = 2019-03-04 17:00"""
-#-------------------------------------------------------------------------------
-import GameWorld
-import IPY_GameWorld
-import IpyGameDataPY
-import DataRecordPack
-import PlayerControl
-import ItemControler
-import Operate_EquipStar
-import ItemCommon
-import ChConfig
-import ShareDefine
-import PlayerActivity
-import NPCCommon
-
-import random
-import time
-import uuid
-
-#// B5 13 拍卖行上架拍品 #tagCMSellAuctionItem
-#
-#struct tagCMSellAuctionItem
-#{
-# tagHead Head;
-# BYTE ItemIndex; //物品在背包中索引
-# WORD SellCount; //上架个数，0代表全部上架
-#};
-def OnSellAuctionItem(index, clientData, tick):
- curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
- playerID = curPlayer.GetPlayerID()
- itemIndex = clientData.ItemIndex
- sellCount = clientData.SellCount if hasattr(clientData, "SellCount") else 0 # 后面加的，仅为测试时做下兼容
- GameWorld.DebugLog("玩家上架拍品: itemIndex=%s" % (itemIndex), playerID)
- playerPack = curPlayer.GetItemManager().GetPack(IPY_GameWorld.rptItem)
- curItem = playerPack.GetAt(itemIndex)
- if curItem.IsEmpty():
- return
- if not ItemControler.GetIsAuctionItem(curItem):
- GameWorld.Log("非拍品，绑定无法上架!", playerID)
- return
- itemGUID = curItem.GetGUID()
- itemID = curItem.GetItemTypeID()
- ipyData = IpyGameDataPY.GetIpyGameData("AuctionItem", itemID)
- if not ipyData:
- return
- # 20201223 主干取消拍品有效时长设定
-# auctionItemCreateTime = curItem.GetUserAttr(ShareDefine.Def_IudetAuctionItemCreateTime)
-# if not auctionItemCreateTime:
-# GameWorld.DebugLog("没有拍品创建时间，无法上架!", playerID)
-# return
-# curTime = int(time.time())
-# if curTime - auctionItemCreateTime > IpyGameDataPY.GetFuncCfg("AuctionItem", 1) * 3600:
-# GameWorld.DebugLog("拍品已过期，无法上架!auctionItemCreateTime=%s" % (GameWorld.ChangeTimeNumToStr(auctionItemCreateTime)), playerID)
-# ItemControler.SetIsAuctionItem(curItem, False, curPlayer)
-# return
-
- QueryGameServer_AuctionHouse(playerID, "AddAuctionItemQuery", [itemIndex, itemGUID, itemID, sellCount])
- return
-
-#// B5 14 拍卖行竞价物品 #tagCMBiddingAuctionItem
-#
-#struct tagCMBiddingAuctionItem
-#{
-# tagHead Head;
-# char ItemGUID[40];
-# WORD BiddingPrice; //竞价价格
-#};
-def OnBiddingAuctionItem(index, clientData, tick):
- curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
- playerID = curPlayer.GetPlayerID()
- itemGUID = clientData.ItemGUID
- biddingPrice = clientData.BiddingPrice
- if not PlayerControl.HaveMoney(curPlayer, IPY_GameWorld.TYPE_Price_Gold_Paper, biddingPrice):
- return
- QueryGameServer_AuctionHouse(playerID, "BidAuctionItemQuery", [itemGUID, biddingPrice])
- return
-
-def QueryGameServer_AuctionHouse(playerID, queryType, queryData):
- msgInfo = str([queryType, queryData])
- GameWorld.GetPlayerManager().GameServer_QueryPlayerResult(playerID, 0, 0, "AuctionHouse", msgInfo, len(msgInfo))
- GameWorld.DebugLog("拍卖行发送GameServer: playerID=%s,queryType=%s,queryData=%s" % (playerID, queryType, queryData))
- return
-
-def QueryResult_AuctionHouse(curPlayer, resultList):
- ## 拍卖行GameServer返回处理
- if len(resultList) != 3:
- return
- queryType, queryData, result = resultList
- if queryType == "AddAuctionItemQuery":
- itemIndex, itemGUID, itemID, sellCount = queryData
- if not result or not result[0]:
- return
- __DoPlayerSellAuctionItem(curPlayer, itemIndex, itemGUID, itemID, sellCount)
-
- elif queryType == "BidAuctionItemQuery":
- itemGUID, biddingPrice = queryData
- if not result or not result[0]:
- return
- itemID = result[0]
- __DoPlayerBidAuctionItem(curPlayer, itemGUID, biddingPrice, itemID)
-
- elif queryType == "EquipStarAutoBuy":
- Operate_EquipStar.GameServer_EquipStarAutoBuy(curPlayer, result)
-
- return
-
-def __DoPlayerBidAuctionItem(curPlayer, itemGUID, biddingPrice, itemID):
- ## 玩家竞价拍品
-
- # 地图只处理扣除竞价价格
- infoDict = {"ItemID":itemID, "ItemGUID":itemGUID, "BiddingPrice":biddingPrice}
- if not PlayerControl.PayMoney(curPlayer, IPY_GameWorld.TYPE_Price_Gold_Paper, biddingPrice, ChConfig.Def_Cost_AuctionBid, infoDict):
- return
-
- DR_AuctionHouse(curPlayer, "PlayerPayBid", infoDict)
- playerID = curPlayer.GetPlayerID()
- QueryGameServer_AuctionHouse(playerID, "BidAuctionItem", [itemGUID, biddingPrice])
-
- PlayerActivity.AddDailyActionFinishCnt(curPlayer, ShareDefine.DailyActionID_AuctionItem, 1)
- return
-
-def __DoPlayerSellAuctionItem(curPlayer, itemIndex, itemGUID, itemID, sellCount):
- ## 玩家上架拍品
- playerID = curPlayer.GetPlayerID()
- playerPack = curPlayer.GetItemManager().GetPack(IPY_GameWorld.rptItem)
- curItem = playerPack.GetAt(itemIndex)
- if curItem.IsEmpty():
- return
- if not ItemControler.GetIsAuctionItem(curItem):
- GameWorld.Log("非拍品，无法上架!", playerID)
- return
- curItemGUID = curItem.GetGUID()
- curItemID = curItem.GetItemTypeID()
- if itemGUID != curItemGUID or itemID != curItemID:
- GameWorld.Log("请求上架的拍品已变化，无法上架!", playerID)
- return
- __DoAddAuctionItem(curPlayer, [[curItem, sellCount]])
- return
-
-def DoAddFamilyAuctionItem(familyAuctionItemDict):
- ''' 上架仙盟拍品，因为仙盟拍品默认上架，所以使用批量上架
- @param familyAuctionItemDict: {仙盟ID:[[享受收益的成员ID, ...], [[拍品ID,个数], [拍品ID,个数,是否拍品], ...]], ...}
- '''
- GameWorld.Log("上架仙盟拍品: %s" % familyAuctionItemDict)
- isAuctionItem = True
- auctionItemList = []
- for familyID, auctionInfo in familyAuctionItemDict.items():
- familyPlayerIDList, familyAuctionItemList = auctionInfo
- for itemInfo in familyAuctionItemList:
- if len(itemInfo) < 2:
- continue
- itemID, itemCount = itemInfo[:2]
- ipyData = IpyGameDataPY.GetIpyGameData("AuctionItem", itemID)
- if not ipyData:
- GameWorld.ErrLog("非拍卖物品，无法上架仙盟拍品! familyID=%s,itemID=%s,itemCount=%s" % (familyID, itemID, itemCount))
- continue
- curItem = ItemControler.GetOutPutItemObj(itemID, itemCount, isAuctionItem)
- if not curItem:
- continue
- auctionItemList.append([curItem, familyID, familyPlayerIDList])
- __DoAddAuctionItem(None, auctionItemList)
- return
-
-def __DoAddAuctionItem(curPlayer, auctionItemList):
- ''' 上架拍品，支持批量上架
- @param curPlayer: 非个人拍品时为None
- @param auctionItemList: [[curItem], [curItem, sellCount], [curItem, familyID, familyPlayerIDList], ...]
- '''
- playerID = 0 if not curPlayer else curPlayer.GetPlayerID()
- addAuctionItemList = []
- for itemInfo in auctionItemList:
- curItem = itemInfo[0]
- familyID, familyPlayerIDList = 0, []
- if not curPlayer and len(itemInfo) == 3:
- familyID, familyPlayerIDList = itemInfo[1:]
-
- itemID = curItem.GetItemTypeID()
- itemData = {"GUID":curItem.GetGUID(), "ItemID":itemID, "ItemCount":curItem.GetCount(),
- "ItemType":curItem.GetType(), "ItemJobLimit":curItem.GetJobLimit(), "ItemClassLV":ItemCommon.GetItemClassLV(curItem),
- "UserData":curItem.GetUserData()}
-
- #扣物品
- if curPlayer and not familyID:
- sellCount = itemInfo[1] if len(itemInfo) == 2 else 0
- if sellCount <= 0:
- sellCount = curItem.GetCount()
- else:
- sellCount = min(sellCount, curItem.GetCount())
- itemData["ItemCount"] = sellCount
- if sellCount != curItem.GetCount():
- itemData["GUIDSrc"] = curItem.GetGUID()
- itemData["GUID"] = str(uuid.uuid1()).upper() # 不是全部卖掉的，生成新的GUID
- ItemCommon.DelItem(curPlayer, curItem, sellCount, True, ChConfig.ItemDel_AuctionHouse)
- else:
- if not ItemControler.GetIsAuctionItem(curItem):
- GameWorld.Log("非拍品，绑定无法上架!", playerID)
- curItem.Clear()
- continue
- curItem.Clear()
-
- drDict = {"FamilyID":familyID, "FamilyPlayerIDList":familyPlayerIDList, "ItemData":itemData}
- DR_AuctionHouse(curPlayer, "MapClearItem", drDict)
-
- addAuctionItemList.append([playerID, familyID, familyPlayerIDList, itemData])
- GameWorld.DebugLog("上架拍品: playerID=%s,familyID=%s,%s" % (playerID, familyID, drDict), playerID)
-
- QueryGameServer_AuctionHouse(playerID, "AddAuctionItem", addAuctionItemList)
- if curPlayer:
- PlayerActivity.AddDailyActionFinishCnt(curPlayer, ShareDefine.DailyActionID_AuctionItem, 1)
- return
-
-def DoAddSystemAuctionItem(sysAuctionItemList):
- ''' 上架系统拍品
- @param sysAuctionItemList: [物品ID, [阶,颜色,[部位, ...],是否套装,星级,[可选参数职业, ...]], ...]
- '''
- #先屏蔽上架系统拍品，日志影响地图功能开发，之后拍卖行功能也会删除 - sg
- return
- GameWorld.Log("上架系统拍品: %s" % sysAuctionItemList)
-
- isAuctionItem = True
- auctionItemList = []
- for sysAuctionItemInfo in sysAuctionItemList:
- itemCount = 1 # 系统拍品，默认上架一个
- if type(sysAuctionItemInfo) == int:
- itemID = sysAuctionItemInfo
- elif type(sysAuctionItemInfo) == list and len(sysAuctionItemInfo) == 2:
- itemID, itemCount = sysAuctionItemInfo
- elif type(sysAuctionItemInfo) == list and len(sysAuctionItemInfo) >= 5:
- classLV, color, placeList, isSuit, star = sysAuctionItemInfo[:5]
- if star:
- # 有星级的代表非境界装备，暂不处理，之后有需要扩展
- randEquipIDList = []
- else:
- itemJobList = sysAuctionItemInfo[5] if len(sysAuctionItemInfo) > 5 else []
- randEquipIDList = NPCCommon.__GetEquipIDList(0, classLV, color, isSuit, placeList, itemJobList, findType="SystemAuctionItem")
- if not randEquipIDList:
- GameWorld.ErrLog("系统拍品找不到可上架的装备! %s" % str(sysAuctionItemInfo))
- continue
- itemID = random.choice(randEquipIDList)
- else:
- GameWorld.ErrLog("系统拍品格式错误，无法上架! %s" % str(sysAuctionItemInfo))
- continue
- ipyData = IpyGameDataPY.GetIpyGameData("AuctionItem", itemID)
- if not ipyData:
- GameWorld.ErrLog("非拍卖物品，无法上架系统拍品! itemID=%s" % (itemID))
- continue
- curItem = ItemControler.GetOutPutItemObj(itemID, itemCount, isAuctionItem)
- if not curItem:
- continue
- auctionItemList.append([curItem])
- if not auctionItemList:
- return
- __DoAddAuctionItem(None, auctionItemList)
- return
-
-#// B5 15 拍卖行下架拍品 #tagCMUnsellAuctionItem
-#
-#struct tagCMUnsellAuctionItem
-#{
-# tagHead Head;
-# char ItemGUID[40];
-#};
-def OnUnsellAuctionItem(index, clientData, tick):
- curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
- playerID = curPlayer.GetPlayerID()
- itemGUID = clientData.ItemGUID
-
- # 直接发邮件，这里就不验证背包了
-# #验证背包空间
-# if not ItemCommon.CheckPackHasSpace(curPlayer, IPY_GameWorld.rptItem):
-# PlayerControl.NotifyCode(curPlayer, "GeRen_chenxin_998371")
-# return
-
- QueryGameServer_AuctionHouse(playerID, "UnsellAuctionItem", [itemGUID])
- return
-
-def DR_AuctionHouse(curPlayer, eventName, drDict):
-# accID = "" if not curPlayer else curPlayer.GetAccID()
-# playerID = 0 if not curPlayer else curPlayer.GetPlayerID()
-# dataDict = {"EventName":eventName,"PlayerID":playerID, "AccID":accID}
-# dataDict.update(drDict)
-# DataRecordPack.SendEventPack("AuctionHouse", dataDict, curPlayer)
- return
-
-
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBindJadeWheel.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBindJadeWheel.py
deleted file mode 100644
index 5b72253..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBindJadeWheel.py
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#-------------------------------------------------------------------------------
-#
-##@package Player.PlayerBindJadeWheel
-#
-# @todo:绑玉转盘
-# @author xdh
-# @date 2018-09-27
-# @version 1.0
-#
-# 详细描述: 绑玉转盘
-#
-#-------------------------------------------------------------------------------
-#"""Version = 2018-09-27 16:00"""
-#-------------------------------------------------------------------------------
-
-import GameWorld
-import PlayerVip
-import IpyGameDataPY
-import IPY_GameWorld
-import ChPyNetSendPack
-import PlayerControl
-import NetPackCommon
-import ChConfig
-
-
-
-
-def OnDay(curPlayer):
- PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_BindJadeWheelCurCnt, 0)
- SyncBindJadeWheelResult(curPlayer)
- return
-
-def OnLogin(curPlayer):
- SyncBindJadeWheelResult(curPlayer)
- return
-
-#// A5 17 绑玉转盘开始 #tagCMStartBindJadeWheel
-#
-#struct tagCMStartBindJadeWheel
-#
-#{
-# tagHead Head;
-#};
-def OnStartBindJadeWheel(index, clientData, tick):
- curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
- maxCnt = PlayerVip.GetPrivilegeValue(curPlayer, ChConfig.VIPPrivilege_BindJadeWheel)
- curCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_BindJadeWheelCurCnt)
- if curCnt >= maxCnt:
- GameWorld.DebugLog(' 绑玉转盘次数不足！')
- return
- costMoney = IpyGameDataPY.GetFuncCfg('BindJadeWheelCfg')
- if not PlayerControl.HaveMoney(curPlayer, IPY_GameWorld.TYPE_Price_Gold_Money, costMoney):
- return
- historyCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_BindJadeWheelHistoryCnt)
- beSureCountDict = IpyGameDataPY.GetFuncEvalCfg('BindJadeWheelCfg', 4, {})
- updHistory = historyCnt + 1
- if updHistory in beSureCountDict:
- gridNumRateList = beSureCountDict[updHistory]
- else:
- gridNumRateList = IpyGameDataPY.GetFuncEvalCfg('BindJadeWheelCfg', 3)
- gridNum = GameWorld.GetResultByRandomList(gridNumRateList)
- if not gridNum:
- GameWorld.ErrLog(' 绑玉转盘 没转出结果 gridNumRateList=%s'%gridNumRateList, curPlayer.GetID())
- return
- giveMoney = IpyGameDataPY.GetFuncEvalCfg('BindJadeWheelCfg', 2, {}).get(str(gridNum))
- if not giveMoney:
- return
- PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_BindJadeWheelCurCnt, curCnt+1)
- PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_BindJadeWheelHistoryCnt, updHistory)
-
- infoDict = {"giveMoney":giveMoney, "historyCnt":historyCnt, "curCnt":curCnt}
- PlayerControl.PayMoney(curPlayer, IPY_GameWorld.TYPE_Price_Gold_Money, costMoney, ChConfig.Def_Cost_BindJadeWheel, infoDict)
- PlayerControl.GiveMoney(curPlayer, IPY_GameWorld.TYPE_Price_Gold_Paper, giveMoney, ChConfig.Def_GiveMoney_BindJadeWheel, isSysHint=False)
- SyncBindJadeWheelResult(curPlayer, gridNum)
-
- if giveMoney >= IpyGameDataPY.GetFuncCfg('BindJadeWheelNotice'):
- PlayerControl.WorldNotify(0, 'BindJadeNotice', [curPlayer.GetName(), giveMoney])
- return
-
-def SyncBindJadeWheelResult(curPlayer, gridNum=0):
- sendPack = ChPyNetSendPack.tagMCBindJadeWheelResult()
- sendPack.Clear()
- sendPack.Index = gridNum
- sendPack.Cnt = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_BindJadeWheelCurCnt)
- NetPackCommon.SendFakePack(curPlayer, sendPack)
- return
\ No newline at end of file
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBourseTube.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBourseTube.py
deleted file mode 100644
index ef25341..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBourseTube.py
+++ /dev/null
@@ -1,359 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#
-#
-##@package PlayerBourseTube.py
-#
-# @todo:玩家交易所 地图服务器处理模块
-#
-# @author xmnathan
-# @date 2010-01-01 21:30
-# @version 1.6
-# @note:
-# @change: "2014-05-21 20:00" xmnathan 玩家交易所
-# @change: "2014-06-03 13:00" xmnathan 日志输出改成Debug
-# @change: "2014-07-14 18:30" hxp 增加每日活跃度
-# @change: "2015-01-14 00:30" hxp 增加交易事件汇报
-# @change: "2015-08-24 11:00" xdh 增加交易次数成就
-# @change: "2017-03-27 16:00" hxp 增加贵族降低交易所手续费特权
-#------------------------------------------------------------------------------
-#"""Version = 2017-03-27 16:00"""
-#------------------------------------------------------------------------------
-import IPY_GameWorld
-import GameWorld
-import ChConfig
-import ShareDefine
-import NetPackCommon
-import PlayerControl
-import ItemCommon
-import ItemControler
-import ChMapToGamePyPack
-import PlayerVip
-import PlayerSuccess
-import IpyGameDataPY
-
-#------------------------------------------------------------------------------
-#// B5 01 交易所玩家上架物品#tagCMPYPlayerSellBourseItem
-#struct tagCMPYPlayerSellBourseItem
-#{
-# tagHead Head;
-# BYTE ItemIndex; //物品在背包中索引
-# WORD Count; //出售数量
-# BYTE PriceType; //出售价格类型
-# DWORD PriceCount; //出售价格
-# char Pwd[8]; //交易密码
-#};
-def OnPlayerSellBourseItem(index, clientData, tick):
- curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
- GameWorld.DebugLog("Bourse### PlayerSellBourseItem in, PlayerID %s"%curPlayer.GetPlayerID())
- playerPack = curPlayer.GetItemManager().GetPack(IPY_GameWorld.rptItem)
- itemIndex = clientData.ItemIndex
- curItem = playerPack.GetAt(itemIndex)
- if curItem.IsEmpty():
- #错误的背包索引
- GameWorld.DebugLog("Bourse### PlayerSellBourseItem ItemIndex = %s IsEmpty"%itemIndex)
- return
- if curItem.GetIsBind() or (not curItem.GetCanTrade()):
- #绑定物品不可交易
- GameWorld.DebugLog("Bourse### PlayerSellBourseItem ItemIndex = %s IsBind"%itemIndex)
- return
- if curItem.GetIsSuite():
- GameWorld.DebugLog("Bourse### PlayerSellBourseItem ItemIndex = %s IsSuite"%itemIndex)
- return
-
- if clientData.PriceCount <= 0:
- GameWorld.DebugLog("Bourse### PlayerSellBourseItem PriceCount <= 0"%itemIndex)
- return
- if clientData.Count > curItem.GetCount():
- GameWorld.Log(' Bourse### 客户端发的物品数量大于实际数量！！')
- sellCount = min(clientData.Count, curItem.GetCount())
- if sellCount <= 0:
- return
-
- password = clientData.Pwd
- #判断vip权限
- if password and not PlayerVip.GetPrivilegeValue(curPlayer, ChConfig.VIPPrivilege_BoursePwd):
- GameWorld.DebugLog("Bourse### PlayerSellBourseItem VIP权限不足，不能用上架密码")
- return
-
- #发包到GameServer//02 01 询问是否可以添加玩家交易所物品#tagMGCheckAddPlayerBourseItem
- sendPack = ChMapToGamePyPack.tagMGCheckAddPlayerBourseItem()
- sendPack.PlayerID = curPlayer.GetPlayerID()
- sendPack.ItemIndex = itemIndex
- sendPack.Count = sellCount
- sendPack.PriceType = clientData.PriceType
- sendPack.PriceCount = clientData.PriceCount
- sendPack.Pwd = password
- NetPackCommon.SendPyPackToGameServer(sendPack)
- GameWorld.DebugLog("Bourse### PlayerSellBourseItem out")
- return
-
-##//02 01 查询玩家是否可以添加交易所物品结果#tagGMCheckAddPlayerBourseItemResult
-# @param curPackData:封包结构体
-# @param tick:时间戳
-# @return None
-def OnGMCheckAddPlayerBourseItemResult(curPackData, tick):
- GameWorld.DebugLog("Bourse### GMCheckAddPlayerBourseItemResult in, PlayerID %s"%curPackData.PlayerID)
- curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(curPackData.PlayerID)
- if not curPlayer:
- GameWorld.DebugLog("Bourse### GMCheckAddPlayerBourseItemResult curPlayer no found, PlayerID %s"%curPackData.PlayerID)
- return
- if not curPackData.Result:
- #玩家交易所物品已达上限，无法继续添加
- PlayerControl.NotifyCode(curPlayer, 'GeRen_liubo_318640', [])
- GameWorld.DebugLog('Bourse### GMCheckAddPlayerBourseItemResult False')
- return
-
- playerPack = curPlayer.GetItemManager().GetPack(IPY_GameWorld.rptItem)
- curItem = playerPack.GetAt(curPackData.ItemIndex)
- if curItem.IsEmpty():
- #错误的背包索引
- GameWorld.DebugLog('Bourse### GMCheckAddPlayerBourseItemResult ItemIndex=%s IsEmpty'%curPackData.ItemIndex)
- return
-
- minPrice = IpyGameDataPY.GetFuncCfg('BoursePriceLimit')
- maxPrice = IpyGameDataPY.GetFuncCfg('BoursePriceLimit', 2)
-
- if curPackData.PriceCount < minPrice or curPackData.PriceCount > maxPrice:
- GameWorld.DebugLog('Bourse### GMCheckAddPlayerBourseItemResult PriceCount = %s err'%curPackData.PriceCount)
- return
-
- singleItem = curItem.GetItem()
- #if singleItem.GetPackCount() == curPackData.Count:
- #发包到GameServer//02 02 玩家交易所添加出售的物品#tagMGAddPlayerSellBourseItem
- sendPack = ChMapToGamePyPack.tagMGAddPlayerSellBourseItem()
- sendPack.PlayerID = curPackData.PlayerID
- sendPack.PlayerName = curPlayer.GetPlayerName()
- sendPack.OperateInfo = curPlayer.GetOperateInfo()
- sendPack.ItemGUID = singleItem.GetGUID()
- sendPack.Count = curPackData.Count
- #roleItem
- sendPack.PriceType = curPackData.PriceType
- sendPack.PriceCount = curPackData.PriceCount
- sendPack.ItemTypeID = singleItem.GetItemTypeID()
- sendPack.UserData = singleItem.GetUserData()
- sendPack.UserDataLen = len(sendPack.UserData)
- sendPack.Type = singleItem.GetType()
- sendPack.EquipPlace = singleItem.GetEquipPlace()
- sendPack.LV = singleItem.GetLV()
- sendPack.UseLV = singleItem.GetUseLV()
- sendPack.JobLimit = singleItem.GetJobLimit()
- sendPack.SuiteID = singleItem.GetSuiteID()
- sendPack.ItemQuality = singleItem.GetItemQuality()
- sendPack.ItemColor = singleItem.GetItemColor()
- sendPack.Pwd = curPackData.Pwd
- sendPack.EquipGS = ItemCommon.GetEquipGearScore(curItem)
- itemName = singleItem.GetName().decode(ShareDefine.Def_Game_Character_Encoding).encode(GameWorld.GetCharacterEncoding())
- sendPack.ItemName = itemName
- NetPackCommon.SendPyPackToGameServer(sendPack)
- #扣物品
- ItemCommon.DelItem(curPlayer, curItem, curPackData.Count, True, ChConfig.ItemDel_AddBourseItem, isForceDR=True)
-
- GameWorld.DebugLog('Bourse### GMCheckAddPlayerBourseItemResult out 1 ItemGUID=%s'%sendPack.ItemGUID)
- return
-
-
-#------------------------------------------------------------------------------
-##//1B 03 交易所玩家取下正在出售的物品或出售收益#tagCMPlayerRecaptureBourseItem
-#tagCMPlayerRecaptureBourseItem
-#struct tagCMPlayerRecaptureBourseItem
-#{
-# tagHead Head;
-# char ItemGUID[40];
-#};
-##1B 03 交易所玩家取下正在出售的物品或出售收益#tagCMPlayerRecaptureBourseItem
-# @param index:玩家索引
-# @param tick:时间戳
-# @return None
-def OnPlayerRecaptureBourseItem(index, tick):
- clientPack = IPY_GameWorld.IPY_CMPlayerRecaptureBourseItem()
- curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
- GameWorld.DebugLog("Bourse### PlayerRecaptureBourseItem in, PlayerID %s"%curPlayer.GetPlayerID())
- #获取背包空格
- itemPackSpace = ItemControler.GetItemPackSpace(curPlayer,IPY_GameWorld.rptItem)
- #发包到GameServer//02 05 交易所玩家取下正在出售的物品或出售收益#tagMGPlayerRecaptureBourseItem
- sendPack = ChMapToGamePyPack.tagMGPlayerRecaptureBourseItem()
- sendPack.PlayerID = curPlayer.GetPlayerID()
- sendPack.ItemGUID = clientPack.GetItemGUID()
- sendPack.PackSpaceCount = itemPackSpace #//当前背包剩余空间
- GameWorld.DebugLog("Bourse### PlayerRecaptureBourseItem,ItemGUID %s, itemPackSpace = %s"%(sendPack.ItemGUID, itemPackSpace))
- NetPackCommon.SendPyPackToGameServer(sendPack)
- GameWorld.DebugLog("Bourse### PlayerRecaptureBourseItem out")
- return
-#------------------------------------------------------------------------------
-##//02 03 玩家获取交易所物品结果#tagGMGiveBourseItem
-# @param curPackData:封包结构体
-# @param tick:时间戳
-# @return None
-def OnGMGiveBourseItem(curPackData, tick):
- GameWorld.DebugLog("Bourse### GMGiveBourseItem in, PlayerID %s"%curPackData.PlayerID)
- curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(curPackData.PlayerID)
- if not curPlayer:
- GameWorld.DebugLog("Bourse### GMGiveBourseItem , PlayerID %s no found "%curPackData.PlayerID)
- return
-
- #创建新物品
- curCreateItem = ItemCommon.CreateSingleItem(curPackData.ItemID)
- if not curCreateItem:
- return
-
- #if curPackData.PriceCount > 0:
-# #需要付钱购买才能获得物品
-# infoDict = {ChConfig.Def_Cost_Reason_SonKey:curCreateItem.GetName()}
-# PlayerControl.PayMoney(curPlayer, curPackData.PriceType, curPackData.PriceCount, ChConfig.Def_Cost_BourseBuy, infoDict)
-
- # 购买物品算交易所活跃度
- # 活跃度
- #PlayerActivity.AddActivityFinishCnt(curPlayer, ShareDefine.ActivityNum_FinishTrade)
-
-
- #给物品
- ItemControler.SetItemCount(curCreateItem, curPackData.Count)
-
- if curCreateItem.GetPackCount() == 1:
- ItemCommon.SetEquipGearScore(curCreateItem, curPackData.EquipGS)
- curCreateItem.SetUserData(curPackData.UserData, curPackData.UserDataLen)
-
- GameWorld.DebugLog("Bourse### GMGiveBourseItem curPackData.ItemID %s"%(curPackData.ItemID))
- #放入物品
- ItemControler.PlayerItemControler(curPlayer).PutInItem(IPY_GameWorld.rptItem, curCreateItem,
- event=[ChConfig.ItemGive_BourseItem, True, {}])
- GameWorld.DebugLog("Bourse### GMGiveBourseItem out")
-
- return
-
-
-def OnGivePlayerBourseGains(curPlayer, msgList):
- ## 玩家获得交易所收益
- moneyType, priceCount, itemName, soldOutTime, itemInfo = msgList
- bourseTaxPer = PlayerVip.GetPrivilegeValue(curPlayer, ChConfig.VIPPrivilege_BourseTax)
- chargeMin = IpyGameDataPY.GetFuncCfg('BourseCharge')
- taxMoney = max(chargeMin, priceCount * bourseTaxPer / ShareDefine.Def_MaxRateValue)
- giveMoney = priceCount - taxMoney
- if giveMoney <0:
- GameWorld.ErrLog(' 交易所给交易收益异常 priceCount=%s, taxMoney=%s'%(priceCount, taxMoney), curPlayer.GetID())
- return
- GameWorld.DebugLog('发送补偿邮件 物品售出 钱发给玩家')
-
- PlayerControl.SendMailByKey('BourseSellVip' if curPlayer.GetVIPLv() else 'BourseSell', [curPlayer.GetPlayerID()], [], [itemName, priceCount, taxMoney, giveMoney], giveMoney)
-#
-# addDataDict = {ChConfig.Def_Give_Reason_SonKey:"Gains"}
-# PlayerControl.GiveMoney(curPlayer, moneyType, giveMoney, ChConfig.Def_GiveMoney_Bourse, addDataDict)
-
-
- resultInfo = str([soldOutTime, taxMoney, giveMoney, itemInfo])
- GameWorld.GetPlayerManager().GameServer_QueryPlayerResult(curPlayer.GetID(), 0, 0,
- "GivePlayerBourseGainsResult", resultInfo, len(resultInfo))
- return
-
-##//02 04 玩家获得交易所收益#tagGMGivePlayerBourseGains
-# @param curPackData:封包结构体
-# @param tick:时间戳
-# @return None
-def OnGMGivePlayerBourseGains(curPackData, tick):
-# GameWorld.DebugLog("Bourse### GMGivePlayerBourseGains in, PlayerID %s"%curPackData.PlayerID)
-# curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(curPackData.PlayerID)
-# if not curPlayer:
-# GameWorld.DebugLog("Bourse### GMGivePlayerBourseGains , PlayerID %s no found "%curPackData.PlayerID)
-# return
-# BourseCharge = ReadChConfig.GetEvalChConfig("BourseCharge")
-# chargeRate, chargeMin= BourseCharge[1]
-# if poundageReducePer > 0:
-# chargeRate = int(chargeRate * max(0, 100 - poundageReducePer) / 100.0)
-# GameWorld.DebugLog("贵族降低交易手续费: poundageReducePer=%s,chargeRate=%s" % (poundageReducePer, chargeRate))
-# chargeMoney = max(chargeMin, curPackData.MoneyCount*chargeRate/10000)
-#
-# #给玩家交易所收益
-# addDataDict = {ChConfig.Def_Give_Reason_SonKey:"Gains"}
-# PlayerControl.GiveMoney(curPlayer, curPackData.MoneyType, curPackData.MoneyCount, ChConfig.Def_GiveMoney_Bourse, addDataDict)
-# GameWorld.DebugLog("Bourse### GMGivePlayerBourseGains out,MoneyType = %s MoneyCount = %s chargeRate = %s chargeMoney %s"
-# % (curPackData.MoneyType, curPackData.MoneyCount, chargeRate, chargeMoney))
-# # 交易所获取收益，汇报交易钻石
-# playerName = curPlayer.GetPlayerName()
-# leftGold = curPlayer.GetGold()
-# eventParam = "RoleID=%s,Price=%s,TradeType=Get,LeftGold=%s" \
-# % (playerName, curPackData.MoneyCount, leftGold)
-# EventReport.EventReport(ShareDefine.Def_UserAction_TradeGold, eventParam, curPlayer)
-#
-# #扣除玩家交易手续费
-# PlayerControl.PayMoney(curPlayer, curPackData.MoneyType, chargeMoney, ChConfig.Def_Cost_BourseCharge)
-#
-# # 回收收益算交易所活跃度
-# # 活跃度
-# PlayerActivity.AddActivityFinishCnt(curPlayer, ShareDefine.ActivityNum_FinishTrade)
-# # 完成X次拍卖行交易成就
-# PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_Exchange, 1)
- return
-
-#------------------------------------------------------------------------------
-#// B3 02 交易所购买物品#tagCMPYBuyBourseItem
-#struct tagCMPYBuyBourseItem
-#{
-# tagHead Head;
-# char ItemGUID[40];
-# char Pwd[8]; //交易密码
-#};
-
-##///B5 02 交易所购买物品#tagCMPYBuyBourseItem
-# @param index:玩家索引
-# @param tick:时间戳
-# @return None
-def OnPlayerBuyBourseItem(index, clientData, tick):
- curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
- GameWorld.DebugLog("Bourse### PlayerBuyBourseItem in, PlayerID %s"%curPlayer.GetPlayerID())
- itemPackSpace = ItemControler.GetItemPackSpace(curPlayer,IPY_GameWorld.rptItem)
- if itemPackSpace <= 0:
- #没有空间购买物品
- GameWorld.DebugLog("Bourse### PlayerBuyBourseItem , PlayerID %s no space"%curPlayer.GetPlayerID())
- return
-
- #//02 03 玩家询问购买交易所物品#tagMGCheckBuyBourseItem
- sendPack = ChMapToGamePyPack.tagMGCheckBuyBourseItem()
- sendPack.PlayerID = curPlayer.GetPlayerID()
- sendPack.ItemGUID = clientData.ItemGUID
- sendPack.Pwd = clientData.Pwd
- GameWorld.DebugLog("Bourse### PlayerBuyBourseItem send ItemGUID %s"%sendPack.ItemGUID)
- NetPackCommon.SendPyPackToGameServer(sendPack)
- GameWorld.DebugLog("Bourse### PlayerBuyBourseItem out")
- return
-
-##//02 02 玩家购买交易所物品查询结果#tagGMCheckBuyBourseItemResult
-# @param curPackData:封包结构体
-# @param tick:时间戳
-# @return None
-def OnGMCheckBuyBourseItemResult(curPackData, tick):
- GameWorld.DebugLog("Bourse### GMCheckBuyBourseItemResult in, PlayerID %s"%curPackData.PlayerID)
-
- playerName = __CheckBuyBourseItemResult(curPackData)
- #//02 04 玩家确认购买交易所物品#tagMGBuyBourseItemSure
- sendPack = ChMapToGamePyPack.tagMGBuyBourseItemSure()
- sendPack.PlayerID = curPackData.PlayerID
- sendPack.PlayerName = playerName #发空代表购买失败
- sendPack.ItemGUID = curPackData.ItemGUID
- NetPackCommon.SendPyPackToGameServer(sendPack)
- GameWorld.DebugLog("Bourse### GMCheckBuyBourseItemResult out, PriceCount %s"%curPackData.PriceCount)
- return
-
-def __CheckBuyBourseItemResult(curPackData):
- curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(curPackData.PlayerID)
- if not curPlayer:
- GameWorld.DebugLog("Bourse### GMCheckBuyBourseItemResult , PlayerID %s no found "%curPackData.PlayerID)
- return ''
-
- if curPackData.PriceCount != 0:
- if not PlayerControl.HaveMoney(curPlayer, curPackData.PriceType, curPackData.PriceCount):
- GameWorld.DebugLog("Bourse### GMCheckBuyBourseItemResult , ItemGUID %s no enough money %s"%(curPackData.ItemGUID, curPackData.PriceCount))
- return ''
- if curPackData.PriceType == IPY_GameWorld.TYPE_Price_Gold_Money:
- if not PlayerControl.HaveMoney(curPlayer, ShareDefine.TYPE_Price_BourseMoney, curPackData.PriceCount):
- curBourseMoney = PlayerControl.GetMoney(curPlayer, ShareDefine.TYPE_Price_BourseMoney)
- GameWorld.Log("Bourse### GMCheckBuyBourseItemResult , ItemGUID %s no enough bourse money! priceCount=%s,curBourseMoney=%s"
- % (curPackData.ItemGUID, curPackData.PriceCount, curBourseMoney), curPlayer.GetPlayerID())
- return ''
- #先付钱再给卖家收益
- infoDict = {"ItemGUID":curPackData.ItemGUID}
- PlayerControl.PayMoney(curPlayer, curPackData.PriceType, curPackData.PriceCount, ChConfig.Def_Cost_BourseBuy, infoDict)
- return curPlayer.GetPlayerName()
- return ''
-
-
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDiceEx.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDiceEx.py
deleted file mode 100644
index 1b81d09..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDiceEx.py
+++ /dev/null
@@ -1,194 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#-------------------------------------------------------------------------------
-#
-#-------------------------------------------------------------------------------
-#
-##@package Player.PlayerDiceEx
-#
-# @todo:我要太极
-# @author xdh
-# @date 2016-09-12 16:00
-# @version 1.0
-#
-# 详细描述: 我要太极
-#---------------------------------------------------------------------
-#"""Version = 2016-09-26 20:00"""
-#---------------------------------------------------------------------
-
-import GameWorld
-import IPY_GameWorld
-import PlayerControl
-import ShareDefine
-import ItemControler
-import ChPyNetSendPack
-import NetPackCommon
-import ChConfig
-import IpyGameDataPY
-import PlayerActivity
-import PlayerSuccess
-import ItemCommon
-import PlayerTongTianLing
-
-
-## OnLogin
-# @param curPlayer
-# @return
-def DiceExOnLogin(curPlayer):
- NotifyDiceResult(curPlayer)
- return
-
-def OnDay(curPlayer):
- PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_Dice_FreeChangeCnt, 0)
- NotifyDiceResult(curPlayer, 2)
- return
-
-#// AB 0C 摇骰子 #tagCMDiceEx
-#
-#struct tagCMDiceEx
-#{
-# tagHead Head;
-# BYTE Type; // 0-投骰子 1-改投 2-见好就收
-#};
-# @param index
-# @param clientData
-# @param tick
-# @return None
-def OnDice(index, clientData, tick):
- curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
- diceType = clientData.Type
- hasOpen = GameWorld.GetGameWorld().GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_DailyActionState % ShareDefine.DailyActionID_Dice)
- if not hasOpen and diceType != 2:
- GameWorld.DebugLog(" 摇骰子活动未开启！")
- return
-
- diceResult = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_Dice_Result, 0)
-
- if diceType == 0:
- if diceResult:
- GameWorld.DebugLog(" 摇骰子上局还未结算！")
- return
- #每日活动
- if not PlayerActivity.AddDailyActionFinishCnt(curPlayer, ShareDefine.DailyActionID_Dice):
- return
- if not __DoDicelogic(curPlayer):
- return
- PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_FeastRedPack_Dice, 1)
- PlayerTongTianLing.AddTongTianTaskValue(curPlayer, ChConfig.TTLTaskType_Dice, 1)
-
- elif diceType == 1:
- if not diceResult:
- GameWorld.DebugLog(" 摇骰子没有结果不能改投！")
- return
- if diceResult == 666666:
- return
- #免费次数判断
- hasChangeCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_Dice_FreeChangeCnt, 0)
- freeCnt = IpyGameDataPY.GetFuncCfg('DiceFreeNum')
- if hasChangeCnt >=freeCnt:
- return
- if not __DoDicelogic(curPlayer, diceResult, True):
- return
- PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_Dice_FreeChangeCnt, hasChangeCnt+1)
-
-
- elif diceType == 2:
- if not diceResult:
- GameWorld.DebugLog(" 摇骰子没有结果不能结算！")
- return
- __DoGiveDiceAward(curPlayer, diceResult)
- NotifyDiceResult(curPlayer, diceType)
- return
-
-def __DoDicelogic(curPlayer, result=0, isChange=False):
- diceRandomDict = IpyGameDataPY.GetFuncEvalCfg('DiceRandomList')
-
- diceRandomList = diceRandomDict.get(str(result).count('6'), [])
- hasAdd = False #是否有增加6的数量
- changeIndex = -1 #非6的索引
- for i in range(6):
- if isChange and GameWorld.GetDataByDigitPlace(result, i) == 6:
- continue
- resultNum = GameWorld.GetResultByRandomList(diceRandomList)
-
- if not resultNum:
- GameWorld.ErrLog(" 摇骰子没有随机到结果 DiceRandomList异常！")
- return
- result = GameWorld.ChangeDataByDigitPlace(result, i, resultNum)
- if resultNum == 6:
- hasAdd = True
- elif changeIndex == -1:
- changeIndex = i
-
- #GameWorld.DebugLog(" 摇骰子结果 resultNum=%s, result=%s" % (resultNum, result))
- if isChange and not hasAdd and changeIndex >=0:
- result = GameWorld.ChangeDataByDigitPlace(result, changeIndex, 6)
- GameWorld.DebugLog(" 摇骰子结果 result=%s,isChange=%s" % (result, isChange))
- PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_Dice_Result, result)
- if result == 666666:
- PlayerControl.WorldNotify(0, 'WytjReward', [curPlayer.GetName()])
- return True
-
-def __DoGiveDiceAward(curPlayer, result):
- ## 给奖励
- prizeDict = IpyGameDataPY.GetFuncEvalCfg('DiceReward')
- goodCnt = str(result).count('6')
- if str(goodCnt) not in prizeDict:
- GameWorld.DebugLog(" 摇骰子DiceReward未配置6的个数 goodCnt=%s" % goodCnt)
- return
- prizeInfo = prizeDict[str(goodCnt)]
- itemInfo = prizeInfo.get("item", [])
- if itemInfo:
- # 检查背包
- packSpace = ItemCommon.GetItemPackSpace(curPlayer, IPY_GameWorld.rptItem)
- if 1 > packSpace:
- PlayerControl.NotifyCode(curPlayer, "GeRen_chenxin_998371")
- return
- # 给物品
- ItemControler.GivePlayerItem(curPlayer, itemInfo[0], itemInfo[1], 0, [IPY_GameWorld.rptItem],
- event=[ChConfig.ItemGive_DiceEx, False, {}])
- reExp = PlayerControl.GetPlayerReExp(curPlayer)
- exp = eval(prizeInfo.get("exp", '0'))
- if exp:
- PlayerControl.PlayerControl(curPlayer).AddExp(exp)
- money = prizeInfo.get("gold", 0)
- if money:
- PlayerControl.GiveMoney(curPlayer, IPY_GameWorld.TYPE_Price_Silver_Money, money)
-
- PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_Dice_Result, 0)
- #奖励回包
- NotifyDiceAwardResult(curPlayer, goodCnt)
- return
-
-#// AB 22 摇骰子结果 #tagMCDiceExResult
-#
-#struct tagMCDiceExResult
-#{
-# tagHead Head;
-# DWORD ResultNum; // 骰子结果
-# BYTE DiceType; // 0-正常 1-改投 2-重置
-#};
-def NotifyDiceResult(curPlayer, diceType=0):
- diceResult = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_Dice_Result, 0)
- useFreeCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_Dice_FreeChangeCnt, 0)
- if not diceResult and diceType != 2 and not useFreeCnt:
- return
- packData = ChPyNetSendPack.tagMCDiceExResult()
- packData.ResultNum = diceResult
- packData.DiceType = diceType
- packData.UseFreeCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_Dice_FreeChangeCnt, 0)
- NetPackCommon.SendFakePack(curPlayer, packData)
- return
-
-#// AB 23 摇骰子奖励回包 #tagMCDiceAward
-#
-#struct tagMCDiceAward
-#{
-# tagHead Head;
-# BYTE AwardCnt; // 太极数量
-#};
-def NotifyDiceAwardResult(curPlayer, awardCnt):
- packData = ChPyNetSendPack.tagMCDiceAward()
- packData.AwardCnt = awardCnt
- NetPackCommon.SendFakePack(curPlayer, packData)
- return
\ No newline at end of file
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py
index 33c23ed..86b8bf3 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py
@@ -21,7 +21,6 @@
import FBLogic
import IPY_GameWorld
import ChPlayer
-import GameLogInfo
import GameServerRefresh
import ShareDefine
import PlayerGameWallow
@@ -39,7 +38,6 @@
import FunctionNPCCommon
import PlayerGoldGift
import PlayerActivity
-import PlayerBindJadeWheel
import FBCommon
import PlayerSuccess
import PlayerFreeGoods
@@ -104,7 +102,6 @@
import PlayerCrossYaomoBoss
import PlayerLuckyCloudBuy
import PlayerLuckyTreasure
-import PlayerAuctionHouse
import PlayerTongTianLing
import PlayerRefineStove
import PlayerFlashSale
@@ -115,7 +112,6 @@
import PlayerZhanling
import PlayerVip
import PlayerLove
-import PlayerDiceEx
import IpyGameDataPY
import FamilyRobBoss
import FBHelpBattle
@@ -144,8 +140,6 @@
playerManager = GameWorld.GetPlayerManager()
#处理所有玩家信件的onday事件, 把存在时间+1
playerManager.ProcessAllPlayerMailOnDay()
- #清空每日日记记录信息
- GameLogInfo.ClearGameLogInfo()
#副本OnDay事件响应
FBLogic.OnDay(tick)
@@ -329,8 +323,6 @@
PlayerGoldGift.OnDay(curPlayer)
#炼丹
PlayerRefineStove.OnDay(curPlayer)
- #绑玉转盘
- PlayerBindJadeWheel.OnDay(curPlayer)
#转盘
PlayerActTurntable.PlayerOnDay(curPlayer)
#情缘
@@ -364,9 +356,6 @@
PlayerRecover.RecoverOnDay(curPlayer)
#购买次数清空
Operate_PlayerBuyZhenQi.PlayerOnDay(curPlayer)
-
- #我要太极过天
- PlayerDiceEx.OnDay(curPlayer)
# 世界boss
BossHurtMng.OnDay(curPlayer)
# 仙盟过天
@@ -1006,18 +995,6 @@
assistData = eval(msgValue)
if GameWorld.GetMap().GetMapID() == assistData[0]:
PlayerAssist.GameServer_AssistBossMsg(assistData[1:])
- return
-
- if key == ShareDefine.Def_Notify_WorldKey_AddFamilyAuctionItem:
- mapID, familyAuctionItemDict = eval(msgValue)
- if GameWorld.GetMap().GetMapID() == mapID:
- PlayerAuctionHouse.DoAddFamilyAuctionItem(familyAuctionItemDict)
- return
-
- if key == ShareDefine.Def_Notify_WorldKey_AddSystemAuctionItem:
- mapID, sysAuctionItemList = eval(msgValue)
- if GameWorld.GetMap().GetMapID() == mapID:
- PlayerAuctionHouse.DoAddSystemAuctionItem(sysAuctionItemList)
return
if key == ShareDefine.Def_Notify_WorldKey_FairyDomainLimit:
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerExam.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerExam.py
deleted file mode 100644
index 03057e8..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerExam.py
+++ /dev/null
@@ -1,204 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#---------------------------------------------------------------------
-#
-#---------------------------------------------------------------------
-##@package PlayerExam
-# @todo: 答题活动
-#
-# @author: panwei
-# @date 2011-03-31
-# @version 1.7
-#
-# @change: "2011-04-07 19:00" panwei 答题新增一个无敌Buff
-# @change: "2011-04-08 10:40" panwei 答题进入新增等级验证, 玩家下线退出答题逻辑修改
-# @change: "2012-05-16 15:00" jiang C++修改接口GameServer_QueryPlayerByID和GameServer_QueryPlayerResult
-# @change: "2013-04-17 20:35" Alee 统一BUFF删除函数DelBuffBySkillID
-# @change: "2013-04-25 13:30" Alee 转移DelBuffBySkillID
-# @change: "2014-05-04 15:00" xcc 修改答题活动，不判断玩家当前状态和锁定玩家当前状态
-# @change: "2014-07-14 18:30" hxp 增加每日活跃度
-#------------------------------------------------------------------------------
-"""Version = 2014-07-14 18:30"""
-#---------------------------------------------------------------------
-import GameWorld
-import ShareDefine
-import PlayerControl
-import ChConfig
-import SkillCommon
-import BuffSkill
-import PetControl
-import ReadChConfig
-import IPY_GameWorld
-import PlayerActivity
-#---------------------------------------------------------------------
-#玩家不可参加答题状态系统提示
-Def_Exam_JionFailByPlayerActionNotifyDict = {IPY_GameWorld.paDie: 'FB_liubo_692265',
- IPY_GameWorld.paAttack: 'FB_liubo_837087',
- IPY_GameWorld.paTrade: 'Campaign_lhs_372238',
- IPY_GameWorld.paSit:'Campaign_lhs_425673',
- IPY_GameWorld.paProduce:'FB_liubo_902992',
- }
-
-#---------------------------------------------------------------------
-#===============================================================================
-# //01 1B参加活动#tagCJoinAction
-# //对性能影响不大
-# struct tagCJoinAction
-# {
-# BYTE Type;//活动类型
-# };
-#===============================================================================
-##参加活动#tagCJoinAction
-# @param index 玩家索引
-# @param tick 时间戳
-# @return 返回值无意义
-# @remarks 客户端封包响应 01 1B参加活动#tagCJoinAction
-def Client_JoinAction(index, tick):
-# GameWorld.Log("客户端发包，请求加入/退出答题活动")
- curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
-
- pack = IPY_GameWorld.IPY_CJoinAction()
- sendExamType = pack.GetType()
-
- if sendExamType == 0:
- #退出活动
-# GameWorld.Log("客户端发包，请求退出答题活动")
- DoLogic_ExitExam(curPlayer, tick)
- return
-
- #---验证封包合法性---
- if sendExamType not in ShareDefine.Def_Game_ExamTypeList:
- GameWorld.ErrLog('Client_JoinAction, sendExamType = %s 题库异常'%(sendExamType))
- return
-
- serverExamType = __GetExamType()
-
- if sendExamType != serverExamType:
- #GameWorld.Log('Client_JoinAction Err sendExamType = %s, serverExamType = %s'%(sendExamType, serverExamType))
- #FB_liubo_656426 现在不是活动时间,不能参加活动唷!
- PlayerControl.NotifyCode(curPlayer, "FB_liubo_656426")
- return
-
- #---检查是否可以参加活动---
- if not __CheckPlayerCanJoinExam(curPlayer, serverExamType):
-# GameWorld.Log("玩家当前状态无法参加活动")
- return
-
- # 活跃度
- #PlayerActivity.AddActivityFinishCnt(curPlayer, ShareDefine.ActivityNum_JoinZXH)
-
- #发送封包到GameServer参与答题活动
-# GameWorld.Log("MapServer 发包给 GameServer通知玩家请求加入答题活动")
- curPlayer.GameServer_QueryPlayerByID(ChConfig.queryType_JionExam, sendExamType, '', '', 0)
- return
-#---------------------------------------------------------------------
-##检查玩家是否可以参与答题
-# @param curPlayer 玩家实例
-# @param serverExamType 当前答题类型
-# @return 布尔值
-# @remarks
-def __CheckPlayerCanJoinExam(curPlayer, serverExamType):
- #验证玩家等级
- curPlayerLv = curPlayer.GetLV()
- enterExamLvDict = ReadChConfig.GetEvalChConfig('ExamJionLv')
- enterExamLv = enterExamLvDict.get(serverExamType)
-
- if enterExamLv != None and enterExamLv > curPlayerLv:
- #FB_admin_0 <n color="255,255,255" BKCOLOR="0,0,0">您的等级不足{%S1%},无法参加此活动!
- PlayerControl.NotifyCode(curPlayer, "FB_admin_0", [enterExamLv])
- return False
-
-# if curPlayer.IsMoving():
-# PlayerControl.NotifyCode(curPlayer, "Campaign_lhs_671654")
-# return False
-#
-# if curPlayer.IsBattleState():
-# PlayerControl.NotifyCode(curPlayer, "FB_liubo_837087")
-# return False
-#
-# playerAction = curPlayer.GetPlayerAction()
-#
-# if playerAction in Def_Exam_JionFailByPlayerActionNotifyDict:
-# PlayerControl.NotifyCode(curPlayer, Def_Exam_JionFailByPlayerActionNotifyDict[playerAction])
-# return False
-#
-# if playerAction != IPY_GameWorld.paNull:
-# PlayerControl.NotifyCode(curPlayer, "FB_liubo_314575")
-# return False
-#
-# if GameWorld.GetMap().GetMapFBType() != IPY_GameWorld.fbtNull:
-# PlayerControl.NotifyCode(curPlayer, "FB_liubo_314885")
-# return False
-
- return True
-
-#---------------------------------------------------------------------
-##获取答题类型.
-# @param 无参数
-# @return Def_Game_Exam_Type
-# @remarks
-def __GetExamType():
- return GameWorld.GetGameWorld().GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_Game_EXAM)
-
-#---------------------------------------------------------------------
-##玩家主动退出答题
-# @param curPlayer 玩家实例
-# @param tick 时间戳
-# @param needRefresh 是否立即刷新
-# @return 返回值无意义
-# @remarks
-def DoLogic_ExitExam(curPlayer, tick, needRefresh=True):
- #删除答题Buff
- if not ClearExamBuff(curPlayer, tick, needRefresh = True):
-# GameWorld.Log("删除答题buff失败")
- return
-
-# GameWorld.Log("通知GameServer,玩家退出答题")
- #通知GameServer退出答题 这里有可能玩家已经下线, 不能调用curPlayer.GameServer_QueryPlayerByID
- GameWorld.GetPlayerManager().GameServer_QueryPlayerResult(curPlayer.GetID(), 0, 0, 'ExitExam', '', 0)
- return
-
-#---------------------------------------------------------------------
-##玩家主动进入答题
-# @param curPlayer 玩家实例
-# @param tick 时间戳
-# @return 返回值无意义
-# @remarks
-def DoLogic_EnterExam(curPlayer, tick):
-# GameWorld.Log("GameServer 通知 MapServer 玩家参加答题成功")
-# #召唤回出战的宠物
-# PetControl.ReCallFightPet(curPlayer)
-# #给玩家添加答题Buff
-# SkillCommon.AddBuffBySkillType_NoRefurbish(curPlayer, ChConfig.Def_SkillID_JoinExam, tick)
-# #给玩家加活动无敌Buff
-# SkillCommon.AddBuffBySkillType(curPlayer, ChConfig.Def_SkillID_ActionWuDi, tick)
-# #设置玩家为答题状态
-# PlayerControl.ChangePlayerAction(curPlayer, IPY_GameWorld.paDOT)
- return
-
-#---------------------------------------------------------------------
-##删除答题Buff
-# @param curPlayer 玩家实例
-# @param tick 时间戳
-# @param needRefresh 是否立即刷新
-# @return 布尔值
-# @remarks
-def ClearExamBuff(curPlayer, tick, needRefresh=True):
- #删除活动Buff
-# BuffSkill.DelBuffBySkillID(curPlayer, ChConfig.Def_SkillID_ActionWuDi, tick)
-#
-# #删除答题Buff
-# if not BuffSkill.DelBuffBySkillID(curPlayer, ChConfig.Def_SkillID_JoinExam, tick):
-# return False
-#
-# #玩家状态变更
-# PlayerControl.ChangePlayerAction(curPlayer, IPY_GameWorld.paNull)
-#
-# if not needRefresh:
-# return True
-#
-# #重新刷新属性
-# playerControl = PlayerControl.PlayerControl(curPlayer)
-# playerControl.RefreshAllState()
- return True
-
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerQuDaoDoubleBill.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerQuDaoDoubleBill.py
deleted file mode 100644
index 91023e2..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerQuDaoDoubleBill.py
+++ /dev/null
@@ -1,143 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#
-##@package
-#
-# @todo: 渠道删档测试充值双倍返利
-#
-# @author: Alee
-# @date 2019-1-22 下午08:22:54
-# @version 1.0
-#
-# @note: #总共681条, 含平台['kupai', 'uc', 'gionee', 'xiaomi', 'vivo', 'lenovo', 'meizu', 'yyb', 'oppo', 'qh360']
-#
-#---------------------------------------------------------------------
-
-import PyGameData
-import ChConfig
-import GameWorld
-import ReadChConfig
-import datetime
-import IPY_GameWorld
-import PlayerControl
-import math
-
-Def_Qudao_DoubleBill = ['kupai', 'uc', 'gionee', 'xiaomi', 'vivo', 'lenovo', 'meizu', 'yyb', 'oppo', 'qh360']
-
-
-def OnMapQDDoubleBill(curPlayer):
- return
- try:
- if GameWorld.IsCrossServer():
- return
-
- dbBillDict = ReadChConfig.GetEvalChConfig("DoubleBillConfig")
- if not dbBillDict["IsOpen"]:
- return
-
- OnFirstQDDoubleBillQuery(curPlayer)
- OnOtherQuDaoDoubleBill(curPlayer)
- except Exception, e:
- GameWorld.Log("OnMapQDDoubleBill 异常 %s-%s"%(curPlayer.GetID(), e))
- return
-
-
-# 跨服不处理
-# 1. 第一次为请求数据, 如果是神决宗则请求总数据
-# 2. 后续切换地图，判断是否隔天领取
-def OnFirstQDDoubleBillQuery(curPlayer):
- # 1 为无充值 2 为已领取 其他数值为具体返利总仙玉
- spID, accID = GetAccIDInfo(curPlayer.GetAccID())
- if spID not in Def_Qudao_DoubleBill:
- # 非渠道的
- return
-
- gold = curPlayer.NomalDictGetProperty(ChConfig.Def_QuDao_DoubleBillGold)
- if gold:
- # 已请求
- return
-
- # {spid:[accID...]}
- if PyGameData.g_Qudao_DoubleBill:
- # 有缓存但不在缓存中的
- if spID not in PyGameData.g_Qudao_DoubleBill:
- return
-
- if accID not in PyGameData.g_Qudao_DoubleBill[spID]:
- return
-
- centerUrl = "center.2460web.com"
- #centerUrl = "vm-mobilecom"
- # 先个人请求
- getUrl = "http://%s:53004/DoublieBill.php?AccID=%s"%(centerUrl, curPlayer.GetAccID())
- GameWorld.GetGameWorld().EventReport_EventReport("", "", "", "", 0, getUrl)
-
- if curPlayer.GetMapID() != 10010:
- return
-
- if not PyGameData.g_Qudao_DoubleBill:
- # 缓存请求
- getUrl = "http://%s:53004/QueryAllDoubleBill.php?ccccc=fanggongji"%centerUrl
- GameWorld.GetGameWorld().EventReport_EventReport("", "", "", "", 0, getUrl)
-
- return
-
-
-# 后续天返回充值比例
-def OnOtherQuDaoDoubleBill(curPlayer):
- # 1 为无充值 2 为已领取 其他数值为具体返利总仙玉
- spID, accID = GetAccIDInfo(curPlayer.GetAccID())
- if spID not in Def_Qudao_DoubleBill:
- # 非渠道的
- return
-
- gold = curPlayer.NomalDictGetProperty(ChConfig.Def_QuDao_DoubleBillGold)
- if gold <= 2:
- #无可领取的
- return
-
- CalcDoubleBillByDay(curPlayer)
-
- return
-
-
-##获取平台账号 和 spid
-def GetAccIDInfo(gameAccID):
- infoList = gameAccID.split('@')
- return infoList[1], infoList[0]
-
-# 每日领取返利
-def CalcDoubleBillByDay(curPlayer):
- gold = curPlayer.NomalDictGetProperty(ChConfig.Def_QuDao_DoubleBillGold)
- if gold <= 2:
- return
- dbBillDict = ReadChConfig.GetEvalChConfig("DoubleBillConfig")
- billDayRate = dbBillDict["BillDayRate"]
- # 记录返利次数： 时间+次数
- #count = curDay.year*100000 + curDay.month*1000 + curDay.day*10 + 0
- count = curPlayer.NomalDictGetProperty(ChConfig.Def_QuDao_DoubleBillCount)
- realCnt = count%10 # 已领取次数
- if realCnt >= len(billDayRate):
- return
- dateStr = "%d-%02d-%02d"%(count/100000, count%100000/1000, count%1000/10)
- startDate = GameWorld.GetDateTimeByStr(dateStr, ChConfig.TYPE_Time_Format_Day)
- curDay = datetime.datetime.today()
- theDay = curDay - startDate
- if theDay.days < realCnt:
- return
-
- giveGold = int(math.ceil(billDayRate[realCnt]/100.0*gold))
-
- PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_QuDao_DoubleBillCount, count+1)
-
- title = "测试玩家返利".decode("gbk").encode("utf8")
- content = "亲爱的道友：</r><Space=2>欢迎归来，感谢您在付费删档测试期间对我们的大力支持，给您奉上今日份回归大礼。您在付费删档测试期间的充值按照1元=20仙玉的比例共计返还7天，具体每日返还比例请您查看登录公告-删档回归有礼。请您留意每日返利邮件，祝您游戏愉快!".decode("gbk").encode("utf8")
-
- mailItemInfoList = []
- if realCnt == 0:
- mailItemInfoList = [[57, 1, 1]]
- # 发邮件
- PlayerControl.SendMail(title, content, 30, [curPlayer.GetPlayerID()], mailItemInfoList, gold=giveGold)
- GameWorld.Log("领取渠道返利 第%s次 仙玉=%s"%(realCnt+1, giveGold))
- return
-
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.py
index e8c9970..1bc629e 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.py
@@ -25,7 +25,6 @@
import AttackCommon
import ChItem
import PlayerGMOper
-import GameLogInfo
import ItemCommon
import OperControlManager
import ShareDefine
@@ -1054,7 +1053,6 @@
# @return 返回值, 无意义
# @remarks C++封包触发, 全局定时器, 处理玩家状态
def __Func_ProcessState(tick):
- timeClock = time.clock()
#2009-07-01断言tick >=0 ,服务器tick为DWord,超过24天未重启硬件，将导致逻辑不可预知
if tick < 0 :
GameWorld.Log('###服务器运行时间超过24天 tick = %s' % (tick))
@@ -1068,10 +1066,8 @@
if curPlayer.GetID() == 0:
continue
- ProcessPlayerState(curPlayer, tick)
-
- #记录玩家逻辑处理总耗时
- GameLogInfo.LogInfo_PlayerLogicTime(timeClock)
+ ProcessPlayerState(curPlayer, tick)
+
return
#---------------------------------------------------------------------
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_AuctionHouse.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_AuctionHouse.py
deleted file mode 100644
index 32c3da9..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_AuctionHouse.py
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#-------------------------------------------------------------------------------
-#
-##@package Player.RemoteQuery.GY_Query_AuctionHouse
-#
-# @todo:拍卖行
-# @author hxp
-# @date 2019-03-04
-# @version 1.0
-#
-# 详细描述: 拍卖行
-#
-#-------------------------------------------------------------------------------
-#"""Version = 2019-03-04 17:00"""
-#-------------------------------------------------------------------------------
-
-import PlayerAuctionHouse
-import GameWorld
-
-
-## 请求逻辑
-# @param query_Type 请求类型
-# @param query_ID 请求的玩家ID
-# @param packCMDList 发包命令 [ ]
-# @param tick 当前时间
-# @return resultDisc
-def DoLogic(query_Type, query_ID, packCMDList, tick):
- return
-
-#---------------------------------------------------------------------
-## 执行结果
-# @param curPlayer 发出请求的玩家
-# @param callFunName 功能名称
-# @param funResult 查询的结果
-# @param tick 当前时间
-# @return None
-# @remarks 函数详细说明.
-def DoResult(curPlayer, callFunName, funResult, tick):
- try:
- funResultList = eval(funResult)
- except:
- GameWorld.ErrLog("GY_Query_AuctionHouse %s eval Error" % funResult, curPlayer.GetPlayerID())
- return
-
- GameWorld.DebugLog("GY_Query_AuctionHouse ResultList=%s" % str(funResultList), curPlayer.GetPlayerID())
- PlayerAuctionHouse.QueryResult_AuctionHouse(curPlayer, funResultList)
- return
-
-
-
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_AuctionHouseGiveItem.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_AuctionHouseGiveItem.py
deleted file mode 100644
index 822cfab..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_AuctionHouseGiveItem.py
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#-------------------------------------------------------------------------------
-#
-##@package Player.RemoteQuery.GY_Query_AuctionHouseGiveItem
-#
-# @todo:拍卖行直接给玩家物品
-# @author hxp
-# @date 2019-10-29
-# @version 1.0
-#
-# 详细描述: 拍卖行直接给玩家物品
-#
-#-------------------------------------------------------------------------------
-#"""Version = 2019-10-29 19:00"""
-#-------------------------------------------------------------------------------
-
-import GameWorld
-import ItemCommon
-import ItemControler
-import IPY_GameWorld
-import PlayerControl
-import ChConfig
-
-
-## 请求逻辑
-# @param query_Type 请求类型
-# @param query_ID 请求的玩家ID
-# @param packCMDList 发包命令 [ ]
-# @param tick 当前时间
-# @return resultDisc
-def DoLogic(query_Type, query_ID, packCMDList, tick):
- return
-
-#---------------------------------------------------------------------
-## 执行结果
-# @param curPlayer 发出请求的玩家
-# @param callFunName 功能名称
-# @param funResult 查询的结果
-# @param tick 当前时间
-# @return None
-# @remarks 函数详细说明.
-def DoResult(curPlayer, callFunName, funResult, tick):
- playerID = curPlayer.GetPlayerID()
- try:
- funResultList = eval(funResult)
- except:
- GameWorld.ErrLog("GY_Query_AuctionHouseGiveItem %s eval Error" % funResult, playerID)
- return
-
- GameWorld.DebugLog("GY_Query_AuctionHouseGiveItem ResultList=%s" % funResult, playerID)
- itemGUID, itemID, itemCount, userData, mailInfo = funResultList
- curCreateItem = ItemCommon.CreateSingleItem(itemID, itemCount)
- if not curCreateItem:
- GameWorld.ErrLog("GY_Query_AuctionHouseGiveItem %s CreateSingleItem Error" % funResult, playerID)
- return
-
- if userData:
- curCreateItem.SetUserData(userData, len(userData))
- ItemCommon.MakeEquipGS(curCreateItem)
-
- drDict = {"ItemGUID":itemGUID, "ItemID":itemID, "ItemCount":itemCount, "UserData":userData}
- isOK = ItemControler.DoLogic_PutItemInPack(curPlayer, curCreateItem, event=[ChConfig.ItemGive_BourseItem, True, drDict],
- packIndexList=[IPY_GameWorld.rptItem])
- if not isOK:
- mailTypeKey, addItemList, paramList, detail = mailInfo
- PlayerControl.SendMailByKey(mailTypeKey, [playerID], addItemList, paramList, detail=detail)
- PlayerControl.NotifyCode(curPlayer, "PaimaiGiveItemMail")
- else:
- PlayerControl.NotifyCode(curPlayer, "PaimaiGiveItemOK")
-
- return
-
-
-
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_ExamCloseKickPlayer.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_ExamCloseKickPlayer.py
deleted file mode 100644
index 169f752..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_ExamCloseKickPlayer.py
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#---------------------------------------------------------------------
-#
-#---------------------------------------------------------------------
-##@package GY_Query_ExamCloseKickPlayer
-# @todo: 答题T人
-#
-# @author: panwei
-# @date 2011-03-31
-# @version 1.0
-#
-# @note:
-#---------------------------------------------------------------------
-"""Version = 2011-03-31 13:10"""
-#---------------------------------------------------------------------
-import PlayerExam
-#---------------------------------------------------------------------
-## 请求逻辑
-# @param query_Type 请求类型
-# @param query_ID 请求的玩家ID
-# @param packCMDList 发包命令 []
-# @param tick 当前时间
-# @return "True" or "False" or ""
-# @remarks 函数详细说明.
-def DoLogic(query_Type, query_ID, packCMDList, tick):
- return
-
-#---------------------------------------------------------------------
-#执行结果
-## 执行结果
-# @param curPlayer 发出请求的玩家
-# @param callFunName 功能名称
-# @param funResult 查询的结果
-# @param tick 当前时间
-# @return None
-# @remarks 函数详细说明.
-def DoResult(curPlayer, callFunName, funResult, tick):
- PlayerExam.ClearExamBuff(curPlayer, tick, needRefresh = True)
- return
-
-
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_ExamJoinOK.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_ExamJoinOK.py
deleted file mode 100644
index 7a90251..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_ExamJoinOK.py
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#---------------------------------------------------------------------
-#
-#---------------------------------------------------------------------
-##@package ExamJoinOK
-# @todo: 参加答题成功
-#
-# @author: panwei
-# @date 2011-03-31
-# @version 1.0
-#
-# @note:
-#---------------------------------------------------------------------
-"""Version = 2011-03-31 13:10"""
-#---------------------------------------------------------------------
-import PlayerExam
-#---------------------------------------------------------------------
-## 请求逻辑
-# @param query_Type 请求类型
-# @param query_ID 请求的玩家ID
-# @param packCMDList 发包命令 []
-# @param tick 当前时间
-# @return "True" or "False" or ""
-# @remarks 函数详细说明.
-def DoLogic(query_Type, query_ID, packCMDList, tick):
- return
-
-#---------------------------------------------------------------------
-#执行结果
-## 执行结果
-# @param curPlayer 发出请求的玩家
-# @param callFunName 功能名称
-# @param funResult 查询的结果
-# @param tick 当前时间
-# @return None
-# @remarks 函数详细说明.
-def DoResult(curPlayer, callFunName, funResult, tick):
- PlayerExam.DoLogic_EnterExam(curPlayer, tick)
- return
-
-
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_GivePlayerBourseGains.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_GivePlayerBourseGains.py
deleted file mode 100644
index d96cefc..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_GivePlayerBourseGains.py
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#---------------------------------------------------------------------
-#
-#---------------------------------------------------------------------
-##@package GY_Query_GivePlayerBourseGains
-# @todo: 给交易收益
-#
-# @author: xdh
-# @date 2016-08-12 21:00
-# @version 1.0
-#
-# @note: 给交易收益
-#---------------------------------------------------------------------
-#"""Version = 2016-08-12 21:00"""
-#---------------------------------------------------------------------
-import GameWorld
-import PlayerBourseTube
-#---------------------------------------------------------------------
-
-## XX
-# @param query_Type 请求类型
-# @param query_ID 请求的玩家ID
-# @param packCMDList 发包命令
-# @param tick 当前时间
-# @return "True" or "False" or ""
-def DoLogic(query_Type, query_ID, packCMDList, tick):
- return ''
-
-
-## 登陆信息
-# @param curPlayer 发出请求的玩家
-# @param callFunName 功能名称
-# @param funResult 查询的结果
-# @param tick 当前时间
-# @return None
-def DoResult(curPlayer, callFunName, funResult, tick):
- playerID = curPlayer.GetPlayerID()
- GameWorld.DebugLog("GY_Query_GivePlayerBourseGains funResult=%s" % funResult, playerID)
- result = eval(funResult)
- if len(result) != 5:
- return
- PlayerBourseTube.OnGivePlayerBourseGains(curPlayer, result)
- return
-
-
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_QDFLDoubleBill.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_QDFLDoubleBill.py
deleted file mode 100644
index 05616dc..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_QDFLDoubleBill.py
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#
-##@package
-#
-# @todo: 渠道返利发放
-#
-# @author: Alee
-# @date 2019-1-23 下午02:38:15
-# @version 1.0
-#
-# @note:
-#
-#---------------------------------------------------------------------
-#导入
-import PlayerControl
-import GameWorld
-import ChConfig
-import datetime
-import PlayerQuDaoDoubleBill
-#---------------------------------------------------------------------
-#全局变量
-#---------------------------------------------------------------------
-#---------------------------------------------------------------------
-#逻辑实现
-## 请求逻辑
-# @param query_Type 请求类型
-# @param query_ID 玩家ID
-# @param packCMDList 发包命令
-# @param tick 当前时间
-# @return "True" or "False" or ""
-# @remarks 函数详细说明.
-def DoLogic(query_Type, query_ID, packCMDList, tick):
- return
- curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(query_ID)
-
- if not curPlayer or curPlayer.IsEmpty():
- GameWorld.Log("渠道返利无法找到玩家:%s"%query_ID)
- return
-
- gold = packCMDList[0]
-
- curGold = curPlayer.NomalDictGetProperty(ChConfig.Def_QuDao_DoubleBillGold)
- if curGold != 0:
- # 已记录的不能再更改
- return
-
- PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_QuDao_DoubleBillGold, gold)
- if gold <= 2:
- return
-
- #第一天返利
- # 记录返利次数： 时间+次数
- curDay = datetime.datetime.today()
- count = curDay.year*100000 + curDay.month*1000 + curDay.day*10 + 0
- PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_QuDao_DoubleBillCount, count)
-
- GameWorld.Log("渠道返利发放 %s状态%s-%s"%(curPlayer.GetAccID(), count, gold))
- PlayerQuDaoDoubleBill.CalcDoubleBillByDay(curPlayer)
- return
-
-#---------------------------------------------------------------------
-#执行结果
-## 执行结果
-# @param curPlayer 发出请求的玩家
-# @param callFunName 功能名称
-# @param funResult 查询的结果
-# @param tick 当前时间
-# @return None
-# @remarks 函数详细说明.
-def DoResult(curPlayer, callFunName, funResult, tick):
- return
-
-
-
-
-
-
-
-
-
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ReadChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ReadChConfig.py
index 08d278d..15dea17 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ReadChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ReadChConfig.py
@@ -30,7 +30,6 @@
import FormulaControl
import ConfigParser
import ShareDefine
-import MapConfig
#---------------------------------------------------------------------
#全局变量
#---------------------------------------------------------------------
@@ -114,8 +113,6 @@
FormulaControl.ClearCompileFormulaDist()
PyMongoDataServerConfig = None
DBAllChConfig = {}
-
- MapConfig.ClearConfig()
GameWorld.Log('MapServer_Reload_ChConfig')
#关闭字典
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
index 7318c09..ba190b1 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
@@ -172,7 +172,6 @@
Def_Notify_WorldKey_CommMapLinePlayerCount = 'CommMapLinePlayerCount' # 常规地图玩家人数信息
Def_Notify_WorldKey_PurTalk = 'PursuePlayerTalk' # 追踪玩家聊天
Def_Notify_WorldKey_ReloadConfig = 'ReloadConfig' # 重读策划配置表
-Def_Notify_WorldKey_Game_EXAM = 'Game_EXAM' # 答题
Def_Notify_WorldKey_ReloadTexCaptcha = 'ReloadTexCaptcha' # 重读tex图形验证码
Def_Notify_WorldKey_ReloadJpegCaptcha = 'ReloadJpegCaptcha' # 重读tex图形验证码
Def_Notify_WorldKey_GameServerScriptReloadVersion = 'GameServerScriptReloadVersion' # GameServer 脚本重读版本标记
@@ -428,33 +427,6 @@
ActStateJoin_Start, # 开启参与中 1
ActStateJoin_End, # 参与结束，仅有配置参与时间段的活动有该状态 2
) = range(3)
-
-#答题类型枚举
-Def_Game_ExamTypeList = range(1, 4 + 1)
-(
-Def_Game_Exam_ZGTX, #智冠天下
-Def_Game_Exam_BSL, #变色龙
-Def_Game_Exam_JQBD, #举旗不定
-Def_Game_Exam_ZXH, #真心话
-) = Def_Game_ExamTypeList
-
-#答题附加功能枚举
-Def_Game_Exam_Func_Cnt = 4
-(
-Def_Game_Exam_Func_Double, #双倍
-Def_Game_Exam_Func_AnswerRight, #自动跳过
-Def_Game_Exam_Func_DelOper, #删除选项
-Def_Game_Exam_Func_Three, #三倍
-) = range(1, Def_Game_Exam_Func_Cnt + 1)
-
-#真心话大冒险特殊阶段定义
-(
-Def_ExamZXH_FunctionNO_SendSelectOption,
-Def_ExamZXH_FunctionNO_SendAnswer,
-) = range(1, 2 + 1)
-
-#答题玩家未上榜索引标示
-Def_Game_Exam_NoInBillboardSign = 999
#玩家头顶经验显示,获得经验渠道枚举,前端 2、4、5有展示经验倍率
(
@@ -994,35 +966,6 @@
#装备最大孔数
Def_Equip_Max_Hole_Count = 9
-
-#---倒计时类型---
-#===============================================================================
-# /**计时器类型*/
-# enum TTimeTickType
-# {
-# tttLeaveMap = 0, ///<离开地图倒计时
-# tttWaitStart, ///<等待开始
-# tttTowerTake, ///<家族战占领塔, id为NPCid
-# tttFlagTake, ///<家族战占领棋
-# tttLeaveFamilyWar, ///<家族战完毕, 等待退出
-# tttAddUpTime, ///<累加时间
-# tttFBAddTime, ///<副本时间累计
-# tttMax, ///<无意义, 表示最大数目
-# };
-#===============================================================================
-(
-Def_TimeTickType_LeaveMap, #离开地图倒计时
-Def_TimeTickType_WaitStart, #等待开始
-Def_TimeTickType_TowerTake, #家族战占领塔, id为NPCid
-Def_TimeTickType_FlagTake, #家族战占领棋
-Def_TimeTickType_LeaveFamilyWar, #家族战完毕, 等待退出
-Def_TimeTickType_AddUpTime, #累加时间
-Def_TimeTickType_FBAddTime, #副本时间累计
-Def_TimeTickType_ExamLeaveMap, #答题剩余总时间
-Def_TimeTickType_ExamWaitStart, #答题等待时间
-Def_TimeTickType_ExamBeginCountDown, #答题开始倒计时特效
-Def_TimeTickType_Max, #无意义, 表示最大数目
-) = range(0, 10 + 1)
#---------------------------------------------------------------------
#/**聊天频道*/
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.py
index cb6496f..875dd0d 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.py
@@ -855,7 +855,7 @@
#异常错误
if not buffSkill:
- #GameWorld.Log("查找Buff异常 = %s "%(ChConfig.Def_SkillID_JoinExam) , curPlayer.GetPlayerID())
+ #GameWorld.Log("查找Buff异常", curPlayer.GetPlayerID())
return False
buffType = SkillCommon.GetBuffType(buffSkill)
@@ -897,7 +897,7 @@
#异常错误
if not buffSkill:
- #GameWorld.Log("查找Buff异常 = %s "%(ChConfig.Def_SkillID_JoinExam) , curPlayer.GetPlayerID())
+ #GameWorld.Log("查找Buff异常", curPlayer.GetPlayerID())
return False
buffType = SkillCommon.GetBuffType(buffSkill)
--
Gitblit v1.8.0