237 【福利内容】每日任务/每周任务/章节奖励-服务端（增加每日任务类型 6 ~ 10）

hxp

6 天以前 ba67d86ccc7dde96a4fe2bb2ae3abfbd0aacc561

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

@@ -37,7 +37,6 @@
import NetPackCommon

import DataRecordPack

import PlayerPrestigeSys

import PlayerActivity

import FBCommon

import PassiveBuffEffMng

import EventReport

@@ -51,17 +50,16 @@
import PlayerCostRebate

import PlayerActLunhuidian

import GY_Query_CrossRealmReg

import PlayerTongTianLing

import FunctionNPCCommon

import PlayerGoldInvest

import CrossRealmPlayer

import CrossPlayerData

import PlayerActivity

import ChNetSendPack

import PlayerState

import PlayerGubao

import PlayerOnline

import PlayerTask

import PlayerMail

import PlayerLLMJ

import ChPlayer

import GameObj



@@ -414,10 +412,6 @@
        

    if not GameWorld.IsCrossServer() and GetCrossMapID(curPlayer):

        NotifyCode(curPlayer, "CrossMap10") 

        return False

    
    if curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_ClientCustomScene):

        GameWorld.Log("客户端自定义场景下无法传送!", curPlayer.GetPlayerID())

        return False

    

    return True

@@ -1000,10 +994,8 @@
    playerID = curPlayer.GetPlayerID()

    if not isDisconnect:

        CrossPlayerData.ClearCrossSyncDataCache(curPlayer)

        PyGameData.g_fbBuyBuffTimeDict.pop(playerID, None)

    #清除地图玩家缓存

    PyGameData.g_playerReqEnterFBEx.pop(playerID, None)

    NPCCommon.ClearPriWoodPile(curPlayer)

    #移除地图缓存的境界难度玩家ID信息

    for playerIDList in PyGameData.g_realmDiffPlayerDict.values():

        if playerID in playerIDList:

@@ -1408,7 +1400,7 @@
    #进入副本通用检查

    fbIpyData = FBCommon.GetFBIpyData(mapID)

    fbLineIpyData = FBCommon.GetFBLineIpyData(mapID, lineID)

    sceneMapID = mapID if not fbLineIpyData else fbLineIpyData.GetMapID()

    sceneMapID = mapID #if not fbLineIpyData else fbLineIpyData.GetMapID()

    #过滤封包地图ID

    if not GameWorld.GetMap().IsMapIDExist(sceneMapID):

        GameWorld.ErrLog('###非法地图数据，sceneMapID: %s' % (sceneMapID), curPlayer.GetID())

@@ -1437,15 +1429,14 @@
            GameWorld.Log("非队长，无法发起进入组队副本请求!", curPlayer.GetPlayerID())

            return

        isSendToGameServer = True

    if isSendToGameServer or mapID in ChConfig.Def_MapID_SendToGameServer \

        or mapID in ReadChConfig.GetEvalChConfig("MapID_SendToGameServer"):

    if isSendToGameServer:

        extendParamList = []

        if mapID in ChConfig.Def_MapID_LineIDToPropertyID:

            enterCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_EnterFbCntDay % mapID)

            enterCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_FbEnterCnt % mapID)

            extendParamList = [enterCnt]

        elif mapID in ChConfig.MirrorBattleMapIDList:

            reqInfoEx["sceneMapID"] = sceneMapID

            extendParamList = [reqInfoEx]

        #elif mapID in ChConfig.MirrorBattleMapIDList:

        #    reqInfoEx["sceneMapID"] = sceneMapID

        #    extendParamList = [reqInfoEx]

        SendToGameServerEnterFB(curPlayer, mapID, lineID, tick, extendParamList)

        return

    

