hxp
2019-08-09 b8db02d69c95fa1f94e304ab6a7714c54517a9e0
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.py
@@ -71,7 +71,7 @@
def ActiveMagicWeaponByFB(curPlayer, mapID, lineID, passLV=0):
    ##通关副本激活法宝(人族、魔族法宝)
    ipyData = IpyGameDataPY.GetIpyGameDataByCondition('MagicWeaponFB', {'LineID':lineID, 'Level':passLV})
    ipyData = IpyGameDataPY.GetIpyGameDataByCondition('MagicWeaponFB', {'LineID':lineID, 'Level':passLV}, isLogNone=False)
    if ipyData:
        mwID = ipyData.GetMWID()
        GameWorld.Log('更新魔族副本关卡 mwID=%s,level=%s' % (mwID, passLV), curPlayer.GetID())
@@ -149,13 +149,13 @@
        return
    addPointDict = IpyGameDataPY.GetFuncEvalCfg("LVUPAddPoint", 1, {})
    fabaoAddPoint = PlayerControl.GetFabaoAddPoint(curPlayer)
    multiple = PlayerControl.GetLVAddPointMultiple(curPlayer)
    curLV = curPlayer.GetLV()
    addFreePoint = 0
    for rangLVs, point in addPointDict.items():
        if curLV < rangLVs[0]:
            continue
        addFreePoint += fabaoAddPoint * multiple * (min(curLV, rangLVs[1]) - rangLVs[0] + 1)
        addFreePoint += fabaoAddPoint * (min(curLV, rangLVs[1]) - rangLVs[0] + 1)
    freePoint = curPlayer.GetFreePoint()
    updFreePoint = freePoint + addFreePoint
    curPlayer.SetFreePoint(updFreePoint)
@@ -353,13 +353,16 @@
    return
def GetXBXZAwardProgress(curPlayer, mwID):
    ##获取仙宝寻主当前达到条件的个数
    ##获取仙宝寻主当前达到条件的个数(包含已领取的)
    ipyDataList = IpyGameDataPY.GetIpyGameDataByCondition('XBXZ', {'MWID': mwID}, True, False)
    if not ipyDataList:
        return 0
    cnt = 0
    playerEquip = curPlayer.GetItemManager().GetPack(IPY_GameWorld.rptEquip)
    for ipyData in ipyDataList:
        if GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_PDict_XBXZAwardRecord, ipyData.GetID()):
            cnt += 1
            continue
        curType = ipyData.GetType()
        conditionList = ipyData.GetCondition()