8012 【2.0.300】【后端】升星功能调整（消耗不同阶装备概率支持根据等阶差增加或衰减概率）

hxp

2019-07-19 3fc13c42d926d91d3183a9608b769b22b5f4c87c

 ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/AuctionHouse.py

@@ -475,8 +475,8 @@
                    

                    # 仙盟拍品收益邮件

                    detail = {"ItemGUID":itemGUID, "ItemID":itemID, "Count":itemCount, "BidderPrice":bidderPrice, "FamilyPlayerIDList":familyPlayerIDList}

                    paramList = [itemID, itemID, auctionItem.BidderName, bidderPrice, taxRate, giveGoldAverage, personMaxRate]

                    PlayerCompensation.SendMailByKey("PaimaiMail6", familyPlayerIDList, [], paramList, gold=giveGoldAverage, 
                    paramList = [itemID, itemID, bidderPrice, taxRate, giveGoldAverage, personMaxRate]

                    PlayerCompensation.SendMailByKey("PaimaiMail8", familyPlayerIDList, [], paramList, gold=giveGoldAverage, 
                                                     detail=detail, moneySource=ChConfig.Def_GiveMoney_AuctionGain)

                else:

                    GameWorld.ErrLog("仙盟拍品没有人获得收益!familyID=%s,itemID=%s,itemGUID=%s" % (familyID, itemID, itemGUID))

@@ -488,15 +488,16 @@
                

                # 个人拍卖收益邮件

                detail = {"ItemGUID":itemGUID, "ItemID":itemID, "Count":itemCount, "BidderPrice":bidderPrice}

                paramList = [itemID, itemID, auctionItem.BidderName, bidderPrice, taxRate, givePlayerGold]

                PlayerCompensation.SendMailByKey("PaimaiMail5", [playerID], [], paramList, gold=givePlayerGold, 
                paramList = [itemID, itemID, bidderPrice, taxRate, givePlayerGold]

                PlayerCompensation.SendMailByKey("PaimaiMail7", [playerID], [], paramList, gold=givePlayerGold, 
                                                 detail=detail, moneySource=ChConfig.Def_GiveMoney_AuctionGain)

                

            AddAuctionRecord(auctionItem, AuctionRecordResult_SellOK)

            

            ipyData = IpyGameDataPY.GetIpyGameData("AuctionItem", itemID)

            if ipyData and ipyData.GetNeedWorldNotify():

                PlayerControl.WorldNotify(0, "Paimai6", [auctionItem.BidderName, bidderID, auctionItem.AuctionType, bidderPrice, itemID])

            #策划需求屏蔽掉成交广播

            #ipyData = IpyGameDataPY.GetIpyGameData("AuctionItem", itemID)

            #if ipyData and ipyData.GetNeedWorldNotify():

            #    PlayerControl.WorldNotify(0, "Paimai6", [auctionItem.BidderName, bidderID, auctionItem.AuctionType, bidderPrice, itemID])

        else:

            # 仙盟拍品回收

            if familyID:

@@ -509,7 +510,7 @@
                # 流拍返还物品邮件

                paramList = []

                detail = {"ItemGUID":itemGUID}

                addItemList = [{"ItemID":itemID, "Count":itemCount, "IsAuctionItem":False, "UserData":auctionItem.UserData}]

                addItemList = [{"ItemID":itemID, "Count":itemCount, "IsAuctionItem":True, "UserData":auctionItem.UserData}]

                PlayerCompensation.SendMailByKey("PaimaiMail4", [playerID], addItemList, paramList, detail=detail)

                

                AddAuctionRecord(auctionItem, AuctionRecordResult_SellFail)

@@ -710,7 +711,9 @@
    auctionItem.UserDataLen = len(auctionItem.UserData)

    auctionItem.FamilyPlayerIDInfo = str(familyPlayerIDList)

    auctionItem.FamilyPlayerIDLen = len(auctionItem.FamilyPlayerIDInfo)

            
    auctionItem.AuctionType = AuctionType_Family if familyID else AuctionType_World

    GameWorld.Log("上架拍品: playerID=%s,familyID=%s,itemID=%s,auctionType=%s" % (playerID, familyID, itemID, auctionItem.AuctionType))

    
    if not __InitAuctionItemAttrEx(auctionItem):

        return

    

@@ -719,12 +722,10 @@
    auctionItemMgr.allAuctionItemByEndTimeList.append(auctionItem)

    

    if familyID:

        auctionItem.AuctionType = AuctionType_Family

        familyItemList = auctionItemMgr.familyAuctionItemDict.get(familyID, [])

        familyItemList.append(auctionItem)

        auctionItemMgr.familyAuctionItemDict[familyID] = familyItemList

    else:

        auctionItem.AuctionType = AuctionType_World

        auctionItemMgr.worldAuctionItemList.append(auctionItem)

        

        # 添加进我的拍卖