PySysDB/PySysDBPY.h

@@ -1240,7 +1240,7 @@
    BYTE        _TaskType;    //任务类型

    list        TaskConds;    //任务条件[...]

    DWORD        NeedValue;    //所需任务值

    BYTE        AwardLiveness;    //奖励活跃度

    list        AwardItemList;    //奖励物品列表

};



//每日活跃奖励表


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py

@@ -498,10 +498,10 @@
Def_ItemType_Title = 4           #称号

Def_ItemType_SPValue = 5           #SPֵ

Def_ItemType_SPBook = 6           #SP技能书

Def_ItemType_HPMP = 7             #补红补篮

Def_ItemType_AddExpBuff = 8          #经验道具

Def_ItemType_AddLimitBuff = 9    #添加限时buff物品类型

Def_ItemType_AddLimitBuff2 = 18   #添加限时buff物品类型，效果相同，前端需求需要区分类型

#Def_ItemType_HPMP = 7             #补红补篮

#Def_ItemType_AddExpBuff = 8          #经验道具

#Def_ItemType_AddLimitBuff = 9    #添加限时buff物品类型

#Def_ItemType_AddLimitBuff2 = 18   #添加限时buff物品类型，效果相同，前端需求需要区分类型

Def_ItemType_OnhookCard = 10    #挂机卡

Def_ItemType_ChangePlayerName = 11          #改名贴

Def_ItemType_Transmit = 12          #传送道具

@@ -536,7 +536,7 @@
Def_ItemType_FamilyBossFood = 50       #仙盟兽粮

Def_ItemType_ActiveMWItem = 53     # 用于激活法宝的物品，不存在背包 （王者法宝）

Def_ItemType_ActiveMWItem2 = 56     # 用于激活法宝的物品，不存在背包（非王者法宝）

Def_ItemType_ResetAttrPoint = 59       #洗点卷轴 使用后将某个属性一定值变为未分配属性

#Def_ItemType_ResetAttrPoint = 59       #洗点卷轴 使用后将某个属性一定值变为未分配属性

Def_ItemType_GatherSoulExp = 61 #聚魂精华材料

Def_ItemType_GatherSoul = 62 #普通聚魂

Def_ItemType_GatherSoulCore = 63 #聚魂核心

@@ -574,7 +574,6 @@
Def_ItemType_DogzEquipTooth = 121   # 神兽獠牙

Def_ItemType_DogzEquipClaw = 122    # 神兽兽爪

Def_ItemType_DogzEquipScute = 123   # 神兽鳞甲

Def_ItemType_AddCrossRealmPKCnt = 127 #增加跨服PK次数



Def_ItemType_DogzStuff = 139 # 神兽材料



@@ -629,7 +628,7 @@
Def_Effect_GivePlayerMoneyGift = 202    #给人物金钱 绑定仙玉道具效果ID

Def_Effect_GivePlayerMoneyGold = 203    #给人物金钱 仙玉道具效果ID

Def_Effect_AddDienstgrad = 204   #使用物品获得称号

Def_Effect_UseItemGiveZhenQi = 205      #使用道具给予真气

#205      #使用道具给予真气

Def_Effect_ItemGiveFamilyContribution = 209      #使用道具给予仙盟贡献

Def_Effect_ItemAddExp = 213      #给经验道具 

Def_Effect_ItemAddLV = 214       #直接升级道具 

@@ -638,16 +637,16 @@
Def_Effect_EquipStone = 225   #镶嵌宝石效果；A值-宝石镶嵌类型，B值-宝石等级，C值-下一级宝石ID

Def_Effect_Reborn = 227                 #复活物品(还阳咒)效果ID

Def_Effect_PrizeCoin = 228                 #奖励充值点券; A值点券；B值奖励点券

Def_Effect_AddVIPExp = 229                 #增加VIP经验；A值经验点

Def_Effect_ResetBossKillCnt = 230                 #重置boss击杀疲劳；A值重置的boss疲劳类型

#229                 #增加VIP经验；A值经验点

#230                 #重置boss击杀疲劳；A值重置的boss疲劳类型

Def_Effect_GivePlayerSilverPaper = 1915    #给人物金钱银票（恶魔精华）道具效果ID

Def_Effect_ItemSpeak = 2700              #小喇叭效果ID

Def_Effect_CleanGuilt = 2812   # 洗红名

