Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode

hch

2019-06-28 ef14e89ba15079832f141edc9c24a629733f8db1

Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode

 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipPlus.py

@@ -173,7 +173,7 @@
    #PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_EquipPlusLV, 1, [updPlusLV])



    # 开服活动数据

    OpenServerCampaign.UpdOpenServerCampaignRecordData(curPlayer, ShareDefine.Def_Campaign_Type_PlusLV, ChEquip.GetTotalPlusLV(curPlayer))

    #OpenServerCampaign.UpdOpenServerCampaignRecordData(curPlayer, ShareDefine.Def_Campaign_Type_PlusLV, ChEquip.GetTotalPlusLV(curPlayer))

    return updPlusLV






 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py

@@ -1237,7 +1237,7 @@
            curItem.AddUserAttr(ShareDefine.Def_IudetLegendAttrValue, legendAttrValueList[i])

        ItemCommon.MakeEquipGS(curItem)

        updScore = ItemCommon.GetEquipGearScore(curItem)

        GameWorld.ErrLog("传奇属性异常，重新刷新一次属性: packType=%s,itemID=%s,legendAttrIDList=%s,legendAttrValueList=%s,srcScore=%s,updScore=%s" 
        GameWorld.DebugLog("传奇属性异常，重新刷新一次属性: packType=%s,itemID=%s,legendAttrIDList=%s,legendAttrValueList=%s,srcScore=%s,updScore=%s" 
                         % (packType, curItem.GetItemTypeID(), legendAttrIDList, legendAttrValueList, srcScore, updScore), curPlayer.GetPlayerID())

        return

    


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.py

@@ -313,7 +313,7 @@
        if IpyGameDataPY.GetIpyGameDataNotLog("AuctionItem", itemID):

            ItemControler.SetIsAuctionItem(curSingleItem, isAuctionItem)

        else:

            GameWorld.ErrLog("拍卖物品表不存在该ID!创建拍品失败，默认转为非拍品!itemID=%s" % itemID)

            GameWorld.DebugLog("拍卖物品表不存在该ID!创建拍品失败，默认转为非拍品!itemID=%s" % itemID)

            

    ItemControler.SetItemCount(curSingleItem, itemCount)

    


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py

@@ -5934,7 +5934,7 @@
        GameWorld.ErrLog("自定义场景地图不允许采集! mapID=%s,lineID=%s,npcID=%s" % (mapID, lineID, npcID), playerID)

        return

    

    collectNPCIpyData = IpyGameDataPY.GetIpyGameData("CollectNPC", npcID)

    collectNPCIpyData = IpyGameDataPY.GetIpyGameDataNotLog("CollectNPC", npcID)

    if collectNPCIpyData:

        DoGiveCollectNPCAward(curPlayer, npcID, collectNPCIpyData)

    return


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

@@ -317,7 +317,7 @@
    #累积充值X元

    PlayerActTotalRecharge.AddTotalRechargeGold(curPlayer, orderCoin/100)

    #开服活动

    OpenServerCampaign.AddOpenServerCampaignRecordData(curPlayer, ShareDefine.Def_Campaign_Type_Recharge, orderCoin)

    #OpenServerCampaign.AddOpenServerCampaignRecordData(curPlayer, ShareDefine.Def_Campaign_Type_Recharge, orderCoin)

    PlayerWeekParty.AddWeekPartyActionCnt(curPlayer, ChConfig.Def_WPAct_Recharge, addVIPExp)

    #投资

    if ipyData:


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

@@ -4086,7 +4086,7 @@
            

            FBLogic.OnPlayerLVUp(curPlayer)

            # 记录开服活动冲级数据

            OpenServerCampaign.UpdOpenServerCampaignRecordData(curPlayer, ShareDefine.Def_Campaign_Type_LV, curPlayer.GetLV())

            #OpenServerCampaign.UpdOpenServerCampaignRecordData(curPlayer, ShareDefine.Def_Campaign_Type_LV, curPlayer.GetLV())

            #神秘限购

            FunctionNPCCommon.MysticalLimitShopOpen(curPlayer, befLV, aftLV)




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

@@ -212,7 +212,7 @@
    #更新排行榜

    PlayerBillboard.UpdateRealmBillboard(curPlayer)

    # 记录开服活动

    OpenServerCampaign.UpdOpenServerCampaignRecordData(curPlayer, ShareDefine.Def_Campaign_Type_RealmLV, nextRealmLv)

    #OpenServerCampaign.UpdOpenServerCampaignRecordData(curPlayer, ShareDefine.Def_Campaign_Type_RealmLV, nextRealmLv)

    EventShell.EventRespons_RealmUp(curPlayer, nextRealmLv)

    #流向

    DataRecordPack.DR_RealmLVUp(curPlayer, nextRealmLv)


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

@@ -375,7 +375,7 @@
        PlayerWeekParty.AddWeekPartyActionCnt(curPlayer, ChConfig.Def_WPAct_Rune, itemColor, False)

    PlayerSuccess.UptateSuccessProgress(curPlayer, ShareDefine.SuccType_RuneLvUp, totalLV)

    # 开服活动数据

    OpenServerCampaign.UpdOpenServerCampaignRecordData(curPlayer, ShareDefine.Def_Campaign_Type_RuneLV, totalLV)

    #OpenServerCampaign.UpdOpenServerCampaignRecordData(curPlayer, ShareDefine.Def_Campaign_Type_RuneLV, totalLV)

    return



#// A5 66 符印分解 #tagCMRuneDecompose


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

@@ -257,7 +257,7 @@
    if not wingData:

        return

    wingClassLV = ItemCommon.GetItemClassLV(wingData)

    return IpyGameDataPY.GetIpyGameData("WingRefineAttr", wingClassLV)

    return IpyGameDataPY.GetIpyGameDataNotLog("WingRefineAttr", wingClassLV)



def GetWingProgressPerValueByID(itemID, per):

    ## 获取翅膀精炼百分比对应的精炼值