From a90e9dd726f63017404ed69d8c682956e42cd172 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 26 八月 2025 10:24:06 +0800
Subject: [PATCH] 1111 删除不需要内容；
---
/dev/null | 58 -----
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script.ini | 8
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini | 14 -
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py | 116 ----------
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py | 257 -----------------------
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/DataRecordPack.py | 16 -
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py | 161 +-------------
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyGameData.py | 2
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py | 5
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py | 10
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.py | 6
11 files changed, 20 insertions(+), 633 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
index ecc9787..e7514e6 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
@@ -668,20 +668,6 @@
PacketSubCMD_1 = 0x09
PacketCallFunc_1 = OnSignDay
-
-;新手卡
-[PlayerNewGuyCard]
-ScriptName = Player\PlayerNewGuyCard.py
-Writer = hxp
-Releaser = hxp
-RegType = 0
-RegisterPackCount = 1
-
-PacketCMD_1 = 0xA5
-PacketSubCMD_1 = 0x10
-PacketCallFunc_1 = UseNewGuyCard
-
-
;境界
[PlayerPrestigeSys]
ScriptName = Player\PlayerPrestigeSys.py
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script.ini b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script.ini
index 6aa7b63..f630018 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script.ini
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script.ini
@@ -148,14 +148,6 @@
ClassName = ParseItemUserData
FuncName = ParseItemUserData
-[QueryNewGuyCardState]
-ScriptName = Player\PlayerNewGuyCard.py
-Writer = wdb
-Releaser = wdb
-RegType = 1
-ClassName = DataServer_QueryNewGuyCardState
-FuncName = QueryNewGuyCardState
-
[PushRecharge]
ScriptName = Player\GameServerRefresh.py
Writer = alee
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py
index 2eff10c..82a2cc6 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py
@@ -9004,70 +9004,6 @@
#------------------------------------------------------
-#A5 10 使用新手卡 #tagUseNewGuyCard
-
-class tagUseNewGuyCard(Structure):
- Head = tagHead()
- CodeStrLen = 0 #(BYTE CodeStrLen)
- CodeStr = "" #(String CodeStr)//size = CodeStrLen
- data = None
-
- def __init__(self):
- self.Clear()
- self.Head.Cmd = 0xA5
- self.Head.SubCmd = 0x10
- return
-
- def ReadData(self, _lpData, _pos=0, _Len=0):
- self.Clear()
- _pos = self.Head.ReadData(_lpData, _pos)
- self.CodeStrLen,_pos = CommFunc.ReadBYTE(_lpData, _pos)
- self.CodeStr,_pos = CommFunc.ReadString(_lpData, _pos,self.CodeStrLen)
- return _pos
-
- def Clear(self):
- self.Head = tagHead()
- self.Head.Clear()
- self.Head.Cmd = 0xA5
- self.Head.SubCmd = 0x10
- self.CodeStrLen = 0
- self.CodeStr = ""
- return
-
- def GetLength(self):
- length = 0
- length += self.Head.GetLength()
- length += 1
- length += len(self.CodeStr)
-
- return length
-
- def GetBuffer(self):
- data = ''
- data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
- data = CommFunc.WriteBYTE(data, self.CodeStrLen)
- data = CommFunc.WriteString(data, self.CodeStrLen, self.CodeStr)
- return data
-
- def OutputString(self):
- DumpString = '''
- Head:%s,
- CodeStrLen:%d,
- CodeStr:%s
- '''\
- %(
- self.Head.OutputString(),
- self.CodeStrLen,
- self.CodeStr
- )
- return DumpString
-
-
-m_NAtagUseNewGuyCard=tagUseNewGuyCard()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagUseNewGuyCard.Head.Cmd,m_NAtagUseNewGuyCard.Head.SubCmd))] = m_NAtagUseNewGuyCard
-
-
-#------------------------------------------------------
# A6 23 修改家族公告 #tagCMChangeFamilyBroadcast
class tagCMChangeFamilyBroadcast(Structure):
@@ -19873,58 +19809,6 @@
m_NAtagCGQueryTagMapTeam=tagCGQueryTagMapTeam()
ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCGQueryTagMapTeam.Cmd,m_NAtagCGQueryTagMapTeam.SubCmd))] = m_NAtagCGQueryTagMapTeam
-
-
-#------------------------------------------------------
-# B9 10 查询在线队员对应功能数据 #tagCGQueryTeamMemFuncData
-
-class tagCGQueryTeamMemFuncData(Structure):
- _pack_ = 1
- _fields_ = [
- ("Cmd", c_ubyte),
- ("SubCmd", c_ubyte),
- ("TeamMemFuncType", c_ubyte), # 查询队员的功能数据类型
- ]
-
- def __init__(self):
- self.Clear()
- self.Cmd = 0xB9
- self.SubCmd = 0x10
- 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 = 0xB9
- self.SubCmd = 0x10
- self.TeamMemFuncType = 0
- return
-
- def GetLength(self):
- return sizeof(tagCGQueryTeamMemFuncData)
-
- def GetBuffer(self):
- return string_at(addressof(self), self.GetLength())
-
- def OutputString(self):
- DumpString = '''// B9 10 查询在线队员对应功能数据 //tagCGQueryTeamMemFuncData:
- Cmd:%s,
- SubCmd:%s,
- TeamMemFuncType:%d
- '''\
- %(
- self.Cmd,
- self.SubCmd,
- self.TeamMemFuncType
- )
- return DumpString
-
-
-m_NAtagCGQueryTeamMemFuncData=tagCGQueryTeamMemFuncData()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCGQueryTeamMemFuncData.Cmd,m_NAtagCGQueryTeamMemFuncData.SubCmd))] = m_NAtagCGQueryTeamMemFuncData
#------------------------------------------------------
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
index 143b4cf..19a7250 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
@@ -52683,135 +52683,6 @@
#------------------------------------------------------
-# B9 11 队员进入副本准备状态刷新 #tagGCTeamEnterFBPrepare
-
-class tagGCTeamMemPrepareState(Structure):
- _pack_ = 1
- _fields_ = [
- ("PlayerID", c_int),
- ("PrepareState", c_ubyte), # 状态，0-未准备，1-已准备，2-拒绝
- ]
-
- def __init__(self):
- self.Clear()
- 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.PlayerID = 0
- self.PrepareState = 0
- return
-
- def GetLength(self):
- return sizeof(tagGCTeamMemPrepareState)
-
- def GetBuffer(self):
- return string_at(addressof(self), self.GetLength())
-
- def OutputString(self):
- DumpString = '''// B9 11 队员进入副本准备状态刷新 //tagGCTeamEnterFBPrepare:
- PlayerID:%d,
- PrepareState:%d
- '''\
- %(
- self.PlayerID,
- self.PrepareState
- )
- return DumpString
-
-
-class tagGCTeamEnterFBPrepare(Structure):
- Head = tagHead()
- TagMapID = 0 #(DWORD TagMapID)// 目标地图，不一定是队伍目标
- TagMapEx = 0 #(WORD TagMapEx)// 目标地图扩展
- IsPrepareErr = 0 #(BYTE IsPrepareErr)// 是否准备异常(在所有队员都准备好后准备传入副本出现有队员最终不能进入的情况时该值为1)
- MemCount = 0 #(BYTE MemCount)
- MemStateList = list() #(vector<tagGCTeamMemPrepareState> MemStateList)// 队员状态列表
- data = None
-
- def __init__(self):
- self.Clear()
- self.Head.Cmd = 0xB9
- self.Head.SubCmd = 0x11
- return
-
- def ReadData(self, _lpData, _pos=0, _Len=0):
- self.Clear()
- _pos = self.Head.ReadData(_lpData, _pos)
- self.TagMapID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
- self.TagMapEx,_pos = CommFunc.ReadWORD(_lpData, _pos)
- self.IsPrepareErr,_pos = CommFunc.ReadBYTE(_lpData, _pos)
- self.MemCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
- for i in range(self.MemCount):
- temMemStateList = tagGCTeamMemPrepareState()
- _pos = temMemStateList.ReadData(_lpData, _pos)
- self.MemStateList.append(temMemStateList)
- return _pos
-
- def Clear(self):
- self.Head = tagHead()
- self.Head.Clear()
- self.Head.Cmd = 0xB9
- self.Head.SubCmd = 0x11
- self.TagMapID = 0
- self.TagMapEx = 0
- self.IsPrepareErr = 0
- self.MemCount = 0
- self.MemStateList = list()
- return
-
- def GetLength(self):
- length = 0
- length += self.Head.GetLength()
- length += 4
- length += 2
- length += 1
- length += 1
- for i in range(self.MemCount):
- length += self.MemStateList[i].GetLength()
-
- return length
-
- def GetBuffer(self):
- data = ''
- data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
- data = CommFunc.WriteDWORD(data, self.TagMapID)
- data = CommFunc.WriteWORD(data, self.TagMapEx)
- data = CommFunc.WriteBYTE(data, self.IsPrepareErr)
- data = CommFunc.WriteBYTE(data, self.MemCount)
- for i in range(self.MemCount):
- data = CommFunc.WriteString(data, self.MemStateList[i].GetLength(), self.MemStateList[i].GetBuffer())
- return data
-
- def OutputString(self):
- DumpString = '''
- Head:%s,
- TagMapID:%d,
- TagMapEx:%d,
- IsPrepareErr:%d,
- MemCount:%d,
- MemStateList:%s
- '''\
- %(
- self.Head.OutputString(),
- self.TagMapID,
- self.TagMapEx,
- self.IsPrepareErr,
- self.MemCount,
- "..."
- )
- return DumpString
-
-
-m_NAtagGCTeamEnterFBPrepare=tagGCTeamEnterFBPrepare()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagGCTeamEnterFBPrepare.Head.Cmd,m_NAtagGCTeamEnterFBPrepare.Head.SubCmd))] = m_NAtagGCTeamEnterFBPrepare
-
-
-#------------------------------------------------------
# B9 03 队伍信息变更 #tagGCTeamInfoChange
class tagGCTeamInfoChange(Structure):
@@ -53218,134 +53089,6 @@
m_NAtagGCTeamMemberRefreshProperty=tagGCTeamMemberRefreshProperty()
ChNetPackDict[eval("0x%02x%02x"%(m_NAtagGCTeamMemberRefreshProperty.Cmd,m_NAtagGCTeamMemberRefreshProperty.SubCmd))] = m_NAtagGCTeamMemberRefreshProperty
-
-
-#------------------------------------------------------
-# B9 12 队员功能数据查询结果 #tagGCTeamMemFuncDataList
-
-class tagGCTeamMemFuncData(Structure):
- PlayerID = 0 #(DWORD PlayerID)
- DataLen = 0 #(WORD DataLen)
- MemFuncData = "" #(String MemFuncData)// 队员对应功能数据查询结果
- data = None
-
- def __init__(self):
- self.Clear()
- return
-
- def ReadData(self, _lpData, _pos=0, _Len=0):
- self.Clear()
- self.PlayerID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
- self.DataLen,_pos = CommFunc.ReadWORD(_lpData, _pos)
- self.MemFuncData,_pos = CommFunc.ReadString(_lpData, _pos,self.DataLen)
- return _pos
-
- def Clear(self):
- self.PlayerID = 0
- self.DataLen = 0
- self.MemFuncData = ""
- return
-
- def GetLength(self):
- length = 0
- length += 4
- length += 2
- length += len(self.MemFuncData)
-
- return length
-
- def GetBuffer(self):
- data = ''
- data = CommFunc.WriteDWORD(data, self.PlayerID)
- data = CommFunc.WriteWORD(data, self.DataLen)
- data = CommFunc.WriteString(data, self.DataLen, self.MemFuncData)
- return data
-
- def OutputString(self):
- DumpString = '''
- PlayerID:%d,
- DataLen:%d,
- MemFuncData:%s
- '''\
- %(
- self.PlayerID,
- self.DataLen,
- self.MemFuncData
- )
- return DumpString
-
-
-class tagGCTeamMemFuncDataList(Structure):
- Head = tagHead()
- TeamMemFuncType = 0 #(BYTE TeamMemFuncType)// 查询队员的功能数据类型
- MemCount = 0 #(BYTE MemCount)
- MemFuncDataList = list() #(vector<tagGCTeamMemFuncData> MemFuncDataList)// 数据列表
- data = None
-
- def __init__(self):
- self.Clear()
- self.Head.Cmd = 0xB9
- self.Head.SubCmd = 0x12
- return
-
- def ReadData(self, _lpData, _pos=0, _Len=0):
- self.Clear()
- _pos = self.Head.ReadData(_lpData, _pos)
- self.TeamMemFuncType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
- self.MemCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
- for i in range(self.MemCount):
- temMemFuncDataList = tagGCTeamMemFuncData()
- _pos = temMemFuncDataList.ReadData(_lpData, _pos)
- self.MemFuncDataList.append(temMemFuncDataList)
- return _pos
-
- def Clear(self):
- self.Head = tagHead()
- self.Head.Clear()
- self.Head.Cmd = 0xB9
- self.Head.SubCmd = 0x12
- self.TeamMemFuncType = 0
- self.MemCount = 0
- self.MemFuncDataList = list()
- return
-
- def GetLength(self):
- length = 0
- length += self.Head.GetLength()
- length += 1
- length += 1
- for i in range(self.MemCount):
- length += self.MemFuncDataList[i].GetLength()
-
- return length
-
- def GetBuffer(self):
- data = ''
- data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
- data = CommFunc.WriteBYTE(data, self.TeamMemFuncType)
- data = CommFunc.WriteBYTE(data, self.MemCount)
- for i in range(self.MemCount):
- data = CommFunc.WriteString(data, self.MemFuncDataList[i].GetLength(), self.MemFuncDataList[i].GetBuffer())
- return data
-
- def OutputString(self):
- DumpString = '''
- Head:%s,
- TeamMemFuncType:%d,
- MemCount:%d,
- MemFuncDataList:%s
- '''\
- %(
- self.Head.OutputString(),
- self.TeamMemFuncType,
- self.MemCount,
- "..."
- )
- return DumpString
-
-
-m_NAtagGCTeamMemFuncDataList=tagGCTeamMemFuncDataList()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagGCTeamMemFuncDataList.Head.Cmd,m_NAtagGCTeamMemFuncDataList.Head.SubCmd))] = m_NAtagGCTeamMemFuncDataList
#------------------------------------------------------
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/DataRecordPack.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/DataRecordPack.py
index cb15ef7..ec52203 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/DataRecordPack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/DataRecordPack.py
@@ -1074,22 +1074,6 @@
SendEventPack("PlayerDead", dataDict, curPlayer)
return
-
-## 给存奖励表物品
-# @param curPlayer: 玩家
-# @param rewardType: 奖励类型
-# @param itemID: 物品ID
-# @param itemCnt: 物品个数
-# @return
-def DR_PlayerGetReward(curPlayer, rewardType, itemID, itemCnt):
- dataDict = {'PlayerID':curPlayer.GetPlayerID(), "PlayerName":curPlayer.GetPlayerName(),
- 'AccID':curPlayer.GetAccID(), 'itemID':itemID, 'itemCnt':itemCnt,
- 'rewardType':rewardType}
-
- #发送封包
- SendEventPack("PlayerGetReward", dataDict, curPlayer)
- return
-
## 申请加入贵宾俱乐部
# @param curPlayer
# @param hasRegister: 之前是否已报名
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/TestMediaCard.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/TestMediaCard.py
deleted file mode 100644
index 2eeffcd..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/TestMediaCard.py
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#-------------------------------------------------------------------------------
-#
-##@package GM.Commands.TestMediaCard
-#
-# @todo:媒体卡使用测试
-# @author hxp
-# @date 2017-05-31
-# @version 1.0
-#
-# 详细描述: 媒体卡使用测试
-#
-#-------------------------------------------------------------------------------
-#"""Version = 2017-05-31 18:00"""
-#-------------------------------------------------------------------------------
-
-import PlayerNewGuyCard
-import GameWorld
-import ChConfig
-
-#---------------------------------------------------------------------
-#全局变量
-#---------------------------------------------------------------------
-
-#---------------------------------------------------------------------
-#逻辑实现
-## GM命令执行入口
-# @param curPlayer 当前玩家
-# @param paramList 参数列表 [itemIndex]
-# @return None
-# @remarks 函数详细说明.
-def OnExec(curPlayer, paramList):
- if len(paramList) < 2:
- GameWorld.DebugAnswer(curPlayer, "TestMediaCardItem 卡类型 卡状态(1-可用; 2-已使用过) 可选是否无视使用记录")
- return
- cardCode = "GMCODETestMediaCardItem"
- cardType, cardState = paramList[:2]
- isResetState = paramList[2] if len(paramList) > 2 else 0
- if isResetState:
- GameWorld.SetDictValueByBit(curPlayer, ChConfig.Def_Player_Dict_UseMediaCardState, cardType, 0)
- PlayerNewGuyCard.OnGMTGiveMediaCardAwardItem(curPlayer, cardType, cardCode, cardState)
- return
-
-
-
-
\ No newline at end of file
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 11ada8d..bfc75ea 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
@@ -33,8 +33,6 @@
import PetControl
import OperControlManager
import ShareDefine
-import PlayerAutoCheckOnline
-import PlayerGameWallow
import NetPackCommon
import ChPyNetSendPack
import DataRecordPack
@@ -461,7 +459,7 @@
InitPlayerPack(curPlayer)
if GameWorld.IsCrossServer():
- SkillCommon.PlayerLoginMergeServerSkillLogic(curPlayer, tick)
+ #SkillCommon.PlayerLoginMergeServerSkillLogic(curPlayer, tick)
# 重置所有技能CD
DoPlayerLoginInMap(curPlayer, tick)
@@ -469,7 +467,7 @@
DataRecordPack.DR_PlayerLogin(curPlayer)
EventReport.WriteEvent_login(curPlayer)
#---玩家上线, 宠物逻辑处理---
- PetControl.DoLogic_PetInfo_OnLogin(curPlayer, tick)
+ #PetControl.DoLogic_PetInfo_OnLogin(curPlayer, tick)
return
leaveServerSecond = PlayerControl.GetPlayerLeaveServerSecond(curPlayer)
@@ -494,18 +492,18 @@
PlayerControl.UpdPlayerServerGroupID(curPlayer)
#上线学习技能
- SkillCommon.PlayerLoginCheckLearnSkill(curPlayer)
+ #SkillCommon.PlayerLoginCheckLearnSkill(curPlayer)
#刷新技能CD
- SkillCommon.PlayerLoginUpdateSkillCD(curPlayer, tick)
+ #SkillCommon.PlayerLoginUpdateSkillCD(curPlayer, tick)
#通知玩家技能信息
- __Sync_ClientSkill(curPlayer)
+ #__Sync_ClientSkill(curPlayer)
#清除VIPbuff
#BuffSkill.DelBuffBySkillID(curPlayer, ChConfig.Def_VIPExp_SkillTypeID, tick)
#通知玩家的buff
- __Sync_ClientBuff(curPlayer)
+ #__Sync_ClientBuff(curPlayer)
#---刷新了玩家属性, 登陆只刷新一次，其他地方不用刷
DoPlayerLoginInMap(curPlayer, tick)
@@ -522,9 +520,6 @@
__DoMixServerFirstLogin(curPlayer)
PlayerBillboard.BillboardOnLogin(curPlayer)
- #上线时通知脱机挂时被击杀的离线时间
- __Sync_PlayerOffline(curPlayer, tick)
-
#玩家扩展信息
__SyncPlayerInfoEx(curPlayer)
@@ -532,16 +527,11 @@
GiveDownloadPatchAward(curPlayer)
#PK模式
- SyncPKModel(curPlayer)
+ #SyncPKModel(curPlayer)
#---玩家上线, 宠物逻辑处理---
- PetControl.DoLogic_PetInfo_OnLogin(curPlayer, tick)
- PlayerPet.OnPlayerPetLogin(curPlayer)
-
- #PlayerLoginNotify(curPlayer, tick)
-
- #防沉迷计算下线累积时间
- PlayerGameWallow.Calc_Wallow_OfflineTime(curPlayer, tick)
+ #PetControl.DoLogic_PetInfo_OnLogin(curPlayer, tick)
+ #PlayerPet.OnPlayerPetLogin(curPlayer)
# 通知等级奖励领取记录
PlayerLVAward.Sync_LVAwardGetRecordInfo(curPlayer)
@@ -550,17 +540,17 @@
# 首充/天天首充/充值豪礼
PlayerGoldGift.OnLogin(curPlayer)
-# #通知功能首次触发情况
+ #通知功能首次触发情况
GameFuncComm.Sync_FuncOpenState(curPlayer)
-#
-# #通知客户端签到信息
+
+ #通知客户端签到信息
PlayerSignDay.SignDayOnLogin(curPlayer)
#通知玩家死亡时间
- PlayerControl.PlayerControl(curPlayer).NotifyPlayerDeadTime(curPlayer)
+ #PlayerControl.PlayerControl(curPlayer).NotifyPlayerDeadTime(curPlayer)
#角色改名次数
- UpdatePlayerName.Sync_UpdatePlayerNameCount(curPlayer)
+ #UpdatePlayerName.Sync_UpdatePlayerNameCount(curPlayer)
# 坐骑相关通知
PlayerHorse.PlayerHorseLogin(curPlayer)
@@ -580,7 +570,7 @@
OpenServerCampaign.OnOpenServerCampaignLogin(curPlayer)
# 采集NPC次数通知
- NPCCommon.SyncCollNPCTime(curPlayer)
+ #NPCCommon.SyncCollNPCTime(curPlayer)
# 每日活跃度
PlayerActivity.OnLogin(curPlayer)
@@ -628,7 +618,7 @@
PlayerControl.NotifyPlayerAllCurrency(curPlayer)
PlayerControl.NotifyUseMoneyTotal(curPlayer)
#通知基础属性
- NotifyPlayerBasePoint(curPlayer)
+ #NotifyPlayerBasePoint(curPlayer)
#跨服充值排行
CrossActCTGBillboard.OnPlayerLogin(curPlayer)
@@ -670,9 +660,7 @@
#PassiveBuffEffMng.OnLoginGFPassive(curPlayer)
PlayerOnlinePrize.OnPlayerLogin(curPlayer)
#装备分解
- PlayerEquipDecompose.PlayerLogin(curPlayer)
- #防沉迷
- PlayerGameWallow.DoLogic_CheckWallow(curPlayer, tick)
+ #PlayerEquipDecompose.PlayerLogin(curPlayer)
# 极品白拿
PlayerFreeGoods.OnLogin(curPlayer)
# BOSS复活活动
@@ -735,7 +723,7 @@
SyncLittleHelper(curPlayer)
PlayerFB.OnLogin(curPlayer)
#技能专精信息
- SkillShell.NotifyElementSkillInfo(curPlayer)
+ #SkillShell.NotifyElementSkillInfo(curPlayer)
#Boss首杀
GY_Query_BossFirstKill.OnPlayerLogin(curPlayer)
#通天令
@@ -952,51 +940,6 @@
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_DeadTime, 0)
return
-##玩家登陆, 相关活动通知
-#@param curPlayer 玩家实例
-#@param tick 时间戳
-#@return 返回值无意义
-#@remarks 玩家登陆, 相关活动通知
-def PlayerLoginNotify(curPlayer, tick):
- curTime = GameWorld.GetCurrentTime()
-
- #读取上线提示表
- notifyByTimeSect = ReadChConfig.GetEvalChConfig('PlayerLoginNotify_TimeSect') #某时间段内上线提示
- notifyByDict = ReadChConfig.GetEvalChConfig('PlayerLoginNotify_Dict') #根据字典值给提示
-
- #在规定时间段内上线给提示
- DoNotifyByTimeSect(curPlayer, curTime, notifyByTimeSect)
- #指定字典值内提示
- DoNotifyByDict(curPlayer, notifyByDict)
- return
-#---------------------------------------------------------------------
-##在活动规定时间段内上线给提示
-#@param curPlayer 玩家索引
-#@param curTime 传入时间
-#@param notifyInfo 提示信息
-#@return 返回值无意义
-#@remarks 在活动规定时间段内上线给提示
-def DoNotifyByTimeSect(curPlayer, curTime, notifyInfo):
- for curNotify in notifyInfo:
- #有时间段限制，验证时间段
- if not GameWorld.IsAtActTime(curTime, curNotify[0]):
- continue
-
- PlayerControl.NotifyCode(curPlayer, curNotify[1], curNotify[2])
-
-#---------------------------------------------------------------------
-##指定字典值内提示
-#@param curPlayer 玩家实例
-#@param notifyInfo 提示信息
-#@return 返回值无意义
-#@remarks 指定字典值内提示
-def DoNotifyByDict(curPlayer, notifyInfo):
- gameWorld = GameWorld.GetGameWorld()
- for curNotify in notifyInfo:
- if gameWorld.GetGameWorldDictByKey(curNotify[0]) in curNotify[1]:
- PlayerControl.NotifyCode(curPlayer, curNotify[2], curNotify[3])
-
-
#---------------------------------------------------------------------
##通知背包详细信息
#@param curPlayer 玩家实例
@@ -1087,54 +1030,6 @@
clientPack.ObjID = curPlayer.GetID()
clientPack.BuffType = 99 # 99代表清所有
NetPackCommon.SendFakePack(curPlayer, clientPack)
- return
-
-#---------------------------------------------------------------------
-##上线时通知离线时间（离线挂机功能）
-# @param curPlayer 玩家实例
-# @param tick 时间戳
-# @return 返回值无意义
-# @remarks 上线时通知离线时间（离线挂机功能）
-def __Sync_PlayerOffline(curPlayer, tick):
- #---等级限制---
- if GameWorld.IsCrossServer():
- return
-
-#===============================================================================
-# #---等级限制---
-# lvLimit = ReadChConfig.GetEvalChConfig('OfflineSys_LVLimit')
-# if curPlayer.GetLV() < lvLimit:
-# return
-#
-# if GameWorld.IsCrossServer():
-# return
-#
-# #当前离线时间（分）
-# curOfflineMinutes = min(PlayerControl.GetPlayerLeaveServerMinute(curPlayer),
-# ChConfig.Def_UpperLimit_DWord)
-#
-# #防止服务器时间修改到过去得到负值
-# if curOfflineMinutes < 0:
-# GameWorld.ErrLog("Login Time Error, outTime: %s - loginTime :%s" %
-# (curPlayer.GetLogoffTime(), GameWorld.GetCurrentDataTimeStr()),
-# curPlayer.GetPlayerID())
-# curOfflineMinutes = 0
-#
-# #时间为分钟
-# minTimeLimit, maxTimeLimit = ReadChConfig.GetEvalChConfig("OfflineSys_AllTimeUpperLimit")
-# if curOfflineMinutes >= minTimeLimit:
-# #总离线时间（分）
-# allOfflineMinutes = min(curPlayer.GetOfflineMinutes() + curOfflineMinutes, maxTimeLimit)
-# #记录离线总时间
-# curPlayer.SetOfflineMinutes(int(allOfflineMinutes))
-# GameWorld.DebugLog("设置离线奖励时间 %s,curOfflineMinutes=%s" % (allOfflineMinutes, curOfflineMinutes), curPlayer.GetPlayerID())
-# else:
-# GameWorld.DebugLog("离线时间过短,不计入离线奖励!curOfflineMinutes=%s" % curOfflineMinutes, curPlayer.GetPlayerID())
-#
-# #通知客户端离线时间
-# # curPlayer.Syn_OfflineTimeRefresh(int(curOfflineMinutes))
-# curPlayer.Syn_OfflineTimeQueryResult()
-#===============================================================================
return
#---------------------------------------------------------------------
@@ -3389,26 +3284,6 @@
state = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_FamilyArrestAwardState)
awardReceiveState.ReceiveState = state
NetPackCommon.SendFakePack(curPlayer, awardReceiveState)
- return
-
-## 领取奖励表奖励
-# @param None None
-# @return None
-def ClientPlayerGetReward(index, clientData, tick):
- playerManager = GameWorld.GetPlayerManager()
- curPlayer = playerManager.GetPlayerByIndex(index)
-
- # 背包空间不足
- if not ItemCommon.CheckPackHasSpace(curPlayer, IPY_GameWorld.rptItem):
- PlayerControl.NotifyCode(curPlayer, "GeRen_chenxin_676165", [IPY_GameWorld.rptItem])
- return
-
- rewardType = clientData.RewardType
-
- #通知GameServer领取奖励
- resultName = str(rewardType)
- GameWorld.GetPlayerManager().GameServer_QueryPlayerResult(curPlayer.GetID(), 0, 0, 'PlayerGetReward',
- resultName, len(resultName))
return
#//A5 04 玩家领取奖励 #tagCMPlayerGetReward
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
index d3e6b88..68e8e37 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
@@ -33,7 +33,6 @@
import PlayerBillboard
import GameServerRefresh
import IPY_GameWorld
-import PlayerGameWallow
import ChPyNetSendPack
import NetPackCommon
import DataRecordPack
@@ -1593,10 +1592,6 @@
# @return 无意义
# @remarks 刷新玩家时钟，切地图玩家时钟记录清空，处理相应逻辑
def RefreshPlayerTick(curPlayer):
- tick = GameWorld.GetGameWorld().GetTick()
-
- #防沉迷切线时间
- PlayerGameWallow.DoLogic_WallowOnlineTime(curPlayer, tick)
return
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 dee4d3b..dc748e3 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py
@@ -23,7 +23,6 @@
import ChPlayer
import GameServerRefresh
import ShareDefine
-import PlayerGameWallow
import PlayerSignDay
import PlayerCoin
import PlayerControl
@@ -40,7 +39,6 @@
import PlayerFreeGoods
import ChItem
import PlayerGoldInvest
-import PlayerNewGuyCard
import PlayerCrossRealmPK
import PlayerCrossChampionship
import PlayerPet
@@ -266,9 +264,7 @@
curPlayer.SetDayProcessGameEventCount(0)
#重置宠物每天的训练次数
- PlayerPet.DoLogic_PetInfo_OnDay(curPlayer)
-
- PlayerGameWallow.RevertHealthGame_OnDay(curPlayer)
+ #PlayerPet.DoLogic_PetInfo_OnDay(curPlayer)
PlayerOnlinePrize.ResetPrizeInfoOnDay(curPlayer)
@@ -284,10 +280,6 @@
PlayerTree.PlayerOnDay(curPlayer)
#成就
PlayerSuccess.SuccOnDay(curPlayer)
-
- # 新手卡
- PlayerNewGuyCard.NewGuyCardOnday(curPlayer)
-
#投资
PlayerGoldInvest.OnDay(curPlayer)
#战令
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGameWallow.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGameWallow.py
deleted file mode 100644
index 2ed0d0e..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGameWallow.py
+++ /dev/null
@@ -1,258 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#
-##@package PlayerGameWallow
-#
-# @todo:
-#
-# @author: Alee
-# @date 2018-3-15 下午08:32:14
-# @version 1.0
-#
-# @note:
-#
-#---------------------------------------------------------------------
-
-
-import ChConfig
-import GameWorld
-import ReadChConfig
-import PlayerControl
-import ChPyNetSendPack
-import NetPackCommon
-#------------------------------------------------------------------------------
-
-
-#防沉迷经验系数
-Def_GameWallow_ExpDict = {ChConfig.Def_GameWallow_LV_1_1:1,
- ChConfig.Def_GameWallow_LV_1_2:1,
- ChConfig.Def_GameWallow_LV_First:1,
- ChConfig.Def_GameWallow_LV_Second:0,
- ChConfig.Def_GameWallow_LV_2_1:0,
- ChConfig.Def_GameWallow_LV_2_2:0,
- ChConfig.Def_GameWallow_LV_2_3:0,
- ChConfig.Def_GameWallow_LV_Third:0,
- }
-
-# 防沉迷在线时间分钟对应阶段
-Def_WallowLV_Time_Dict = [
- [60, ChConfig.Def_GameWallow_LV_1_2],
- [120, ChConfig.Def_GameWallow_LV_First],
- [180, ChConfig.Def_GameWallow_LV_Second],
- [210, ChConfig.Def_GameWallow_LV_2_1],
- [240, ChConfig.Def_GameWallow_LV_2_2],
- [270, ChConfig.Def_GameWallow_LV_2_3],
- [300, ChConfig.Def_GameWallow_LV_Third],
- ]
-
-# 等级，提示
-Def_WallowLV_Notify_Dict = {
- ChConfig.Def_GameWallow_LV_1_2:["AvoidSink02", [1]],
- ChConfig.Def_GameWallow_LV_First:["AvoidSink02", [2]],
- ChConfig.Def_GameWallow_LV_Second:["AvoidSink03", [3]],
- ChConfig.Def_GameWallow_LV_2_1:["AvoidSink03", ['3.5']],
- ChConfig.Def_GameWallow_LV_2_2:["AvoidSink03", [4]],
- ChConfig.Def_GameWallow_LV_2_3:["AvoidSink03", ['4.5']],
- ChConfig.Def_GameWallow_LV_Third:["AvoidSink05", [5]],
- }
-
-
-#防沉迷开启
-Def_GameWallow_Open = 1
-
-#防沉迷离线累积时间上限达到X小时，为健康状态
-Def_Wallow_Offline_HealthTime = 5 * 60
-#------------------------------------------------------------------------------
-
-# 通知客户端防沉迷在线时间
-def NotifyWallowTime(curPlayer):
- sendPack = ChPyNetSendPack.tagMCPlayerWallow()
- if not GetIsWallowRole(curPlayer):
- sendPack.Open = 0
- sendPack.OnlineTime = 0
- else:
- sendPack.Open = 1
- sendPack.OnlineTime = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_Wallow_OnlineTime)/1000
-
- NetPackCommon.SendFakePack(curPlayer, sendPack)
-
-
-
-##上线/切地图防沉迷判定
-# @param curPlayer 玩家实例
-# @param tick 时间戳
-# @return None
-def DoLogic_CheckWallow(curPlayer, tick):
- NotifyWallowTime(curPlayer)
- if not GetIsWallowRole(curPlayer):
- #非沉迷，删除沉迷状态
- Del_Wallow(curPlayer)
- return
-
- wallowLV = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_Wallow_LV)
-
- if wallowLV != ChConfig.Def_GameWallow_LV_None:
- return
-
- #第一次进入防沉迷，设置1级沉迷
- PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_Wallow_LV, ChConfig.Def_GameWallow_LV_1_1)
- PlayerControl.NotifyCode(curPlayer, "AvoidSink01")
-
- return
-
-##删除BUFF，去掉沉迷标识
-# @param curPlayer 玩家实例
-# @return 无
-def Del_Wallow(curPlayer):
- if curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_Wallow_LV) == ChConfig.Def_GameWallow_LV_None:
- return
-
- #清空标识
- PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_Wallow_LV, ChConfig.Def_GameWallow_LV_None)
- #在线时间清空
- PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_Wallow_OnlineTime, 0)
- #离线清空
- PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_Wallow_OfflineTime, 0)
-
- return
-
-
-##上线计算累积离线时间处理防沉迷
-# @param curPlayer 玩家实例
-# @param tick 时间戳
-# @return None
-def Calc_Wallow_OfflineTime(curPlayer, tick):
- if not GetIsWallowRole(curPlayer):
- return
-
- PlayerControl.NotifyCode(curPlayer, "AvoidSink01")
-
- offMin = PlayerControl.GetPlayerLeaveServerMinute(curPlayer)
- noteOffMin = offMin + curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_Wallow_OfflineTime)
-
- if noteOffMin < Def_Wallow_Offline_HealthTime:
- #未达到健康离线，记录时间,退出
- PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_Wallow_OfflineTime, noteOffMin)
- return
-
- #设置为健康状态
- RevertHealthGame(curPlayer, tick)
-
-
-##恢复为一级沉迷，健康游戏
-# @param curPlayer 玩家实例
-# @param tick 时间戳
-# @return None
-def RevertHealthGame(curPlayer, tick):
- #设置1级沉迷
- PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_Wallow_OfflineTime, 0)
- PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_Wallow_LV, ChConfig.Def_GameWallow_LV_1_1)
-
- #在线时间清空
- PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_Wallow_OnlineTime, 0)
-
- PlayerControl.NotifyCode(curPlayer, "AvoidSink01")
-
- return
-
-
-##获得是否为防沉迷角色
-# @param curPlayer 玩家实例
-# @return bool
-def GetIsWallowRole(curPlayer):
- if ReadChConfig.GetEvalChConfig("HealthGame_CountWallow") != Def_GameWallow_Open:
- return False
-
- if curPlayer.IsAdult() == 1:
- return False
-
- return True
-
-##恢复为一级沉迷，健康游戏
-# @param curPlayer 玩家实例
-# @param tick 时间戳
-# @return None
-def RevertHealthGame_OnDay(curPlayer):
- if not GetIsWallowRole(curPlayer):
- #非沉迷，删除沉迷状态
- Del_Wallow(curPlayer)
- return
-
- tick = GameWorld.GetGameWorld().GetTick()
-
- #设置为健康状态
- RevertHealthGame(curPlayer, tick)
-
-
-##返回沉迷后的经验
-# @param curPlayer 玩家实例
-# @param addExp 增加经验值
-# @return 计算后的经验
-def ChangeExpByWallow(curPlayer, addExp):
- if not GetIsWallowRole(curPlayer):
- return addExp
-
- wallowLV = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_Wallow_LV)
- expMulNum = Def_GameWallow_ExpDict.get(wallowLV, 1)
-
- if expMulNum == None:
- GameWorld.ErrLog("无法找到经验系数，当前沉迷等级%s 对应表%s"%(wallowLV, Def_GameWallow_ExpDict))
- return addExp
-
- return int(addExp*expMulNum)
-
-
-##沉迷在线时间
-# @param curPlayer 玩家实例
-# @param pastTick 经过的时间
-# @param tick 时间戳
-# @return none
-def DoLogic_WallowOnlineTime(curPlayer, tick):
-
- if not GetIsWallowRole(curPlayer):
- return
-
- lastDealTick = curPlayer.GetTickByType(ChConfig.TYPE_Player_Tick_PlayerWallow)
-
- if lastDealTick <= 0:
- #切换地图，无信息，重新记录
- curPlayer.SetTickByType(ChConfig.TYPE_Player_Tick_PlayerWallow, tick)
- return
-
- curTimePassed = tick - lastDealTick
-
- #刷新间隔没有到
- checkInterval = ChConfig.TYPE_Player_Tick_Time[ChConfig.TYPE_Player_Tick_PlayerWallow]
- if curTimePassed < checkInterval:
- return
-
- curPlayer.SetTickByType(ChConfig.TYPE_Player_Tick_PlayerWallow, tick)
-
- onlineTick = min(curTimePassed + curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_Wallow_OnlineTime), 24*60*60*1000)
-
- PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_Wallow_OnlineTime, onlineTick)
-
- wallowLV = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_Wallow_LV)
- onlineMin = onlineTick/1000/60
-
- findLv = ChConfig.Def_GameWallow_LV_1_1
- for timeList in Def_WallowLV_Time_Dict:
- if onlineMin >= timeList[0]:
- findLv = timeList[1]
-
- # 提高到更高等级需提示
- if findLv > wallowLV:
- PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_Wallow_LV, findLv)
- notifyInfo = Def_WallowLV_Notify_Dict.get(findLv, ["AvoidSink05", [5]])
- PlayerControl.NotifyCode(curPlayer, notifyInfo[0], notifyInfo[1])
- NotifyWallowTime(curPlayer)
- return
-
- # 5小时后每15分钟提示一次
- if onlineMin > 300 and (onlineMin - 300)%15 == 0:
- PlayerControl.NotifyCode(curPlayer, "AvoidSink05", [5])
- NotifyWallowTime(curPlayer)
- return
-
- return
-
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerNewGuyCard.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerNewGuyCard.py
deleted file mode 100644
index 86d1b97..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerNewGuyCard.py
+++ /dev/null
@@ -1,553 +0,0 @@
-#!/usr/bin/python
-#-*- coding: GBK -*-
-#----------------------------------------------------------------------------------------------------
-#
-#----------------------------------------------------------------------------------------------------
-#
-##@package PlayerNewGuyCard.py
-# 新手卡
-#
-# @author wdb
-# @date 2012-05-07
-# @version 3.2
-#
-# 修改时间 修改人 修改内容
-# @change: "2012-05-07 18:30" wdb 修改使用一个字典记录使用新手卡情况
-# @change: "2012-05-14 15:30" wdb 代码优化修改
-# @change: "2012-06-15 11:00" wdb 未记录防范时间间隔
-# @change: "2012-06-19 12:00" wdb c++接口修改
-# @change: "2012-06-21 15:30" wdb 增加使用gm工具再db中插入新手卡方式
-# @change: "2012-06-27 12:00" wdb 去除新手卡类型最大29限制，大与29类型不记录大玩家字典
-# @change: "2012-07-05 11:00" wdb 查询返回结果类型小于1时，判定为卡号不正确
-# @change: "2012-07-05 12:00" wdb 去除配表是否正确判断
-# @change: "2013-11-14 16:30" hxp 恢复新手卡功能
-# @change: "2014-12-12 16:00" hxp 修改新手卡重复使用规则逻辑；卡类型最大支持类型到255
-# @change: "2014-12-28 23:10" ljd 增加指定账号新手卡使用
-# @change: "2014-12-29 15:30" hxp 指定账号新手卡使用增加累计充值钻石数限制
-# @change: "2015-01-07 14:10" ljd 修改指定账号新手卡验证规则
-# @change: "2015-05-25 19:30" hxp 增加通用新手卡
-# @change: "2015-06-06 15:30" hxp 修复日志输出报错
-# @change: "2015-06-08 20:30" hxp 增加流向事件汇报
-# @change: "2015-08-13 14:00" ljd 可重复领取的卡限制日领取次数
-# @change: "2016-07-30 19:00" hxp 指定账号新手卡支持通服卡号
-# @change: "2016-08-15 20:00" hxp 代码整理；增加可配置有效日期
-# @change: "2016-08-31 20:00" hxp 通用卡可绑定常规卡类型; 统计新手卡使用事件
-# @change: "2017-05-26 14:00" hxp 增加新版媒体卡发放奖励支持
-# @change: "2017-07-01 15:30" hxp 平台信息改为从玩家账号中取，支持混服
-#---------------------------------------------------------------------
-#"""Version = 2017-07-01 15:30"""
-#---------------------------------------------------------------------
-#导入
-import GameWorld
-import IPY_GameWorld
-import ChConfig
-import ReadChConfig
-import PlayerControl
-import ItemControler
-import EventReport
-import ItemCommon
-import DataRecordPack
-import ShareDefine
-import PlayerCoin
-
-import md5
-#---------------------------------------------------------------------
-# 指定账号生成的新手卡标识
-MarkIdCardFlag = 'v'
-# GM工具生成的新手卡标志
-StoreInDBCardFlag = 'n'
-
-(
-Def_NCard_KeyList, # 生成卡所用的key列表
-Def_NCard_Notify, # 已领取过的提示
-Def_NCard_RepeatCnt, # 每日可重复领取次数
-Def_NCard_ItemInfo, # (物品ID, 物品数量, 是否绑定)
-Def_NCard_ValidTime, # 有效日期格式yyyy-MM-dd hh:mm:ss
-Def_NCard_WriteEvent, # 是否记录使用事件
-) = range(6)
-
-#=======================================================================================================================
-#//A5 10 使用新手卡 #tagUseNewGuyCard
-#
-#struct tagUseNewGuyCard
-#
-#{
-# tagHead Head;
-# BYTE CodeStrLen;
-# char CodeStr[CodeStrLen]; //size = CodeStrLen
-#};
-#=======================================================================================================================
-## 使用新手卡
-# @param index 索引
-# @param clientData 封包结构体
-# @param tick 时间戳
-# @return None
-def UseNewGuyCard(index, clientData, tick):
- curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
-
- if tick - curPlayer.GetTickByType(ChConfig.TYPE_Player_Tick_NewGuyCard) \
- <= ChConfig.TYPE_Player_Tick_Time[ChConfig.TYPE_Player_Tick_NewGuyCard]:
- #新手卡查询时间间隔
- return
-
- codeStr = clientData.CodeStr
- GameWorld.DebugLog("使用新手卡 codeStr=%s" % codeStr, curPlayer.GetPlayerID())
-
- curPlayer.SetTickByType(ChConfig.TYPE_Player_Tick_NewGuyCard, tick)
-
- # 正在查询中
- if curPlayer.GetQueryNewGuyCardState() == IPY_GameWorld.qngcsQuerying:
- GameWorld.DebugLog(" 正在查询中")
- return
-
- # 背包空间不足
- if not ItemCommon.CheckPackHasSpace(curPlayer, IPY_GameWorld.rptItem):
- PlayerControl.NotifyCode(curPlayer, "GeRen_chenxin_676165", [IPY_GameWorld.rptItem])
- return
-
- # 卡种1: 通用卡检测
- if UseCommonNewGuyCard(curPlayer, codeStr):
- return
-
- # 卡种2: 指定账号卡检测
- if UseAccIDNewGuyCard(curPlayer, codeStr):
- return
-
- # 卡种3: GM工具生成的新卡，使用情况已全部记录在数据库中，直接查询
- if codeStr.startswith(StoreInDBCardFlag):
- # 请求卡是否被使用过
- GameWorld.DebugLog(" 是GM工具生成的卡, 查询GM工具生成卡是否被使用过")
- curPlayer.SendQueryNewGuyCardState(codeStr)
- return
-
- # 卡种4: 非GM工具生成的旧卡，要解析获得卡的类型
- curCardType, notifyMsg, dailyGetCnt = GetNewGuyCardType(codeStr)
-
- GameWorld.DebugLog(" 非GM工具生成的旧卡,curCardType=%s,notifyMsg=%s,dailyGetCnt=%s" % (curCardType, notifyMsg, dailyGetCnt))
-
- # 假卡
- if curCardType <= 0:
- PlayerControl.NotifyCode(curPlayer, "GeRen_pan_161234")
- return
-
- # 不可重复领取的，验证玩家是否已用过该类型卡; 可重复领取的验证每日使用次数上限
- if not dailyGetCnt:
- if GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_Player_Dict_UseNewGuyCardState, curCardType):
- PlayerControl.NotifyCode(curPlayer, notifyMsg)
- return
- else:
- repeatGotNum = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_UseNewGuyCardNum % curCardType)
- if repeatGotNum >= dailyGetCnt:
- PlayerControl.NotifyCode(curPlayer, "GeRen_lwh_372238")
- return
-
- # 请求卡是否被使用过
- curPlayer.SendQueryNewGuyCardState(codeStr)
-
- # 记录查询的类型，和key的位置
- curPlayer.SetDict(ChConfig.Def_PlayerKey_QueryNewGuyCardType, curCardType)
- return
-
-## 通用新手卡使用
-# @param curPlayer
-# @param codeStr 卡号
-# @return False-非该种类卡; True-是该种类卡
-def UseCommonNewGuyCard(curPlayer, codeStr):
- CommonCardDict = ReadChConfig.GetEvalChConfig("CommonCardData")
- if codeStr not in CommonCardDict:
- GameWorld.DebugLog(" 非通用卡！%s" % (codeStr))
- return False
-
- # 以下必须都返回 True, 代表是该卡种
- cardIndex, itemInfo, hadUseNotify, needLV, needGold, validTime, cardType, isEventLog = CommonCardDict[codeStr]
- if needLV > 0 and curPlayer.GetLV() < needLV:
- PlayerControl.NotifyCode(curPlayer, "LvErr")
- return True
-
- if needGold > 0:
- Def_CoinRate = PlayerCoin.GetCoinRate()
- coinPointTotal = curPlayer.GetChangeCoinPointTotal()
- if coinPointTotal * Def_CoinRate < needGold:
- PlayerControl.NotifyCode(curPlayer, "GeRen_hgg_676165", [needGold])
- return True
-
- isUsed = GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_Player_Dict_CommonNewGuyCardState, cardIndex)
- if isUsed:
- PlayerControl.NotifyCode(curPlayer, hadUseNotify)
- return True
-
- # 大于0则对应 NewGuyCardKey.txt 及 StoreInDBCardData.txt 中的卡类型, 两者绑定, 仅可通过其中一种方式使用一次
- if cardType > 0:
- if GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_Player_Dict_UseNewGuyCardState, cardType):
- PlayerControl.NotifyCode(curPlayer, hadUseNotify)
- return True
-
- if validTime != "" and GameWorld.GetPastSeconds(validTime) >= 0:
- PlayerControl.NotifyCode(curPlayer, "GeRen_pan_795514")
- return True
-
- #给予物品
- itemID, itemCnt, isBand = itemInfo
- if not ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem]):
- #背包空间不足
- PlayerControl.NotifyCode(curPlayer, "GeRen_chenxin_676165", [IPY_GameWorld.rptItem])
- return True
-
- GameWorld.SetDictValueByBit(curPlayer, ChConfig.Def_Player_Dict_CommonNewGuyCardState, cardIndex, 1) # 更新该玩家已使用该卡
- #PlayerControl.NotifyCode(curPlayer, "ObtainRes01", [itemID, itemCnt])
- DoUseReport(curPlayer, codeStr, "CommonCard", itemID, itemCnt) # 记录玩家使用新手卡
-
- if cardType > 0:
- GameWorld.SetDictValueByBit(curPlayer, ChConfig.Def_Player_Dict_UseNewGuyCardState, cardType, 1)
-
- if isEventLog:
- itemData = GameWorld.GetGameData().GetItemByTypeID(itemID)
- itemName = itemID if not itemData else itemData.GetName()
- #EventReport.WriteEvent_custom_events(curPlayer, EventReport.Def_Custom_Events_CommonCard % codeStr, itemName)
-
- GameWorld.DebugLog("通用卡使用OK！codeStr=%s,cardType=%s,itemID=%s,itemCnt=%s" % (codeStr, cardType, itemID, itemCnt))
- return True
-
-## 使用指定账号卡号
-# @param curPlayer
-# @param codeStr 卡号
-# @return False-非该种类卡; True-是该种类卡
-def UseAccIDNewGuyCard(curPlayer, codeStr):
- idflagLen = len(MarkIdCardFlag)
- if not (len(codeStr) == idflagLen + 32 and MarkIdCardFlag == codeStr[:idflagLen]):
- GameWorld.DebugLog(" 非指定账号卡号！%s" % (codeStr))
- return False
-
- # 以下必须都返回 True, 代表是该卡种
- cardBack = CheckMarkIdCardRule(curPlayer, codeStr)
- if cardBack == None:
- PlayerControl.NotifyCode(curPlayer, "GeRen_pan_161234")
- return True
-
- cardIndex, cardInfo = cardBack
- codeKey, itemInfo, hadUseNotify, validTime = cardInfo
-
- isUsed = GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_Player_Dict_IDNewGuyCardState, cardIndex)
- if isUsed:
- PlayerControl.NotifyCode(curPlayer, hadUseNotify)
- return True
-
- if validTime != "" and GameWorld.GetPastSeconds(validTime) >= 0:
- PlayerControl.NotifyCode(curPlayer, "GeRen_pan_795514")
- return True
-
- #给予物品
- itemID, itemCnt, isBand = itemInfo
- GameWorld.DebugLog(" itemInfo=%s" % str(itemInfo))
- if not ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem]):
- #背包空间不足
- PlayerControl.NotifyCode(curPlayer, "GeRen_chenxin_676165", [IPY_GameWorld.rptItem])
- return True
-
- GameWorld.SetDictValueByBit(curPlayer, ChConfig.Def_Player_Dict_IDNewGuyCardState, cardIndex, 1) # 更新该玩家已使用该卡
- #PlayerControl.NotifyCode(curPlayer, "ObtainRes01", [itemID, itemCnt])
- DoUseReport(curPlayer, codeStr, "AccIDCard", itemID, itemCnt) # 记录玩家使用新手卡
-
- GameWorld.DebugLog("指定账号卡使用OK！codeKey=%s,codeStr=%s,cardIndex=%s,itemID=%s,itemCnt=%s"
- % (codeKey, codeStr, cardIndex, itemID, itemCnt), curPlayer.GetPlayerID())
- return True
-
-## 是否符合指定账号生成新卡规则
-# @param cardCode 卡号
-# @return 序号
-def CheckMarkIdCardRule(curPlayer, cardCode):
- idName = curPlayer.GetAccID()
- platform = GameWorld.GetPlayerPlatform(curPlayer)
- platFormIdName = GameWorld.GetPlatformAccID(idName)
- markIdCardData = ReadChConfig.GetEvalChConfig("IDMarkCardData")
- for cardIndex, cardInfo in markIdCardData.items():
- codeKey = cardInfo[0]
- markMD5 = md5.md5('wyOu' + platform + codeKey).hexdigest()
-
- # 平台账号通服卡号
- md5PlatFormId = md5.md5(markMD5 + platFormIdName).hexdigest()
- if MarkIdCardFlag + md5PlatFormId == cardCode:
- return cardIndex, cardInfo
-
- # 对应游戏区服账号卡号
- md5Id = md5.md5(markMD5 + idName).hexdigest()
- if MarkIdCardFlag + md5Id == cardCode:
- return cardIndex, cardInfo
- return
-
-## =================================================================================================
-
-## 验证并获得新手卡的类型
-# @param codeStr 卡号
-# @return None
-def GetNewGuyCardType(codeStr):
- curCardType = 0
- notifyMsg = ""
- dailyGetCnt = 0 # 每日可重复领取次数
- NewGuyCardKeyDict = ReadChConfig.GetEvalChConfig("NewGuyCardKey")
- if NewGuyCardKeyDict == {} or NewGuyCardKeyDict == None:
- return curCardType, notifyMsg, dailyGetCnt
-
- # 获得卡的索引
- keyStr, cardIndex = GetCardInfo(codeStr)
-
- # 是否是新手卡或者媒体卡
- for cardType, values in NewGuyCardKeyDict.items():
-
- for key in values[Def_NCard_KeyList]:
-
- # 是否与key匹配
- if GetRealCardStr(keyStr, cardIndex, key) != codeStr:
- continue
-
- curCardType = cardType
- notifyMsg = values[Def_NCard_Notify]
- dailyGetCnt = values[Def_NCard_RepeatCnt]
- break
-
- return curCardType, notifyMsg, dailyGetCnt
-
-
-## 获得对应正确的卡号
-# @param codeStr 卡号
-# @param mark 验证key
-# @return None
-def GetRealCardStr(keyStr, cardIndex, mark):
- key = 'CJC729058'
-
- #索引字符翻倍
- markMD5 = md5.md5('wyOu' + mark).hexdigest()
- realStr = str(cardIndex) * 2 + markMD5 + key
- result = md5.md5(realStr).hexdigest()
-
- return (result[:3] + keyStr + result[-3:])
-
-
-## 获得卡号信息
-# @param codeStr 卡号
-# @return None
-def GetCardInfo(codeStr):
- xorkey = 11784950
-
- cardIndex = -1
- keyStr = ''
-
- if len(codeStr) <= 6:
- return keyStr, cardIndex
-
- # 去除加密字段
- keyStr = codeStr[3:]
- keyStr = keyStr[:-3]
-
- try:
- indexNum = int(keyStr, 16)
- except ValueError:
- return keyStr, cardIndex
-
- cardIndex = indexNum ^ xorkey
- return keyStr, cardIndex
-
-
-## 查询回复
-# @param index 索引
-# @param tick 时间戳
-# @return None
-def QueryNewGuyCardState(index, tick):
- curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
-
- # 已经使用过
- if curPlayer.GetNewGuyCardIsUsed():
- PlayerControl.NotifyCode(curPlayer, "GeRen_pan_543685")
- return
-
- dbValidTime = curPlayer.GetNewGuyCardValidTime()
- if dbValidTime != '':
- # 接口中为当前时间减传入参数时间, 结果大于0，则卡已过期
- if GameWorld.GetPastSeconds(dbValidTime) >= 0:
- PlayerControl.NotifyCode(curPlayer, "GeRen_pan_795514")
- return
-
- # 获得当前的新手卡信息
- newGuyCardStr = curPlayer.GetNewGuyCardID()
- validTime = ""
- itemInfo = None
- dailyGetCnt = 0 # 每日可重复领取次数
- isWriteEvent = False # 是否写使用事件
-
- GameWorld.DebugLog(" 新手卡使用回复：newGuyCardStr=%s" % (newGuyCardStr), curPlayer.GetPlayerID())
-
- # 判断是否为gm工具生成的新卡
- if newGuyCardStr.startswith(StoreInDBCardFlag):
- curCardType = curPlayer.GetNewGuyCardCardType()
- GameWorld.DebugLog(" GM工具生成的DB新卡 curCardType=%s" % curCardType)
- if curCardType <= 0:
- PlayerControl.NotifyCode(curPlayer, "GeRen_pan_161234")
- return
-
- # 获得物品信息
- StoreInDBCardData = ReadChConfig.GetEvalChConfig("StoreInDBCardData")
- cardTypeInfo = StoreInDBCardData.get(curCardType)
- if cardTypeInfo == None:
- return
-
- itemInfo, notifyMsg, dailyGetCnt, validTime = cardTypeInfo
-
- # 玩家已用过该类型卡
- if not dailyGetCnt and GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_Player_Dict_UseNewGuyCardState, curCardType):
- PlayerControl.NotifyCode(curPlayer, notifyMsg)
- return
-
- else:
- curCardType = curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_QueryNewGuyCardType)
- GameWorld.DebugLog(" 算法生成的卡 curCardType=%s" % (curCardType))
-
- # 获取卡的key
- newGuyCardkeyDict = ReadChConfig.GetEvalChConfig("NewGuyCardKey")
- cardTypeInfo = newGuyCardkeyDict.get(curCardType)
- if cardTypeInfo == None:
- return
-
- dailyGetCnt = cardTypeInfo[Def_NCard_RepeatCnt]
- itemInfo = cardTypeInfo[Def_NCard_ItemInfo]
- validTime = cardTypeInfo[Def_NCard_ValidTime]
- isWriteEvent = cardTypeInfo[Def_NCard_WriteEvent]
-
- if validTime != "" and GameWorld.GetPastSeconds(validTime) >= 0:
- PlayerControl.NotifyCode(curPlayer, "GeRen_pan_795514")
- return
-
- if itemInfo == None:
- GameWorld.ErrLog('QueryNewGuyCardResult-> Get new guy card item info error:None')
- return
-
- # 不可重复领取的卡, 设置改种卡已领取过
- if not dailyGetCnt:
- GameWorld.SetDictValueByBit(curPlayer, ChConfig.Def_Player_Dict_UseNewGuyCardState, curCardType, 1)
- else:
- repeatGotNumKey = ChConfig.Def_Player_Dict_UseNewGuyCardNum % curCardType
- repeatGotNum = curPlayer.NomalDictGetProperty(repeatGotNumKey)
- if repeatGotNum >= dailyGetCnt:
- PlayerControl.NotifyCode(curPlayer, "GeRen_lwh_372238")
- return
- PlayerControl.NomalDictSetProperty(curPlayer, repeatGotNumKey, repeatGotNum + 1)
-
- #给予物品
- itemID, itemCnt, isBand = itemInfo
- if not ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem]):
- #背包空间不足
- PlayerControl.NotifyCode(curPlayer, "GeRen_chenxin_676165", [IPY_GameWorld.rptItem])
- return
-
- #PlayerControl.NotifyCode(curPlayer, "ObtainRes01", [itemID, itemCnt]) # 获得物品提示
- curPlayer.SendUpdateNewGuyCardState(newGuyCardStr, True, '', curCardType, validTime) # 更改新手卡使用状态
- DoUseReport(curPlayer, newGuyCardStr, curCardType, itemID, itemCnt, isWriteEvent) # 记录玩家使用新手卡
-
- GameWorld.DebugLog(" 新手卡使用OK！newGuyCardStr=%s,curCardType=%s,dailyGetCnt=%s,itemID=%s,itemCnt=%s"
- % (newGuyCardStr, curCardType, dailyGetCnt, itemID, itemCnt))
- return
-
-
-## 使用新手卡记录汇报
-def DoUseReport(curPlayer, newGuyCardStr, curCardType, itemID, itemCnt, isWriteEvent=False):
- DataRecordPack.DR_UseNewGuyCard(curPlayer, newGuyCardStr, curCardType, itemID, itemCnt)
- #===========================================================================
- # playerName = curPlayer.GetPlayerName()
- # eventParam = "RoleID=%s,LV=%s,CreateRoleTime=%s,CardStr=%s,CardType=%s,ItemID=%s,ItemCount=%s" \
- # % (playerName, curPlayer.GetLV(), curPlayer.GetCreateRoleTime(), \
- # newGuyCardStr, curCardType, itemID, itemCnt)
- # EventReport.EventReport(5015, eventParam, curPlayer)
- #
- # if isWriteEvent:
- # itemData = GameWorld.GetGameData().GetItemByTypeID(itemID)
- # itemName = itemID if not itemData else itemData.GetName()
- # EventReport.WriteEvent_custom_events(curPlayer, EventReport.Def_Custom_Events_NewbieCard % curCardType, itemName)
- #===========================================================================
- return
-
-## 新手卡OnDay
-# @param curPlayer
-# @return
-def NewGuyCardOnday(curPlayer):
- # 算法生成的新手卡
- NewGuyCardKeyDict = ReadChConfig.GetEvalChConfig("NewGuyCardKey")
- for cardType, cardData in NewGuyCardKeyDict.items():
- if cardData[Def_NCard_RepeatCnt] <= 0:
- continue
- PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_UseNewGuyCardNum % cardType, 0)
-
- # 插入db的新手卡
- StoreInDBCardDataDict = ReadChConfig.GetEvalChConfig("StoreInDBCardData")
- for dbCardType, dbCardData in StoreInDBCardDataDict.items():
- if dbCardData[2] <= 0:
- continue
- PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_UseNewGuyCardNum % dbCardType, 0)
-
- return
-
-def OnGMTGiveMediaCardAwardItem(curPlayer, cardType, cardCode, cardState):
- '''
- GM工具发放媒体卡奖励物品, 这里只做发放奖励逻辑，卡的合法性及使用记录在媒体卡中心服务器判断
- @param cardType: 媒体卡中心服务器设置的卡类型
- @param cardCode: 媒体卡码
- @param cardState: 该玩家当前卡类型使用状态， 0 不可用，1.可用发放奖励 ，2.已被他人使用
- '''
- if cardState == 0:
- PlayerControl.NotifyCode(curPlayer, "GeRen_pan_161234")
- return
- if cardState == 2:
- PlayerControl.NotifyCode(curPlayer, "GeRen_pan_543685")
- return
-
- if cardState != 1:
- GameWorld.DebugLog("该媒体卡状态不处理: cardState=%s" % cardState)
- return
-
- if GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_Player_Dict_UseMediaCardState, cardType):
- PlayerControl.NotifyCode(curPlayer, "GeRen_admin_327925")
- return
-
- platform = GameWorld.GetPlayerPlatform(curPlayer)
- MediaCardDict = ReadChConfig.GetEvalChConfig("MediaCard")
- commMediaCardDict, platformMediaCardDict = MediaCardDict
-
- cardInfo = None
- if cardType in commMediaCardDict:
- cardInfo = commMediaCardDict[cardType]
- elif platform in platformMediaCardDict:
- curPlatformCardDict = platformMediaCardDict[platform]
- if cardType in curPlatformCardDict:
- cardInfo = curPlatformCardDict[cardType]
-
- if cardInfo == None:
- GameWorld.ErrLog("找不到该媒体卡类型配置, cardType=%s,platform=%s" % (cardType, platform))
- return
- awardItemMark, isWriteEvent = cardInfo
- MediaCardAwardItemDict = ReadChConfig.GetEvalChConfig("MediaCardAwardItem")
- if awardItemMark not in MediaCardAwardItemDict:
- GameWorld.ErrLog("找不到该媒体卡物品礼包品种库配置, cardType=%s,platform=%s,awardItemMark=%s"
- % (cardType, platform, awardItemMark))
- return
- awardItemList = MediaCardAwardItemDict[awardItemMark]
-
- packSpace = ItemCommon.GetItemPackSpace(curPlayer, IPY_GameWorld.rptItem, len(awardItemList))
- if len(awardItemList) > packSpace:
- PlayerControl.NotifyCode(curPlayer, "GeRen_chenxin_998371")
- return
-
- # 设置已使用过该类型卡, 发放奖励
- GameWorld.SetDictValueByBit(curPlayer, ChConfig.Def_Player_Dict_UseMediaCardState, cardType, 1)
-
- succGiveItemList = []
- for itemInfo in awardItemList:
- itemID, itemCount, itemBind = itemInfo[:3]
- appointID = itemInfo[3] if len(itemInfo) > 3 else 0
- setAttrDict = {ShareDefine.Def_CItemKey_AppointID:appointID}
- isOK = ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem], setAttrDict=setAttrDict)
- if isOK:
- succGiveItemList.append(itemInfo)
-
- DataRecordPack.DR_UseMediaCard(curPlayer, cardCode, cardType, succGiveItemList)
- #if isWriteEvent:
- # EventReport.WriteEvent_custom_events(curPlayer, EventReport.Def_Custom_Events_MediaCard % cardType, cardCode)
- 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 848bf14..81d6998 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.py
@@ -24,7 +24,6 @@
import PlayerGMOper
import OperControlManager
import ShareDefine
-import PlayerGameWallow
import ReadChConfig
import PlayerDienstgrad
import IpyGameDataPY
@@ -867,11 +866,8 @@
# @remarks 刷新玩家在线时间
def ProcessPlayer_OnlineTime(curPlayer, tick):
if not CommonCheckTick(curPlayer, tick, ChConfig.TYPE_Player_Tick_PlayerOnlineTime):
- return
+ return
- #处理防沉迷在线时间，
- PlayerGameWallow.DoLogic_WallowOnlineTime(curPlayer, tick)
-
return
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_AddSuccessProgress.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_AddSuccessProgress.py
deleted file mode 100644
index 5616c55..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_AddSuccessProgress.py
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#-------------------------------------------------------------------------------
-#
-#-------------------------------------------------------------------------------
-#
-##@package Player.RemoteQuery.GY_Query_AddSuccessProgress
-#
-# @todo:增加成就进度值
-# @author hxp
-# @date 2014-11-12
-# @version 1.0
-#
-# 详细描述: 增加成就进度值
-#
-#---------------------------------------------------------------------
-"""Version = 2014-11-12 20:00"""
-
-import PlayerSuccess
-import ShareDefine
-import GameWorld
-#---------------------------------------------------------------------
-
-#逻辑实现
-## 请求逻辑，添加好友成功
-# @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):
- resultList = eval(funResult)
- if len(resultList) != 3:
- return
-
- successType, addCnt, condition = resultList
- GameWorld.DebugLog("GY_Query_AddSuccessProgress DoResult successType=%s,addCnt=%s,condition=%s"
- % (successType, addCnt, condition), curPlayer.GetPlayerID())
-
- if successType not in ShareDefine.SuccessTypeList:
- return
-
- PlayerSuccess.DoAddSuccessProgress(curPlayer, successType, addCnt, condition)
- return
-
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_AllDoubleBill.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_AllDoubleBill.py
deleted file mode 100644
index 2ca0ac8..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_AllDoubleBill.py
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#
-##@package
-#
-# @todo: 渠道返利发放 - 缓存所有未领取数据
-#
-# @author: Alee
-# @date 2019-1-23 下午02:38:15
-# @version 1.0
-#
-# @note:
-#
-#---------------------------------------------------------------------
-#导入
-import GameWorld
-import ChConfig
-import PyGameData
-import json
-#---------------------------------------------------------------------
-#全局变量
-#---------------------------------------------------------------------
-#---------------------------------------------------------------------
-#逻辑实现
-## 请求逻辑
-# @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):
-
- PyGameData.g_Qudao_DoubleBill = json.loads(packCMDList[0])
- 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/Player/RemoteQuery/GY_Query_ChearUpdatePlayerName.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_ChearUpdatePlayerName.py
deleted file mode 100644
index 7ff8285..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_ChearUpdatePlayerName.py
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#
-#
-##@package GY_Query_ChearUpdatePlayerName.py
-#
-# @todo:清除记录的改名锁
-#
-# @author jiang
-# @date 2013-01-25
-# @version 1.2
-# @note:
-#
-# @change: "2013-02-01 12:00" jiang 修改不管改名结果都扣钱bug
-# @change: "2014-12-23 03:40" Alee 改名字典用内存key
-#------------------------------------------------------------------------------
-"""Version = 2014-12-23 03:40"""
-#------------------------------------------------------------------------------
-# 导入
-import GameWorld
-import ChConfig
-import UpdatePlayerName
-import ShareDefine
-#------------------------------------------------------------------------------
-
-#---------------------------------------------------------------------
-#逻辑实现
-## 请求逻辑
-# @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):
-
- result = packCMDList
-
- curFindPlayer = GameWorld.GetPlayerManager().FindPlayerByID(query_ID)
- if not curFindPlayer or curFindPlayer.IsEmpty():
- return
-
- #改名成功扣除改名消耗
- if result == ShareDefine.Def_Rename_Result_Succeed:
- UpdatePlayerName.PayUpdatePlayerNameCost(curFindPlayer)
-
- #清除改名锁
- curFindPlayer.SetDict(ChConfig.Def_Player_Dict_UpdatePlayerName, 0)
- 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/Player/RemoteQuery/GY_Query_ClientServerReceiveMsg.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_ClientServerReceiveMsg.py
deleted file mode 100644
index 9b42a4d..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_ClientServerReceiveMsg.py
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#-------------------------------------------------------------------------------
-#
-##@package Player.RemoteQuery.GY_Query_ClientServerReceiveMsg
-#
-# @todo:子服收到跨服服务器信息
-# @author hxp
-# @date 2019-01-10
-# @version 1.0
-#
-# 详细描述: 子服收到跨服服务器信息
-#
-#-------------------------------------------------------------------------------
-#"""Version = 2019-01-10 15:30"""
-#-------------------------------------------------------------------------------
-
-import GameWorld
-import ShareDefine
-import NPCCommon
-import ChPlayer
-import FBLogic
-
-#------------------------------------------------------------------------------
-
-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()
- GameWorld.Log("GY_Query_ClientServerReceiveMsg %s" % funResult, playerID)
- msgType, msgData = eval(funResult)
-
- if msgType == ShareDefine.CrossServerMsg_RebornRet:
- ChPlayer.CrossServerMsg_RebornRet(curPlayer, msgData, tick)
-
- elif msgType == ShareDefine.CrossServerMsg_CollectNPCOK:
- NPCCommon.CrossServerMsg_CollectNPCOK(curPlayer, msgData)
-
- elif msgType == ShareDefine.CrossServerMsg_NPCAttackCount:
- NPCCommon.CrossServerMsg_NPCAttackCount(curPlayer, msgData)
-
- elif msgType == ShareDefine.CrossServerMsg_FBEnd:
- mapID, lineID = msgData[:2]
- exData = msgData[2:]
- FBLogic.OnEndCrossFB(curPlayer, mapID, lineID, exData)
-
- return
-
-
-
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CreateFamilyPayMoney.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CreateFamilyPayMoney.py
deleted file mode 100644
index 91014a4..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CreateFamilyPayMoney.py
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#---------------------------------------------------------------------
-#
-#---------------------------------------------------------------------
-##@package GY_Query_CreateFamilyPayMoney
-# @todo: 建盟扣钱
-#
-# @author: xdh
-# @date 2019-06-10 12:00
-# @version 1.0
-#
-# @note: 建盟扣钱
-#---------------------------------------------------------------------
-#"""Version = 2019-06-10 12:00"""
-#---------------------------------------------------------------------
-import GameWorld
-import PlayerControl
-import ChConfig
-#---------------------------------------------------------------------
-
-## 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_CreateFamilyPayMoney funResult=%s" % funResult, playerID)
- result = eval(funResult)
-
- if len(result) !=2:
- return
-
- type_Price, price = result
- PlayerControl.PayMoney(curPlayer, type_Price, price, ChConfig.Def_Cost_CreatFamily)
- return
-
-
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CreatePlayerRoomID.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CreatePlayerRoomID.py
deleted file mode 100644
index 81a7266..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CreatePlayerRoomID.py
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#---------------------------------------------------------------------
-#
-#---------------------------------------------------------------------
-##@package GY_Query_CreatePlayerRoomID
-# @todo: 设置玩家房间ID
-#
-# @author: whx
-# @date 2012-11-08 14:30
-# @version 1.1
-#
-# @change: "2012-12-28 17:50" hyx 添加设置房间Log
-# @note:
-#---------------------------------------------------------------------
-"""Version = 2012-12-28 17:50"""
-#------------------------------------------------------------------------------
-import IPY_GameWorld
-import GameWorld
-import ChConfig
-import PlayerControl
-import ShareDefine
-#---------------------------------------------------------------------
-
-
-## 执行结果
-# @param curPlayer 发出请求的玩家
-# @param callFunName 功能名称
-# @param funResult 查询的结果
-# @param tick 当前时间
-# @return None
-# @remarks 函数详细说明.
-def DoResult(curPlayer, callFunName, funResult, tick):
- roomID = int(funResult)
-
- GameWorld.Log("SetPlayerRoomID playerID=%s, roomID=%s"%(curPlayer.GetPlayerID(), roomID))
- curPlayer.SetVsRoomId(roomID)
-
- return
-
-
-
-
-
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_DelFamilyImpeachItem.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_DelFamilyImpeachItem.py
deleted file mode 100644
index 1cff9b4..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_DelFamilyImpeachItem.py
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#---------------------------------------------------------------------
-#
-#---------------------------------------------------------------------
-##@package GY_Query_DelFamilyImpeachItem.py
-# @todo: 删除家族弹劾符
-#
-# @author: wdb
-# @date 2012-08-07 14:00
-# @version 1.0
-#
-# @note
-#---------------------------------------------------------------------
-"""Version = 2012-08-07 14:00"""
-#---------------------------------------------------------------------
-import GameWorld
-import ItemCommon
-import ChConfig
-import IPY_GameWorld
-#---------------------------------------------------------------------
-## 执行结果
-# @param curPlayer 发出请求的玩家
-# @param callFunName 功能名称
-# @param funResult 查询的结果
-# @param tick 当前时间
-# @return None
-def DoResult(curPlayer, callFunName, funResult, tick):
-#===============================================================================
-# itemPack = curPlayer.GetItemManager().GetPack(IPY_GameWorld.rptItem)
-#
-# #搜索背包查找物品
-# for i in range(0, itemPack.GetCount()):
-# curItem = itemPack.GetAt(i)
-#
-# if not ItemCommon.CheckItemCanUse(curItem):
-# continue
-#
-# if curItem.GetEffectByIndex(0).GetEffectID() != ChConfig.Def_Effect_FamilyImpeach:
-# continue
-#
-# #找到物品扣除返回
-# ItemCommon.DelItem(curPlayer, curItem, 1, True, "DelFamilyImpeachItem")
-# return
-#
-# GameWorld.ErrLog('GY_Query_DelFamilyImpeachItem, Item not found; playerID = %s'%(curPlayer.GetID()))
-#===============================================================================
- return
-
-
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_FamilyBroadcastCost.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_FamilyBroadcastCost.py
deleted file mode 100644
index 7e06553..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_FamilyBroadcastCost.py
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#
-#
-##@package GY_Query_FamilyBroadcastCost.py
-#
-# @todo:家族公告消耗
-#
-# @author xdh
-# @date 2017-08-24
-# @version 1.0
-# @note:
-#
-#------------------------------------------------------------------------------
-#"""Version = 2017-08-24 19:30"""
-#------------------------------------------------------------------------------
-import ChConfig
-import ShareDefine
-import IPY_GameWorld
-import PlayerControl
-#---------------------------------------------------------------------
-
-#逻辑实现
-## 请求逻辑
-# @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):
- costMoney = int(funResult)
- #优先使用绑玉
- costMoneyType = IPY_GameWorld.TYPE_Price_Gold_Paper if PlayerControl.HaveMoney(curPlayer, IPY_GameWorld.TYPE_Price_Gold_Paper, costMoney, False) else IPY_GameWorld.TYPE_Price_Gold_Money
- PlayerControl.PayMoney(curPlayer, costMoneyType, costMoney, ChConfig.Def_Cost_FamilyBroadcast)
- return
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_FamilyNameRefresh.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_FamilyNameRefresh.py
deleted file mode 100644
index 3829477..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_FamilyNameRefresh.py
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-
-##@package GY_Query_FamilyNameRefresh
-# 刷新家族名称
-#
-# @author mark
-# @date 2010-3-31
-# @version 1.0
-#
-# 修改时间 修改人 修改内容
-# VER = "2010-05-12 18:30" zhengyang 添加注释
-#
-# 模块详细说明
-#---------------------------------------------------------------------
-#导入
-import GameWorld
-import PlayerFamily
-import ChConfig
-#---------------------------------------------------------------------
-#全局变量
-#---------------------------------------------------------------------
-
-#---------------------------------------------------------------------
-#逻辑实现
-## 请求逻辑query_ID 是玩家ID , packCMDList是家族名字
-# @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):
-
- curFindPlayer = GameWorld.GetPlayerManager().FindPlayerByID( query_ID )
-
- if not curFindPlayer:
- GameWorld.Log( '###家族改名，查找玩家失败 = %s'%(query_ID) )
- return
- leaderID, newFamilyName = packCMDList
- if newFamilyName:
- curFindPlayer.SetFamilyName( '%s'%(newFamilyName) )
- #广播周围玩家家族改名
- curFindPlayer.Notify_FamilyNameRefresh()
-
- if leaderID == query_ID:
- #改名成功扣除改名消耗
- if newFamilyName:
- PlayerFamily.PayUpdateFamilyNameCost(curFindPlayer)
-
- #清除改名锁
- #curFindPlayer.SetDict(ChConfig.Def_Player_Dict_UpdateFamilyName, 0)
- 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/Player/RemoteQuery/GY_Query_FamilyStore.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_FamilyStore.py
deleted file mode 100644
index 7dd1370..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_FamilyStore.py
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#-------------------------------------------------------------------------------
-#
-##@package Player.RemoteQuery.GY_Query_FamilyStore
-#
-# @todo:仙盟仓库
-# @author hxp
-# @date 2017-09-09
-# @version 1.0
-#
-# 详细描述: 仙盟仓库
-#
-#-------------------------------------------------------------------------------
-#"""Version = 2017-09-08 18:30"""
-#-------------------------------------------------------------------------------
-import GameWorld
-import PlayerFamilyStore
-import ChConfig
-
-#---------------------------------------------------------------------
-#逻辑实现
-## 请求逻辑
-# @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):
-
- GameWorld.DebugLog("GY_Query_FamilyStore funResult=%s" % str(funResult))
-
- if funResult == "":
- curPlayer.SetDict(ChConfig.Def_PlayerKey_QueryFamilyStoreTick, 0)
- return
- PlayerFamilyStore.OnFamilyStoreQueryResult(curPlayer, eval(funResult))
- return
-
-
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_ForbiddenFamilyAction.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_ForbiddenFamilyAction.py
deleted file mode 100644
index 7590972..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_ForbiddenFamilyAction.py
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#---------------------------------------------------------------------
-#
-#---------------------------------------------------------------------
-##@package GY_Query_ForbiddenFamilyAction.py
-# @todo: 玩家不能参加家族活动
-#
-# @author: wdb
-# @date 2012-08-07 14:00
-# @version 1.0
-#
-# @note
-#---------------------------------------------------------------------
-"""Version = 2012-08-07 14:00"""
-#---------------------------------------------------------------------
-import GameWorld
-import PlayerFamily
-#---------------------------------------------------------------------
-## 执行结果
-# @param curPlayer 发出请求的玩家
-# @param callFunName 功能名称
-# @param funResult 查询的结果
-# @param tick 当前时间
-# @return None
-def DoResult(curPlayer, callFunName, funResult, tick):
-
- forbidFamilyAction = GameWorld.ToIntDef(funResult)
-
- # 设置玩家是否可以参加家族活动
- #PlayerFamily.SetForbidFamilyAction(curPlayer, forbidFamilyAction)
- return
-
-
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_GMTMediaCard.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_GMTMediaCard.py
deleted file mode 100644
index 50b6620..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_GMTMediaCard.py
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#-------------------------------------------------------------------------------
-#
-##@package Player.RemoteQuery.GY_Query_GMTMediaCard
-#
-# @todo:媒体卡
-# @author hxp
-# @date 2017-05-26
-# @version 1.0
-#
-# 详细描述: 媒体卡发放奖励
-#
-#-------------------------------------------------------------------------------
-#"""Version = 2017-05-26 14:00"""
-#-------------------------------------------------------------------------------
-
-#导入
-import GameWorld
-import DataRecordPack
-import PlayerNewGuyCard
-#---------------------------------------------------------------------
-#全局变量
-#---------------------------------------------------------------------
-#---------------------------------------------------------------------
-#逻辑实现
-## 请求逻辑
-# @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):
- #===========================================================================
- # curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(query_ID)
- # if not curPlayer or curPlayer.IsEmpty():
- # return
- # cardType, cardCode, cardState = packCMDList
- # GameWorld.Log("GMT_MediaCard, cardType=%s,cardCode=%s,cardState=%s"
- # % (cardType, cardCode, cardState), curPlayer.GetPlayerID())
- # PlayerNewGuyCard.OnGMTGiveMediaCardAwardItem(curPlayer, cardType, cardCode, cardState)
- # #流向, 可使用时才记录使用记录流向
- # if cardState == 1:
- # drMsg = {"cardType":cardType, "cardCode":cardCode, "cardState":cardState}
- # DataRecordPack.DR_ToolGMOperate(query_ID, curPlayer.GetPlayerName(), curPlayer.GetAccID(), 'GMT_MediaCard', drMsg)
- #===========================================================================
- 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/Player/RemoteQuery/GY_Query_GetPlayerExpRate.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_GetPlayerExpRate.py
deleted file mode 100644
index 8754927..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_GetPlayerExpRate.py
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#---------------------------------------------------------------------
-#
-#---------------------------------------------------------------------
-##@package GY_Query_GetPlayerExpRate
-# @todo: 数据库GM命令执行->获取玩家的经验倍率
-#
-# @author: panwei
-# @date 2011-07-13
-# @version 1.1
-#
-
-# @change: "2012-05-16 15:00" jiang C++修改接口GameServer_QueryPlayerByID和GameServer_QueryPlayerResult
-#---------------------------------------------------------------------
-"""Version = 2012-05-16 15:00"""
-#---------------------------------------------------------------------
-import ChConfig
-import GameWorld
-import PlayerControl
-#---------------------------------------------------------------------
-#全局变量
-#---------------------------------------------------------------------
-
-#---------------------------------------------------------------------
-## 请求逻辑
-# @param query_Type 请求类型
-# @param query_ID 请求的玩家ID
-# @param packCMDList 发包命令 [数据库GM操作索引]
-# @param tick 当前时间
-# @return None or ""
-# @remarks 函数详细说明.
-def DoLogic(query_Type, query_ID, packCMDList, tick):
- curFindPlayer = GameWorld.GetPlayerManager().FindPlayerByID(query_ID)
-
- if not curFindPlayer or curFindPlayer.IsEmpty():
- return ''
-
- gmOperIndex = packCMDList[0]
-
- sendMsg = '%s'%(PlayerControl.GetPlayerExpRate(curFindPlayer))
-
- #发送结果到GameServer
- curFindPlayer.GameServer_QueryPlayerByID(ChConfig.queryType_sqtDataServer_GMCommand, gmOperIndex,
- 'GetPlayerExpRate', sendMsg, len(sendMsg))
- 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/Player/RemoteQuery/GY_Query_GetPlayerFuncInfo.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_GetPlayerFuncInfo.py
deleted file mode 100644
index 2443bd4..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_GetPlayerFuncInfo.py
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#---------------------------------------------------------------------
-#
-#---------------------------------------------------------------------
-##@package GY_Query_GetPlayerFuncInfo
-# @todo: 提供查询玩家功能信息
-#
-# @author: xdh
-# @date 2017-07-12 12:00
-# @version 1.0
-# @note
-#---------------------------------------------------------------------
-"""Version = 2017-07-12 12:00"""
-#---------------------------------------------------------------------
-import IPY_GameWorld
-import GameWorld
-import ChConfig
-import Operate_EquipPlus
-import ItemCommon
-
-#---------------------------------------------------------------------
-
-## 请求逻辑
-# @param query_Type 请求类型
-# @param query_ID 请求的玩家ID
-# @param packCMDList 发包命令 [ ]
-# @param tick 当前时间
-# @return resultDisc
-# @remarks 函数详细说明.
-def DoLogic(query_Type, query_ID, packCMDList, tick):
- curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(query_ID)
-
- if not curPlayer or curPlayer.IsEmpty():
- return ''
- #GameWorld.Log('GY_Query_GetPlayerFuncInfo packCMDList=%s'%packCMDList)
- queryKeyStr = packCMDList[1]
-
- resultDict = {}
- queryKeyList = queryKeyStr.split('|')
- for queryKey in queryKeyList:
- if queryKey == 'herolv': #角色等级
- resultDict['herolv'] = curPlayer.GetLV()
- if queryKey == 'viplv': #vip等级
- resultDict['viplv'] = curPlayer.GetVIPLv()
- #if queryKey == 'rechargeOnce': #一次性充值钱
- # result = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_RechargeOnce_Coin)
- # resultDict['rechargeOnce'] = result
-# elif queryKey == 'horselv': #坐骑阶级
-# result = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_Horser_ClassLV, 0, ChConfig.Def_PDictType_Horse)
-# resultDict['horselv'] = result
- #elif queryKey == 'petlv': #最高的宠物阶级
- # result = curPlayer.GetDictByKey(ChConfig.Def_PDict_BillboardPetClassLV)
- # resultDict['petlv'] = result
- elif queryKey == 'officiallv': #爵位阶级
- result = curPlayer.GetOfficialRank()
- resultDict['officiallv'] = result
- #=======================================================================
- # elif queryKey == 'pluslv':
- # #全身12部位强化等级最低的一件
- # result = Operate_EquipPlus.GetMinPlusLV(curPlayer)
- # resultDict['pluslv'] = result
- #=======================================================================
- elif queryKey == 'orangeEquip':
- equipPartIndexList = ChConfig.Pack_EquipPart_CanPlusStar.get(IPY_GameWorld.rptEquip, [])
- equipPack = curPlayer.GetItemManager().GetPack(IPY_GameWorld.rptEquip)
- result = -1 #全身最低橙色装备的阶数
- for equipIndex in range(0, equipPack.GetCount()):
- #非可强化部位不处理
- if equipIndex not in equipPartIndexList:
- continue
- curEquip = equipPack.GetAt(equipIndex)
- if curEquip.IsEmpty():
- result = 0
- break
- if curEquip.GetItemColor() < ChConfig.Def_Quality_Orange:
- result = 0
- break
- equipClassLV = ItemCommon.GetItemClassLV(curEquip)
- if result == -1 or equipClassLV < result:
- result = equipClassLV
- resultDict['orangeEquip'] = result
-
-
- resultMsg = str([packCMDList[0], resultDict, 'GMT_GetPlayerFuncInfo'])
- GameWorld.GetPlayerManager().GameServer_QueryPlayerResult(0, 0, 0, 'GMToolResult',
- resultMsg, len(resultMsg))
- return ''
-
-
-
-
-
\ No newline at end of file
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_PetChangeName.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_PetChangeName.py
deleted file mode 100644
index 829f524..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_PetChangeName.py
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#
-#
-##@package GY_Query_PetChangeName
-# @todo: 宠物改名（当收到gameserver发来的结果 再确定修改 gameServer的脏字判定）
-#
-# @author: adaws
-# @date 2010-06-25
-# @version 1.0
-#
-# @note:
-#---------------------------------------------------------------------
-#导入
-#---------------------------------------------------------------------
-#全局变量
-#---------------------------------------------------------------------
-
-#---------------------------------------------------------------------
-#逻辑实现
-## 因为只是查询宠物名有没有在gameServer中的脏字列表中 所以mapServer不需要做相应的查询逻辑
-# @param query_Type 请求类型
-# @param query_ID 请求的玩家ID
-# @param packCMDList 发包命令 [ ]
-# @param tick 当前时间
-# @return 无
-# @remarks 函数详细说明.
-def DoLogic(query_Type, query_ID, recvCmd, tick):
- pass
-
-
-
-## 根据gameServer检查后的结果做相应的操作
-# @param curPlayer 发出请求的玩家
-# @param callFunName 功能名称
-# @param funResult 查询的结果
-# @param tick 当前时间
-# @return None
-# @remarks 函数详细说明. 因为只是请求能不能改名 只需要在GameServer处理 不会请求失败
-def DoResult(curPlayer, callFunName, funResult, tick):
- return
- cmdList = eval(funResult)
- petObjId = cmdList[0]
- petName = cmdList[-1]
-
- #玩家没有这个宠物了不处理
- #if not PlayerPet.CheckHavePet(curPlayer, petObjId):
- # return
-
- #在脏字列表中 这里不提示 客户端有一次过滤
- if petName == '':
- return
-
- petMgr = curPlayer.GetPetMgr()
- curPetObj = petMgr.PetList_Find(petObjId)
- petData = curPetObj.GetRolePet()
- petData.Name = petName
-
- #设结构体
- curPetObj.SetRolePet(petData)
-# GameWorld.Log('PetNameAfterChanged:'+curPetObj.GetRolePet().Name)
-
- #通知客户端
- curPetObj.Sync_PetRenameResult(petName)
- return
-
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_PlayerGetReward.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_PlayerGetReward.py
deleted file mode 100644
index 065d02b..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_PlayerGetReward.py
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#-------------------------------------------------------------------------------
-#
-#-------------------------------------------------------------------------------
-#
-##@package GY_Query_PlayerGetReward
-#
-# @todo:
-# @author whx
-# @date 2012-10-31 16:50
-# @version 1.0
-#
-#-----------------------------------------------------------------------------
-# 详细描述:
-import IPY_GameWorld
-import PlayerControl
-import ItemControler
-import DataRecordPack
-import ChConfig
-#------------------------------------------------------------------------------
-"""Version = 2012-10-31 16:50"""
-
-#逻辑实现
-## 玩家请求领取奖励
-# @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):
-
- #奖励类型, 元宝数，银两数，物品列表
- rewardType, allGoldCnt, allSilverCnt, allItemList = eval(funResult)
-
- addDataDict = {ChConfig.Def_Give_Reason_SonKey:"PlayerGetReward"}
- if allGoldCnt > 0:
- PlayerControl.GiveMoney(curPlayer, IPY_GameWorld.TYPE_Price_Gold_Money, allGoldCnt, ChConfig.Def_GiveMoney_Unknown, addDataDict)
-
- if allSilverCnt > 0:
- PlayerControl.GiveMoney(curPlayer, IPY_GameWorld.TYPE_Price_Silver_Money, allSilverCnt, ChConfig.Def_GiveMoney_Unknown, addDataDict)
-
- if not allItemList:
- return
-
- for itemID, itemCnt in allItemList:
-
- if itemID <= 0 or itemCnt <= 0:
- continue
-
- #给予物品
- isPutIn = ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0,
- [IPY_GameWorld.rptItem, IPY_GameWorld.rptAnyWhere])
- if isPutIn:
- #PlayerControl.NotifyCode(curPlayer, "ObtainRes01", [itemID, itemCnt])
- #流向
- DataRecordPack.DR_PlayerGetReward(curPlayer, rewardType, itemID, itemCnt)
-
- return
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_RewardOnLogin.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_RewardOnLogin.py
deleted file mode 100644
index f6420c5..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_RewardOnLogin.py
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#-------------------------------------------------------------------------------
-#
-#-------------------------------------------------------------------------------
-#
-##@package Player.RemoteQuery.GY_Query_RewardOnLogin
-#
-# @todo:登陆时领取离线奖励
-# @author hxp
-# @date 2015-9-21
-# @version 1.0
-#
-# 详细描述: 登陆时领取离线奖励
-#
-#---------------------------------------------------------------------
-"""Version = 2015-9-21 20:30"""
-#---------------------------------------------------------------------
-
-#import PlayerControl
-#import DataRecordPack
-#import ShareDefine
-#import GameWorld
-#import ChConfig
-
-
-#逻辑实现
-## 玩家请求领取奖励
-# @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):
-
-# rewarDict = eval(funResult) #{actionType:{rewardType:value,...}, ...}
-# GameWorld.Log("登陆时领取离线奖励 rewarDict=%s" % str(rewarDict), curPlayer.GetPlayerID())
-# if not rewarDict:
-# return
-#
-# for actionType, rewardValueDict in rewarDict.items():
-# addDataDict = {ChConfig.Def_Give_Reason_SonKey:"RewardOnLogin_%s" % actionType}
-# gongXun = rewardValueDict.get(ChConfig.Def_RewardType_GongXun, 0)
-# PlayerControl.GiveMoney(curPlayer, ShareDefine.TYPE_Price_GongXun, gongXun, ChConfig.Def_GiveMoney_Unknown, addDataDict)
-#
-# DataRecordPack.DR_PlayerGetRewardOnLogin(curPlayer, actionType, rewardValueDict)
-
- return
-
-
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_SendFriendEnergy.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_SendFriendEnergy.py
deleted file mode 100644
index cca30fc..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_SendFriendEnergy.py
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#---------------------------------------------------------------------
-#
-#---------------------------------------------------------------------
-##@package GY_Query_GetFriendSendEnergy
-# @todo: 赠送好友精力处理
-#
-# @author: xdh
-# @date 2017-03-14 11:00
-# @version 1.0
-#
-# @note: 赠送好友精力处理
-#---------------------------------------------------------------------
-#"""Version = 2017-03-14 11:00"""
-#---------------------------------------------------------------------
-import GameWorld
-import PlayerActivity
-import ShareDefine
-#---------------------------------------------------------------------
-
-## 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.Log("GY_Query_GetFriendSendEnergy funResult=%s" % funResult, playerID)
-
- #活跃度
- #PlayerActivity.AddActivityFinishCnt(curPlayer, ShareDefine.ActivityNum_SendFriendEnergy)
- return
-
-
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_SetItemDelete.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_SetItemDelete.py
deleted file mode 100644
index 7eb235a..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_SetItemDelete.py
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-
-##@package GY_Query_SetItemDelete
-# 删除一定数量物品
-#
-# @author mark
-# @date 2010-3-31
-# @version 1.3
-#
-# @change: "2012-05-16 15:00" jiang C++修改接口GameServer_QueryPlayerByID和GameServer_QueryPlayerResult
-# @change: "2012-06-27 15:30" whx 增加setCount错误oss记录
-# @change: "2012-08-10 15:00" zhangxi 修改OSS记录
-#
-#导入
-import GameWorld
-import ChConfig
-import ItemControler
-#---------------------------------------------------------------------
-"""Version = 2012-08-10 15:00"""
-#---------------------------------------------------------------------
-
-#---------------------------------------------------------------------
-#逻辑实现
-## 请求逻辑
-# @param query_Type 请求类型
-# @param query_ID 请求的玩家ID
-# @param packCMDList 发包命令 [ ]
-# @param tick 当前时间
-# @return None
-# @remarks 函数详细说明.
-def DoLogic(query_Type , query_ID , packCMDList , tick):
- curFindPlayer = GameWorld.GetPlayerManager().FindPlayerByID(query_ID)
-
- if not curFindPlayer or curFindPlayer.IsEmpty():
- return ''
-
- #参数为 背包ID，背包索引，物品GUID，物品索引, 物品数量
- #packCMDList = [packID , packIndex , itemGUID , cmdIndex , delCount]
- curItem = curFindPlayer.GetItemManager().GetPack( int( packCMDList[0] ) ).GetAt( int( packCMDList[1] ) )
-
- reslut = __DoLogic_ItemLock( curFindPlayer , curItem , str( packCMDList[2] ) , int( packCMDList[4] ) )
-
- sendMsg = '%s'%(reslut)
- curFindPlayer.GameServer_QueryPlayerByID( ChConfig.queryType_sqtDataServer_GMCommand , int( packCMDList[3] ),
- 'SetItemDelete', sendMsg, len(sendMsg) )
- return
-
-## 锁定物品
-# @param curFindPlayer 当前玩家
-# @param curItem 当前物品
-# @param itemGUID 物品guid
-# @param delCount 删除数量
-# @return None
-# @remarks 函数详细说明.
-def __DoLogic_ItemLock( curFindPlayer , curItem , itemGUID , delCount ):
- if not curItem or curItem.IsEmpty():
- return 'NoItem'
-
- curItemGUID = curItem.GetGUID()
-
- if curItemGUID != itemGUID:
- return 'NoGUID'
-
- curItemCount = curItem.GetCount()
-
- if curItemCount < delCount:
- return 'NoECount'
-
- ItemControler.SetItemCount(curItem, curItemCount - delCount,
- curFindPlayer.GetPlayerID(), curFindPlayer.GetAccID(),
- curFindPlayer.GetPlayerName())
- return 'True'
-#---------------------------------------------------------------------
-#执行结果
-## 执行结果
-# @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/Player/RemoteQuery/GY_Query_SetItemLock.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_SetItemLock.py
deleted file mode 100644
index 4fb9ab9..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_SetItemLock.py
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-
-##@package GY_Query_SetItemLock
-# 锁定物品
-#
-# @author mark
-# @date 2010-3-31
-# @version 1.1
-#
-# @change: "2012-05-16 15:00" jiang C++修改接口GameServer_QueryPlayerByID和GameServer_QueryPlayerResult
-#
-#------------------------------------------------------------------------------
-"""Version = 2012-05-16 15:00"""
-#------------------------------------------------------------------------------
-#导入
-import GameWorld
-import ChConfig
-#---------------------------------------------------------------------
-#全局变量
-#---------------------------------------------------------------------
-
-#---------------------------------------------------------------------
-#逻辑实现
-## 请求逻辑
-# @param query_Type 请求类型
-# @param query_ID 请求的玩家ID
-# @param packCMDList 发包命令 [ ]
-# @param tick 当前时间
-# @return '' or None
-# @remarks 函数详细说明.
-def DoLogic(query_Type , query_ID , packCMDList , tick):
- curFindPlayer = GameWorld.GetPlayerManager().FindPlayerByID(query_ID)
-
- if not curFindPlayer or curFindPlayer.IsEmpty():
- return ''
-
- #参数为 背包ID，背包索引，物品GUID，物品索引
- #packCMDList = [packID , packIndex , itemGUID , cmdIndex]
- curItem = curFindPlayer.GetItemManager().GetPack( int( packCMDList[0] ) ).GetAt( int( packCMDList[1] ) )
-
- reslut = __DoLogic_ItemLock( curItem , str( packCMDList[2] ) )
-
- sendMsg = '%s'%(reslut)
-
- curFindPlayer.GameServer_QueryPlayerByID( ChConfig.queryType_sqtDataServer_GMCommand ,
- int( packCMDList[3] ), 'SetItemLock', sendMsg, len(sendMsg))
- return
-
-## 锁定物品
-# @param curItem 当前物品
-# @param itemGUID 物品guid
-# @return str
-# @remarks 函数详细说明.
-def __DoLogic_ItemLock( curItem , itemGUID ):
- if not curItem or curItem.IsEmpty():
- return 'NoItem'
-
- if curItem.GetGUID() != itemGUID:
- return 'NoGUID'
-
- if curItem.GetIsLocked():
- return 'IsLocked'
-
- curItem.SetIsLocked( True )
- return 'True'
-#---------------------------------------------------------------------
-#执行结果
-## 执行结果
-# @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/Player/RemoteQuery/GY_Query_SetItemUnLock.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_SetItemUnLock.py
deleted file mode 100644
index b249611..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_SetItemUnLock.py
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-
-##@package GY_Query_SetItemUnLock
-# 解封物品
-#
-# @author mark
-# @date 2010-3-31
-# @version 1.1
-#
-# @change: "2012-05-16 15:00" jiang C++修改接口GameServer_QueryPlayerByID和GameServer_QueryPlayerResult
-#
-#------------------------------------------------------------------------------
-"""Version = 2012-05-16 15:00"""
-#------------------------------------------------------------------------------
-#导入
-import GameWorld
-import ChConfig
-#---------------------------------------------------------------------
-#全局变量
-#---------------------------------------------------------------------
-
-#---------------------------------------------------------------------
-#逻辑实现
-## 请求逻辑
-# @param query_Type 请求类型
-# @param query_ID 请求的玩家ID
-# @param packCMDList 发包命令 [ ]
-# @param tick 当前时间
-# @return "" or None
-# @remarks 函数详细说明.
-def DoLogic(query_Type , query_ID , packCMDList , tick):
- curFindPlayer = GameWorld.GetPlayerManager().FindPlayerByID(query_ID)
-
- if not curFindPlayer or curFindPlayer.IsEmpty():
- return ''
-
- #参数为 背包ID，背包索引，物品GUID，物品索引
- #packCMDList = [packID , packIndex , itemGUID , cmdIndex]
- curItem = curFindPlayer.GetItemManager().GetPack( int( packCMDList[0] ) ).GetAt( int( packCMDList[1] ) )
-
- reslut = __DoLogic_ItemLock( curItem , str( packCMDList[2] ) )
-
- sendMsg = '%s'%(reslut)
- curFindPlayer.GameServer_QueryPlayerByID( ChConfig.queryType_sqtDataServer_GMCommand ,
- int( packCMDList[3] ), 'SetItemUnLock', sendMsg, len(sendMsg))
- return
-
-## 锁定物品
-# @param curItem 当前物品
-# @param itemGUID 物品ID
-# @return str
-# @remarks 函数详细说明.
-def __DoLogic_ItemLock( curItem , itemGUID ):
- if not curItem or curItem.IsEmpty():
- return 'NoItem'
-
- if curItem.GetGUID() != itemGUID:
- return 'NoGUID'
-
- if not curItem.GetIsLocked():
- return 'IsUnLocked'
-
- curItem.SetIsLocked( False )
- return 'True'
-#---------------------------------------------------------------------
-#执行结果
-## 执行结果
-# @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/Player/RemoteQuery/GY_Query_TeamMemFuncData.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_TeamMemFuncData.py
deleted file mode 100644
index 3a0269a..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_TeamMemFuncData.py
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#-------------------------------------------------------------------------------
-#
-##@package Player.RemoteQuery.GY_Query_TeamMemFuncData
-#
-# @todo:查询队伍成员功能数据
-# @author hxp
-# @date 2017-12-17
-# @version 1.0
-#
-# 详细描述: 查询队伍成员功能数据
-#
-#-------------------------------------------------------------------------------
-#"""Version = 2017-12-17 15:00"""
-#-------------------------------------------------------------------------------
-
-#导入
-import GameWorld
-import ChConfig
-import FBCommon
-
-#---------------------------------------------------------------------
-
-
-#---------------------------------------------------------------------
-#逻辑实现
-## 请求逻辑
-# @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):
- GameWorld.Log("GY_Query_TeamMemFuncData DoLogic() query_Type=%s,query_ID=%s,packCMDList=%s,tick=%s" %
- (query_Type, query_ID, packCMDList, tick))
-
- queryFuncRet = []
- curFindPlayer = GameWorld.GetPlayerManager().FindPlayerByID(query_ID)
- if not curFindPlayer or curFindPlayer.IsEmpty():
- return packCMDList + queryFuncRet
-
- queryFuncType = packCMDList[0]
-
- # 娲皇可挑战的最高层线路ID
- if queryFuncType == 0:
- canChallengeLineID = 0
- mapID = ChConfig.Def_FBMapID_QueenRelics
- maxGrade = len(FBCommon.GetFBLineGrade(mapID, 0))
- for lineID in xrange(1, 50):
- lineIpyData = FBCommon.GetFBLineIpyData(mapID, lineID, False)
- if not lineIpyData:
- break
- preLineID = lineID - 1
- preLineGrade = GameWorld.GetDictValueByBit(curFindPlayer, ChConfig.Def_Player_Dict_PlayerFBStar_MapId, preLineID, False, [mapID])
- if preLineGrade < maxGrade:
- break
- canChallengeLineID = lineID
- queryFuncRet = [canChallengeLineID]
-
- GameWorld.DebugLog(" queryFuncRet=%s" % str(queryFuncRet))
- return packCMDList + queryFuncRet
-
-
-#执行结果
-## 执行结果
-# @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/Player/RemoteQuery/GY_Query_TransferToRebornPos.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_TransferToRebornPos.py
deleted file mode 100644
index c102940..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_TransferToRebornPos.py
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-
-##@package GY_Query_TransferToRebornPos
-# 传送到复活点
-#
-# @author mark
-# @date 2010-3-31
-# @version 1.0
-#
-# 修改时间 修改人 修改内容
-# VER = "2010-05-12 18:30" zhengyang 添加注释
-#
-# 模块详细说明
-#导入
-import GameWorld
-import PlayerControl
-#---------------------------------------------------------------------
-#全局变量
-#---------------------------------------------------------------------
-
-#---------------------------------------------------------------------
-#逻辑实现
-## 请求逻辑
-# @param query_Type 请求类型
-# @param query_ID 请求的玩家ID
-# @param packCMDList 发包命令 [ ]
-# @param tick 当前时间
-# @return '' or None
-# @remarks 函数详细说明.
-def DoLogic(query_Type , query_ID , packCMDList , tick):
- curFindPlayer = GameWorld.GetPlayerManager().FindPlayerByID(query_ID)
-
- if not curFindPlayer or curFindPlayer.IsEmpty():
- return ''
-
- playerControl = PlayerControl.PlayerControl(curFindPlayer)
- playerControl.SetToBornPlace()
-
- return
-#---------------------------------------------------------------------
-#执行结果
-## 执行结果
-# @param curPlayer 发出请求的玩家
-# @param callFunName 功能名称
-# @param funResult 查询的结果
-# @param tick 当前时间
-# @return None
-# @remarks 函数详细说明.
-def DoResult(curPlayer , callFunName , funResult , tick):
- curPlayer.GMAnswer('%s;%s'%(callFunName, funResult))
- return
\ No newline at end of file
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_TransportToOccupyCity.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_TransportToOccupyCity.py
deleted file mode 100644
index 4833248..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_TransportToOccupyCity.py
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-
-##@package GY_Query_TransportToOccupyCity
-# 传送王城
-#
-# @author mark
-# @date 2010-3-31
-# @version 1.0
-#
-# 修改时间 修改人 修改内容
-# VER = "2010-05-12 18:30" zhengyang 添加注释
-#
-# 模块详细说明
-#
-#---------------------------------------------------------------------
-#导入
-import GameWorld
-import PlayerControl
-#---------------------------------------------------------------------
-#全局变量
-LostHornor = 10
-#---------------------------------------------------------------------
-#逻辑实现
-## 请求逻辑
-# @param query_Type 请求类型
-# @param query_ID 请求的玩家ID
-# @param packCMDList 发包命令 [ ]
-# @param tick 当前时间
-# @return '' or None
-# @remarks 函数详细说明.
-def DoLogic(query_Type , query_ID , packCMDList , tick):
- curFindPlayer = GameWorld.GetPlayerManager().FindPlayerByID(query_ID)
-
- if not curFindPlayer or curFindPlayer.IsEmpty():
- return ''
-
- #packCMDList [地图ID，地图坐标X，地图坐标Y]
- familyHornor = curFindPlayer.GetFamilyHornor()
-
- if familyHornor < LostHornor:
- PlayerControl.NotifyCode( curFindPlayer, "52E28358-6933-4D40-B3B1B8C9BDC2445E" )
- return
-
- curFindPlayer.SetFamilyHornor( familyHornor - LostHornor )
-
- #FAFA412E-F590-4CDC-97B63CA1FB7C5CEC
- PlayerControl.NotifyCode( curFindPlayer, "FAFA412E-F590-4CDC-97B63CA1FB7C5CEC" , [LostHornor] )
-
- mapID = packCMDList[0]
- posX = packCMDList[1]
- posY = packCMDList[2]
-
- PlayerControl.PlayerResetWorldPosFB( curFindPlayer, mapID, posX, posY, 0)
- return
-#---------------------------------------------------------------------
-
-
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyGameData.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyGameData.py
index 400e2c3..127ea96 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyGameData.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyGameData.py
@@ -111,8 +111,6 @@
g_crossPlayerItemsChangeInfo = {} #跨服玩家物品变化信息 {playerID:{"背包类型-物品位":itemMD5, ...}, ...}
g_crossPlayerSkillsChangeInfo = {} #跨服玩家技能变化信息 {playerID:[技能ID], ...}
-g_Qudao_DoubleBill = {} # 渠道删档充值返利
-
g_crossFuncLineDataCache = {} # 动态分配的跨服虚拟分线数据缓存 {(mapID, copyMapID):funcLineDataCache, ...}
g_crossPlayerServerGroupIDInfo = {} #跨服玩家服务器组ID缓存，副本线路关闭时才释放，所以支持离线跨服玩家 {copyMapID:{playerID:serverGroupID, ...}, ...}
g_fbBuyBuffTimeDict = {} # 副本购买buff时间缓存{playerID:{moneyCnt:time}}
--
Gitblit v1.8.0