From 94bb5ab94e98fb616137f9c143e702aae10df8a6 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期三, 17 七月 2019 14:32:17 +0800
Subject: [PATCH] 8125 子 【主干】新功能:累计充值 / 【后端】【主干】累计充值

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py |  131 ++++++++++++++++++++++---------------------
 1 files changed, 67 insertions(+), 64 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index 7274299..5f4fc93 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -271,9 +271,11 @@
 Def_ItemID_SoulSplinters = 701               # 直接给聚魂碎片
 Def_ItemID_SoulCore = 702               # 直接给核心环
 Def_ItemID_Honor = 2141               # 直接给荣誉
+Def_ItemID_XianyuanCoin = 2138               # 直接给仙缘币
 Def_TransformItemIDList = [Def_ItemID_FamilyContribution, Def_ItemID_FamilyActive, Def_ItemID_SP, #Def_ItemID_GoldPaper, 
                            Def_ItemID_RealmPoint, Def_ItemID_SilverMoney, Def_ItemID_BossReborn, Def_ItemID_Ysog,
-                           Def_ItemID_SoulDust, Def_ItemID_SoulSplinters, Def_ItemID_SoulCore, Def_ItemID_Honor, Def_ItemID_GoldMoney]
+                           Def_ItemID_SoulDust, Def_ItemID_SoulSplinters, Def_ItemID_SoulCore, Def_ItemID_Honor, Def_ItemID_GoldMoney,
+                           Def_ItemID_XianyuanCoin]
 #---------------------------------------------------------------------
 #写死的物品类型都放这边
 Def_ItemType_All = -1             #所有类型
@@ -361,20 +363,7 @@
 Def_ItemType_DogzEquipScute = 123   # 神兽鳞甲
 Def_ItemType_AddCrossRealmPKCnt = 127 #增加跨服PK次数
 
-Def_ItemType_ZXCloak = 128 # 诛仙披风
-Def_ItemType_ZXMask = 129 # 诛仙面具
-Def_ItemType_ZXGlove = 130 # 诛仙手套
-Def_ItemType_ZXRuyi = 131 # 诛仙如意
-Def_ItemType_ZXPendant = 132 # 诛仙吊坠
-Def_ItemType_ZXRing = 133 # 诛仙戒指
-Def_ItemType_ZXWeapon1 = 134 # 诛仙剑1
-Def_ItemType_ZXWeapon2 = 135 # 诛仙剑2
-Def_ItemType_ZXWeapon3 = 136 # 诛仙剑3
-Def_ItemType_ZXWeapon4 = 137 # 诛仙剑4
-Def_ItemType_ZhuXianStuff = 138 # 诛仙材料
-
 Def_ItemType_DogzStuff = 139 # 神兽材料
-Def_ItemType_ZhuXianStone = 140 # 诛仙宝石
 
 #以下定义物品类型下次删除
 Def_Item_Type_Horse = 1000036          #坐骑
@@ -452,6 +441,8 @@
 Def_Effect_ItemGiveWeekPartyPoint1 = 246      #使用道具给予节日巡礼积分
 Def_Effect_AddRealmExpRate = 251 #增加聚灵效率
 Def_Effect_TouchMission = 252 #触发任务
+Def_Effect_HorsePetSkinExp = 253 #骑宠觉醒值
+Def_Effect_ItemGiveTreasureScore = 254      #使用道具给予寻宝积分
 #----以下未使用或代码依然存在的---
 Def_Effect_ItemGiveGongXun = 1920        #使用道具给予功勋
 Def_Effect_ItemGiveRuneJH = 1925       #使用道具给予符印精华
@@ -782,13 +773,10 @@
 
 Def_EquipItemType_TJGAutoEat = xrange(Def_ItemType_retWeapon, Def_ItemType_retShoes + 1)
 #装备类型
-Def_EquipItemType = range(Def_ItemType_retWeapon, Def_ItemType_DogzEquipScute + 1) + range(Def_ItemType_ZXCloak, Def_ItemType_ZXWeapon4 + 1)
+Def_EquipItemType = range(Def_ItemType_retWeapon, Def_ItemType_DogzEquipScute + 1)
 
 #神兽装备类型
 Def_DogzEquiipType = xrange(Def_ItemType_DogzEquipHorn, Def_ItemType_DogzEquipScute + 1)
