From 14b330f7dd90ab09f2a7a00c2bcf3a8008e0abd3 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 19 八月 2025 16:13:06 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(删除4012效果)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py |  236 ++++++++++++++++++++++------------------------------------
 1 files changed, 89 insertions(+), 147 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
index 12eae96..a88b907 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
@@ -38,7 +38,6 @@
 import PlayerGameWallow
 import NetPackCommon
 import ChPyNetSendPack
-import Operate_PlayerBuyZhenQi
 import DataRecordPack
 import PlayerBillboard
 import UpdatePlayerName
@@ -51,21 +50,17 @@
 import PlayerFamily
 import PlayerLoginDayAward
 import PlayerGodWeapon
-import PlayerWorldAverageLv
 import PlayerGoldInvest
 import PlayerActivity
 import FBCommon
 import BossHurtMng
 import PlayerWishingWell
-import PlayerAttrFruit
 import PlayerSuccess
 import PlayerDienstgrad
 import PlayerFreeGoods
 import PlayerRecover
-import GameLogic_IceLode
 import GameLogic_SkyTower
 import PlayerEquipDecompose
-import PlayerGreatMaster
 import PlayerGatherSoul
 import PlayerGatherTheSoul
 import PlayerFairyDomain
@@ -175,6 +170,8 @@
 import PyMongoMain
 import PlayerTalk
 import PlayerHero
+import PlayerOnline
+import TurnAttack
 
 import datetime
 import time
@@ -198,6 +195,7 @@
 #@return 返回值无意义
 #@remarks 玩家登陆游戏初始化
 def InitLoginPlayer(curPlayer, tick):
+    PlayerOnline.OnPlayerLogin(curPlayer)
     #初始化玩家的时钟个数
     if curPlayer.GetTickTypeCount() == 0:
         curPlayer.SetTickTypeCount(ChConfig.TYPE_Player_Tick_Count)
@@ -481,8 +479,6 @@
     curPlayer.SetLoginTime(GameWorld.GetCurrentDataTimeStr())
     #初始化玩家背包
     InitPlayerPack(curPlayer)
-    #通知玩家物品信息
-    __Sync_PackDetel(curPlayer)
     
     if GameWorld.IsCrossServer():
         SkillCommon.PlayerLoginMergeServerSkillLogic(curPlayer, tick)
@@ -508,7 +504,10 @@
         # 离线过久恢复为非跨服状态
         if PlayerControl.GetCrossMapID(curPlayer):
             PlayerControl.SetCrossMapID(curPlayer, 0)
-        
+            
+    __FirstLoginOnEnter(curPlayer)
+    
+    TurnAttack.OnPlayerLogin(curPlayer)
     SyncGuideState(curPlayer)
     
     #上线检查一次装备属性
@@ -530,9 +529,6 @@
     #通知玩家的buff
     __Sync_ClientBuff(curPlayer)
     
-    #初始化现实时间物品
-    InitRealityTimeItem(curPlayer, tick)
-    
     #---刷新了玩家属性, 登陆只刷新一次,其他地方不用刷
     DoPlayerLoginInMap(curPlayer, tick)
     
@@ -543,8 +539,6 @@
     PlayerPrestigeSys.OnLogin(curPlayer)
     #DataRecordPack.DR_PlayerLogin(curPlayer)
     EventReport.WriteEvent_login(curPlayer)
-    
-    __FirstLoginOnEnter(curPlayer)
     
     # 合服首登处理
     __DoMixServerFirstLogin(curPlayer)
@@ -561,12 +555,6 @@
     
     #PK模式
     SyncPKModel(curPlayer)
-        
-    #装备相关信息
-    ChEquip.OnPlayerEquipLoginLogic(curPlayer)
-    
-    #大师
-    PlayerGreatMaster.MasterOnLogin(curPlayer)
     
     #通知VIP
     PlayerVip.DoOnLogin(curPlayer, tick)
