From b7270f2676fd8e37aa05d71dcd31b9f42938b4d5 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 28 三月 2019 15:07:10 +0800
Subject: [PATCH] 6373 【后端】【2.0】删除无用功能代码、封包、配置
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.py | 1
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerBillboard.py | 9 --
/dev/null | 183 ---------------------------------------------
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMissionCollect.py | 3
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/FBDefenseCommon.py | 1
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerDataCollect.py | 3
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.py | 1
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerViewCache.py | 5 -
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PetControl.py | 1
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.py | 2
ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py | 5 -
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_AddDienstgrad.py | 4 -
12 files changed, 0 insertions(+), 218 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py
index d2f7655..9ab6681 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py
@@ -27,13 +27,10 @@
import GMCommon
import ShareDefine
#import PlayerFamilyTech
-import PlayerDataCollect
import time
import ChPyNetSendPack
import NetPackCommon
import GameDataRecord
-import GameConfig
-import ReadChConfig
import UpdatePlayerName
import GameWorldBoss
import PlayerFamilyBoss
@@ -42,11 +39,9 @@
import PlayerXMZZ
import PlayerTruck
import PlayerHorsePetBoss
-import EventReport
import PlayerCompensation
import PlayerFamilyRedPacket
#import PlayerFamilyStore
-import PyDataManager
import PlayerSocial
import PlayerFamilyParty
import PlayerSealDemon
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerBillboard.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerBillboard.py
index 6423041..57e9abd 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerBillboard.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerBillboard.py
@@ -20,10 +20,8 @@
import GameWorld
import ChConfig
import ShareDefine
-import ReadChConfig
import ChPyNetSendPack
import NetPackCommon
-import PlayerDBGSEvent
import DataRecordPack
import PlayerFamily
@@ -655,13 +653,6 @@
def IsBillboardLVLimit(playerLV, billboardType):
# 等级判断已由地图处理掉，这里不再做判断
return True
-# BillBoardLimitInfo = ReadChConfig.GetEvalChConfig("BillBoardLimit")
-# defaultMinLV, limitLVDict = BillBoardLimitInfo
-# lvBillBoardMinLV = limitLVDict.get(billboardType, defaultMinLV)
-# if playerLV < lvBillBoardMinLV:
-# return True
-#
-# return False
def RedressBillboard(curPlayer):
## 纠正排行榜中的玩家名字记录
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerDataCollect.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerDataCollect.py
index 342f011..ba4253b 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerDataCollect.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerDataCollect.py
@@ -22,9 +22,6 @@
#------------------------------------------------------------------------------
import GameWorld
import ChConfig
-import ReadChConfig
-import ShareDefine
-import PlayerControl
import IPY_GameServer
import base64
import ctypes
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerViewCache.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerViewCache.py
index 484ff38..72ccc54 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerViewCache.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerViewCache.py
@@ -19,13 +19,8 @@
#------------------------------------------------------------------------------
import GameWorld
import ChPyNetSendPack
-import IPY_PlayerDefine
-import PlayerFamilyAction
import PlayerControl
import NetPackCommon
-import ReadChConfig
-import PlayerFamily
-import IPY_GameServer
import PlayerFBHelpBattle
import IpyGameDataPY
import ShareDefine
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.py
index d70b3fb..ae42380 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.py
@@ -22,7 +22,6 @@
import PlayerControl
import NPCCommon
import ChConfig
-import ChEquip
import SkillCommon
import AttackLogic
import ItemControler
@@ -36,7 +35,6 @@
import OperControlManager
import DataRecordPack
import ChItem
-import ReadChConfig
import GameObj
import ChPyNetSendPack
import ChNetSendPack
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ClearClothesCoat.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ClearClothesCoat.py
deleted file mode 100644
index 3eecfbb..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ClearClothesCoat.py
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#-------------------------------------------------------------------------------
-#
-#-------------------------------------------------------------------------------
-#
-##@package GM.Commands.ClearClothesCoat
-#
-# @todo:重置时装
-# @author hxp
-# @date 2015-6-15
-# @version 1.0
-#
-# 详细描述: 重置时装
-#
-#---------------------------------------------------------------------
-"""Version = 2015-6-15 23:00"""
-#---------------------------------------------------------------------
-
-
-import ChConfig
-import PlayerControl
-import IPY_GameWorld
-import PlayerCoat
-import ReadChConfig
-#---------------------------------------------------------------------
-#全局变量
-#---------------------------------------------------------------------
-
-#---------------------------------------------------------------------
-#逻辑实现
-## GM命令执行入口
-# @param curPlayer 当前玩家
-# @param list 参数列表 [npcID]
-# @return None
-# @remarks 函数详细说明.
-def OnExec(curPlayer, list):
- #清除相关背包物品
-
- return
-
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetRein.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetRein.py
deleted file mode 100644
index f0bca99..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetRein.py
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#-------------------------------------------------------------------------------
-#
-#-------------------------------------------------------------------------------
-#
-##@package GM.Commands.SetRein
-#
-# @todo:设置转生
-# @author hxp
-# @date 2016-2-24
-# @version 1.0
-#
-# 详细描述: 设置转生
-#
-#---------------------------------------------------------------------
-"""Version = 2016-2-24 16:00"""
-#---------------------------------------------------------------------
-
-import ReadChConfig
-import PlayerBillboard
-import PlayerControl
-import ChConfig
-import GameWorld
-
-#逻辑实现
-## GM命令执行入口
-# @param curPlayer 当前玩家
-# @param msgList 参数列表 [classLV, starLV, exp]
-# @return None
-# @remarks 函数详细说明.
-def OnExec(curPlayer, msgList):
- #输入命令格式错误
- if len(msgList) < 1:
- return
-
- reinLV = msgList[0]
-
- Reincarnation_Condition = ReadChConfig.GetEvalChConfig("Reincarnation_Condition")
- if reinLV not in Reincarnation_Condition:
- GameWorld.DebugAnswer(curPlayer, "不存在该转生!")
- return
-
- LV = Reincarnation_Condition[reinLV][0]
- curPlayer.SetLV(LV + 1)
-
- curPlayer.SetReincarnationLv(reinLV)
- PlayerBillboard.UpdatePlayerBillboardOnLeaveServer(curPlayer)
- #同时重置奖励
- PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_Reinc_AwardRecord, 0)
- return
-
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_AddDienstgrad.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_AddDienstgrad.py
index 3235d3d..d7bee61 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_AddDienstgrad.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_AddDienstgrad.py
@@ -18,11 +18,7 @@
#---------------------------------------------------------------------
#导入
import ChConfig
-import PlayerControl
-import GameWorld
import ItemCommon
-import ReadChConfig
-import DataRecordPack
import PlayerDienstgrad
#---------------------------------------------------------------------
#全局变量
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/FBDefenseCommon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/FBDefenseCommon.py
index 07c967b..367ed38 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/FBDefenseCommon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/FBDefenseCommon.py
@@ -33,7 +33,6 @@
import GameWorld
import NPCCommon
import IPY_GameWorld
-import OperControlManager
import BaseAttack
import ChConfig
import ReadChConfig
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PetControl.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PetControl.py
index f042785..0e72461 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PetControl.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PetControl.py
@@ -28,7 +28,6 @@
import IPY_GameWorld
import ChConfig
import GameWorld
-import ReadChConfig
import BuffSkill
import SkillShell
import PlayerPet
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMissionCollect.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMissionCollect.py
index 92ba2ba..94485a4 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMissionCollect.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMissionCollect.py
@@ -29,10 +29,7 @@
import PlayerControl
import OperControlManager
import NPCCommon
-import FBLogic
import AttackCommon
-import ReadChConfig
-import PlayerState
import GameObj
#---------------------------------------------------------------------
'''Version = 2010-09-16 09:55'''
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PythonData.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PythonData.py
deleted file mode 100644
index 763ad11..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PythonData.py
+++ /dev/null
@@ -1,183 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#-------------------------------------------------------------------------------
-#
-#-------------------------------------------------------------------------------
-#
-##@package PythonData
-#
-# @todo:PY读表器
-# @author hxp
-# @date 2016-01-26
-# @version 1.0
-#
-# 详细描述: PY读表器
-#
-#---------------------------------------------------------------------
-"""Version = 2016-01-26 15:00"""
-#---------------------------------------------------------------------
-#导入
-import GameWorld
-import ChConfig
-
-import copy
-import os
-#---------------------------------------------------------------------
-#全局变量
-
-FIELD_LINE = 1 #标出字段名的行号
-EFFECT_START_LINE = 3 #有效内容起始行号ugOutput(str(info))
-
-## 读表类
-#
-# 读取表数据，支持各种接口查询表数据，接口在模块末尾有注释
-class FileData:
-
- ## 读取指定的表的内容并保存起来
- # @param 参数
- # @return 返回值
- # @remarks 函数详细说明：
- def __init__(self, filePath, filedLine=FIELD_LINE, StartLine=EFFECT_START_LINE):
- self.fieldList = [] #字段名列表
- self.lineCount = 0 #总有效行数
- self.contentList = [] #内容列表
-
- #动态设置起始行和字段行
- self.fieldLine = filedLine
- self.effectStartLine = StartLine
- self.filePath = filePath
- self.__CreateContent(self.__OpenFileData(filePath))
- return
-
- ## 读取数据
- # @param filePath: 文件
- # @return 文件内容
- def __OpenFileData(self, filePath):
- curPath = ChConfig.GetAppPath() + "\\" + filePath
-
- if not os.path.isfile(curPath):
- GameWorld.ErrLog('未发现目标文件 = %s,%s' % (filePath , curPath))
- raise Exception ('未发现目标文件 = %s,%s' % (filePath , curPath))
-
- # 以二进制读取
- fileObj = open(curPath, 'rb')
- strMsg = fileObj.read()
- fileObj.close()
- return strMsg
-
-
- ## 生成内容字典
- # @param 参数
- # @return 返回值
- # @remarks 函数详细说明：读文本内容转化成行字典的列表
- def __CreateContent(self, content):
- infoList = content.split('\r\n') #拆分行
- for i in range(len(infoList)):
- info = infoList[i]
- if not info:
- continue
-
- rowList = info.split('\t') #行列表，每一行
-
- #字段名所在行
- if i == self.fieldLine:
- self.fieldList = rowList[:] #字段列表
- #有效内容行
- if i >= self.effectStartLine:
- #行内容列数小于字段名个数
- if len(rowList) != len(self.fieldList):
- GameWorld.ErrLog("%s 内容数与字段数不相等, line=%s" % (self.filePath, i + 1))
- raise Exception ("%s 内容数与字段数不相等, line=%s" % (self.filePath, i + 1))
-
- rowDic = {} #行字典
- for j in range(len(self.fieldList)):
- if rowList[j] == '-':
- rowDic[self.fieldList[j]] = ''
- else:
- rowDic[self.fieldList[j]] = rowList[j]
- self.contentList.append(rowDic) #添加内容列表
-
- self.lineCount = len(self.contentList)
- GameWorld.Log("加载PY表数据: %s, 内容条数=%s" % (self.filePath, self.lineCount))
- return
-
- #================================================================================
-
- ## 通过字典查询
- # @param 参数
- # @return 符合条件的行列表
- # @remarks 函数详细说明：通过字典查询可以包含多个查询条件
- def GetRecordByDic(self, searchDic, getRecordCnt=0):
- resultList = [] #结果列表
-
- #传入的参数不是字典
- if type(searchDic) != type({}):
- return resultList
-
- count = self.GetRecordCount()
- #遍历内容列表
- for i in range(count):
- rowDic = self.contentList[i] #行字典
-
- isCorrectResult = True
- for key in searchDic:
- #行字典里无查询字典中的键
- if key not in rowDic:
- return []
- #查询字段的值不符
- if searchDic[key] != rowDic[key]:
- isCorrectResult = False
- break
-
- #本行符合查询条件
- if isCorrectResult:
- resultList.append(rowDic)
- if getRecordCnt > 0 and len(resultList) >= getRecordCnt:
- break
-
- # 返回结果进行深拷贝，防止基表数据被修改
- return copy.deepcopy(resultList)
-
- ## 通过某个字段查询
- # @param 参数
- # @return 符合条件的行列表
- # @remarks 函数详细说明：通过某个字段的值为多少进行的查询
- def GetRecord(self, fieldName, value, getRecordCnt=0):
- return self.GetRecordByDic({fieldName:str(value)}, getRecordCnt)
-
- ## 返回有效内容条数
- # @param 参数
- # @return 条数
- # @remarks 函数详细说明：
- def GetRecordCount(self):
- return self.lineCount
-
- ## 通过索引返回内容
- # @param 参数
- # @return 返回值
- # @remarks 函数详细说明：
- def GetRecordByIndex(self, index):
- # 返回结果进行深拷贝，防止基表数据被修改
- return copy.deepcopy(self.contentList[index])
-
-#----------------------------接口使用说明-------------------------------
-#接口：GetRecordByDic（searchDic） 通过一个字典查询数据
-# 参数：一个查询字典 如：{'FrmName':'frmIndividualRankEx','FunctionID':'2'} 字典字典可任意添加查询字段 'TwoValue':'0'
-# 返回值：符合条件的列表，列表里是符合条件的每行字典
-# 使用： GameRank = FileData()
-# list = GameRank.GetRecordByDic({'FrmName':'frmIndividualRankEx','FunctionID':'2'})
-# dic = list[0]
-# id = dic['FunctionID']
-
-#接口：GetRecord（fieldName,value） 通过字段名和该字段的值查询
-# 参数：字段名，字段值 如：'FrmName','frmIndividualRankEx'
-# 返回值：符合条件的列表，列表里是符合条件的每行字典
-# 使用： obj.GetRecord('FrmName','frmIndividualRankEx')[0]['Remark']
-#
-#接口：GetRecordCount（） 取得有效内容条数
-# 返回值：int 内容条数
-#
-#接口：GetRecordByIndex（index） 通过索引返回内容
-# 参数：int 索引
-# 返回值：该索引行的字典
-# 使用： obj.GetRecordByIndex(0)['Remark']
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.py
index 3c3f3ae..af042e5 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.py
@@ -18,7 +18,6 @@
import GameBuffs
import ChConfig
import FBLogic
-import ReadChConfig
import SkillShell
import PassiveBuffEffMng
import ChNetSendPack
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.py
index 116989f..6362eda 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.py
@@ -21,7 +21,6 @@
#导入
import IPY_GameWorld
-import ReadChConfig
import PassiveBuff
import GameWorld
import ChConfig
--
Gitblit v1.8.0