ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
@@ -2663,22 +2663,6 @@
    return playerlist
#---------------------------------------------------------------------
##转变付费货币类型
# @param curPlayer 玩家实例
# @param moneyType 货币类型 1表示金子,2表示金票,3表示银子,4表示银票, 5:金子/金票 6:银子/银票
# @return 返回值, 货币类型
# @remarks 转变付费货币类型
def ChangeMoneyType(curPlayer, moneyType):
#    if moneyType == 5:
#        return curPlayer.GetUseGoldType()
#
#    if moneyType == 6:
#        return curPlayer.GetUseSilverType()
    if moneyType not in ChConfig.Def_MoneyType_All:
        GameWorld.ErrLog("金钱类型填写错误 %s" % moneyType)
    return moneyType
#---------------------------------------------------------------------
##获取玩家货币数
# @param curPlayer 玩家实例
# @param TYPE_Price ,货币类型
@@ -2887,6 +2871,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
    #金子支付
    if type_Price == IPY_GameWorld.TYPE_Price_Gold_Money:
        curPlayerGold = curPlayer.GetGold()
@@ -3155,13 +3142,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亿, 暂不做上限控制
@@ -3191,7 +3178,8 @@
            PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_GetRealmPoint, value)
            EventShell.EventRespons_GetRealmPoint(curPlayer)
    else:
        GameWorld.Log("金钱类型错误, priceType = %s" % (priceType), curPlayer.GetPlayerID())
        GameWorld.ErrLog("金钱类型错误, priceType=%s,value=%s,giveType=%s" % (priceType, value, giveType), curPlayer.GetPlayerID())
        DataRecordPack.DR_GiveMoneyError(curPlayer, priceType, value, giveType, addDataDict)
        return
    
    if isSysHint and priceType != ShareDefine.TYPE_Price_BourseMoney: