129 【战斗】战斗系统-服务端（修复buff报错；）

hxp

2025-09-04 726517b2002ec6dd46e07f89c10fdfe0274243af

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

@@ -33,7 +33,6 @@
import PlayerBillboard

import GameServerRefresh

import IPY_GameWorld

import PlayerGameWallow

import ChPyNetSendPack

import NetPackCommon

import DataRecordPack

@@ -49,10 +48,8 @@
import PyGameData

import PlayerFeastTravel

import PlayerActTurntable

import GameLogic_CrossDemonKing

import PlayerCostRebate

import PlayerActLunhuidian

import PlayerActGarbageSorting

import GY_Query_CrossRealmReg

import PlayerTongTianLing

import FunctionNPCCommon

@@ -1385,12 +1382,6 @@
    # 需要动态分布线路的地图，发送到跨服服务器进行分配

    if mapID in ChConfig.Def_CrossDynamicLineMap:

        extendInfo = {}

        if mapID == ChConfig.Def_FBMapID_CrossDemonKing:

            bossID = GameLogic_CrossDemonKing.GetCurFBLineBOSSID(mapID, lineID)

            if not bossID:

                return

            extendInfo["BossID"] = bossID

            
        msgDict = {"PlayerID":curPlayer.GetPlayerID(), "MapID":mapID, "FuncLineID":lineID, "LV":curPlayer.GetLV()}

        if extendInfo:

            msgDict.update(extendInfo)

@@ -1600,10 +1591,6 @@
# @return 无意义

# @remarks 刷新玩家时钟，切地图玩家时钟记录清空，处理相应逻辑

def RefreshPlayerTick(curPlayer):

    tick = GameWorld.GetGameWorld().GetTick()

    
    #防沉迷切线时间

    PlayerGameWallow.DoLogic_WallowOnlineTime(curPlayer, tick)

    return





@@ -2568,7 +2555,7 @@
    #---钱不够 返回假如果需要提示的话 提示信息---

    if needMoneyCount < Price:

        if needNotify and notifyCode:

            NotifyCode(curPlayer, notifyCode)

            pass#NotifyCode(curPlayer, notifyCode)

        GameWorld.DebugLog("货币不足: TYPE_Price=%s, Price=%s, curMoneyCount=%s" % (TYPE_Price, Price, needMoneyCount))

        return False

    

@@ -2617,8 +2604,8 @@
        gold = curPlayer.GetGold() # 元宝

        

        if goldPaper + gold < Price: # 钱不够

            if needNotify:

                NotifyCode(curPlayer, "GoldErr")

            #if needNotify:

            #    NotifyCode(curPlayer, "GoldErr")

            return []

            

        if goldPaper >= Price: # 只用礼券就够了

@@ -2753,11 +2740,11 @@
    __PayMoneyAfter(curPlayer, type_Price, lostMoney, costType, infoDict, quantity, costVIPGold)

    

    #通知客户端失去金钱

    if isNotify:

        if type_Price == ShareDefine.TYPE_Price_PayCoin:

            NotifyCode(curPlayer, "LostMoney", [type_Price, str(round(lostMoney/100.0, 2))])

        else:

            NotifyCode(curPlayer, "LostMoney", [type_Price, lostMoney])

    #if isNotify:

    #    if type_Price == ShareDefine.TYPE_Price_PayCoin:

    #        NotifyCode(curPlayer, "LostMoney", [type_Price, str(round(lostMoney/100.0, 2))])

    #    else:

    #        NotifyCode(curPlayer, "LostMoney", [type_Price, lostMoney])

    return True



## 付款以后后续操作

@@ -2818,6 +2805,9 @@
                NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_UnXiantaoCntBooty % itemID, unXiantaoCntBooty + price)

                

        PlayerPrestigeSys.AddRealmTaskValue(curPlayer, PlayerPrestigeSys.RealmTaskType_UseXiantao, price)

        PlayerTask.AddTaskValue(curPlayer, ChConfig.TaskType_CutTree, price)

        
        
    unitPrice = price if quantity == 1 else int(math.ceil(price * 1.0 / quantity)) # 单价

    #reason_name = "Unknown" if not costType else costType

    reason_name = costType

