From f1c2ac9588321aad9e075c1440b52eb155b8ba18 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 29 十一月 2024 11:37:24 +0800
Subject: [PATCH] 10263 【越南】【英文】后端支持NPC仿真实玩家战斗和快速战斗

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFB.py |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFB.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFB.py
index c6b3359..20217e6 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFB.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFB.py
@@ -38,6 +38,7 @@
 import ShareDefine
 import GameFuncComm
 import FBHelpBattle
+import MirrorAttack
 import SkillShell
 import PyGameData
 import PetControl
@@ -496,7 +497,7 @@
                           % (curMapID, curLineID), playerID)
             result = 0
         StartCustomSceneResult(curPlayer, mapID, lineID, result)
-        return
+        return result
     
     #进入副本通用检查
     if mapID:
@@ -504,7 +505,7 @@
         fbLineIpyData = FBCommon.GetFBLineIpyData(mapID, lineID)
         if PlayerControl.CheckMoveToFB(curPlayer, mapID, lineID, fbIpyData, fbLineIpyData, tick) != ShareDefine.EntFBAskRet_OK:
             StartCustomSceneResult(curPlayer, mapID, lineID, 0)
-            return
+            return 0
     
     PlayerControl.SetPlayerSightLevel(curPlayer, curPlayer.GetID())
         
@@ -512,6 +513,7 @@
     curPlayer.SetDict(ChConfig.Def_PlayerKey_ClientCustomSceneStepTick, tick)
     PlayerControl.SetCustomMap(curPlayer, mapID, lineID)
     NPCCommon.ClearPriWoodPile(curPlayer)
+    MirrorAttack.ClearMirrorBattleByPlayer(curPlayer)
     GameWorld.Log("玩家开始自定义场景!mapID=%s,lineID=%s" % (mapID, lineID), playerID)
     if mapID:
         #PetControl.DoLogic_PetLoadMapOK(curPlayer)
@@ -523,7 +525,7 @@
         
     #通知进入状态
     StartCustomSceneResult(curPlayer, mapID, lineID, 1)
-    return
+    return 1
 
 def StartCustomSceneResult(curPlayer, mapID, lineID, result):
     if result != 1:
@@ -547,6 +549,7 @@
     if mapID and FBCommon.GetCustomMapStep(curPlayer, mapID, lineID) != ChConfig.CustomMapStep_Over:
         FBCommon.SetCustomMapStep(curPlayer, mapID, lineID, ChConfig.CustomMapStep_Over)
     NPCCommon.ClearPriWoodPile(curPlayer)
+    MirrorAttack.ClearMirrorBattleByPlayer(curPlayer)
     
     #默认回满血
     if GameObj.GetHP(curPlayer) > 0 and curPlayer.GetPlayerAction() != IPY_GameWorld.paDie and GameObj.GetHP(curPlayer) < GameObj.GetMaxHP(curPlayer):

--
Gitblit v1.8.0