237 【福利内容】每日任务/每周任务/章节奖励-服务端（修复主线过关ID判断bug，成就过关进度及主线榜单值；）

hxp

2 天以前 d8aabb88ad30ab1ae999f23e7b3ffd4ae5b1e8f8

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

@@ -16,7 +16,6 @@
import GameWorld

import SkillShell

import ChConfig

import PlayerHorse

import SkillCommon

import GameMap

import FBLogic

@@ -415,24 +414,6 @@
        return False

    

    return True





##地图特殊限制检查, 装备检查

# @param curPlayer

# @return bool

def CheckEquipCanTrans(curPlayer, destMapID):

    if destMapID != 10060:

        return True

    
    #有翅膀可以上天空

    playerEquip = curPlayer.GetItemManager().GetPack(IPY_GameWorld.rptEquip)

    curEquip = playerEquip.GetAt(IPY_GameWorld.retWing)

    if curEquip and not curEquip.IsEmpty():

        return True

    
    #GeRen_lhs_861048

    NotifyCode(curPlayer, "GeRen_lhs_861048", [destMapID])

    return False



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

##通知客户端, 玩家Loading开始

@@ -932,19 +913,6 @@
    return (curPlayerAction in ChConfig.Def_Player_Can_Transfer_State)



#------------------------------玩家离开服务器的逻辑------------------------------------

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

##骑马下线逻辑

# @param curPlayer 玩家实例

# @return 返回值无意义

# @remarks 骑马下线逻辑

def __RidingHorsePlayerDisconnect(curPlayer):

    #在骑马

    if curPlayer.GetPlayerVehicle() == IPY_GameWorld.pvHorse:

        #执行下马逻辑

        PlayerHorse.PlayerRideHorseDown(curPlayer, False)

        
    return

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

##玩家下线/玩家切换地图公用逻辑

# @param curPlayer 玩家实例

# @param tick 时间戳

@@ -1111,8 +1079,6 @@
    

    #玩家下线/玩家切换地图公用逻辑

    __PlayerLeaveServerLogic(curPlayer, tick, True)

    #骑马玩家下线逻辑

    __RidingHorsePlayerDisconnect(curPlayer)

    #召唤兽死亡

    KillPlayerSummonNPC(curPlayer)

    #更新从本地图离线信息

@@ -4068,14 +4034,6 @@
    

    if curPlayerAction == IPY_GameWorld.paPreparing:

        DoExitPreparing(curPlayer)

    
    #---玩家交通工具处理---

    curPlayerVehicle = curPlayer.GetPlayerVehicle()

    
    #玩家骑马中, 下马

    if curPlayerVehicle == IPY_GameWorld.pvHorse:

        #执行下马逻辑

        PlayerHorse.PlayerRideHorseDown(curPlayer, False)

        

    #---其他系统处理---

    

@@ -4242,6 +4200,15 @@
                

    return totalExpRate



##外观额外数据:  其他 * 100 + 坐骑外观

def GetHorseSkinID(curPlayer): return GameWorld.GetValue(curPlayer.GetEquipShowSwitch(), 2, 2)

def SetHorseSkinID(curPlayer, horseSkinID):

    showValue = curPlayer.GetEquipShowSwitch()

    updShowValue = GameWorld.SetValue(showValue, 2, 2, min(horseSkinID, 99))

    curPlayer.SetEquipShowSwitch(updShowValue)

    GameWorld.DebugLog("使用坐骑外观: horseSkinID=%s,showValue=%s,updShowValue=%s" % (horseSkinID, showValue, updShowValue))

    return



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

#---玩家扩展字段---



@@ -4337,10 +4304,25 @@


def IsMainLevelPass(curPlayer, lvID):

    ## 判断玩家是否过关某个主线关卡ID

    # @param lvID: 关卡唯一ID，与策划约定好 = 章节*100+关卡编号

    passChapterID, passLevelNum, _ = GetMainLevelPassInfo(curPlayer)

    passValue = passChapterID * 100 + passLevelNum # 因为pass的记录是带波数的，即当前关卡boss还没过关，所以只有大于该记录值的才算过关

    return passValue > lvID

    return GetPassMainLevelID(curPlayer) >= lvID

