From 9d5ec7599f3abe0cebb76ce1df3c3b8c4e0aa51e Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 10 二月 2026 11:40:15 +0800
Subject: [PATCH] 66 【公会】基础主体-服务端(跨服聊天;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py |   30 ++----------------------------
 1 files changed, 2 insertions(+), 28 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..b5fde3d 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py
@@ -23,14 +23,12 @@
 import SkillShell
 import BuffSkill
 import BaseAttack
-import ChNetSendPack
 import SkillCommon
 import AttackCommon
 import ItemControler
 import ItemCommon
 import FBLogic
 import ReadChConfig
-import PetControl
 import NPCAI
 import OperControlManager
 import ShareDefine
@@ -40,25 +38,11 @@
 import DataRecordPack
 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
 import PlayerActTask
-#import PlayerZhanling
 import IpyGameDataPY
 import PlayerState
-import TurnAttack
 import PyGameData
 import GameObj
 import ChNPC
@@ -190,7 +174,7 @@
     #存一个满足要求的所有的物品的列表 然后从当中随机选一个
     #注: 阶、颜色、套装ID、职业、部位,这5个条件可确认唯一一件装备
     
-    if not PyGameData.InitPyItem:
+    if not PyGameData.g_initPyItem:
         GameWorld.ErrLog("地图还未启动好载物品!")
         return []
     
@@ -335,8 +319,7 @@
         ownerDetail = GetSummonOwnerDetel(npcObj)
         
     elif npcObjType == IPY_GameWorld.gnotPet:
-        #查找宠物主人
-        ownerDetail = PetControl.GetPetOwner(npcObj)  
+        pass
 
     return ownerDetail
 #---------------------------------------------------------------------
@@ -825,9 +808,6 @@
             
         ChNPC.OnNPCSetDead(curNPC)
         
-        if npcid == IpyGameDataPY.GetFuncCfg("CrossYaomoBoss", 1):
-            PlayerCrossYaomoBoss.OnCrossYaomoBossDead(curNPC)
-            
     # 清除队伍成员伤血列表
     AttackCommon.ClearTeamPlayerHurtValue(curNPC)
     if curNPC.GetType() == ChConfig.ntRobot:
@@ -2270,7 +2250,6 @@
     
         #宠物特殊处理
         if curNPC.GetGameNPCObjType() == IPY_GameWorld.gnotPet:
-            PetControl.RefurbishPetAttr(curNPC, canSyncClient)
             return
         
         DoNPCAttrStrengthen(curNPC, isReborn)
@@ -2508,7 +2487,6 @@
         
         #宠物死亡调用独立接口
         if curNPC_GameNPCObjType == IPY_GameWorld.gnotPet:
-            PetControl.SetPetDead(curNPC)
             return
         
         #---通用死亡逻辑---
@@ -3126,7 +3104,6 @@
         else:
             if GetNPCLV(curNPC) >= curPlayer.GetLV() - IpyGameDataPY.GetFuncCfg('DailyQuestKillMonster'):
                 PlayerActTask.AddActTaskValue(curPlayer, ChConfig.ActTaskType_KillNPC)
-        #PlayerPrestigeSys.AddRealmTaskValue(curPlayer, PlayerPrestigeSys.RealmTaskType_KillNPC, 1)
         
         if ChConfig.IsGameBoss(curNPC):
             OnPlayerKillBoss(curPlayer, npcID, mapID, False)
@@ -4067,7 +4044,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:
@@ -4097,8 +4073,6 @@
         return
     # 增加购买次数
     PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_Boss_KillCntBuyCnt%killBossMark, hasBuyCnt + 1)
-    
-    CrossPlayerData.SendMergePlayerDataNow(curPlayer)
     return
 
 #// A2 23 NPC秀结束 #tagCMNPCShowEnd

--
Gitblit v1.8.0