-
-#诛仙装备类型
-Def_ZhuXianEquiipType = xrange(Def_ItemType_ZXCloak, Def_ItemType_ZXWeapon4 + 1)
 
 # 技能造成实质性伤害的类型
 Def_RealAttack_Type = [
@@ -849,10 +837,6 @@
 Def_PackCnt_DogzItem = 100
 #初始化神兽装备格子数
 Def_PackCnt_DogzEquip = 100
-#初始化诛仙背包格子数
-Def_PackCnt_ZhuXianItem = 100
-#初始化诛仙装备格子数
-Def_PackCnt_ZhuXianEquip = 12
 #初始化装备栏2
 Def_PackCnt_Equip2 = 0
 #初始化回收站
@@ -1096,8 +1080,6 @@
                                     ShareDefine.rptPet,
                                     ShareDefine.rptDogzItem,
                                     ShareDefine.rptDogzEquip,
-                                    ShareDefine.rptZhuXianItem,
-                                    ShareDefine.rptZhuXianEquip,
                                     ]
 
 #装备可强化背包列表
@@ -1246,7 +1228,7 @@
 ) = range( 0, Def_AutoAtkSkillType )
 
 #技能类型
-Def_SkillType_Count = 24
+Def_SkillType_Count = 25
 (
    Def_SkillType_Special      ,  #特殊技能   0        
    Def_SkillType_Atk          ,  #攻击类   1
@@ -1272,6 +1254,7 @@
    Def_SkillType_PassiveLstPlsBuff,  #被动触发持续增益类buff 21
    Def_SkillType_PassiveLstDepBuff,  #被动触发持续减益类buff 22
    Def_SkillType_AttrSkillNoLearn,   # 可叠加的同类型ID属性类技能 不可学习 算属性直接取表 目前用于神兽技能 23
+   Def_SkillType_PassiveLstPlsBuffAtk,  #被动持续攻击类BUFF 24
    
 ) = range( 0, Def_SkillType_Count )
 
@@ -1295,20 +1278,21 @@
                        Def_SkillType_PassiveActionBuff : IPY_GameWorld.bfActionBuff ,  #影响行为BUFF 14
                        Def_SkillType_PassiveLstPlsBuff: IPY_GameWorld.bfProcessBuff,  #被动触发持续增益类buff 3
                        Def_SkillType_PassiveLstDepBuff: IPY_GameWorld.bfProcessDeBuff,  #被动触发持续减益类buff 4
+                       Def_SkillType_PassiveLstPlsBuffAtk : IPY_GameWorld.bfProcessBuff   ,  #持续增益BUFF  3
                        
                      }
 
 # 伤害型技能
-Def_HurtSkill_List = [Def_SkillType_Atk, Def_SkillType_LstPlsBuffAtk]
+Def_HurtSkill_List = [Def_SkillType_Atk, Def_SkillType_LstPlsBuffAtk, Def_SkillType_PassiveLstPlsBuffAtk]
 
 
 #持续型技能列表
