From ab57c59ab33f5e4bf7e3bfd5514b04cb3d38dc2b Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 04 二月 2026 18:19:05 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_ServerCode

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py
index e77f12f..fcd8663 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py
@@ -41,16 +41,12 @@
 import NetPackCommon
 import FBCommon
 import PlayerPrestigeSys
-import GY_Query_BossFirstKill
 import FormulaControl
-import PlayerBossReborn
 import PlayerCrossYaomoBoss
 import PlayerActCollectWords
 import PlayerTongTianLing
 import CrossPlayerData
 import PlayerFeastWish
-import PlayerFeastTravel
-import PlayerGoldInvest
 import PlayerWeekParty
 import NPCRealmRefresh
 import PlayerActLogin
@@ -190,7 +186,7 @@
     #存一个满足要求的所有的物品的列表 然后从当中随机选一个
     #注: 阶、颜色、套装ID、职业、部位,这5个条件可确认唯一一件装备
     
-    if not PyGameData.InitPyItem:
+    if not PyGameData.g_initPyItem:
         GameWorld.ErrLog("地图还未启动好载物品!")
         return []
     
@@ -4067,7 +4063,6 @@
     if not buyTimesVIPPriID:
         return
     canBuyCnt = 0
-    canBuyCnt += PlayerGoldInvest.GetAddBossBuyCnt(curPlayer, killBossMark)
     hasBuyCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_Boss_KillCntBuyCnt%killBossMark, 0)
     playerID = curPlayer.GetPlayerID()
     if hasBuyCnt >= canBuyCnt:

--
Gitblit v1.8.0