@@ -577,9 +565,6 @@
     #---玩家上线, 宠物逻辑处理---
     PetControl.DoLogic_PetInfo_OnLogin(curPlayer, tick)
     PlayerPet.OnPlayerPetLogin(curPlayer)
-    
-    #清空玩家万能背包中的任务物品
-    ItemControler.ClearPackEventItem(curPlayer, IPY_GameWorld.rptAnyWhere)
     
     #PlayerLoginNotify(curPlayer, tick)
     
@@ -593,9 +578,6 @@
     # 首充/天天首充/充值豪礼
     PlayerGoldGift.OnLogin(curPlayer)
     
-    #通知购买功能中各购买类型的已购买和可购买次数
-    Operate_PlayerBuyZhenQi.DoPlayerLogin(curPlayer)
-#    
 #    #通知功能首次触发情况
     GameFuncComm.Sync_FuncOpenState(curPlayer)
 #    
@@ -645,14 +627,8 @@
     # 副本进入时间
     FBCommon.FBOnLogin(curPlayer)
     
-    #世界等级
-    PlayerWorldAverageLv.OnLogin(curPlayer)
-    
     # 投资理财
     PlayerGoldInvest.OnLogin(curPlayer)
-    
-    #属性果实使用情况
-    PlayerAttrFruit.AttrFruitOnLogin(curPlayer)
     
     #成就
     PlayerSuccess.SuccOnLogin(curPlayer)
@@ -926,19 +902,19 @@
     
     #---补满血满魔---
     GameObj.SetHP(curPlayer, GameObj.GetMaxHP(curPlayer))
-    curPlayer.SetMP(curPlayer.GetMaxMP())
+    #curPlayer.SetMP(curPlayer.GetMaxMP())
     
     #默认触发一次功能开启
     if curPlayer.GetLV() == 1:
         GameFuncComm.DoFuncOpenLogic(curPlayer)
         
     #初始化组队状态
-    autoJoinReqCheck = IpyGameDataPY.GetFuncCfg("TeamCheckSet", 1)
-    autoInviteCheck = IpyGameDataPY.GetFuncCfg("TeamCheckSet", 2)
-    PlayerControl.SetTeamCheckStateEx(curPlayer, int(not autoJoinReqCheck), int(not autoInviteCheck))
+    #autoJoinReqCheck = IpyGameDataPY.GetFuncCfg("TeamCheckSet", 1)
+    #autoInviteCheck = IpyGameDataPY.GetFuncCfg("TeamCheckSet", 2)
+    #PlayerControl.SetTeamCheckStateEx(curPlayer, int(not autoJoinReqCheck), int(not autoInviteCheck))
     
     #玩家默认恶名值
-    curPlayer.SetInfamyValue(ChConfig.Def_FirstLogin_InfamyValue)
+    #curPlayer.SetInfamyValue(ChConfig.Def_FirstLogin_InfamyValue)
     
     #curPlayer.SetDict("ThunderLogin", 1)
     #记录第一次登陆
@@ -949,6 +925,8 @@
     for mailTypeKey, mailItemList in mailList:
         PlayerControl.SendMailByKey(mailTypeKey, [curPlayer.GetPlayerID()], mailItemList)
         
+    PlayerHero.OnPlayerFirstLogin(curPlayer)
+    
     PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_FirstLogin, 1)
     return
 
@@ -1095,18 +1073,6 @@
         rolePack = itemManager.GetPack(packIndex)
         rolePack.Sync_Refresh()
         
-        # 刷下装备评分,仓库可以暂不处理,取出装备后登录触发刷新
-        for i in xrange(rolePack.GetCount()):
-            curItem = rolePack.GetAt(i)
-            if curItem.IsEmpty():
-                continue
-            newScore = ItemCommon.CalcEquipGS(curItem)
-            hisScore = ItemCommon.GetEquipGearScore(curItem)
-            if hisScore != newScore:
-                ItemCommon.SetEquipGearScore(curItem, newScore)
-                GameWorld.Log("登录更新装备评分: packType=%s,i=%s,hisScore=%s,newScore=%s,itemID=%s,guid=%s" 
-                              % (packIndex, i, hisScore, newScore, curItem.GetItemTypeID(), curItem.GetGUID()), curPlayer.GetPlayerID())
-                
     for packIndex in ChConfig.Def_VPackCnt_Dict.keys():
         ItemControler.Sync_VPackItem_Refresh(curPlayer, packIndex)
         
@@ -1137,16 +1103,6 @@
 #    #itemManager.GetPack(IPY_GameWorld.rptBreakPrepare).Sync_Refresh()
 #    #itemManager.GetPack(IPY_GameWorld.rptBreakItem).Sync_Refresh()
 #===============================================================================
-    return
-
-#---------------------------------------------------------------------
-##初始化现实时间物品
-#@param curPlayer 玩家实例
-#@param tick 时间戳
-#@return 返回值无意义
-#@remarks 初始化现实时间物品
-def InitRealityTimeItem(curPlayer, tick):
-    PlayerState.ProcessTimeEquip(curPlayer, tick)
     return
 
 #---------------------------------------------------------------------
@@ -1268,25 +1224,29 @@
     if GameWorld.GetMap().GetMapFBType() != IPY_GameWorld.fbtNull:
         #副本地图上线切换才加无敌buff
         SkillCommon.AddBuffBySkillType_NoRefurbish(curPlayer, ChConfig.Def_SkillID_LimitSuperBuff, tick)
-            
-    #刷新玩家的视野
-    if not GameWorld.IsCrossServer() and (PlayerControl.GetCrossMapID(curPlayer) or PlayerControl.GetCustomMapID(curPlayer)):
-        GameWorld.DebugLog("===登录本服地图时,处于跨服或自定义场景状态,不刷新视野!", curPlayer.GetPlayerID())
+        
+    #卡牌改为0视野            
+    if curPlayer.GetSightLevel() != curPlayer.GetID():
         PlayerControl.SetPlayerSightLevel(curPlayer, curPlayer.GetID())
-    elif not GameWorld.IsCrossServer():
-        realmDifficulty = PlayerControl.GetMapRealmDifficulty(curPlayer)
-        if realmDifficulty:
-            GameWorld.DebugLog("===登录本服地图时,处于境界难度地图,自动设置难度! realmDifficulty=%s" % realmDifficulty, curPlayer.GetPlayerID())
-            PlayerControl.SetRealmDifficulty(curPlayer, realmDifficulty)
-            
+    if curPlayer.GetSight() != 0:
+        PlayerControl.SetSight(curPlayer, 0)
+    #刷新玩家的视野
+    #if not GameWorld.IsCrossServer() and (PlayerControl.GetCrossMapID(curPlayer) or PlayerControl.GetCustomMapID(curPlayer)):
+    #    GameWorld.DebugLog("===登录本服地图时,处于跨服或自定义场景状态,不刷新视野!", curPlayer.GetPlayerID())
+    #    PlayerControl.SetPlayerSightLevel(curPlayer, curPlayer.GetID())
+    #elif not GameWorld.IsCrossServer():
+    #    realmDifficulty = PlayerControl.GetMapRealmDifficulty(curPlayer)
+    #    if realmDifficulty:
+    #        GameWorld.DebugLog("===登录本服地图时,处于境界难度地图,自动设置难度! realmDifficulty=%s" % realmDifficulty, curPlayer.GetPlayerID())
+    #        PlayerControl.SetRealmDifficulty(curPlayer, realmDifficulty)
+    
     PlayerState.ChangePlayerSigh(curPlayer, tick)
     
     if GameWorld.IsCrossServer():
         curPlayer.SetForbiddenSyncClientState(False)
         
-    playerControl = PlayerControl.PlayerControl(curPlayer)
-    #刷新所有状态
-    playerControl.ReCalcAllState()
+    olPlayer = PlayerOnline.GetOnlinePlayer(curPlayer)
+    olPlayer.ReCalcAllAttr()
     
     if GameWorld.IsCrossServer():
         curPlayer.SetForbiddenSyncClientState(True)