-Def_LstBuff_List = [ Def_SkillType_LstPlsBuff, Def_SkillType_LstDepBuff, Def_SkillType_LstPlsBuffAtk,
+Def_LstBuff_List = [ Def_SkillType_LstPlsBuff, Def_SkillType_LstDepBuff, Def_SkillType_LstPlsBuffAtk, Def_SkillType_PassiveLstPlsBuffAtk,
                     Def_SkillType_PassiveLstPlsBuff, Def_SkillType_PassiveLstDepBuff ]
 
 #对敌使用技能列表
 Def_CanAttackSkill_List = [ Def_SkillType_LstDepBuff, Def_SkillType_DepBuff, Def_SkillType_Atk, 
-                           Def_SkillType_Action, Def_SkillType_LstPlsBuffAtk, 
+                           Def_SkillType_Action, Def_SkillType_LstPlsBuffAtk, Def_SkillType_PassiveLstPlsBuffAtk,
                            Def_SkillType_PassiveDepBuff, Def_SkillType_PassiveActionBuff, Def_SkillType_PassiveLstDepBuff ]
 
 #不利BUFF给NPC添加仇恨
@@ -1453,7 +1437,7 @@
 #自动恢复计算间隔
 Def_HPRestoreInterval = 5000
 #允许重置的背包索引
-Def_CanItemResetPack = [IPY_GameWorld.rptItem, IPY_GameWorld.rptWarehouse, ShareDefine.rptTreasure, ShareDefine.rptZhuXianItem]
+Def_CanItemResetPack = [IPY_GameWorld.rptItem, IPY_GameWorld.rptWarehouse, ShareDefine.rptTreasure]
 #仓库分页个数
 Def_ItemReset_WarehousePageCnt = 56
 #玩家捡起物品的距离 8
@@ -1849,7 +1833,7 @@
 Def_NoPlayerNeedProcessRefreshPointMap = [Def_FBMapID_HorsePetBoss, Def_FBMapID_SealDemon, Def_FBMapID_GodArea, Def_FBMapID_BossHome, Def_FBMapID_GatherSoul, Def_FBMapID_ZhuXianBoss, Def_FBMapID_AllFamilyBoss]
 
 # 可重复进的副本
-Def_NoLimitEnterCntMap = [Def_FBMapID_AllFamilyBoss, Def_FBMapID_FamilyParty, Def_FBMapID_FamilyWar, Def_FBMapID_FamilyInvade, Def_FBMapID_ElderBattlefield, Def_FBMapID_ZhuXianBoss]
+Def_NoLimitEnterCntMap = [Def_FBMapID_AllFamilyBoss, Def_FBMapID_FamilyParty, Def_FBMapID_FamilyWar, Def_FBMapID_FamilyInvade, Def_FBMapID_ElderBattlefield]
 
 # 无玩家时不自动关闭的自伸缩副本
 Def_NoPlayerNotCloseAutoSizeMap = [Def_FBMapID_FamilyInvade, Def_FBMapID_FamilyBossMap, Def_FBMapID_GatherSoul]
@@ -3471,6 +3455,7 @@
 Def_PDict_OnlineStartTick = "OnlineStartTime"        # 在线计算时间
 Def_PDict_LVAwardGetRecord = "LVAwardGetRecord"  # 等级奖励领取信息记录,按二进制位标示
 Def_PDict_LVAwardVIPGetRecord = "LVAwardVIPGetRecord"  # 等级奖励vip领取信息记录,按二进制位标示
+Def_PDict_HistoryChargeAwardGetRecord = "HTotalGoldAwardRecord"  # 历史累计充值奖励领取信息记录,按二进制位标示
 Def_PDict_CTGCountResetTime = "CTGCountResetTime"  # CTG次数重置时间time值
 Def_PDict_TodayCTGCount = "TodayCTGCount_%s"  # 当日充值次数,参数(CTG对应的商品记录ID)
 Def_PDict_CTGGoodsBuyCount = "CTGGoodsBuyCount_%s"  # 对应充值商品已购买次数,参数(CTG对应的商品记录ID)
@@ -3526,7 +3511,7 @@
 Def_PDict_RecoverFBNoBuyCnt = "RecoverFBNoBuyCnt_%s" # 资源找回副本普通次数  <%s-找回项索引>
 Def_PDict_RecoverGainData = "RecoverGainData_%s" # 资源找回额外数据<%s-找回项索引>
 Def_PDict_RecoverGainDataEx = "RecoverGainDataEx_%s" # 资源找回额外数据<%s-找回项索引>
-Def_PDict_HaveRecover = "HaveRecover_%s" # 资源找回今日是否已找回<%s-找回项索引>
+Def_PDict_HaveRecover = "HaveRecover_%s" # 资源找回今日是否已找回<%s-找回项索引> 1:找回了普通  2:找回了vip  3:2个都有找回
 Def_PDict_RecoverGainLastTime = "RecoverGainLastTime" # 上一次资源找回时的时间
 
 Def_PDict_NPCKillCount = "NPCKillCount_%s"   # NPC已击杀次数, 参数(NPCID) CCBBAA, AA存储公共装备次数,BB存储公共ID次数,CC存储私有次数
@@ -3610,10 +3595,6 @@
 #试炼之塔
 Def_Player_Dict_TrialTower_PassLV = "TrialTower_PassLV"  # 试炼之塔通关层数
 Def_Player_Dict_TrialTower_LastDayPassLV = "Tower_LastDayPassLV"  # 试炼之塔昨日通关层数
-#诛仙塔
-Def_Player_Dict_ZhuXianTowerPassLV = "ZhuXianTowerPassLV"  # 诛仙塔已通关层数
-Def_Player_Dict_ZhuXianTowerLastFloor = "ZhuXianTowerLastFloor"  # 诛仙塔上次挑战层数
-Def_Player_Dict_ZhuXianTowerCostTime = "ZhuXianTowerCostTime"  # 诛仙塔通关时间
 #天星塔
 Def_Player_Dict_SkyTowerFloor = "SkyTowerFloor"  # 天星塔已通关层数
 
@@ -3769,7 +3750,9 @@
 Def_PDict_Horser_LV = "Horser_LV_%d"  # 坐骑等级 0代表未激活 1代表1级
 Def_PDict_Horser_Exp = "Horser_Exp_%d"  # 坐骑经验
 Def_PDict_Horser_Multiple = "Horser_Multiple"  # 坐骑下次升阶暴击倍数
-
+#骑宠觉醒
+Def_PDict_HorsePetSkinData = "HorsePetSkinData%d_%s"  #觉醒等级*100+外观索引  参数(类型,关联ID) 1-坐骑 2-灵宠
+Def_PDict_HorsePetSkinExp = "HorsePetSkinExp%d_%s"  #经验  参数(类型,关联ID) 1-坐骑 2-灵宠
 # 符印
 Def_PDict_Rune_HoleOpenState = "Rune_HoleOpenState"  # 符印解锁状态
 Def_PDict_Rune_Data = "Rune_Data_%s"  # 符印镶嵌数据, 参数(第几孔)
@@ -3832,7 +3815,8 @@
 Def_PDict_CrossPK_DanLV = "CrossPK_DanLV" # 当前段位
 Def_PDict_CrossPK_PKCount = "CrossPK_PKCount" # 当前总PK次数
 Def_PDict_CrossPK_WinCount = "CrossPK_WinCount" # 当前胜利次数
-Def_PDict_CrossPK_CWinCount = "CrossPK_CWinCount" # 跨当前连胜次数
+Def_PDict_CrossPK_CWinCount = "CrossPK_CWinCount" # 当前连胜次数
+Def_PDict_CrossPK_CLoseCount = "CrossPK_CLoseCount" # 当前连败次数
 Def_PDict_CrossPK_TodayPKCount = "CrossPK_TodayPKCount" # 今日已PK次数
 Def_PDict_CrossPK_TodayWinCount = "CrossPK_TodayWinCount" # 今日已胜利次数
 Def_PDict_CrossPK_TodayBuyCount = "CrossPK_TodayBuyCount" # 今日已购买PK次数
@@ -4380,7 +4364,9 @@
 Def_CalcAttrFunc_Coat, # 时装 36
 Def_CalcAttrFunc_LingQi, # 灵器 37
 Def_CalcAttrFunc_LingQiAttr, # 灵器属性 38
-) = range(39)
+Def_CalcAttrFunc_HorseSkin, # 坐骑觉醒 39
+Def_CalcAttrFunc_PetSkin, # 灵宠觉醒 40
+) = range(41)
 
 # 技能功能点列表  - 默认不算战力,不享受百分比加成,技能功能点暂时配置,之后优化技能属性逻辑后可去掉
 CalcAttrFuncSkillList = [Def_CalcAttrFunc_HorseSkill, Def_CalcAttrFunc_PetSkill, Def_CalcAttrFunc_DogzBattleSkill]
