xdh
2018-10-26 d6b10edddf7d3b451fc7af1ced9ef613dae53c72
4219 【后端】【1.2.0】仙盟宴会5分钟给经验修改为传功给经验
1个文件已修改
130 ■■■■ 已修改文件
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.py 130 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.py
@@ -32,23 +32,26 @@
#当前副本地图的状态
(
FB_Step_Open, # 地图开启
FB_Step_Fighting, # 战斗中
FB_Step_Over, # 副本关闭
FB_Step_Open,  # 地图开启
FB_Step_Fighting,  # 战斗中
FB_Step_Over,  # 副本关闭
) = range(3)
#---战盟副本---
Map_FamilyPartyFB_FamilyID = "FamilyPartyFB_FamilyID"     # 对应的家族id
Map_FamilyPartyFB_StartTick = "Map_FamilyPartyFB_StartTick"     # 副本开始时间
GameFBDict_LastEnterFbDay = 'LastEnterFbDay_%s' #上次进入活动的开服天
FBPlayerDict_TotalExp = 'XMYH_TotalExp%s'   # 获得的总经验
FBPlayerDict_TotalExpPoint = 'XMYH_TotalExpPoint%s'   # 获得的总经验点
FBPlayerDict_TotalPoint = 'XMYH_TotalPoint%s'   # 获得的总仙盟贡献值
FBPlayerDict_HasCollect = 'XMYH_HasCollect%s'   # 是否已采集
Map_FamilyPartyFB_FamilyID = "FamilyPartyFB_FamilyID"  # 对应的家族id
Map_FamilyPartyFB_StartTick = "Map_FamilyPartyFB_StartTick"  # 副本开始时间
GameFBDict_LastEnterFbDay = 'LastEnterFbDay_%s'  #上次进入活动的开服天
FBPlayerDict_TotalExp = 'XMYH_TotalExp%s'  # 获得的总经验
FBPlayerDict_TotalExpPoint = 'XMYH_TotalExpPoint%s'  # 获得的总经验点
FBPlayerDict_TotalPoint = 'XMYH_TotalPoint%s'  # 获得的总仙盟贡献值
FBPlayerDict_HasCollect = 'XMYH_HasCollect%s'  # 是否已采集
FBPlayerDict_HasSit = 'XMYH_HasSit%s'  # 是否已传功
def OnFBPlayerOnDay(curPlayer):
    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_FamilyPartyAnswerCnt, 0)
    return
##开启副本
# @param tick 时间戳
@@ -57,7 +60,7 @@
def OnOpenFB(tick):
    gameFB = GameWorld.GetGameFB()
    gameFB.SetGameFBDict(Map_FamilyPartyFB_FamilyID, 0)
    gameFB.ClearAllPlayerGameFBDict() # 清除所有玩家对应的副本字典信息
    gameFB.ClearAllPlayerGameFBDict()  # 清除所有玩家对应的副本字典信息
    gameFB.SetGameFBDict(ChConfig.Map_FBDict_NotifyStart, 0)
    return
@@ -106,6 +109,7 @@
# @return posX, posY, 随机半径(可选)
def OnGetFBEnterPos(curPlayer, mapID, lineId, ipyEnterPosInfo, tick):
    return ipyEnterPosInfo
   
##是否可以进入
# @param ask 请求结构体
@@ -134,6 +138,7 @@
    #可进入
    return IPY_GameWorld.cmeAccept
##玩家进入副本
# @param curPlayer 玩家实例
# @param tick 时间戳
@@ -153,7 +158,7 @@
        PlayerControl.PlayerLeaveFB(curPlayer)
        return
    curPlayer.Sync_TimeTick(IPY_GameWorld.tttTowerTake, 0, closeFB_RemainTick, True) 
    GameWorld.DebugLog('closeFB_RemainTick=%s'%closeFB_RemainTick)
    GameWorld.DebugLog('closeFB_RemainTick=%s' % closeFB_RemainTick)
    if not gameFB.GetGameFBDictByKey(Map_FamilyPartyFB_FamilyID):
        gameFB.SetGameFBDict(Map_FamilyPartyFB_FamilyID, curPlayer.GetFamilyID())
       