#Def_Effect_CleanGuilt = 2812   # 洗红名

Def_Effect_ResetAttrPoint = 231   # 洗点

Def_Effect_AddFBCnt = 233   # 增加副本可进入次数，A值副本ID，B值是否自动使用

Def_Effect_AddKillBossCnt = 234   # 增加BOSS可击杀次数

#234   # 增加BOSS可击杀次数

Def_Effect_DogzEquipPlusExp = 235   # 神兽强化材料经验效果，A值基础经验，B值双倍强化消耗仙玉

Def_Effect_AddMagicWeaponUpExp = 236   # 增加法宝升星经验 A值法宝ID B值X经验

#236   # 增加法宝升星经验 A值法宝ID B值X经验

Def_Effect_ChatBubbleBox = 237   # 激活聊天气泡框，A值气泡框ID

Def_Effect_ItemGiveRealmPoint = 238      #使用道具给予修行点

Def_Effect_ItemGiveSoulDust = 239   # 使用道具给予魂尘

@@ -656,14 +655,14 @@
Def_Effect_ItemGiveHonor = 242      #使用道具给予荣誉

Def_Effect_ItemGiveWeekPartyPoint = 245      #使用道具给予七日巡礼积分

Def_Effect_ItemGiveWeekPartyPoint1 = 246      #使用道具给予节日巡礼积分

Def_Effect_AddRealmExpRate = 251 #增加聚灵效率

Def_Effect_TouchMission = 252 #触发任务

#251 #增加聚灵效率

#252 #触发任务

#253 #骑宠觉醒值

Def_Effect_ItemGiveTreasureScore = 254      #使用道具给予寻宝积分

Def_Effect_VIPLVCard = 256    #VIP等级直升卡 直接升到VIPx级，只加经验，享受VIP特权    效果值A： vip等级    效果值B： 领取是否默认直接使用

Def_Effect_AddArenaBattleCount = 257    #增加竞技场挑战次数，A值为增加次数

#256    #VIP等级直升卡 直接升到VIPx级，只加经验，享受VIP特权    效果值A： vip等级    效果值B： 领取是否默认直接使用

#257    #增加竞技场挑战次数，A值为增加次数

Def_Effect_ItemGiveMoney = 264    #通用给货币道具，A值数量，B值货币类型

Def_Effect_GuajiAward = 266    #直接给挂机收益，A值分钟

#266    #直接给挂机收益，A值分钟

Def_Effect_ItemCount = 267     #自动转化为对应物品ID的个数，不存背包

Def_Effect_TrainRealmLV = 272     #境界培养卡，值A-功能（1-坐骑；2-灵宠；3-灵器）， 值B-境界

Def_Effect_TiandaoQiyun = 273   #增加天道树气运；A值-增加值   效果值B： 领取是否默认直接使用

@@ -674,54 +673,14 @@
Def_Effect_FamilyEmblem = 278   #激活仙盟徽章； A值-徽章ID；

Def_Effect_HeroSkin = 279   #激活武将皮肤； A值-武将ID；B值-皮肤索引

Def_Effect_FamilyTaofaCnt = 280   #增加公会讨伐次数； A值-讨伐次数

Def_Effect_AddActivity = 281   #给活跃度



#放入背包自动使用的物品效果ID

AutoUseItemEffectIDList = [Def_Effect_ItemCount, Def_Effect_AddActivity]



#----以下未使用或代码依然存在的---

Def_Effect_ItemGiveGongXun = 1920        #使用道具给予功勋

Def_Effect_ItemGiveRuneJH = 1925       #使用道具给予符印精华

Def_Effect_ItemGiveRuneSplinters = 1926       #使用道具给予符印碎片

Def_Effect_SuiteMark = 2838    #用于标示套装装备，过滤等使用

Def_Effect_ClothesCoatSkin = 1919   #玩家时装皮肤

#Def_Effect_PetReSet = 5500        #易髓丹

#Def_Effect_PetUpdateTalent = 5501 #造化丹

#Def_Effect_PetRePoint = 5505      #神泣之泪

#Def_Effect_PetEmptySoul = 5503    #宠物空魂

#Def_Effect_PetSoul = 5504         #宠物满魂

#Def_Effect_PetItemAddExp = 2006   #给宠物经验道具 
#Def_Effect_EnergyItem = 2600             #精力药剂

#Def_Effect_PetRewashSkill = 5506         #重洗技能