@@ -4397,9 +4383,9 @@
                             ShareDefine.Def_MFPType_Stone:[Def_CalcAttrFunc_Stone],
                             ShareDefine.Def_MFPType_LingQi:[Def_CalcAttrFunc_LingQi, Def_CalcAttrFunc_LingQiAttr],
                             ShareDefine.Def_MFPType_Wash:[Def_CalcAttrFunc_Wash],
-                            ShareDefine.Def_MFPType_Pet:[Def_CalcAttrFunc_Pet, Def_CalcAttrFunc_PetSign, Def_CalcAttrFunc_PetSkill],
+                            ShareDefine.Def_MFPType_Pet:[Def_CalcAttrFunc_Pet, Def_CalcAttrFunc_PetSign, Def_CalcAttrFunc_PetSkill, Def_CalcAttrFunc_PetSkin],
                             ShareDefine.Def_MFPType_PetSoul:[Def_CalcAttrFunc_PetSoul],
-                            ShareDefine.Def_MFPType_Horse:[Def_CalcAttrFunc_Horse, Def_CalcAttrFunc_HorseSkill],
+                            ShareDefine.Def_MFPType_Horse:[Def_CalcAttrFunc_Horse, Def_CalcAttrFunc_HorseSkill, Def_CalcAttrFunc_HorseSkin],
                             ShareDefine.Def_MFPType_HorseSoul:[Def_CalcAttrFunc_HorseSoul],
                             ShareDefine.Def_MFPType_Prestige:[Def_CalcAttrFunc_Prestige],
                             ShareDefine.Def_MFPType_GodWeapon:[Def_CalcAttrFunc_GodWeapon],