@@ -1536,12 +1527,6 @@
        if isNotify:

            NotifyCode(curPlayer, "Carry_lhs_697674")

        return ShareDefine.EntFBAskRet_Sit

    
    if curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_ClientCustomScene):

        if isNotify:

            NotifyCode(curPlayer, "Carry_lhs_697674")

        GameWorld.Log("客户端自定义场景下无法进入副本!", curPlayer.GetPlayerID())

        return ShareDefine.EntFBAskRet_Other

    

    if playerAction in ChConfig.Def_Player_Cannot_TransState:

        #Carry_lhs_697674：您当前所处的状态不能进行传送!

@@ -1675,8 +1660,7 @@
    curPlayer.SetDict(ChConfig.Def_PlayerKey_TransTick, tick)

    

    mapID = FBCommon.GetRecordMapID(mapID)

    fbLineIpyData = FBCommon.GetFBLineIpyData(mapID, funcLineID)

    sceneMapID = mapID if not fbLineIpyData else fbLineIpyData.GetMapID()

    sceneMapID = mapID #if not fbLineIpyData else fbLineIpyData.GetMapID()

    

    # 地图分流, 减少单地图压力

    FBMapShuntDict = ReadChConfig.GetEvalChConfig("FBMapShunt")

@@ -1836,8 +1820,8 @@
        return tagLineID

    tagLinePlayerCountDict = PyGameData.g_commMapLinePlayerCountDict[tagMapID] # 此分线包含所有分线，含未开放的及活动分线

    

    if bossID and tagMapID != ChConfig.Def_FBMapID_BossHome:

        tagLineID = 0 # Boss的话未分流前先强制1线，即为0

    #if bossID and tagMapID != ChConfig.Def_FBMapID_BossHome:

    #    tagLineID = 0 # Boss的话未分流前先强制1线，即为0

    playerID = curPlayer.GetPlayerID()

    playChangeLineID = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_PlayChangeLineID)

    funcChangeLineID = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_FuncChangeLineID)

@@ -2791,9 +2775,7 @@
    #银票支付

    elif type_Price == IPY_GameWorld.TYPE_Price_Silver_Paper:

        __PayMoneyAfterBySilverPaper(curPlayer, price)

    
    #活跃度处理

    PlayerActivity.OnPayMoneyActivity(curPlayer, type_Price, price)

        
    #转盘活动

    PlayerActTurntable.OnPlayerUseGold(curPlayer, type_Price, price)

    #轮回殿

@@ -2817,9 +2799,10 @@
                unXiantaoCntBooty = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_UnXiantaoCntBooty % itemID)

                NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_UnXiantaoCntBooty % itemID, unXiantaoCntBooty + price)

                

        PlayerLLMJ.AddUseZhanchui(curPlayer, price)

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

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

        
        PlayerActivity.AddDailyTaskValue(curPlayer, ChConfig.DailyTask_CutTree, price)

        

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

    #reason_name = "Unknown" if not costType else costType

@@ -2995,6 +2978,9 @@
        GameWorld.SendMsgToClientServer(ShareDefine.CrossServerMsg_GiveMoney, msgInfo, [serverGroupID])

        return True

    

    if priceType == ShareDefine.TYPE_Price_FamilyExp:

        return PlayerFamily.AddFamilyExp(curPlayer, value)

    
    befMoney = GetMoney(curPlayer, priceType)

    if priceType == IPY_GameWorld.TYPE_Price_Gold_Money:

        updPlayerGold = GetMoneyReal(curPlayer, priceType) + value

@@ -3043,8 +3029,6 @@
            return

        updValue = min(ChConfig.Def_UpperLimit_DWord, curCurrency + value)

        SetPlayerCurrency(curPlayer, priceType, updValue)

        if priceType == ShareDefine.TYPE_Price_RealmPoint:

            PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_GetRealmPoint, value)

    else:

        GameWorld.ErrLog("金钱类型错误, priceType=%s,value=%s,giveType=%s" % (priceType, value, giveType), curPlayer.GetPlayerID())

        DataRecordPack.DR_GiveMoneyError(curPlayer, priceType, value, giveType, addDataDict)

@@ -3076,7 +3060,11 @@
    # 除钻石及绑钻外，未指定操作类型的不记录

    

    PlayerTask.AddTaskValue(curPlayer, ChConfig.TaskType_GetMoney, value, [priceType])

    PlayerActivity.AddDailyTaskValue(curPlayer, ChConfig.DailyTask_GetMoney, value, [priceType])

    

    if priceType == ShareDefine.TYPE_Price_FamilyCoin:

        PlayerFamily.AddFamilyContrib(curPlayer, value) # 公会币同步增加公会贡献

        
    if priceType not in [IPY_GameWorld.TYPE_Price_Gold_Money, IPY_GameWorld.TYPE_Price_Gold_Paper, ShareDefine.TYPE_Price_PayCoin] \

        and giveType == ChConfig.Def_GiveMoney_Unknown:

        #GameWorld.DebugLog("该货币没有指定来源类型不记录!priceType=%s,giveType=%s" % (priceType, giveType))

@@ -3521,14 +3509,11 @@
            #aftFreePoint = curPlayer.GetFreePoint()

            if aftLV > befLV:

                curPlayer.SetLV(aftLV, False) # 这里不再通知GameServer

                PlayerTongTianLing.AddTongTianTaskValue(curPlayer, ChConfig.TTLTaskType_LVUp, aftLV - befLV)

                #PlayerTongTianLing.AddTongTianTaskValue(curPlayer, ChConfig.TTLTaskType_LVUp, aftLV - befLV)

                PlayerTask.UpdTaskValue(curPlayer, ChConfig.TaskType_LV)

                PlayerSuccess.UptateSuccessProgress(curPlayer, ShareDefine.SuccType_HeroLV, aftLV)

                PlayerActivity.DoAddActivityByLV(curPlayer, befLV, aftLV)

                

            #if aftFreePoint > befFreePoint:

            #    curPlayer.SetFreePoint(aftFreePoint)

            PlayerGubao.DoGubaoAddFreePoint(curPlayer)

            

            # 升级需要执行的游戏功能处理

            GameFuncComm.DoFuncOpenLogic(curPlayer)

@@ -3541,11 +3526,6 @@
            #if curPlayer.GetMaxMP() > 0:

            #    curPlayer.SetMP(curPlayer.GetMaxMP())

            

            # 记录开服活动冲级数据

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

            #神秘限购

            FunctionNPCCommon.MysticalLimitShopOpen(curPlayer, befLV, aftLV)



        #不需要做升级任务, 设置玩家经验

        SetPlayerTotalExp(curPlayer, curTotalExp) 

        return

@@ -4214,11 +4194,11 @@
        if actExpIpyData and curPlayer.GetLV() >= actExpIpyData.GetLVLimit():

            fightExpRate += actExpIpyData.GetAddExpRate()

            

    if curPlayer.GetMapID() not in [ChConfig.Def_FBMapID_FamilyInvade]: #守卫人皇不加组队加成

        fightExpRate += curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_TeamExpRate) # 组队

    #if curPlayer.GetMapID() not in [ChConfig.Def_FBMapID_FamilyInvade]: #守卫人皇不加组队加成

    #    fightExpRate += curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_TeamExpRate) # 组队

    

    #地图多倍经验加成，默认是1倍不加成

    mapExpAddMultiple = max(0, FBCommon.GetAreaRewardMultiple(curPlayer) - 1)

    mapExpAddMultiple = 0

    fightExpRate += mapExpAddMultiple * ChConfig.Def_MaxRateValue

    

    if totalExpRate != fightExpRate:

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

    SetMainLevelPassValue(curPlayer, value)

    if wave == 0:

        lvID = chapterID * 100 + levelNum

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

        PlayerTask.UpdTaskValue(curPlayer, ChConfig.TaskType_MainLevel)

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

    return value

