2961 【BUG】【1.5.100】诛仙Boss结算报错

xdh

2019-01-28 6869df298441156d614fa00d8b774af55f868404

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

@@ -79,6 +79,7 @@
import GameLogic_FamilyWar

import PlayerBossReborn

import PlayerWeekParty

import PlayerActLogin

import Operate_EquipWash

import PlayerTreasure

import GameLogic_GodArea

@@ -101,6 +102,7 @@
import PlayerActTotalRecharge

import PlayerSpringSale

import PlayerFairyCeremony

import PlayerNewFairyCeremony

import CrossRealmPlayer

import ChNetSendPack

import FamilyRobBoss

@@ -110,6 +112,7 @@
import PlayerGeTui

import PlayerDogz

import PlayerCoat

import PlayerQuDaoDoubleBill



import datetime

import time

@@ -409,6 +412,9 @@
        PetControl.DoLogic_PetInfo_OnLogin(curPlayer, tick)

        

        PlayerFamily.FamilyPlayerOnLoginCross(curPlayer)

        
        PlayerTeam.OnPlayerLoginCrossServer(curPlayer)

            
        #通知运行成功

        curPlayer.BalanceServer_PlayerLoginInitOK()

        return

@@ -702,8 +708,12 @@
    PlayerBossReborn.OnLogin(curPlayer)

    # 周狂欢活动

    PlayerWeekParty.OnLogin(curPlayer)

    # 登录奖励活动

    PlayerActLogin.OnLogin(curPlayer)

    # 仙界盛典活动

    PlayerFairyCeremony.OnLogin(curPlayer)

    # 新仙界盛典活动

    PlayerNewFairyCeremony.OnLogin(curPlayer)

    # 分支下载奖励记录通知

    SyncPackDownloadAward(curPlayer)

    # 登录触发功能开启（老号处理）

@@ -735,6 +745,7 @@
    # 如果被禁言的，上线同步前端

    if curPlayer.GetGMForbidenTalk():

        curPlayer.SendPropertyRefresh(ShareDefine.CDBPlayerRefresh_ForbidenTalk, curPlayer.GetGMForbidenTalk(), False)

    
    return





@@ -918,11 +929,22 @@
#@return 返回值无意义

#@remarks 通知玩家技能信息

def __Sync_ClientSkill(curPlayer):

    sendPack = ChPyNetSendPack.tagMCPlayerSkills()

    sendPack.Clear()

    sendPack.Skills = []

    skillManager = curPlayer.GetSkillManager()

    for i in range(skillManager.GetSkillCount()):

        curSkill = skillManager.GetSkillByIndex(i)

        curSkill.Sync_Skill()

        #curSkill.Sync_Skill()

        skillInfo = ChPyNetSendPack.tagPlayerSkill()

        skillInfo.SkillID = curSkill.GetSkillID()

        skillInfo.RemainTime = curSkill.GetRemainTime()

        skillInfo.Proficiency = curSkill.GetProficiency()

        
        sendPack.Skills.append(skillInfo)



    sendPack.Count = len(sendPack.Skills)

    NetPackCommon.SendFakePack(curPlayer, sendPack) 
    return

 

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

@@ -1246,6 +1268,15 @@
    curPack.SetCount(ChConfig.Def_PackCnt_DogzEquip)

    curPack.Sync_PackCanUseCount()

    

    #初始化诛仙物品背包

    curPack = curPlayer.GetItemManager().GetPack(ShareDefine.rptZhuXianItem)

    curPack.SetCount(ChConfig.Def_PackCnt_ZhuXianItem)

    curPack.Sync_PackCanUseCount()

    #初始化诛仙装备背包

    curPack = curPlayer.GetItemManager().GetPack(ShareDefine.rptZhuXianEquip)

    curPack.SetCount(ChConfig.Def_PackCnt_ZhuXianEquip)

    curPack.Sync_PackCanUseCount()

    
    #初始化临时交换背包

    curPack = itemManager.GetPack(ShareDefine.rptTempSwap)

    curPack.SetCount(ChConfig.Def_PackCnt_TempSwap)

@@ -1530,6 +1561,8 @@
    

    #EndLoadMap需放在最后

    curPlayer.EndLoadMap()

    # 渠道返利 
    PlayerQuDaoDoubleBill.OnMapQDDoubleBill(curPlayer)

    return True



## 切换地图同步一次PK模式

@@ -5311,7 +5344,15 @@
    # 领取周狂欢积分奖励

    elif rewardType == ChConfig.Def_RewardType_WeekPartyPoint:

        PlayerWeekParty.GetWeekPartyPointAward(curPlayer, dataEx, dataExStr)

    
    # 领取登录奖励活动奖励

    elif rewardType == ChConfig.Def_RewardType_ActLoginAwardAct:

        PlayerActLogin.GetLoginAwardActionAward(curPlayer, dataEx, dataExStr)

    # 领取新仙界盛典充值大礼

    elif rewardType == ChConfig.Def_RewardType_NewFairyCRecharge:

        PlayerNewFairyCeremony.GetFCRechargeAward(curPlayer)

    # 领取新仙界盛典全民来嗨

    elif rewardType == ChConfig.Def_RewardType_NewFairyCParty:

        PlayerNewFairyCeremony.GetFCPartyAward(curPlayer, dataEx)

    return