@@ -164,6 +169,8 @@
        gameWorld.SetGameWorldDict(FBPlayerDict_TotalExpPoint % playerID, 0)
        gameWorld.SetGameWorldDict(FBPlayerDict_TotalPoint % playerID, 0)
        gameWorld.SetGameWorldDict(FBPlayerDict_HasCollect % playerID, 0)
        gameWorld.SetGameWorldDict(FBPlayerDict_HasSit % playerID, 0)
        FBCommon.ClearAreaRewardRecord(playerID)
        
        FBCommon.AddEnterFBCount(curPlayer, ChConfig.Def_FBMapID_FamilyParty)
@@ -174,12 +181,14 @@
    DoFBHelp(curPlayer, tick)
    return
def __GetRemainTick(tick):
    ##活动剩余毫秒
    mapID = GameWorld.GetMap().GetMapID()
    startTick  = GameWorld.GetGameWorld().GetGameWorldDictByKey(Map_FamilyPartyFB_StartTick)
    closeFB_RemainTick = max(0, FBCommon.GetFBLineStepTime(mapID)[0]*1000 - (tick - startTick))
    startTick = GameWorld.GetGameWorld().GetGameWorldDictByKey(Map_FamilyPartyFB_StartTick)
    closeFB_RemainTick = max(0, FBCommon.GetFBLineStepTime(mapID)[0] * 1000 - (tick - startTick))
    return closeFB_RemainTick
##副本定时器
# @param tick 时间戳
@@ -200,8 +209,8 @@
            FBCommon.DoLogic_FBKickAllPlayer()
            GameWorldProcess.CloseFB(tick)
        else:
            FBCommon.DoLogicAreaReward("FamilyPartyAreaAward", tick)
            FBCommon.NotifyCopyMapPlayerFBHelp(tick, DoFBHelp, 10000)
            #FBCommon.DoLogicAreaReward("FamilyPartyAreaAward", tick)
            #FBCommon.NotifyCopyMapPlayerFBHelp(tick, DoFBHelp, 10000)
            
            mapID = GameWorld.GetMap().GetMapID()
            notifyIndex = gameFB.GetGameFBDictByKey(ChConfig.Map_FBDict_NotifyStart)
@@ -215,11 +224,8 @@
                    PlayerControl.FamilyNotify(familyID, "Party_OverTime", [notifySecond])
                     
                    GameWorld.GetGameFB().SetGameFBDict(ChConfig.Map_FBDict_NotifyStart, notifyIndex + 1)
            
    return
def FamilyPartyAnswerRight(curPlayer):
@@ -229,14 +235,14 @@
#        return
#    
    addPoint, addExp = IpyGameDataPY.GetFuncEvalCfg('PartyReward',2)
    addPoint, addExp = IpyGameDataPY.GetFuncEvalCfg('PartyReward', 2)
    #仙盟贡献度
    PlayerFamily.AddPlayerFamilyActiveValue(curPlayer, addPoint, True, ShareDefine.Def_AddFAVReason_FamilyParty, True)
    #答题经验更新
    PlayerControl.PlayerControl(curPlayer).AddExp(addExp)
    
    curAnswerCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_FamilyPartyAnswerCnt)
    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_FamilyPartyAnswerCnt, curAnswerCnt+1)
    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_FamilyPartyAnswerCnt, curAnswerCnt + 1)
    if GameWorld.GetMap().GetMapID() == ChConfig.Def_FBMapID_FamilyParty:
        DoFBHelp(curPlayer, 0)
@@ -245,7 +251,7 @@
def OnFamilyPartyStateChange(state, tick):
    #活动状态变更
    GameWorld.DebugLog('    仙盟宴会活动状态变更 state=%s'%state)
    GameWorld.DebugLog('    仙盟宴会活动状态变更 state=%s' % state)
#    if state == 0:
#        playerManager = GameWorld.GetPlayerManager()
#        for i in xrange(playerManager.GetPlayerCount()):
@@ -256,7 +262,6 @@
#            curAnswerCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_FamilyPartyAnswerCnt)
#            if FBCommon.GetEnterFBCount(curPlayer, ChConfig.Def_FBMapID_FamilyParty) or curAnswerCnt:
#                GiveJoinPrize(curPlayer)
    
    mapID = GameWorld.GetMap().GetMapID()
    if mapID != ChConfig.Def_FBMapID_FamilyParty:
@@ -264,7 +269,6 @@
    if state == 1:
        GameWorld.GetGameWorld().SetGameWorldDict(Map_FamilyPartyFB_StartTick, tick)
    
    return