def GetPassMainLevelID(curPlayer):

    ## 获取已过关主线关卡ID

    passChapterID, passLevelNum, _ = GetMainLevelPassInfo(curPlayer) # 当前过关进度包含波，所以需要取上一关的

    passLVID = 0 # 关卡唯一ID，与策划约定好 = 章节*100+关卡编号

    if passLevelNum > 1:

        preLevelNum = passLevelNum - 1

        passLVID = passChapterID * 100 + preLevelNum

        GameWorld.DebugLog("非某章节的第1关直接减1即可: passLVID=%s,passChapterID=%s,passLevelNum=%s" % (passLVID, passChapterID, passLevelNum))

        
    elif passChapterID > 1: # 取上一章节

        preChapterID = passChapterID - 1

        levelDataList = IpyGameDataPY.GetIpyGameDataByCondition("MainLevel", {"ChapterID":preChapterID}, True)

        levelCount = len(levelDataList) if levelDataList else 0

        if levelCount:

            passLVID = preChapterID * 100 + levelCount

        GameWorld.DebugLog("取上一章节作为已过关关卡: passLVID=%s,preChapterID=%s,levelCount=%s,passChapterID=%s,passLevelNum=%s" 
                           % (passLVID, preChapterID, levelCount, passChapterID, passLevelNum))

    return passLVID



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

def GetMainLevelPassValue(curPlayer): return curPlayer.GetExAttr1()

@@ -4353,7 +4335,7 @@
    value = ComMainLevelValue(chapterID, levelNum, wave)

    SetMainLevelPassValue(curPlayer, value)

    if wave == 0:

        lvID = chapterID * 100 + levelNum

        lvID = GetPassMainLevelID(curPlayer)

        PlayerBillboard.UpdatePlayerBillboard(curPlayer, ShareDefine.Def_BT_MainLevel, lvID)

        PlayerTask.UpdTaskValue(curPlayer, ChConfig.TaskType_MainLevel)

        PlayerSuccess.UptateSuccessProgress(curPlayer, ShareDefine.SuccType_MainLevel, lvID)

@@ -4535,16 +4517,9 @@
def SetFightPower(curPlayer, value):

    beforeFightPower = GetFightPower(curPlayer)

    curPlayer.SetFightPower(value % ChConfig.Def_PerPointValue, value / ChConfig.Def_PerPointValue, False) # 不通知GameServer bNotifyGameServer False

    if value < beforeFightPower:

        DataRecordPack.DR_FightPowerChangeInfo(curPlayer, beforeFightPower)

    highestFightPower = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_FightPower_Highest)

    highestFightPower += curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_FightPower_HighestEx) * ChConfig.Def_PerPointValue

    if value > highestFightPower:

        highestFightPower = value

        NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_FightPower_Highest, highestFightPower % ChConfig.Def_PerPointValue)

        NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_FightPower_HighestEx, highestFightPower / ChConfig.Def_PerPointValue)

        
    GameWorld.DebugLog("总战力: %s, 历史最高战力: %s, beforeFightPower=%s" % (value, highestFightPower, beforeFightPower), curPlayer.GetPlayerID())

    #if value < beforeFightPower:

    #    DataRecordPack.DR_FightPowerChangeInfo(curPlayer, beforeFightPower)

    GameWorld.DebugLog("总战力: %s, beforeFightPower=%s" % (value, beforeFightPower), curPlayer.GetPlayerID())

    #PlayerBillboard.UpdatePlayerFPTotalBillboard(curPlayer)

    #if beforeFightPower != totalFightPower:

    #    CrossPlayerData.OnPlayerFightPowerChange(curPlayer)

@@ -4893,7 +4868,7 @@
## 设置玩家字典值, 存库

def NomalDictSetProperty(curPlayer, key, value, dType=0):

    if CrossPlayerData.IsNeedProcessCrossPlayer(curPlayer) and key not in \

        [ChConfig.Def_PDict_FightPower_Total, ChConfig.Def_PDict_FightPower_TotalEx, ChConfig.Def_PlayerKey_CrossRegisterMap]:

        [ChConfig.Def_PlayerKey_CrossRegisterMap]:

        playerID = curPlayer.GetPlayerID()

        changeDict = PyGameData.g_crossPlayerDictChangeInfo.get(playerID, {})

        changeDict[(key, dType)] = value