From a54fba3894b5d528bed16147f096b6a706a1fc0c Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 27 六月 2019 15:58:03 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Map/GameMap.py | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Map/GameMap.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Map/GameMap.py
index d9276f1..5168672 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Map/GameMap.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Map/GameMap.py
@@ -28,8 +28,6 @@
import ChConfig
import AttackCommon
import IPY_GameWorld
-import GameLogic_ManorWar
-import ShareDefine
#---------------------------------------------------------------------
#########################################################
#Python的pos定义
@@ -289,10 +287,6 @@
#家族区
if effectID == ChConfig.Def_AreaType_SkillID_FamilyPK:
areaType = IPY_GameWorld.gatFamilyPK
-
- ##动态开启
- #if effectID == ChConfig.Def_SkillID_ManorFlagArea and GameLogic_ManorWar.CanManorWarAtk():
- # areaType = ShareDefine.gatManor
#普通区
return areaType
--
Gitblit v1.8.0