@@ -279,7 +283,6 @@
#    return
##获得玩家传入副本需要携带的信息
# @param curPlayer 玩家实例
# @param lineId 分线ID
@@ -288,6 +291,7 @@
def GetPlayerResetWorldPosFBMsg(curPlayer, lineId):
    return '%s' % (curPlayer.GetPlayerID())
##玩家退出家族处理
# @param curPlayer 玩家实例
# @param tick 时间戳
@@ -295,7 +299,6 @@
def OnLeaveFamily(curPlayer, tick):
    #GameWorld.DebugLog("OnLeaveFamily...")
    curPlayerID = curPlayer.GetPlayerID()
        
    PlayerControl.PlayerLeaveFB(curPlayer)
    return
@@ -306,6 +309,7 @@
#  @return 是否副本复活
def OnPlayerReborn():
    return True
##获得副本帮助信息
# @param curPlayer 玩家实例
@@ -318,20 +322,22 @@
    playerID = curPlayer.GetPlayerID()
    totalExp = FBCommon.GetFBAreaRewardExp(gameWorld, playerID)
    curAnswerCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_FamilyPartyAnswerCnt)
    addPoint, addExp = IpyGameDataPY.GetFuncEvalCfg('PartyReward',2)
    exp = gameWorld.GetGameWorldDictByKey(FBPlayerDict_TotalExp%playerID)
    expPoint = gameWorld.GetGameWorldDictByKey(FBPlayerDict_TotalExpPoint%playerID)
    addPoint, addExp = IpyGameDataPY.GetFuncEvalCfg('PartyReward', 2)
    exp = gameWorld.GetGameWorldDictByKey(FBPlayerDict_TotalExp % playerID)
    expPoint = gameWorld.GetGameWorldDictByKey(FBPlayerDict_TotalExpPoint % playerID)
    totalExp = totalExp + expPoint * ChConfig.Def_PerPointValue + exp + addExp * curAnswerCnt
    exp = totalExp % ChConfig.Def_PerPointValue
    expPoint = totalExp / ChConfig.Def_PerPointValue
    
    totalPoint = gameWorld.GetGameWorldDictByKey(FBPlayerDict_TotalPoint%playerID)
    totalPoint = gameWorld.GetGameWorldDictByKey(FBPlayerDict_TotalPoint % playerID)
    #totalPoint += IpyGameDataPY.GetFuncCfg('PartyReward') #加参与奖
    totalPoint += addPoint * curAnswerCnt
    hasCollect = gameWorld.GetGameWorldDictByKey(FBPlayerDict_HasCollect%playerID)
    getCnt = gameWorld.GetGameWorldDictByKey(ChConfig.Map_Player_AreaReward_GetCnt%playerID)
    hasCollect = gameWorld.GetGameWorldDictByKey(FBPlayerDict_HasCollect % playerID)
    hasSit = gameWorld.GetGameWorldDictByKey(FBPlayerDict_HasSit % playerID)
    getCnt = gameWorld.GetGameWorldDictByKey(ChConfig.Map_Player_AreaReward_GetCnt % playerID)
    isFull = 1 if getCnt >= IpyGameDataPY.GetFuncCfg('FamilyPartyAreaAward', 3) else 0
    helpDict = {FBCommon.Help_exp:exp, FBCommon.Help_expPoint:expPoint,FBCommon.Help_score:totalPoint, "hasCollect":hasCollect, "isFullExp":isFull}
    helpDict = {FBCommon.Help_exp:exp, FBCommon.Help_expPoint:expPoint, FBCommon.Help_score:totalPoint, "hasCollect":hasCollect, "isFullExp":isFull, "hasSit":hasSit}
    if PyGameData.g_familyPartyInfo:
        rankList = []
        for i, info in enumerate(PyGameData.g_familyPartyInfo[0], 1):
@@ -339,10 +345,10 @@
        helpDict['familyPartyRank'] = rankList
        helpDict['familyPartyTop'] = {'name':PyGameData.g_familyPartyInfo[1], "cnt":PyGameData.g_familyPartyInfo[2]}
    
    GameWorld.DebugLog("DoFBHelp %s" % helpDict, playerID)
    FBCommon.Notify_FBHelp(curPlayer, helpDict)
    return