@@ -1472,57 +1432,63 @@
 #@return 返回值无意义
 #@remarks 初始化玩家背包
 def InitPlayerPack(curPlayer) :
-    itemManager = curPlayer.GetItemManager()
+    
+    #设置装备实际个数,默认最大个数
+    PlayerControl.Init_PackCount(curPlayer, IPY_GameWorld.rptEquip, defaultMax=True, isSync=False)
     
     #初始化玩家背包
-    PlayerControl.Init_ItemPack(curPlayer)
+    PlayerControl.Init_PackCount(curPlayer, IPY_GameWorld.rptItem)
     
     #初始化玩家仓库
-    PlayerControl.Init_Warehouse(curPlayer)
+    #PlayerControl.Init_Warehouse(curPlayer)
     
-    #初始化寻宝背包
-    PlayerControl.Init_TreasurePack(curPlayer)
+    #初始化鉴定背包,默认最大个数用于存放主线掉落
+    PlayerControl.Init_PackCount(curPlayer, IPY_GameWorld.rptIdentify, defaultMax=True)
     
     #初始化英雄背包
-    PlayerControl.Init_HeroPack(curPlayer)
+    PlayerControl.Init_PackCount(curPlayer, ShareDefine.rptHero)
+    
+    #初始化临时交换背包,默认最大个数
+    PlayerControl.Init_PackCount(curPlayer, ShareDefine.rptTempSwap, defaultMax=True, isSync=False)
+    
+    #初始化临时存放背包,默认最大个数
+    PlayerControl.Init_PackCount(curPlayer, ShareDefine.rptTempItem, defaultMax=True, isSync=False)
+    
+    #初始化寻宝背包
+    PlayerControl.Init_PackCount(curPlayer, ShareDefine.rptTreasure)
     
     #初始化神兽物品背包
-    curPack = curPlayer.GetItemManager().GetPack(ShareDefine.rptDogzItem)
-    curPack.SetCount(ItemCommon.GetPackInitCount(ShareDefine.rptDogzItem))
-    curPack.Sync_PackCanUseCount()
+    #curPack = curPlayer.GetItemManager().GetPack(ShareDefine.rptDogzItem)
+    #curPack.SetCount(ItemCommon.GetPackInitCount(ShareDefine.rptDogzItem))
+    #curPack.Sync_PackCanUseCount()
     #初始化神兽装备背包
-    curPack = curPlayer.GetItemManager().GetPack(ShareDefine.rptDogzEquip)
-    curPack.SetCount(ItemCommon.GetPackInitCount(ShareDefine.rptDogzEquip))
-    curPack.Sync_PackCanUseCount()
+    #curPack = curPlayer.GetItemManager().GetPack(ShareDefine.rptDogzEquip)
+    #curPack.SetCount(ItemCommon.GetPackInitCount(ShareDefine.rptDogzEquip))
+    #curPack.Sync_PackCanUseCount()
     #初始化垃圾分类背包
-    curPack = itemManager.GetPack(ShareDefine.rptGarbage)
-    curPack.SetCount(ItemCommon.GetPackInitCount(ShareDefine.rptGarbage))
-    curPack.Sync_PackCanUseCount()
-    
-    #初始化临时交换背包
-    curPack = itemManager.GetPack(ShareDefine.rptTempSwap)
-    curPack.SetCount(ChConfig.Def_PackCnt_TempSwap)
-    
-    #初始化临时存放背包
-    curPack = itemManager.GetPack(ShareDefine.rptTempItem)
-    curPack.SetCount(ChConfig.Def_PackCnt_TempItem)
-
-    #设置装备实际个数
-    curPack = itemManager.GetPack(IPY_GameWorld.rptEquip)
-    curPack.SetCount(ItemCommon.GetPackInitCount(IPY_GameWorld.rptEquip))
+    #curPack = itemManager.GetPack(ShareDefine.rptGarbage)
+    #curPack.SetCount(ItemCommon.GetPackInitCount(ShareDefine.rptGarbage))
+    #curPack.Sync_PackCanUseCount()
     
     #初始化垃圾桶
     #curPack = itemManager.GetPack(IPY_GameWorld.rptRecycle)
     #curPack.SetCount(ChConfig.Def_PackCnt_Recycle)
         
     #初始化万能背包
-    curPack = itemManager.GetPack(IPY_GameWorld.rptAnyWhere)
-    curPack.SetCount(IPY_GameWorld.Def_AnyWherePackCount)
+    #curPack = itemManager.GetPack(IPY_GameWorld.rptAnyWhere)
+    #curPack.SetCount(IPY_GameWorld.Def_AnyWherePackCount)
 
     #初始化宠物背包
-    curPack = itemManager.GetPack(ShareDefine.rptPet)
-    curPack.SetCount(ItemCommon.GetPackInitCount(ShareDefine.rptPet))
+    #curPack = itemManager.GetPack(ShareDefine.rptPet)
+    #curPack.SetCount(ItemCommon.GetPackInitCount(ShareDefine.rptPet))
     #curPack.Sync_PackCanUseCount()
+    
+    ItemCommon.SyncPackBuyCnt(curPlayer)
+    
+    #通知玩家物品信息
+    __Sync_PackDetel(curPlayer)
+    
+    ItemControler.CheckGiveBindMoneyTypeItem(curPlayer)
     return
 
 #---------------------------------------------------------------------
@@ -1611,16 +1577,21 @@
     #将玩家放置在这个地图上
     curPlayer.InitPos(curPlayer.GetPosX(), curPlayer.GetPosY())
     
-    #刷新自己的视野
-    if not GameWorld.IsCrossServer() and (PlayerControl.GetCrossMapID(curPlayer) or curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_ClientCustomScene)):
-        GameWorld.DebugLog("===本服LoadMapOK时玩家处于跨服或自定义场景状态,不设置可见!", curPlayer.GetPlayerID())
+    #卡牌改为0视野
+    if curPlayer.GetSightLevel() != curPlayer.GetID():
         PlayerControl.SetPlayerSightLevel(curPlayer, curPlayer.GetID())
-    elif not GameWorld.IsCrossServer():
-        realmDifficulty = PlayerControl.GetMapRealmDifficulty(curPlayer)
-        if realmDifficulty:
-            GameWorld.DebugLog("===本服LoadMapOK时玩家处于境界难度地图,自动设置难度!realmDifficulty=%s" % realmDifficulty, curPlayer.GetPlayerID())
-            PlayerControl.SetRealmDifficulty(curPlayer, realmDifficulty)
-            
+    if curPlayer.GetSight() != 0:
+        PlayerControl.SetSight(curPlayer, 0)
+    #刷新自己的视野
+    #if not GameWorld.IsCrossServer() and (PlayerControl.GetCrossMapID(curPlayer) or curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_ClientCustomScene)):
+    #    GameWorld.DebugLog("===本服LoadMapOK时玩家处于跨服或自定义场景状态,不设置可见!", curPlayer.GetPlayerID())
+    #    PlayerControl.SetPlayerSightLevel(curPlayer, curPlayer.GetID())
+    #elif not GameWorld.IsCrossServer():
+    #    realmDifficulty = PlayerControl.GetMapRealmDifficulty(curPlayer)
+    #    if realmDifficulty:
+    #        GameWorld.DebugLog("===本服LoadMapOK时玩家处于境界难度地图,自动设置难度!realmDifficulty=%s" % realmDifficulty, curPlayer.GetPlayerID())
+    #        PlayerControl.SetRealmDifficulty(curPlayer, realmDifficulty)
+    
     curPlayer.RefreshView()
     curPlayer.SetVisible(True)
         
@@ -1747,7 +1718,6 @@
     
     PassiveBuffEffMng.OnLoadMapGFPassive(curPlayer)
     PlayerYinji.OnLoadMap(curPlayer)