def GetMainLevelPassInfo(curPlayer):

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

@@ -4414,6 +4397,13 @@
    wave = value % 100

    return chapterID, levelNum, wave



## 获取佩戴的称号ID

def GetTitleID(curPlayer): return curPlayer.GetExAttr3()

def SetTitleID(curPlayer, titleID):

    curPlayer.SetExAttr3(titleID, False, False)

    PlayerFamily.RefreshFamilyMember(curPlayer)

    return



## 协助目标玩家ID

def GetAssistTagPlayerID(curPlayer): return 0



@@ -4422,12 +4412,9 @@
def SetTeamCheckState(curPlayer, checkState): return

## 副本功能线路ID, 这里做db存储，防止在合并地图副本中掉线重上时前端无法加载正确的场景资源，登录加载场景时机为0102包

def SetFBFuncLineID(curPlayer, mapID, funcLineID):

    value = mapID * 1000 + funcLineID

    if value != curPlayer.GetExAttr3():

        curPlayer.SetExAttr3(value, False, True)

    return

def GetFBFuncMapID(curPlayer): return curPlayer.GetExAttr3() / 1000

def GetFBFuncLineID(curPlayer): return curPlayer.GetExAttr3() % 1000

def GetFBFuncMapID(curPlayer): return 0

def GetFBFuncLineID(curPlayer): return 0



## 跨服状态所在地图ID: 0-非跨服状态，非0-跨服状态对应的地图ID

def GetCrossMapID(curPlayer): return curPlayer.GetExAttr5()

@@ -4435,16 +4422,6 @@
    curPlayer.SetExAttr5(value, False, True)

    if not value:

        CrossPlayerData.ClearCrossSyncDataCache(curPlayer)

    return



## 前端自定义场景

def GetCustomMapID(curPlayer): return curPlayer.GetExAttr14() / 1000

def GetCustomLineID(curPlayer): return curPlayer.GetExAttr14() % 1000

## 自定义场景后端判断已结算后需直接重置为0，防止前端没有退出场景直接下线导致数据没有重置，可能引发可以重复进

def SetCustomMap(curPlayer, mapID, lineID):

    value = mapID * 1000 + lineID

    if value != curPlayer.GetExAttr14():

        curPlayer.SetExAttr14(value, False, True)

    return



## 铜钱点, 支持铜钱超20亿

@@ -4467,8 +4444,8 @@
def SetVIPLVUpTime(curPlayer, lvUpTime): return



##聊天气泡框

def GetChatBubbleBox(curPlayer): return curPlayer.GetExAttr10()

def SetChatBubbleBox(curPlayer, value): return curPlayer.SetExAttr10(value, False, True)

def GetChatBox(curPlayer): return curPlayer.GetExAttr10()

def SetChatBox(curPlayer, value): return curPlayer.SetExAttr10(value, False, True)



##游戏充值支付代币

def GetPayCoinTotal(curPlayer): return GetPayCoin(curPlayer) + GetPlayerCurrency(curPlayer, ShareDefine.TYPE_Price_PayCoinDay)

@@ -4480,11 +4457,6 @@
    if payCoinDay > 0:

        PayMoney(curPlayer, ShareDefine.TYPE_Price_PayCoin, payCoinDay, "PayCoinOnDay")

    return



## 获取佩戴的称号ID

def GetTitleID(curPlayer):

    curDienstgradMgr = curPlayer.GetDienstgradManager()

    return curDienstgradMgr.GetCurGradID()



##伴侣

def GetCoupleID(curPlayer):

@@ -4536,13 +4508,27 @@
    ## 获取玩家在本地图中的境界难度层级，必须在境界地图且有选择境界难度才算，否则为默认0；该难度值同时也是视野层级

    return 0





##玩家退出仙盟信息: 主动离开次数*100 + 被踢次数*10  + 最后一次是否主动离开的

