121 【武将】武将系统-服务端（修复武将修改皮肤战斗时不生效bug；Hero命令增加切换皮肤；）

hxp

2 天以前 46f1b3554ca7c3eeea118aaf80fe756bebdfde93

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

@@ -25,24 +25,20 @@
import OperControlManager

import ShareDefine

import ReadChConfig

import PlayerDienstgrad

import IpyGameDataPY

import GameObj

import GameMap

import math

import time

import PetControl

import AICommon

import PlayerSuccess

import PassiveBuffEffMng

import FunctionNPCCommon

import FormulaControl

import PlayerFlashSale

import PlayerChatBox

import PlayerFace

import PlayerBackup

import PlayerOnline

import PlayerGoldRush

import PlayerTravel

import PlayerHorse

import PlayerHJG



#---------------------------------------------------------------------

#---------------------------------------------------------------------

@@ -124,8 +120,6 @@
        BaseAttack.Sync_AttackResult(curPlayer, useSkillData)

        

    if useSkillData and useSkillData.GetSkillID() != ChConfig.Def_SkillID_Somersault:

        # 跟随玩家同频率攻击

        PetControl.PetFight(curPlayer, tick)

        SummonFollowAtk(curPlayer, tick)

    #===========================================================================

    # if not result:

@@ -1029,25 +1023,13 @@
    #玩家在线时间刷新

    #ProcessPlayer_OnlineTime(curPlayer, tick)

    

    #反外挂验证

    #PlayerAutoCheckOnline.HackDefense(curPlayer, tick)

    
    #副本相关时间处理

    #PlayerFB.DoPlayerFBTimeProcess(curPlayer, tick)

    
    #恶意攻击时间处理

    #AttackCommon.ProcessMaliciousAttackPlayer(curPlayer, tick)



    #活跃放置

    #PlayerActivity.ProcessActivityPlace(curPlayer)

    #自定义场景

    #FBLogic.OnCustomSceneProcess(curPlayer, tick)

    
    #炼器

    #PlayerActLianqi.OnProcess(curPlayer)

    #仙盟攻城战

    #PlayerActFamilyGCZ.OnProcess(curPlayer)

    #跨服数据同步，放最后

    #CrossPlayerData.ProcessCrossPlayer(curPlayer, tick)

    return



def ProcessPlayerSecond(curPlayer, tick):

@@ -1060,11 +1042,11 @@
    #成就

    PlayerSuccess.FinishDelayAddSuccessProgress(curPlayer, tick, False)

    #限时抢购

    PlayerFlashSale.ProcessFlashSaleMail(curPlayer, tick)

    #神秘商店刷新

    FunctionNPCCommon.CheckMysticalShopRefresh(curPlayer, tick)

    #PlayerFlashSale.ProcessFlashSaleMail(curPlayer, tick)

    #淘金

    PlayerGoldRush.OnProcess(curPlayer)

    #游历

    PlayerTravel.OnProcess(curPlayer)

    return



def ProcessPlayerMinute(curPlayer, tick):

@@ -1074,12 +1056,8 @@
        return

    curPlayer.SetTickByType(ChConfig.TYPE_Player_Tick_Minute, tick)

    

    # 时效称号

    PlayerDienstgrad.CheckDienstgradTimeout(curPlayer)

    # 时效头像

    PlayerFace.OnMinute(curPlayer)

    # 聊天气泡

    PlayerChatBox.OnMinute(curPlayer)

    PlayerHJG.OnMinute(curPlayer)

    PlayerHorse.OnMinute(curPlayer)

    return



# 一定时间自动释放的被动技能

@@ -1227,36 +1205,4 @@
        return

    curPlayer.SetDict(ChConfig.Def_PDict_BossStateTick, 0)

    PlayerControl.SendPropertyRefresh(curPlayer, ShareDefine.CDBPlayerRefresh_BossState, 0)

    return

    
def ProcessAreaExp(curPlayer, tick):

    ##给场景经验

    if GameWorld.IsCrossServer():

        return

    if curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_ClientCustomScene):

        return

    crossMapID = PlayerControl.GetCrossMapID(curPlayer)

    mapID = crossMapID if crossMapID else GameWorld.GetMap().GetMapID()

    if not FBLogic.OnCanGetAreaExp(curPlayer, mapID):

        return

    neutralMapExpAwardDict = IpyGameDataPY.GetFuncEvalCfg('NeutralMapExpAward', 1, {})

    expAwardInfo = GameWorld.GetDictValueByKey(neutralMapExpAwardDict, mapID)

    if not expAwardInfo:

        return

    if len(expAwardInfo) != 2:

        return

    secondCD, expFormula = expAwardInfo

    lastTick = curPlayer.GetDictByKey(ChConfig.Def_PDict_MapAreaExpTick)

    if not lastTick:

        curPlayer.SetDict(ChConfig.Def_PDict_MapAreaExpTick, tick)

        return

    if tick - lastTick < secondCD:

        return

    curPlayer.SetDict(ChConfig.Def_PDict_MapAreaExpTick, tick)

    
    reExp = PlayerControl.GetPlayerReExp(curPlayer)

    reLV = curPlayer.GetLV()

    worldLV = GameWorld.GetGameWorld().GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_WorldAverageLv)

    addExp = eval(FormulaControl.GetCompileFormula('NeutralMapExpAward%s'%mapID, expFormula))

    PlayerControl.PlayerControl(curPlayer).AddExp(addExp, ShareDefine.Def_ViewExpType_SysEx)

    return