4597 【主干】拍品装备无法兑换活跃令（拍品改为可兑换）

hxp

2019-10-18 e36d3d08ba14c81bfc159a2797d7c36b5f159ebc

 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py

@@ -1771,7 +1771,8 @@
            newbielineList = IpyGameDataPY.GetFuncEvalCfg('SealDemonNewbieLine', 1)

            # 新手线路特殊处理，直接进入

            if lineID in newbielineList:

                PlayerResetWorldPosFB(curPlayer, mapID, posX, posY, False, fbID, funcLineID=lineID)

                GameWorld.DebugLog("封魔坛虚拟线路只能通过自定义场景进入挑战！")

                #PlayerResetWorldPosFB(curPlayer, mapID, posX, posY, False, fbID, funcLineID=lineID)

                return

            else:

                bossID = GameLogic_SealDemon.CurFBLineBOSSID(lineID)

@@ -2828,6 +2829,7 @@
        return []

    if TYPE_Price == ShareDefine.TYPE_Price_Gold_Paper_Money:

        TYPE_Price = IPY_GameWorld.TYPE_Price_Gold_Money #新版无绑玉，原先绑玉再仙玉的扣法改成 扣仙玉 2019/3/26

        #恺英版： 恢复绑玉，但是不使用先绑玉再仙玉的规则，原来先绑玉再仙玉的规则一样为默认扣仙玉 2019/10/8

        

    if TYPE_Price in [IPY_GameWorld.TYPE_Price_Gold_Money, IPY_GameWorld.TYPE_Price_Gold_Paper,

                      IPY_GameWorld.TYPE_Price_Silver_Money, IPY_GameWorld.TYPE_Price_Silver_Paper]:

@@ -2876,8 +2878,9 @@
        GameWorld.Log('###---扣钱异常 = %s' % (price), curPlayer.GetPlayerID())

        return False

    

    if type_Price == IPY_GameWorld.TYPE_Price_Gold_Paper:

        type_Price = IPY_GameWorld.TYPE_Price_Gold_Money #新版无绑玉，原先绑玉再仙玉的扣法改成 扣仙玉 2019/6/3

    #20190917 恢复绑玉

#    if type_Price == IPY_GameWorld.TYPE_Price_Gold_Paper:

#        type_Price = IPY_GameWorld.TYPE_Price_Gold_Money #新版无绑玉，原先绑玉再仙玉的扣法改成 扣仙玉 2019/6/3

        

    #金子支付

    if type_Price == IPY_GameWorld.TYPE_Price_Gold_Money:

@@ -3039,9 +3042,6 @@
    

    # 消费返利

    PlayerCostRebate.AddCostRebateGold(curPlayer, costType, price, infoDict)

    # 绝版降临

#    PlayerFairyCeremony.AddFCCostGold(curPlayer, costType, price)

#    PlayerNewFairyCeremony.AddFCCostGold(curPlayer, costType, price)

    

    # 事件汇报

    #===========================================================================

@@ -3135,6 +3135,10 @@
        GameWorld.SendMsgToClientServer(ShareDefine.CrossServerMsg_GiveMoney, msgInfo, [serverGroupID])

        return True

    

    ## 恺英版去除了仙缘币，改为直接获得绑玉灵石

    if priceType == ShareDefine.TYPE_Price_XianyuanCoin:

        priceType = IPY_GameWorld.TYPE_Price_Gold_Paper

        
    if priceType == IPY_GameWorld.TYPE_Price_Gold_Money:

        if curPlayer.GetGold() + value > ChConfig.Def_PlayerTotalMoney_Gold:

            #超过金钱上限

@@ -3147,13 +3151,13 @@
            GiveMoney(curPlayer, ShareDefine.TYPE_Price_BourseMoney, value)

            addDataDict["BourseMoney"] = GetMoney(curPlayer, ShareDefine.TYPE_Price_BourseMoney)

            

#    elif priceType == IPY_GameWorld.TYPE_Price_Gold_Paper:

#        if curPlayer.GetGoldPaper() + value > ChConfig.Def_PlayerTotalMoney_Gold:

#            #超过金钱上限

#            NotifyCode(curPlayer, "MoneyIsFull", [priceType])

#            return

#        
#        curPlayer.SetGoldPaper(curPlayer.GetGoldPaper() + value)

    elif priceType == IPY_GameWorld.TYPE_Price_Gold_Paper:

        if curPlayer.GetGoldPaper() + value > ChConfig.Def_PlayerTotalMoney_Gold:

            #超过金钱上限

            NotifyCode(curPlayer, "MoneyIsFull", [priceType])

            return

        
        curPlayer.SetGoldPaper(curPlayer.GetGoldPaper() + value)

        

    elif priceType == IPY_GameWorld.TYPE_Price_Silver_Money:

        # 金钱支持超过20亿, 暂不做上限控制

@@ -5904,6 +5908,24 @@
    return [attr15%1000, attr15/1000%1000, attr15/1000000]

def SetFaceEquipIndex(curPlayer, value): return curPlayer.SetExAttr15(value)



# 返回最大的灵根系

def GetLingGenMaxIndex(curPlayer):

    return curPlayer.GetExAttr16()



def SetLingGenMaxIndex(curPlayer):

    indexList = [

                    ShareDefine.Def_Effect_Metal, # 金

                    ShareDefine.Def_Effect_Wood, # ľ

                    ShareDefine.Def_Effect_Water, # ˮ

                    ShareDefine.Def_Effect_Fire, # 火

                    ShareDefine.Def_Effect_Earth, # 土

                ]

    
    
    tempList = [curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_AddPointValue % attrID) for attrID in indexList]

    
    curPlayer.SetExAttr16(indexList[tempList.index(max(tempList))])



##获得玩家威望值

def GetPrestige(curPlayer): return 0

def SetPrestige(curPlayer, value): return