From ac36bdcfa7db1557790a5b912c3248b22625841f Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期三, 26 十一月 2025 18:49:17 +0800
Subject: [PATCH] Merge branch 'master' of http://mobile.secondworld.net.cn:10010/r/Project_SG_ServerCode

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

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.py
index 5ade292..d4335a8 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.py
@@ -22,7 +22,6 @@
 import ChPyNetSendPack
 import CrossRealmPlayer
 import PlayerTongTianLing
-import FunctionNPCCommon
 import DataRecordPack
 import PlayerWeekParty
 import IPY_GameWorld
@@ -185,7 +184,7 @@
     SyncCrossRealmPKAwardState(curPlayer)
     
     # 重置商店物品
-    FunctionNPCCommon.ShopItemOnCrossPKSeasonChange(curPlayer)
+    #FunctionNPCCommon.ShopItemOnCrossPKSeasonChange(curPlayer)
     return True
 
 #// C1 01 跨服PK匹配 #tagCMCrossRealmPKMatch

--
Gitblit v1.8.0