#Def_Effect_AddStarItemNormal = 1157      #普通升星物品效果ID

#Def_Effect_AddStarItemHighLevel = 1158   #高级升星物品效果ID

#Def_Effect_CompoundJiePo = 1159          #结魄效果ID

#Def_Effect_PickStone = 1160              #摘取符效果ID

#Def_Effect_ItemJionFamilyBattle = 1800   #报名家族争霸赛效果ID

#Def_Effect_ItemEnterMiJingDiTu = 1164    #进入密境地图效果ID

#Def_Effect_FineSouleProtect = 1163       #精魄合成保护符效果ID

#Def_Effect_ItemChangMaxEndure = 1165     #物品提高装备最大耐久

#Def_Effect_ItemNoLostEquipEndure = 1166  #物品不扣装备耐久

#Def_Effect_ItemRestoreEndure = 1167      #物品修复装备耐久

#Def_Effect_ItemWuXingJuan = 1171         #五行转换卷轴

#Def_Effect_ResetAttrItem = 1174          #属性重修丸效果ID

#Def_Effect_PetReSetTalentl = 5507        #宠物道具, 重置资质

#Def_Effect_ResetQuestCount = 1175        #重置任务次数

#Def_Effect_MaxAddSkillCnt = 1184         #增加最大灵纹次数道具

#Def_Effect_FarSellItem = 2012            #远程贩卖所需物品

#Def_MagicStone_EffID = 1104              #灵石

#Def_SuperMagicStone_EffID = 1190         #圣石效果ID

#Def_PhoneVip_EffID = 600                 #手机VIP物品卡效果ID

#Def_Effect_ItemEquipWakeUp = 1191        #神器唤醒效果

#Def_Effect_ItemEquipWakeUpStarLv = 1192  #最高级升星石

#Def_Effect_AddZhenQiByTimes = 2018       #增加真气按一天使用次数减少

#Def_Effect_AddPrestige = 2021            #增加威望 
#Def_Effect_FamilyImpeach = 1193          #弹劾符 
#Def_Item_150_Effect = 2010                 #定点传送符

#Def_Item_152_Effect = 383                  #山洞传送符

#Def_Effect_GetVIP = 2811   # 获取vip物品效果

#Def_ItemEff_WeaponType = 2808   # 武器类型分类（非物品类型）

#Def_ItemEff_Flower = 2816   # 鲜花

#Def_Effect_AddMagicJifen = 1916      #使用道具给予幸运宝藏积分

#Def_Effect_AddSkyGodExp = 2854   #增加天神经验 A值天神经验

#Def_Effect_SummonNPC = 2855   #召唤NPC A值NPCID B值持续时间 C值是否不删除物品，默认0删除

#Def_Effect_AddOfficialExp = 2859   #增加爵位经验



#---------------------------------------------------------------------

Def_Max_Update_Talent_Time = 3    #最大使用造化丹次数



@@ -4484,7 +4443,7 @@
ItemDel_SellPackItem, # 出售物品

ItemDel_2, # 神兵

ItemDel_EquipEnchase, # 宝石镶嵌

ItemDel_Add_LimitingBuff, # 增加buff时间

ItemDel_4, # 增加buff时间

ItemDel_AddDienstgrad, # 增加称号 5

ItemDel_AddExp, # 增加经验

ItemDel_AddLV, # 增加等级

@@ -4534,7 +4493,6 @@
                   ItemDel_Unknown:"Unknown",

                   ItemDel_SellPackItem:"SellPackItem",

                   ItemDel_EquipEnchase:"EquipEnchase",

                   ItemDel_Add_LimitingBuff:"Add_LimitingBuff",

                   ItemDel_AddDienstgrad:"AddDienstgrad",

                   ItemDel_AddExp:"AddExp",

                   ItemDel_AddLV:"AddLV",


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ResetBaseAttr.py

File was deleted

 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py

