From 4087d18ce7cbd1578a6e287962bd902386984048 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 14 七月 2025 10:55:57 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_ServerCode
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBattle.py | 10 ----------
1 files changed, 0 insertions(+), 10 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBattle.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBattle.py
index 5feff75..4876ac8 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBattle.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBattle.py
@@ -21,11 +21,9 @@
#---------------------------------------------------------------------
import IPY_GameWorld
import GameWorld
-import NPCCommon
import PlayerControl
import PlayerState
import ChConfig
-#import PlayerGameEvent
import BaseAttack
import OperControlManager
import GameObj
@@ -109,10 +107,6 @@
# PlayerControl.NotifyCode(curPlayer, "CannotAtk05")
# return
#===========================================================================
-
- if vehicle == IPY_GameWorld.pvTruck:
- PlayerControl.NotifyCode(curPlayer, "CannotAtk06")
- return
sendPack = IPY_GameWorld.IPY_CPlayerBaseAttack()
sendPackObjID = sendPack.GetObjID()
@@ -264,10 +258,6 @@
# #判断是否敌对关系
# if relation[0] != ChConfig.Type_Relation_Enemy :
# return
-#
-# #跳舞钓鱼打断
-# if curPlayerAction == IPY_GameWorld.paGameEvent:
-# PlayerGameEvent.StopGameEvent(curPlayer, tick)
#
# #进度条打断
# elif curPlayerAction == IPY_GameWorld.paPreparing:
--
Gitblit v1.8.0