66 【公会】基础主体-服务端（退出公会时间根据当前是否互通取对应的本服或跨服时间；）

hxp

1 天以前 c280ced8be799a899efc78b21cc807d435ab6609

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

@@ -412,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))

@@ -469,11 +470,13 @@
    needItemCnt = ipyData.GetUpNeedCnt()

    if not needItemID or not needItemCnt:

        return

    itemCount = ItemControler.GetItemCountByID(curPlayer, needItemID)

    if itemCount < needItemCnt:

        GameWorld.DebugLog("红颜时装升星物品不足! skinID=%s,needItemID=%s,itemCount=%s < %s" % (skinID, needItemID, itemCount, needItemCnt))

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

    lackCnt = needItemCnt - bindCnt - unBindCnt

    if lackCnt > 0:

        GameWorld.DebugLog("红颜时装升星物品不足! skinID=%s,needItemID=%s,needItemCnt=%s,lackCnt=%s" % (skinID, needItemID, needItemCnt, lackCnt))

        return

    ItemControler.DelItemCountByID(curPlayer, needItemID, needItemCnt)

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

    

    nextStar = curStar + 1

    GameWorld.DebugLog("红颜时装升星! skinID=%s,nextStar=%s" % (skinID, nextStar), playerID)

@@ -600,13 +603,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