129 【战斗】战斗系统-服务端（修复无法取非主线阵容进行战斗bug）

hxp

2025-10-21 6e0663eac07558bf0e680ef3470e7bc45e2d8c28

 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py

@@ -49,7 +49,6 @@
import FBCommon

import PlayerWishingWell

import PlayerSuccess

import PlayerDienstgrad

import PlayerFreeGoods

import PlayerCrossRealmPK

import PlayerCrossChampionship

@@ -63,7 +62,6 @@
import PlayerActLogin

import PlayerTreasure

import PlayerRune

import PlayerFamilyRedPacket

import IpyGameDataPY

import EventReport

import OpenServerCampaign

@@ -86,7 +84,6 @@
import PlayerSpringSale

import GY_Query_BossFirstKill

import PlayerCrossYaomoBoss

import PlayerFeastRedPacket

import PlayerLuckyCloudBuy

import PlayerLuckyTreasure

import Item_ResetAttrPoint

@@ -111,14 +108,13 @@
import PlayerCustomAward

import PlayerZhanling

import PlayerTree

import PlayerLLMJ

import PlayerLianTi

import PlayerTask

import PlayerYinji

import PlayerLove

import GameObj

import PlayerChangeJob

import PlayerFace

import PlayerChatBox

import PlayerXiangong

import PlayerGoldRush

import PlayerActLoginNew

@@ -129,6 +125,7 @@
import PlayerActTask

import PlayerMail

import DBDataMgr

import UpdatePlayerName

import GameServerRefresh

import IPY_ServerDefine

import CommFunc

@@ -138,6 +135,7 @@
import PlayerHero

import PlayerOnline

import TurnAttack

import PlayerHJG

import ObjPool



import datetime

@@ -555,9 +553,6 @@
    # 采集NPC次数通知

    #NPCCommon.SyncCollNPCTime(curPlayer)

    

    # 每日活跃度

    PlayerActivity.OnLogin(curPlayer)

    
    # 副本进入时间

    FBCommon.FBOnLogin(curPlayer)

    

@@ -577,10 +572,6 @@
#    Sync_AutoFightSetting(curPlayer)

    

    PlayerFamily.OnPlayerLogin(curPlayer, tick)

    #改到 GameServerRefresh GameSever_PlayerInitOK后处理才能保证玩家已经在Gameserver注册

    #PlayerDienstgrad.RefreshBillBoardDienstgrad(curPlayer)

    # 称号

    PlayerDienstgrad.Sync_AllDienstgradOnLogin(curPlayer)

    

    # ʱװ

    PlayerCoat.OnLogin_Coat(curPlayer)

@@ -632,9 +623,6 @@
    ChItem.Sync_ItemDayUseCnt(curPlayer)

    # 符印登录通知

    PlayerRune.PlayerRuneLogin(curPlayer)

    # 仙盟红包登录通知

    PlayerFamilyRedPacket.OnPlayerLogin(curPlayer)

    PlayerFeastRedPacket.DoPlayerOnLogin(curPlayer)

    # 商店物品购买次数登录通知

    FunctionNPCCommon.ShopItemOnLogin(curPlayer)

    # 通知设置的被动功法

@@ -746,8 +734,7 @@
        PyMongoMain.GetUserCtrlDB().OnPlayerLogin(curPlayer)

        PlayerHero.OnPlayerLogin(curPlayer)

        PlayerMail.OnPlayerLogin(curPlayer)

        PlayerChatBox.OnPlayerLogin(curPlayer)

        PlayerFace.OnPlayerLogin(curPlayer)

        PlayerHJG.OnPlayerLogin(curPlayer)

        PlayerXiangong.OnPlayerLogin(curPlayer)

        PlayerGubao.OnPlayerLogin(curPlayer)

        PlayerShentong.OnPlayerLogin(curPlayer)

@@ -758,6 +745,9 @@
        PlayerActFamilyGCZ.OnPlayerLogin(curPlayer)

        PlayerTalk.OnPlayerLogin(curPlayer)

        SyncADCntInfo(curPlayer)

        UpdatePlayerName.OnPlayerLogin(curPlayer)

        PlayerActivity.OnPlayerLogin(curPlayer)

        PlayerLLMJ.OnPlayerLogin(curPlayer)

        

        # 上线查询一次充值订单

        curPlayer.SendDBQueryRecharge()

@@ -3274,15 +3264,21 @@
    # 活跃度奖励

    if rewardType == ChConfig.Def_RewardType_Activity:

        PlayerActivity.GetActivityAward(curPlayer, dataEx)

    # 活跃放置奖励

    elif rewardType == ChConfig.Def_RewardType_ActivityPlace:

        PlayerActivity.GetActivityPlaceReward(curPlayer)

    # 每日任务奖励

    elif rewardType == ChConfig.Def_RewardType_DailyTask:

        PlayerActivity.GetDailyTaskAward(curPlayer, dataEx)

    # 成就奖励

    elif rewardType == ChConfig.Def_RewardType_Success:

        PlayerSuccess.GetSuccessAward(curPlayer, dataEx)

    # 仙树免费减时

    elif rewardType == ChConfig.Def_RewardType_TreeFreeTime:

        PlayerTree.FreeReduceTreeLVTime(curPlayer)

    # 广告奖励

    elif rewardType == ChConfig.Def_RewardType_ADAward:

        OnGetADAward(curPlayer, dataEx)

    # 历练秘笈升级

    elif rewardType == ChConfig.Def_RewardType_LLMJLVUp:

        PlayerLLMJ.OnLLMJLVUp(curPlayer)

    # 每日免费直购礼包

    elif rewardType == ChConfig.Def_RewardType_DayFreeGoldGift:

        PlayerDailyGiftbag.OnGetDailyFreeGiftbag(curPlayer)

@@ -3361,12 +3357,6 @@
    # 跨服妖魔boss伤害奖励

    elif rewardType == ChConfig.Def_RewardType_CrossYaomoBossHurt:

        PlayerCrossYaomoBoss.GetCrossYaomoBossHurtAward(curPlayer, dataEx, tick)

    # 古宝特殊效果物品奖励

    elif rewardType == ChConfig.Def_RewardType_GubaoItemEff:

        PlayerGubao.GetGubaoItemEffAward(curPlayer, dataEx, dataExStr)

    # 成就积分奖励

    elif rewardType == ChConfig.Def_RewardType_SuccessScore:

        PlayerSuccess.GetSuccessScoreAward(curPlayer, dataEx)

    # 买一送多活动免费奖励

    elif rewardType == ChConfig.Def_RewardType_BuyOne:

        PlayerActBuyOne.GetBuyOneFreeAward(curPlayer, dataEx, dataExStr)