xdh
2019-01-14 e463972e32a6c06dd215a55e1d7799be2bc6f1c5
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.py
@@ -288,7 +288,9 @@
        return
    
    curPlayer.SetActionObj(curNPC)
    if curNPC.GetNPCID() in ReadChConfig.GetEvalChConfig("CollectNPCLostHP"):
        curPlayer.SetDict(ChConfig.Def_PlayerKey_CollectLostHPTick, tick)
    prepareTime = FBLogic.GetFBPrepareTime(curPlayer, curNPC)
    
    collTimeReduceRate = PlayerVip.GetPrivilegeValue(curPlayer, ChConfig.VIPPrivilege_CollTimeReduceRate)
@@ -808,8 +810,8 @@
            giveItem.Clear()
            continue
    
    #---初始化装备显隐---
    curPlayer.SetEquipShowSwitch(IPY_GameWorld.revClothesCoat|IPY_GameWorld.revWeaponCoat|IPY_GameWorld.revMask)
    #---初始化装备显隐---前端自己设置
    #curPlayer.SetEquipShowSwitch(IPY_GameWorld.revClothesCoat|IPY_GameWorld.revWeaponCoat|IPY_GameWorld.revMask)
    
    #默认触发一次功能开启
    if curPlayer.GetLV() == 1:
@@ -3703,7 +3705,7 @@
    curPlayer.SetForbiddenResetItem(0)
    ExitCompose(curPlayer)
    ExitWarehouse(curPlayer)
    ExitRepair(curPlayer)
    #ExitRepair(curPlayer)
    ExitCreateFamily(curPlayer)
    ExitBillboard(curPlayer)
    #ExitEventLock(curPlayer)
@@ -3712,9 +3714,9 @@
    #npc商店退出
    ExitNPCShop(curPlayer)
    
    PlayerTrade.LeaveTrade(curPlayer, 0)
    #PlayerTrade.LeaveTrade(curPlayer, 0)
    # 清除py自定义状态
    ClearPyPlayerAction(curPlayer)
    #ClearPyPlayerAction(curPlayer)
    
    #调用底层结束事件
    #避免策划变更,导致其他退出锁定事件使任务1未接取就退出锁定
@@ -3944,7 +3946,7 @@
# @remarks 自定义函数, 读数据库任务删除表, 删除任务
def __DoLogic_DeleteMission(curPlayer, curMission):
    missionID = curMission.GetMissionID()
    GameWorld.Log("__DoLogic_DeleteMission---%s"%missionID)
    GameWorld.Log("__DoLogic_DeleteMission---%s"%missionID, curPlayer.GetID())
    delMissionData = GameWorld.GetGameData().GetMissionDeleteByID(missionID)
    #任务删除表中无此任务
    if not delMissionData: