358 【内政】红颜系统-服务端（红颜时装默认解锁的状态也通知；红颜时装物品解锁改为直接取背包中的物品；）

hxp

4 天以前 6343277477b190efbc389bab2706cf94eb09be8d

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

@@ -145,11 +145,13 @@
    if unlockWay == UnlockWay_Item:

        needItemID = unlockValue

        needItemCnt = unlockNeedCnt

        itemCount = ItemControler.GetItemCountByID(curPlayer, needItemID)

        if itemCount < needItemCnt:

            GameWorld.DebugLog("激活红颜物品不足! beautyID=%s,needItemID=%s,itemCount=%s < %s" % (beautyID, needItemID, itemCount, needItemCnt), playerID)

        
        costItemIndexList, bindCnt, unBindCnt = ItemCommon.GetPackItemBindStateIndexInfo(curPlayer, needItemID, needItemCnt)

        lackCnt = needItemCnt - bindCnt - unBindCnt

        if lackCnt > 0:

            GameWorld.DebugLog("激活红颜物品不足! beautyID=%s,needItemID=%s,needItemCnt=%s,lackCnt=%s" % (beautyID, needItemID, needItemCnt, lackCnt), playerID)

            return

        ItemControler.DelItemCountByID(curPlayer, needItemID, needItemCnt)

        ItemCommon.DelCostItemByBind(curPlayer, costItemIndexList, bindCnt, unBindCnt, needItemCnt, "Beauty")

        

    elif unlockWay == UnlockWay_TaskID:

        taskID = unlockValue

@@ -410,11 +412,12 @@
    if unlockWay == UnlockWaySkin_Item:

        needItemID = unlockValue

        needItemCnt = unlockNeedCnt

        itemCount = ItemControler.GetItemCountByID(curPlayer, needItemID)

        if itemCount < needItemCnt:

            GameWorld.DebugLog("激活红颜时装物品不足! beautyID=%s,needItemID=%s,itemCount=%s < %s" % (beautyID, needItemID, itemCount, needItemCnt))

        costItemIndexList, bindCnt, unBindCnt = ItemCommon.GetPackItemBindStateIndexInfo(curPlayer, needItemID, needItemCnt)

        lackCnt = needItemCnt - bindCnt - unBindCnt

        if lackCnt > 0:

            GameWorld.DebugLog("激活红颜时装物品不足! beautyID=%s,needItemID=%s,needItemCnt=%s,lackCnt=%s" % (beautyID, needItemID, needItemCnt, lackCnt))

            return

        ItemControler.DelItemCountByID(curPlayer, needItemID, needItemCnt)

        ItemCommon.DelCostItemByBind(curPlayer, costItemIndexList, bindCnt, unBindCnt, needItemCnt, "Beauty")

        

    else:

        GameWorld.DebugLog("红颜皮肤不需要激活! beautyID=%s,skinID=%s" % (beautyID, skinID))

@@ -598,13 +601,13 @@
        if ipyDataList:

            for ipyData in ipyDataList:

                skinID = ipyData.GetSkinID()

                skinInfo = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_BeautySkinInfo % skinID)

                #skinInfo = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_BeautySkinInfo % skinID)

                if skinIDList != None:

                    if skinID not in skinIDList:

                        continue

                else:

                    if not skinInfo:

                        continue

                #else:

                #    if not skinInfo:

                #        continue

                beautySkin = ChPyNetSendPack.tagSCBeautySkin()

                beautySkin.SkinID = skinID

                beautySkin.State = 1 if IsBeautySkinCanUse(curPlayer, beautyID, skinID, ipyData) else 0