-    ItemControler.PlayerItemControler(curPlayer).RefreshStartEquipCount()   # 刷新装备珍品星级
     
     #EndLoadMap需放在最后, 0403 tagPlayerLoginLoadOK
     curPlayer.EndLoadMap()
@@ -1839,7 +1809,7 @@
     NotifyPlayerBasePoint(curPlayer, pointAttrIDList)
     playerControl = PlayerControl.PlayerControl(curPlayer)
     playerControl.RefreshPlayerAttrState()
-    PlayerControl.SetLingGenMaxIndex(curPlayer)
+    #PlayerControl.SetLingGenMaxIndex(curPlayer)
     return
 
 #// B2 07 重置加点 #tagCMResetAttrPoint
@@ -2425,6 +2395,9 @@
     
     #离线session
     EventReport.WriteEvent_session(curPlayer)
+    
+    #需放最后
+    PlayerOnline.OnPlayerLogoff(curPlayer)
     return
 
 #---------------------------------------------------------------------
@@ -3412,7 +3385,7 @@
     #参考经验
     rExp = PlayerControl.GetPlayerReExp(curPlayer)
     reLV = curPlayer.GetLV()                    #参考等级
-    worldLvExpRate = PlayerWorldAverageLv.GetWorldAverageLvExpRate(curPlayer) #世界等级经验加成
+    worldLvExpRate = 0
     
     #经验公式
     redeemExp = int(eval(recList[1]))
@@ -3463,34 +3436,6 @@
 #  @param tick: 时间戳
 #  @return: None
 def ReceiveFamilyArrestAward(index, clientData, tick):
-    curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
-    arrestID = clientData.ArrestID
-    
-    bit = ShareDefine.Def_ArrestOverState_BitDic.get(arrestID)
-    if bit == None:
-        #没有这个家族悬赏任务
-        GameWorld.DebugLog("没有这个家族悬赏任务 arrestID=%s" % arrestID)
-        return
-    
-    receiveState = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_FamilyArrestAwardState)
-    
-    if receiveState & pow(2, bit):
-        #该任务奖励已经领取
-        GameWorld.DebugLog("该任务奖励已经领取 arrestID=%s" % arrestID)
-        return
-    
-    if curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_FamilyArrestQueryState) == 1:
-        #已经在查询中, 不重复查询
-        GameWorld.DebugLog("已经在查询中, 不重复查询 arrestID=%s" % arrestID)
-        return
-    
-    sendMsg = '%s' % arrestID
-    
-    #向GameServer请求该悬赏任务是否已经完成
-    curPlayer.GameServer_QueryPlayerByID(ChConfig.queryType_FamilyArrest, 0, 'FamilyArrestAward', sendMsg, len(sendMsg))
-    
-    #设置状态查询中
-    curPlayer.SetDict(ChConfig.Def_PlayerKey_FamilyArrestQueryState, 1)
     return
 
 
@@ -3628,9 +3573,6 @@
     # 功能开启奖励
     elif rewardType == ChConfig.Def_RewardType_OpenFunc:
         GameFuncComm.GetFuncOpenAward(curPlayer, dataEx)
-    # 冰晶矿脉星级奖励
-    elif rewardType == ChConfig.Def_RewardType_IceLodeStar:
-        GameLogic_IceLode.GetIceLodeStarAward(curPlayer, dataEx)
     # 领取周狂欢活动奖励
     elif rewardType == ChConfig.Def_RewardType_WeekPartyAct:
         PlayerWeekParty.GetWeekPartyActionAward(curPlayer, dataEx, dataExStr)
@@ -4371,7 +4313,7 @@
 #    WORD        RealmDifficulty;    //境界难度 = 1000 + 所选境界等级,如境界13,则发1013
 #};
 def OnSelectRealmDifficulty(index, clientData, tick):
-    curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
-    PlayerControl.SetRealmDifficulty(curPlayer, clientData.RealmDifficulty)
+    #curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
+    #PlayerControl.SetRealmDifficulty(curPlayer, clientData.RealmDifficulty)
     return
 

--
Gitblit v1.8.0