@@ -2897,7 +2887,6 @@
    if costType not in ChConfig.CostRebate_DisableType:

        PlayerCostRebate.AddCostRebateGold(curPlayer, costType, price, infoDict)

        PlayerFeastTravel.AddFeastTravelTaskValue(curPlayer, ChConfig.Def_FeastTravel_UseGold, price)

        PlayerActGarbageSorting.AddActGarbageTaskProgress(curPlayer, ChConfig.Def_GarbageTask_UseGold, price)

    else:

        GameWorld.DebugLog("不计入消费活动的消费类型!costType=%s" % costType, curPlayer.GetPlayerID())

        

@@ -3052,12 +3041,12 @@
    if priceType == ShareDefine.TYPE_Price_PayCoinDay:

        priceType = ShareDefine.TYPE_Price_PayCoin

        

    if isSysHint and priceType != ShareDefine.TYPE_Price_BourseMoney:

        #通知客户端得到金钱

        if priceType == ShareDefine.TYPE_Price_PayCoin:

            NotifyCode(curPlayer, "GetMoney", [priceType, str(round(value/100.0, 2))])

        else:

            NotifyCode(curPlayer, "GetMoney", [priceType, value])

    #if isSysHint and priceType != ShareDefine.TYPE_Price_BourseMoney:

    #    #通知客户端得到金钱

    #    if priceType == ShareDefine.TYPE_Price_PayCoin:

    #        NotifyCode(curPlayer, "GetMoney", [priceType, str(round(value/100.0, 2))])

    #    else:

    #        NotifyCode(curPlayer, "GetMoney", [priceType, value])

    __GiveMoneyAfter(curPlayer, priceType, value, giveType, addDataDict)

    

    if befMoney == 0:

@@ -3588,7 +3577,6 @@
            #if curPlayer.GetMaxMP() > 0:

            #    curPlayer.SetMP(curPlayer.GetMaxMP())

            

            FBLogic.OnPlayerLVUp(curPlayer)

            # 记录开服活动冲级数据

            #OpenServerCampaign.UpdOpenServerCampaignRecordData(curPlayer, ShareDefine.Def_Campaign_Type_LV, curPlayer.GetLV())

            #神秘限购

@@ -4420,11 +4408,17 @@
    # @param wave: 第x波

    value = ComMainLevelValue(chapterID, levelNum, wave)

    SetMainLevelPassValue(curPlayer, value)

    if wave == 0:

        PlayerTask.UpdTaskValue(curPlayer, ChConfig.TaskType_MainLevel)

    return value

def GetMainLevelPassInfo(curPlayer):

    ## 获取主线关卡过关进度信息

    # @return: chapterID, levelNum, wave

    return GetMainLevelValue(GetMainLevelPassValue(curPlayer))

    chapterID, levelNum, wave = GetMainLevelValue(GetMainLevelPassValue(curPlayer))

    if not chapterID and not levelNum:

        chapterID, levelNum, wave = 1, 1, 0

        SetMainLevelPassValue(curPlayer, ComMainLevelValue(chapterID, levelNum, wave))

    return chapterID, levelNum, wave



## 主线关卡当前进度值 = 章节*10000+关卡编号*100+第x波

def GetMainLevelNowValue(curPlayer): return curPlayer.GetExAttr2()

@@ -4440,7 +4434,14 @@
def GetMainLevelNowInfo(curPlayer):

    ## 获取主线关卡当前进度信息

    # @return: chapterID, levelNum, wave

    return GetMainLevelValue(GetMainLevelNowValue(curPlayer))

    chapterID, levelNum, wave = GetMainLevelValue(GetMainLevelNowValue(curPlayer))

    if not chapterID and not levelNum:

        chapterID, levelNum, wave = 1, 1, 1

        SetMainLevelNowInfo(curPlayer, chapterID, levelNum, wave)

    if not wave:

        wave = 1

        SetMainLevelNowInfo(curPlayer, chapterID, levelNum, wave)

    return chapterID, levelNum, wave



def ComMainLevelValue(chapterID, levelNum, wave=0): return chapterID * 10000 + levelNum * 100 + wave

def GetMainLevelValue(value):