def GetLeaveFamilyInfo(curPlayer):

    # @return: 主动离开次数, 最后一次是否主动离开的

    value = curPlayer.GetExAttr12()

    leaveCnt = value / 100

    kickedCnt = value % 100 / 10

    lastVoluntarily = value % 10

    return leaveCnt, kickedCnt, lastVoluntarily

def SetLeaveFamilyInfo(curPlayer, leaveCnt, kickedCnt, lastVoluntarily):

    value = min(9, leaveCnt) * 100 + min(9, kickedCnt) * 10 + lastVoluntarily

    curPlayer.SetExAttr12(value) # IPY_PlayerDefine.CDBPlayerRefresh_ExAttr12

    GameWorld.DebugLog("    SetLeaveFamilyInfo: value=%s" % (value))

    return value

##玩家离开仙盟时间（主动或被踢都算）

def GetLeaveFamilyTimeEx(curPlayer):return curPlayer.GetExAttr19()

def SetLeaveFamilyTimeEx(curPlayer, value):

    curPlayer.SetExAttr19(value)

    #curPlayer.SendGameServerRefreshState(ShareDefine.CDBPlayerRefresh_ExAttr19, value, 0)

    curPlayer.SendPropertyRefresh(ShareDefine.CDBPlayerRefresh_ExAttr19, value, 0, False)

    return

    return value



##总战斗力，支持超过20E = 各模块战力总和

def GetFightPower(curPlayer): return curPlayer.GetFightPowerEx() * ChConfig.Def_PerPointValue + curPlayer.GetFightPower()

@@ -4559,9 +4545,7 @@
        NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_FightPower_HighestEx, highestFightPower / ChConfig.Def_PerPointValue)

        

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

    PlayerBillboard.UpdatePlayerFPTotalBillboard(curPlayer)

    # 记录开服活动数据

    #OpenServerCampaign.UpdOpenServerCampaignRecordData(curPlayer, ShareDefine.Def_Campaign_Type_FightPower, totalFightPower)

    #PlayerBillboard.UpdatePlayerFPTotalBillboard(curPlayer)

    #if beforeFightPower != totalFightPower:

    #    CrossPlayerData.OnPlayerFightPowerChange(curPlayer)

    return

@@ -4596,14 +4580,14 @@
# @return 无意义

def SetSight(curPlayer, sight):

    #外挂号 视野验证

    if curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_AutoCheckHack_State) \

                                      == ChConfig.Def_AutoCheck_State_Danger:

        
        if curPlayer.GetSight() > sight:

            curPlayer.SetSight(sight)

        
        return

    
#    if curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_AutoCheckHack_State) \

#                                      == ChConfig.Def_AutoCheck_State_Danger:

#        
#        if curPlayer.GetSight() > sight:

#            curPlayer.SetSight(sight)

#        
#        return

#    
    curPlayer.SetSight(sight)



##获取攻击间隔

@@ -4613,9 +4597,9 @@
    atkInterval = curPlayer.GetAtkInterval()

    

    #外挂号 攻击间隔验证

    if curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_AutoCheckHack_State) \

                                      == ChConfig.Def_AutoCheck_State_Danger:

        atkInterval *= 100

    #if curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_AutoCheckHack_State) \

    #                                  == ChConfig.Def_AutoCheck_State_Danger:

    #    atkInterval *= 100

    

    return atkInterval



@@ -4854,10 +4838,6 @@


# 血瓶恢复效果

def GetHPCureEnhance(curPlayer): return 0



# 仙盟徽章ID

def GetFamilyEmblemID(curPlayer): return curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_FamilyEmblemID)

def SetFamilyEmblemID(curPlayer, emblemID): NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_FamilyEmblemID, emblemID)



# 仙盟职位，使用 GetReceivedSalary，因为FamilyMemberLV没有入库

def GetFamilyMemberLV(curPlayer): return curPlayer.GetReceivedSalary()