@@ -4507,7 +4493,9 @@
 TriggerType_SuperHitPer,  # 暴击伤害百分比 86
 TriggerType_SkillSuccessExpend, # 使用技能成功后不触发技能 处理消耗等问题用 87
 TriggerType_ThumpSkillValue, # 重击增加技能固定值伤害 88
-) = range(1, 89)
+TriggerType_HitValue, # 记录命中个数 89
+TriggerType_ChangeSkillEff, # 改变技能特效广播 90
+) = range(1, 91)
 
 
 #不可以佩戴翅膀的地图
@@ -4560,9 +4548,9 @@
 }
 
 #版本修正标记, 使用key格式 Def_Player_Dict_VersionFix
-#(
-#
-#) = range(0)
+(
+Def_VerFix_LingGenShow, #灵根特效外观
+) = range(1)
 
 ##==================================================================================================
 #游戏消费点类型定义
@@ -4615,6 +4603,7 @@
 Def_Cost_BuyDailyActionCnt, # 购买活动次数
 Def_Cost_FBBuyBuff, # 副本买buff
 Def_Cost_CreatFamily, # 创建仙盟
+Def_Cost_BuyKillBossCnt, #购买boss次数
 #-----------以下为暂时没用的,先不删除,如有新增消费点则放在这些之前------------
 Def_Cost_RefreshArrestTask, # 刷新悬赏任务
 Def_Cost_OffLineExp, # 兑换离线经验
@@ -4627,7 +4616,7 @@
 Def_Cost_Trade, # 交易
 Def_Cost_Rename, # 改名
 Def_Cost_SkillLvUp, # 技能升级
-) = range(2000, 2000 + 59)
+) = range(2000, 2000 + 60)
 
 Def_Cost_Reason_SonKey = "reason_name_son" # 消费点原因子类说明key
 
@@ -4708,6 +4697,7 @@
 Def_Cost_BuyDailyActionCnt:"BuyDailyActionCnt",
 Def_Cost_FBBuyBuff:"FBBuyBuff",
 Def_Cost_CreatFamily:"CreatFamily",
+Def_Cost_BuyKillBossCnt:"BuyKillBossCnt",
 }
 ## -----------------------------------------------------
 
@@ -4802,7 +4792,8 @@
 ItemGive_Chests, # 宝箱
 ItemGive_TrialExchange, # 宗门兑换
 ItemGive_LuckyTreasure, #幸运鉴宝
-) = range(1000, 1000 + 21)
+ItemGive_LingQiEquipBreak, #灵器突破
+) = range(1000, 1000 + 22)
 
 # 物品获得类型对应信息 {类型:eventName, ...}
 ItemGiveTypeDict = {
@@ -4827,6 +4818,7 @@
                     ItemGive_Chests:"Chests",
                     ItemGive_TrialExchange:"TrialExchange",
                     ItemGive_LuckyTreasure:"LuckyTreasure",
+                    ItemGive_LingQiEquipBreak:"LingQiEquipBreak",
                     }
 
 ## 物品扣除类型定义,与获得类型不重复,类型定义为 2000 ~ 2999
@@ -4868,10 +4860,12 @@
 ItemDel_ChatBubbleBox, # 激活聊天气泡框
 ItemDel_GatherSoul, # 聚魂分解
 ItemDel_CoatDecompose, # 时装分解
-ItemDel_ZhuXianDecompose, # 诛仙装备分解
+ItemDel_2037,
 ItemDel_EquipStarUp, # 装备升星
 ItemDel_EquipPlusEvolve, # 装备强化进化
-) = range(2000, 2000 + 40)
+ItemDel_LingQiEquipBreak, # 灵器突破
+ItemDel_HorsePetAwake, # 骑宠觉醒 
+) = range(2000, 2000 + 42)
 
 # 物品扣除类型对应信息 {类型:eventName, ...}
 ItemDelTypeDict = {
@@ -4912,9 +4906,10 @@
                    ItemDel_ChatBubbleBox:"ChatBubbleBox",
                    ItemDel_GatherSoul:"GatherSoul",
                    ItemDel_CoatDecompose:"CoatDecompose",
-                   ItemDel_ZhuXianDecompose:"ZhuXianDecompose",
                    ItemDel_EquipStarUp:"EquipStarUp",
                    ItemDel_EquipPlusEvolve:"EquipPlusEvolve",
+                   ItemDel_LingQiEquipBreak:"LingQiEquipBreak",
+                   ItemDel_HorsePetAwake:"HorsePetAwake",
                    }
 
 ##==================================================================================================
