ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActTurntable.py
@@ -197,8 +197,8 @@
        
    return
def OnPlayerUseGold(curPlayer, addUseGold):
    ## 玩家消耗仙玉
def OnPlayerUseGold(curPlayer, moneyType, addUseGold):
    ## 玩家消耗货币
    
    if addUseGold <= 0:
        return
@@ -217,20 +217,23 @@
        if not ipyData:
            continue
        
        useGoldPrizeList = ipyData.GetUseGoldPrizeList()
        if moneyType != ipyData.GetUseMoneyType():
            continue
        useMoneyPrizeList = ipyData.GetUseMoneyPrizeList()
        nowUseGold = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_TurntableUseGold % actNum)
        if nowUseGold >= max(useGoldPrizeList):
            GameWorld.DebugLog("转盘活动消耗仙玉已达最大记录,actNum=%s,nowUseGold=%s,maxUseGoldValue=%s"
                               % (actNum, nowUseGold, max(useGoldPrizeList)))
        if nowUseGold >= max(useMoneyPrizeList):
            GameWorld.DebugLog("转盘活动消耗货币已达最大记录,actNum=%s,moneyType=%s,nowUseGold=%s,maxUseMoneyValue=%s"
                               % (actNum, moneyType, nowUseGold, max(useMoneyPrizeList)))
            continue
        
        updUseGold = nowUseGold + addUseGold
        PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_TurntableUseGold % actNum, updUseGold)
        GameWorld.DebugLog("转盘活动消耗仙玉,actNum=%s,nowUseGold=%s,updUseGold=%s,addUseGold=%s"
                           % (actNum, nowUseGold, updUseGold, addUseGold))
        GameWorld.DebugLog("转盘活动消耗货币,actNum=%s,moneyType=%s,nowUseGold=%s,updUseGold=%s,addUseGold=%s"
                           % (actNum, moneyType, nowUseGold, updUseGold, addUseGold))
        
        addTurntableCount = 0
        for useGold in useGoldPrizeList:
        for useGold in useMoneyPrizeList:
            if updUseGold < useGold:
                break
            
@@ -460,7 +463,7 @@
    playerActInfo.ActNum = actNum
    playerActInfo.CanUseCount = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_TurntableCanUseCount % actNum)
    playerActInfo.CTGTotal = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_TurntableCTGValue % actNum)
    playerActInfo.UseGoldTotal = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_TurntableUseGold % actNum)
    playerActInfo.UseMoneyTotal = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_TurntableUseGold % actNum)
    playerActInfo.TurnItemState = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_TurntableItemState % actNum)
    playerActInfo.GetItemNum = getItemNum
    NetPackCommon.SendFakePack(curPlayer, playerActInfo)
@@ -492,8 +495,9 @@
    clientPack.LimitLV = ipyData.GetLVLimit()
    clientPack.CTGPrizeList = [CommFunc.RMBToCoin(floatRMB) for floatRMB in ipyData.GetCTGPrizeList()]
    clientPack.CTGPrizeCount = len(clientPack.CTGPrizeList)
    clientPack.UseGoldPrizeList = ipyData.GetUseGoldPrizeList()
    clientPack.UseGoldPrizeCount = len(clientPack.UseGoldPrizeList)
    clientPack.UseMoneyType = ipyData.GetUseMoneyType()
    clientPack.UseMoneyPrizeList = ipyData.GetUseMoneyPrizeList()
    clientPack.UseMoneyPrizeCount = len(clientPack.UseMoneyPrizeList)
    
    numCountList = ipyData.GetLibChooseCountList()
    numCountTotal = sum([numCount for numCount in numCountList])