Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode

hch

2019-04-27 f44c22844d7176ed48b1963f36454637efaa0a54

 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MagicWeapon.py

@@ -446,15 +446,18 @@
        fbMissionID = gameFB.GetGameFBDictByKey(FBPlayerDict_MissionID)

        if fbMissionID:

            EventShell.EventRespons_FBEvent(curPlayer, "cleardevil_pass_%s" % fbMissionID)

        # 成就

        #触发激活法宝

        level = gameFB.GetGameFBDictByKey(FBPlayerDict_Level)

        PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_PassWagicWeapon, 1, [lineID + 1, level])

        # 更新关卡

        if level:

            ipyData = IpyGameDataPY.GetIpyGameDataByCondition('MagicWeaponFB', {'LineID':lineID, 'Level':level})

            if ipyData:

                mwID = ipyData.GetMWID()

                PlayerMagicWeapon.UptateMWFBPasslv(curPlayer, mwID, level)

        PlayerMagicWeapon.ActiveMagicWeaponByFB(curPlayer, ChConfig.Def_FBMapID_MagicWeapon, lineID, level)

#        # 成就

#        level = gameFB.GetGameFBDictByKey(FBPlayerDict_Level)

#        PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_PassWagicWeapon, 1, [lineID + 1, level])

#        # 更新关卡

#        if level:

#            ipyData = IpyGameDataPY.GetIpyGameDataByCondition('MagicWeaponFB', {'LineID':lineID, 'Level':level})

#            if ipyData:

#                mwID = ipyData.GetMWID()

#                PlayerMagicWeapon.UptateMWFBPasslv(curPlayer, mwID, level)

                

    

    DoFBHelp(curPlayer, tick)

@@ -586,14 +589,14 @@
    if isPass:

        EventReport.WriteEvent_FB(curPlayer, ChConfig.Def_FBMapID_MagicWeapon, 0, ChConfig.CME_Log_End, 0, 1)

    

    if lineID == IpyGameDataPY.GetFuncCfg('FirstGoldTryItem', 3):

        if not isPass:

            #副本指定线路失败了，进入首充试用引导

            if not curPlayer.GetChangeCoinPointTotal() and not curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_FirstGoldTry):

                PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_FirstGoldTry, 1)

                PlayerGoldGift.Sync_FirstGoldInfo(curPlayer)

        else:

            PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_FirstGoldTry, 0)

#    if lineID == IpyGameDataPY.GetFuncCfg('FirstGoldTryItem', 3):

#        if not isPass:

#            #副本指定线路失败了，进入首充试用引导

#            if not curPlayer.GetChangeCoinPointTotal() and not curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_FirstGoldTry):

#                PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_FirstGoldTry, 1)

#                PlayerGoldGift.Sync_FirstGoldInfo(curPlayer)

#        else:

#            PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_FirstGoldTry, 0)

    return