@@ -5032,7 +5027,8 @@
 VIPPrivilege_XianyuanCoinAddPer,    #34 仙缘币获得倍率加成(万分比)
 VIPPrivilege_35,    #35 诛仙BOSS购买次数 - 副本总表统一处理
 VIPPrivilege_36,    #36 仙丹批量炼制
-) = range(1, 37)
+VIPPrivilege_BossHomeBuy,    #37 BOSS之家购买次数
+) = range(1, 38)
 
 
 (
@@ -5119,16 +5115,18 @@
 
 # 投资理财类型
 GoldInvestTypeList = (
-GoldInvestType_Month, # 月卡投资
-GoldInvestType_VIP, # vip投资
-GoldInvestType_Gold, # 仙玉投资
-GoldInvestType_Gold2, # 仙玉投资2
-GoldInvestType_Gold3, # 仙玉投资3
-GoldInvestType_Week, # 周卡投资
-) = range(1,6+1)
+GoldInvestType_Month, # 旧月卡投资1(已废弃)
+GoldInvestType_VIP, # vip投资2
+GoldInvestType_Gold, # 仙玉投资3
+GoldInvestType_Gold2, # 仙玉投资4
+GoldInvestType_Gold3, # 仙玉投资5
+GoldInvestType_Week, # 周卡投资6(已废弃)
+GoldInvestType_NewMonth, # 至尊月卡投资7
+GoldInvestType_Month1, # 新30元月卡投资8
+) = range(1,8+1)
 
 #可以循环投资的类型
-CanRepeatInvestType = [GoldInvestType_Week, GoldInvestType_Month, GoldInvestType_VIP]
+CanRepeatInvestType = [GoldInvestType_Week, GoldInvestType_Month, GoldInvestType_VIP, GoldInvestType_NewMonth, GoldInvestType_Month1]
 #仙玉投资类型
 InvestGoldTypeList = [GoldInvestType_Gold, GoldInvestType_Gold2, GoldInvestType_Gold3]
 
@@ -5205,7 +5203,8 @@
 Def_RewardType_FeastWeekPartyAct, # 领取节日巡礼活动奖励25
 Def_RewardType_FeastWeekPartyPoint, # 领取节日巡礼积分奖励26
 Def_RewardType_FairyAdventuresAward, #缥缈奇遇领取27
-)= range(28)
+Def_RewardType_HistoryChargeAward, #历史累计充值领取28
+)= range(29)
 
 
 #boss复活相关活动定义
@@ -5227,7 +5226,7 @@
 Def_BRAct_FamilyBoss,  #仙盟BOSS 15
 ) = range(1, 15+1)
 
-#全民来嗨活动定义
+#全民来嗨活动定义(仙界盛典)
 PeoplePartyActIDList = (
 Def_PPAct_Fireworks,  #购买烟花 1
 Def_PPAct_Treasure,  #极品寻宝 2
@@ -5242,11 +5241,14 @@
 Def_PPAct_Pray,  #祈愿 11
 Def_PPAct_BossHome,  #boss之家 12
 Def_PPAct_VIPBoss,  #vipBOSS 13
-) = range(1, 13+1)
+Def_PPAct_RunFamilyTask, #仙盟任务 14
+Def_PPAct_FamilyBoss,  #仙盟Boss 15
+Def_PPAct_FairyDomain,  #缥缈仙域 16  
+) = range(1, 16+1)
 
-#周狂欢活动定义
+#周狂欢活动定义(七天巡礼)
 WeekPartyActIDList = (
-Def_WPAct_RunTask, #师门悬赏 1
+Def_WPAct_RunTask, #仙盟任务 1
 Def_WPAct_XJMJ, #仙境秘境 2
 Def_WPAct_KirinHome, #麒麟之府 3
 Def_WPAct_QueenRelices, #娲皇遗迹 4
@@ -5274,7 +5276,8 @@
 Def_WPAct_Rune,  #穿戴某品质符印 26
 Def_WPAct_Pray,  #祈愿 27
 Def_WPAct_FamilyBoss,  #仙盟Boss 28
-) = range(1, 28+1)
+Def_WPAct_FairyDomain,  #缥缈仙域 29    
+) = range(1, 29+1)
 
 #可提前完成的周狂欢活动
 AheadFinishWPActList = [Def_WPAct_Horse, Def_WPAct_Pet, Def_WPAct_Dogz, Def_WPAct_Rune]

--
Gitblit v1.8.0