xdh
2019-07-04 fee42f94b6eed8592d24e24726d8b7cb058c0d1a
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.py
@@ -272,8 +272,8 @@
#  @return None
#  @remarks 函数详细说明.
def DoFB_Player_KillNPC(curPlayer , curNPC , tick):
    mapID = curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_ClientCustomSceneMapID)
    lineID = curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_ClientCustomSceneLineID)
    mapID = PlayerControl.GetCustomMapID(curPlayer)
    lineID = PlayerControl.GetCustomLineID(curPlayer)
    if mapID:
        DoCustomScene_Player_KillNPC(curPlayer, curNPC, mapID, lineID)
        return
@@ -525,9 +525,8 @@
    gameMap = GameWorld.GetMap()
    gameMapID = gameMap.GetMapID()
    
    #如果已经设置过副本功能线路属性,则进入时同步玩家,一般下线重登或者非第一个进入该副本的玩家(如队友)会收到该包
    if FBCommon.GetHadSetFBPropertyMark() and gameMap.GetMapFBType() != IPY_GameWorld.fbtSingle:
        PlayerControl.SetFBFuncLineID(curPlayer, FBCommon.GetFBPropertyMark())
    reqFuncLineID = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_ReqFBFuncLine)
    PlayerControl.SetFBFuncLineID(curPlayer, reqFuncLineID)
        
    #成长NPC所需数据初始化
    InitFBNPCStrengthenData(curPlayer, gameMap)
@@ -2208,14 +2207,14 @@
        
    return
## 自定义场景采集OK
## 自定义场景采集OK,需自带是否允许采集的判断
def OnCustomSceneCollectOK(curPlayer, mapID, lineID, npcID):
    do_FBLogic_ID = __GetFBLogic_MapID(mapID)
    
    callFunc = GameWorld.GetExecFunc(FBProcess, "GameLogic_%s.%s" % (do_FBLogic_ID, "OnCustomSceneCollectOK"))
    
    if callFunc:
        callFunc(curPlayer, mapID, lineID, npcID)
        return callFunc(curPlayer, mapID, lineID, npcID)
        
    return