@@ -1013,7 +1013,7 @@
                        ("BYTE", "TaskType", 1),

                        ("list", "TaskConds", 0),

                        ("DWORD", "NeedValue", 0),

                        ("BYTE", "AwardLiveness", 0),

                        ("list", "AwardItemList", 0),

                        ),



                "DailyLivenessReward":(

@@ -3673,7 +3673,7 @@
    def GetTaskType(self): return self.attrTuple[1] # 任务类型 BYTE

    def GetTaskConds(self): return self.attrTuple[2] # 任务条件[...] list

    def GetNeedValue(self): return self.attrTuple[3] # 所需任务值 DWORD

    def GetAwardLiveness(self): return self.attrTuple[4] # 奖励活跃度 BYTE
    def GetAwardItemList(self): return self.attrTuple[4] # 奖励物品列表 list

# 每日活跃奖励表
class IPY_DailyLivenessReward():

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

@@ -574,45 +574,24 @@
    

    #根据物品类型使用{物品类型:call的py名}

    itemTypeCallFuncDic = {

                           ChConfig.Def_ItemType_HPMP:"Item_Add_HPMP",                # 补红补篮药剂

                           ChConfig.Def_ItemType_AddExp:"Item_AddExp",         # 给经验道具

                           ChConfig.Def_ItemType_GiveMoney:"Item_GiveMoney",         # 给人物金钱

                           ChConfig.Def_ItemType_AutoUseMoney:"Item_GiveMoney",         # 给人物金钱

                           ChConfig.Def_ItemType_RuneExp:"Item_RuneExp",         # 给人物符印精华

                           ChConfig.Def_ItemType_AddLimitBuff:"Item_Add_LimitingBuff",         # 给限时buff物品

                           ChConfig.Def_ItemType_AddLimitBuff2:"Item_Add_LimitingBuff",         # 给限时buff物品

                           ChConfig.Def_ItemType_AddExpBuff:"Item_Add_LimitingBuff",         # 给限时buff物品

                           ChConfig.Def_ItemType_ResetAttrPoint:"Item_ResetAttrPoint",    #单个属性点重置

                           ChConfig.Def_ItemType_AddCrossRealmPKCnt:"Item_AddCrossRealmPKCnt"    #增加跨服PK次数

                           } 

    

    #根据物品效果使用{物品效果ID:call的py名}

    itemEffIdCallFuncDic = {

                            ChConfig.Def_Effect_UseItemGiveZhenQi:"Item_UseItemGiveZhenQi", # 使用道具给予真气

                            ChConfig.Def_Effect_ItemAddLV:"Item_AddLV", #升级道具

                            ChConfig.Def_Effect_GuajiAward:"Item_GuajiAward", #直接给挂机收益

                            ChConfig.Def_Effect_CleanGuilt:"Item_CleanGuilt", # 洗红名

                            ChConfig.Def_Effect_PrizeCoin:"Item_PrizeCoin", # 奖励充值点券

                            ChConfig.Def_Effect_AddVIPExp:"Item_AddVIPExp", # 增加VIP经验

                            ChConfig.Def_Effect_VIPLVCard:"Item_VIPLVCard", # VIP等级直升卡

                            ChConfig.Def_Effect_TiandaoQiyun:"Item_TiandaoQiyun", # 天道树气运

                            ChConfig.Def_Effect_TrainRealmLV:"Item_TrainRealmLV", # 境界培养卡

                            ChConfig.Def_Effect_ResetBossKillCnt:"Item_ResetBossKillCnt", # 重置boss击杀疲劳

                            ChConfig.Def_Effect_AddFBCnt:"Item_AddFBCnt", # 增加副本可进入次数

                            ChConfig.Def_Effect_AddKillBossCnt:"Item_AddKillBossCnt", # 增加BOSS可击杀次数

                            ChConfig.Def_Effect_AddMagicWeaponUpExp:"Item_AddMagicWeaponUpExp", # 增加法宝升星经验

                            ChConfig.Def_Effect_EmojiPack:"Item_EmojiPack",

                            ChConfig.Def_Effect_FamilyEmblem:"Item_FamilyEmblem",

                            ChConfig.Def_Effect_ItemGiveWeekPartyPoint:"Item_WeekPartyPoint", # 增加活动巡礼积分

                            ChConfig.Def_Effect_ItemGiveWeekPartyPoint1:"Item_WeekPartyPoint", # 增加活动巡礼积分

                            ChConfig.Def_Effect_AddRealmExpRate:"Item_AddRealmExpRate", # 增加聚灵效率

                            ChConfig.Def_Effect_TouchMission:"Item_TouchMission",  # 触发任务接口

                            ChConfig.Def_Effect_HeroSkin:"Item_HeroSkin",  # 武将皮肤

                            ChConfig.Def_Effect_FamilyTaofaCnt:"Item_FamilyTaofaCnt",  # 增加公会讨伐次数

                            #ChConfig.Def_Effect_AddArenaBattleCount:"Item_AddArenaBattleCount", # 增加竞技场挑战次数

                            #ChConfig.Def_Effect_FamilyImpeach:"Item_FamilyImpeach",  # 弹劾符

                            #ChConfig.Def_Effect_ClothesCoatSkin:"Item_ClothesCoatSkin", #激活时装皮肤

                            #ChConfig.Def_Effect_AddOfficialExp:"Item_AddOfficialExp", # 增加爵位经验

                            }

    

    callFuncName = itemTypeCallFuncDic.get(curItemType, "")


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

@@ -25,6 +25,7 @@
import traceback

import random

import ReadChConfig

import PlayerActivity

import ChPyNetSendPack

import NetPackCommon

import PlayerXiangong

@@ -901,6 +902,18 @@
        GameWorld.SendMsgToClientServer(ShareDefine.CrossServerMsg_PutInItem, itemMsg, [serverGroupID])

        return

    

    def __autoUseByEffectID(self, curPlayer, tagItem, itemEff, itemID, itemCount):

        effectID = itemEff.GetEffectID()

        
        # 物品碎片

        if effectID == ChConfig.Def_Effect_ItemCount:

            SetItemCountByID(curPlayer, itemID, GetItemCountByID(curPlayer, itemID) + itemCount)

        # 活跃度

        elif effectID == ChConfig.Def_Effect_AddActivity:

            PlayerActivity.DoAddActivity(curPlayer, itemCount)

            
        return

    
    ## 放入物品 

    #  @param packIndex 背包索引

    #  @param tagItem 物品

@@ -939,11 +952,11 @@
        #    tagItem.Clear()

        #    return True

        itemEff = tagItem.GetEffectByIndex(0)

        #物品碎片

        if itemEff.GetEffectID() == ChConfig.Def_Effect_ItemCount:

            SetItemCountByID(curPlayer, itemID, GetItemCountByID(curPlayer, itemID) + tagItemCount)

        if itemEff.GetEffectID() in ChConfig.AutoUseItemEffectIDList:

            self.__autoUseByEffectID(curPlayer, tagItem, itemEff, itemID, tagItemCount)

            tagItem.Clear()

            return True

        
        #气运

        if itemEff.GetEffectID() == ChConfig.Def_Effect_TiandaoQiyun:

            isAutoUse = itemEff.GetEffectValue(1)

@@ -2179,7 +2192,7 @@
    if itemData.GetItemTypeID() in ChConfig.Def_TransformItemIDList or itemData.GetType() == ChConfig.Def_ItemType_AutoUseMoney:

        return True

    itemEff = itemData.GetEffectByIndex(0)

    if itemEff.GetEffectID() == ChConfig.Def_Effect_ItemCount:

    if itemEff.GetEffectID() in ChConfig.AutoUseItemEffectIDList:

        return True

    return False




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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

@@ -85,7 +85,6 @@
import PlayerCrossYaomoBoss

import PlayerLuckyCloudBuy

import PlayerLuckyTreasure

import Item_ResetAttrPoint

import CrossActCTGBillboard

import CrossActAllRecharge

import PlayerFuncSysPrivilege

@@ -1581,7 +1580,7 @@
            return

        ItemCommon.ReduceItem(curPlayer, itemPack, [delIndex], 1, False, ChConfig.ItemDel_ResetAttrPoint)

    

    Item_ResetAttrPoint.DoResetAttrPoint(curPlayer, 0, 0, 0)

    #Item_ResetAttrPoint.DoResetAttrPoint(curPlayer, 0, 0, 0)

    return



def NotifyPlayerBasePoint(curPlayer, syncAttrIDList=[]):


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

@@ -125,7 +125,8 @@
    updState = taskState|pow(2, taskID)

    GameWorld.DebugLog("每日任务领奖! taskID=%s,updState=%s" % (taskID, updState), playerID)

    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_DailyTaskState, updState)

    DoAddActivity(curPlayer, ipyData.GetAwardLiveness())

    awardItemList = ipyData.GetAwardItemList()

    ItemControler.GivePlayerItemOrMail(curPlayer, awardItemList, event=["DailyTaskAward", False, {}])

    return