##是否可以采集
# @param curPlayer 玩家实例
@@ -351,7 +357,7 @@
# @return 无意义
# @remarks
def OnCanCollect(curPlayer, curNPC, tick):
    hasCollect = GameWorld.GetGameWorld().GetGameWorldDictByKey(FBPlayerDict_HasCollect%curPlayer.GetID())
    hasCollect = GameWorld.GetGameWorld().GetGameWorldDictByKey(FBPlayerDict_HasCollect % curPlayer.GetID())
    if hasCollect:
        PlayerControl.NotifyCode(curPlayer, 'Party_HadCollected')
        return
@@ -362,6 +368,7 @@
        return
    return True
##副本中,采集物需要Loading时间.
# @param curPlayer 玩家实例
# @param curNPC NPC实例
@@ -369,6 +376,7 @@
# @remarks 副本中,采集物需要Loading时间
def GetFBPrepareTime(curPlayer, curNPC):
    return IpyGameDataPY.GetFuncCfg('FamilyPartyDesk', 2) * 1000
##玩家收集成功(塔, 旗)
# @param curPlayer 玩家实例
@@ -393,4 +401,54 @@
    updPoint = totalPoint + addPoint
    gameWorld.SetGameWorldDict(FBPlayerDict_TotalPoint % playerID, updPoint)
    DoFBHelp(curPlayer, 0)
    return
    return
## 副本行为
#  @param curPlayer 玩家
#  @param actionType 行为类型
#  @param actionInfo 行为信息
#  @param tick 当前时间
#  @return None
def DoFBAction(curPlayer, actionType, actionInfo, tick):
    gameWorld = GameWorld.GetGameWorld()
    playerID = curPlayer.GetID()
    if actionType == 0:  #邀请打坐
        tagPlayerID = actionInfo
        if curPlayer.GetPlayerAction() in [IPY_GameWorld.paSit, IPY_GameWorld.paPreparing]:
            GameWorld.DebugLog('邀请打坐,玩家已处于打坐或采集状态', playerID)
            return
        hasSit = gameWorld.GetGameWorldDictByKey(FBPlayerDict_HasSit % playerID)
        if hasSit:
            GameWorld.Log('邀请打坐,玩家已打坐过一次', playerID)
            return
        copyMapPlayerManager = GameWorld.GetMapCopyPlayerManager()
        tagPlayer = copyMapPlayerManager.FindPlayerByID(tagPlayerID)
        if not tagPlayer:
            GameWorld.DebugLog('邀请%s打坐,该玩家不在副本里' % tagPlayerID, playerID)
            return
        curPlayer.StopMove()
        curPlayer.Sit()
        if tagPlayer.GetPlayerAction() not in [IPY_GameWorld.paSit, IPY_GameWorld.paPreparing]:
            tagPlayer.StopMove()
            tagPlayer.Sit()
    elif actionType == 1:  #打坐结束给奖励
        reLV = curPlayer.GetLV()
        reExp = PlayerControl.GetPlayerReExp(curPlayer)
        worldlv = GameWorld.GetGameWorld().GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_WorldAverageLv)
        giveExp = eval(IpyGameDataPY.GetFuncCompileCfg('FamilyPartySitAward'))
        if giveExp:
            PlayerControl.PlayerControl(curPlayer).AddExp(giveExp)
            exp = gameWorld.GetGameWorldDictByKey(FBPlayerDict_TotalExp % playerID)
            expPoint = gameWorld.GetGameWorldDictByKey(FBPlayerDict_TotalExpPoint % playerID)
            newTotalExp = expPoint*ChConfig.Def_PerPointValue+exp+giveExp
            gameWorld.SetGameWorldDict(FBPlayerDict_TotalExp % playerID, newTotalExp%ChConfig.Def_PerPointValue)
            gameWorld.SetGameWorldDict(FBPlayerDict_TotalExpPoint % playerID, newTotalExp/ChConfig.Def_PerPointValue)
        gameWorld.SetGameWorldDict(FBPlayerDict_HasSit % playerID, 1)
        DoFBHelp(curPlayer, 0)
        if curPlayer.GetPlayerAction() == IPY_GameWorld.paSit:
            curPlayer.Stand()
        GameWorld.DebugLog('    传功结束,给经验%s, worldlv=%s' % (giveExp, worldlv))
    return