def DoAddActivity(curPlayer, addValue):


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

@@ -20,7 +20,6 @@
import IpyGameDataPY

import IPY_GameWorld

import PlayerBillboard

import Item_ResetAttrPoint

import DataRecordPack

import PlayerControl

import ItemControler

@@ -257,7 +256,7 @@
            elmSkillName = elmSkillData.GetSkillName() if elmSkillData else ""

            GameWorld.Log("    重置专精记录等级: elementSkillID=%s(%s),elementSkillIDLV=%s" % (elementSkillID, elmSkillName, elementSkillIDLV), playerID)

            

    Item_ResetAttrPoint.DoResetAttrPoint(curPlayer, 0, 0)

    #Item_ResetAttrPoint.DoResetAttrPoint(curPlayer, 0, 0)

    

    # 处理物品

    GameWorld.Log("替换物品: 个数=%s" % len(assignItemList), playerID)


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

@@ -4304,10 +4304,25 @@


def IsMainLevelPass(curPlayer, lvID):

    ## 判断玩家是否过关某个主线关卡ID

    # @param lvID: 关卡唯一ID，与策划约定好 = 章节*100+关卡编号

    passChapterID, passLevelNum, _ = GetMainLevelPassInfo(curPlayer)

    passValue = passChapterID * 100 + passLevelNum # 因为pass的记录是带波数的，即当前关卡boss还没过关，所以只有大于该记录值的才算过关

    return passValue > lvID

    return GetPassMainLevelID(curPlayer) >= lvID

def GetPassMainLevelID(curPlayer):

    ## 获取已过关主线关卡ID

    passChapterID, passLevelNum, _ = GetMainLevelPassInfo(curPlayer) # 当前过关进度包含波，所以需要取上一关的

    passLVID = 0 # 关卡唯一ID，与策划约定好 = 章节*100+关卡编号

    if passLevelNum > 1:

        preLevelNum = passLevelNum - 1

        passLVID = passChapterID * 100 + preLevelNum

        GameWorld.DebugLog("非某章节的第1关直接减1即可: passLVID=%s,passChapterID=%s,passLevelNum=%s" % (passLVID, passChapterID, passLevelNum))

        
    elif passChapterID > 1: # 取上一章节

        preChapterID = passChapterID - 1

        levelDataList = IpyGameDataPY.GetIpyGameDataByCondition("MainLevel", {"ChapterID":preChapterID}, True)

        levelCount = len(levelDataList) if levelDataList else 0

        if levelCount:

            passLVID = preChapterID * 100 + levelCount

        GameWorld.DebugLog("取上一章节作为已过关关卡: passLVID=%s,preChapterID=%s,levelCount=%s,passChapterID=%s,passLevelNum=%s" 
                           % (passLVID, preChapterID, levelCount, passChapterID, passLevelNum))

    return passLVID



## 主线关卡过关进度值 = 章节*10000+关卡编号*100+第x波

def GetMainLevelPassValue(curPlayer): return curPlayer.GetExAttr1()

@@ -4320,7 +4335,7 @@
    value = ComMainLevelValue(chapterID, levelNum, wave)

    SetMainLevelPassValue(curPlayer, value)

    if wave == 0:

        lvID = chapterID * 100 + levelNum

        lvID = GetPassMainLevelID(curPlayer)

        PlayerBillboard.UpdatePlayerBillboard(curPlayer, ShareDefine.Def_BT_MainLevel, lvID)

        PlayerTask.UpdTaskValue(curPlayer, ChConfig.TaskType_MainLevel)

        PlayerSuccess.UptateSuccessProgress(curPlayer, ShareDefine.SuccType_MainLevel, lvID)


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py

@@ -757,36 +757,36 @@


# 自定义积分及通知字典 {货币类型:通知客户端刷新类型, ...} , 如果不通知的话刷新类型则配置 None

TYPE_Price_CurrencyDict = {

                           TYPE_Price_Rune:CDBPlayerRefresh_Rune,

                           TYPE_Price_RuneSplinters:CDBPlayerRefresh_RuneSplinters,

                           TYPE_Price_TreasureScore:CDBPlayerRefresh_TreasureScore,

                           TYPE_Price_BourseMoney:None,

                           TYPE_Price_RealmPoint:CDBPlayerRefresh_RealmPoint,

                           TYPE_Price_Ysog:CDBPlayerRefresh_Ysog,

                           TYPE_Price_FamilyCoin:CDBPlayerRefresh_FamilyCoin,

                           TYPE_Price_Danjing:CDBPlayerRefresh_Danjing,

                           TYPE_Price_SoulDust:CDBPlayerRefresh_SoulDust,

                           TYPE_Price_SoulSplinters:CDBPlayerRefresh_SoulSplinters,

                           TYPE_Price_SoulCore:CDBPlayerRefresh_SoulCore,

                           TYPE_Price_Honor:CDBPlayerRefresh_Honor,

                           TYPE_Price_BossActScore:CDBPlayerRefresh_BossActScore,

                           TYPE_Price_FuncSysPrivilege:CDBPlayerRefresh_FuncSysPrivilege,

                           TYPE_Price_Environment:CDBPlayerRefresh_Environment,

                           TYPE_Price_BTGMPoint:CDBPlayerRefresh_BTGMPoint,

                           TYPE_Price_GuShenMoney:CDBPlayerRefresh_GuShenMoney,

                           TYPE_Price_GongdePoint:CDBPlayerRefresh_GongdePoint,

                           TYPE_Price_Xiantao:CDBPlayerRefresh_Xiantao,

                           TYPE_Price_Lingyu:CDBPlayerRefresh_Lingyu,

                           TYPE_Price_HeroSoul:CDBPlayerRefresh_HeroSoul,

                           TYPE_Price_FamilyFlagWarPoint:CDBPlayerRefresh_FamilyFlagWarPoint,

                           TYPE_Price_GatherSoul:CDBPlayerRefresh_GatherSoul,

                           TYPE_Price_TiandaoFruit:CDBPlayerRefresh_TiandaoFruit,

                           TYPE_Price_XianyuanScore:CDBPlayerRefresh_XianyuanScore,

                           TYPE_Price_HuanjinggeScore:CDBPlayerRefresh_HuanjinggeScore,

                           TYPE_Price_HeroScore:CDBPlayerRefresh_HeroScore,

                           TYPE_Price_GoldRushEnergy:CDBPlayerRefresh_GoldRushEnergy,

                           TYPE_Price_ArenaTicket:CDBPlayerRefresh_ArenaTicket,

                           TYPE_Price_PayCoinDay:CDBPlayerRefresh_PayCoinDay,

                           #TYPE_Price_Rune:CDBPlayerRefresh_Rune,

                           #TYPE_Price_RuneSplinters:CDBPlayerRefresh_RuneSplinters,

                           #TYPE_Price_TreasureScore:CDBPlayerRefresh_TreasureScore,

                           #TYPE_Price_BourseMoney:None,

                           #TYPE_Price_RealmPoint:CDBPlayerRefresh_RealmPoint,

                           #TYPE_Price_Ysog:CDBPlayerRefresh_Ysog,

                           #TYPE_Price_Danjing:CDBPlayerRefresh_Danjing,

                           #TYPE_Price_SoulDust:CDBPlayerRefresh_SoulDust,

                           #TYPE_Price_SoulSplinters:CDBPlayerRefresh_SoulSplinters,

                           #TYPE_Price_SoulCore:CDBPlayerRefresh_SoulCore,

                           #TYPE_Price_Honor:CDBPlayerRefresh_Honor,

                           #TYPE_Price_BossActScore:CDBPlayerRefresh_BossActScore,

                           #TYPE_Price_FuncSysPrivilege:CDBPlayerRefresh_FuncSysPrivilege,

                           #TYPE_Price_Environment:CDBPlayerRefresh_Environment,

                           #TYPE_Price_BTGMPoint:CDBPlayerRefresh_BTGMPoint,

                           #TYPE_Price_GuShenMoney:CDBPlayerRefresh_GuShenMoney,

                           #TYPE_Price_GongdePoint:CDBPlayerRefresh_GongdePoint,

                           #TYPE_Price_FamilyFlagWarPoint:CDBPlayerRefresh_FamilyFlagWarPoint,

                           #TYPE_Price_GatherSoul:CDBPlayerRefresh_GatherSoul,

                           #TYPE_Price_TiandaoFruit:CDBPlayerRefresh_TiandaoFruit,

                           #TYPE_Price_XianyuanScore:CDBPlayerRefresh_XianyuanScore,

                           #TYPE_Price_HuanjinggeScore:CDBPlayerRefresh_HuanjinggeScore,

                           }



# 支持负值的货币及对应0418刷新类型