From 5ea28aead9761406845a3bff4d663f53e800fdb6 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 19 三月 2019 19:14:53 +0800
Subject: [PATCH] 6332 【后端】【2.0】主要是拍品相关规则调整及背包优化(去除旧版设置绑定逻辑)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py |  269 +++++++++++++++++++++++++++++++++++------------------
 1 files changed, 175 insertions(+), 94 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
index ab6f754..12ec4f7 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
@@ -132,6 +132,7 @@
 Def_Notify_WorldKey_IsMixServer = 'IsMixServer'           # 是否合服服务器
 Def_Notify_WorldKey_MixServerDay = 'MixServerDay'         # 合服天数
 Def_Notify_WorldKey_LastMixServerDay = 'LastMixServerDay' # 上次合服时的开服天数
+Def_Notify_WorldKey_LastMixServerWorldLV = 'LastMixServerWorldLV' # 上次合服时的世界等级
 Def_Notify_WorldKey_OnDayEx = 'OnDayEx'                   # 特殊时间点凌晨X点过天
 Def_Notify_WorldKey_OnWeekEx = 'OnWeekEx'                 # 特殊时间点凌晨X点过周
 Def_Notify_WorldKey_OnMonthEx = 'OnMonthEx'               # 特殊时间点凌晨X点过月
@@ -169,13 +170,11 @@
 
 Def_Notify_WorldKey_CrossServerConnState = "CrossServerConnState"  # 跨服服务器链接状态
 Def_Notify_WorldKey_CrossServerOpen = "CrossServerOpen"  # 跨服服务器是否开启中
+Def_Notify_WorldKey_CrossZoneName = "CrossZoneName"  # 跨服分区名
 
 Def_Notify_WorldKey_CrossPKZoneID = "CrossPKZoneID"  # 本服跨服PK所属赛区
 Def_Notify_WorldKey_CrossPKSeasonID = "CrossPKSeasonID"  # 本服跨服PK当前赛季
 Def_Notify_WorldKey_CrossPKSeasonState = "CrossPKSeasonState"  # 本服跨服PK赛季状态 0-关闭,1-开启中
-
-Def_Notify_WorldKey_MixServerCampaignSaveData = "MixServerCampaignSaveData_%s"  # 合服活动记录数据时机0-否 1-是
-Def_Notify_WorldKey_MixServerCampaignGetAward = "MixServerCampaignGetAward_%s"  # 合服活动可领奖时机0-否 1-是
 
 Def_Notify_WorldKey_GameWorldBossRebornCross = 'BossRebornCross_%s_%s'   # 跨服世界boss重生, 参数为(zoneID, bossID)
 Def_Notify_WorldKey_GameWorldBossReborn = 'BossReborn_%s'   # 世界boss重生, 参数为(bossID)
@@ -214,9 +213,8 @@
 Def_Notify_WorldKey_LoginAwardStartDate = 'LoginAwardStartDate_%s'   # 登录领取奖励开始时间,参数为活动类型
 Def_Notify_WorldKey_LoginAwardEndDate = 'LoginAwardEndDate_%s'   # 登录领取奖励结束时间,参数为活动类型
 
-Def_Notify_WorldKey_ClearBillboardSign = 'ClearBillboardSign'  # 清除排行榜标记
-
 Def_Notify_WorldKey_RedPacketOutput = 'RedPacketOutput'  # 红包产出信息
+Def_Notify_WorldKey_HurtLog = 'HurtLog'  # 战斗伤害日志
 
 #运营活动表名定义
 OperationActionName_ExpRate = "ActExpRate" # 多倍经验活动
@@ -225,20 +223,34 @@
 OperationActionName_BossReborn = "ActBossReborn" # BOSS复活活动
 OperationActionName_FlashGiftbag = "ActFlashGiftbag" # 限时礼包活动
 OperationActionName_FairyCeremony = "ActFairyCeremony" # 仙界盛典活动
+OperationActionName_NewFairyCeremony = "ActNewFairyCeremony" # 仙界盛典活动
 OperationActionName_RealmPoint = "ActRealmPoint" # 多倍修行点活动
 OperationActionName_FlashSale = "ActFlashSale" # 限时抢购活动
 OperationActionName_WishingWell = "ActWishingWell" # 许愿池活动
 OperationActionName_TotalRecharge = "ActTotalRecharge" # 累计充值活动
 OperationActionName_WeekParty = "ActWeekParty" # 周狂欢活动
 OperationActionName_LoginAward = "ActLoginAward" # 登录奖励活动
+OperationActionName_FeastWeekParty = "ActFeastWeekParty" # 节日巡礼狂欢活动
+OperationActionName_FeastRedPacket = "ActFeastRedPacket" # 节日红包活动
+OperationActionName_FeastCollectWords = "ActFeastCollectWords" # 节日集字活动
+OperationActionName_LuckyTreasure = "ActLuckyTreasure" # 幸运鉴宝活动
+#节日活动类型列表 - 该类型无视开服天,日期到了就开启
+FeastOperationActionNameList = [OperationActionName_FeastWeekParty, OperationActionName_FeastRedPacket, OperationActionName_FeastCollectWords]
+#所有的运营活动列表,含节日活动
 OperationActionNameList = [OperationActionName_ExpRate, OperationActionName_CostRebate, 
                            OperationActionName_BossReborn,OperationActionName_SpringSale, 
                            OperationActionName_FlashGiftbag, OperationActionName_FairyCeremony,
                            OperationActionName_RealmPoint, OperationActionName_FlashSale,
                            OperationActionName_WishingWell, OperationActionName_TotalRecharge, 
-                           OperationActionName_WeekParty, OperationActionName_LoginAward, ]
+                           OperationActionName_WeekParty, OperationActionName_LoginAward, 
+                           OperationActionName_NewFairyCeremony, OperationActionName_LuckyTreasure] \
+                           + FeastOperationActionNameList
 #需要记录开启活动时的世界等级的运营活动
-NeedWorldLVOperationActNameList = [OperationActionName_FairyCeremony, OperationActionName_WishingWell]
+NeedWorldLVOperationActNameList = [OperationActionName_FairyCeremony, OperationActionName_WishingWell, 
+                                   OperationActionName_NewFairyCeremony, OperationActionName_FlashSale,
+                                   OperationActionName_BossReborn, OperationActionName_TotalRecharge,
+                                   OperationActionName_CostRebate, OperationActionName_FlashGiftbag,
+                                   OperationActionName_SpringSale, OperationActionName_LuckyTreasure]
 
 #活动信息字典key定义
 ActKey_ID = "ID" # 活动ID,唯一标识的ID,一般是活动开启的time值
@@ -246,6 +258,7 @@
 ActKey_CfgID = "CfgID" # 活动表配置ID
 ActKey_DayIndex = "DayIndex" # 活动表配置ID
 ActKey_WorldLV = "WorldLV" # 活动开启时世界等级
+ActKey_WorldLVList = "WorldLVList" # 活动每天的世界等级列表
 
 #答题类型枚举
 Def_Game_ExamTypeList = range(1, 4 + 1)
@@ -282,7 +295,8 @@
     Def_ViewExpType_Sit        ,            #打坐获取经验 3
     Def_ViewExpType_KillNPCSuper,           #杀怪获得经验暴击 4
     Def_ViewExpType_Sys        ,            #系统给经验-需要展示倍率,实际不享受 5
-) = range(0, 6)
+    Def_ViewExpType_RealmBuff,           #境界全服福利经验(玄女天花) 6
+) = range(0, 7)
 
 
 #物品相关操作类型
@@ -294,7 +308,7 @@
     Def_mitProduceResult,     # 生产采集结果回应
     Def_mitPetEquipMerge,     # 宠物装备合成回应
     Def_mitEquipInherit,      # 装备继承
-    Def_mitEquipPlus,         # 装备加强
+    Def_mitEquipStarUp,       # 装备升星
     Def_mitEquipMayaPlus,     # 装备玛雅加强
     Def_mitEquipAddAttr,      # 装备追加
     Def_mitEquipSlotting,     # 装备打孔
@@ -407,8 +421,6 @@
 Def_Effect_MissRate = 45 #20026
 #杀怪经验百分比, 百分比增加基础杀怪经验(a值为万分率,直接加上)
 Def_Effect_FightExpRate = 46
-#魂器基础属性百分比
-Def_Effect_HorcruxBasePer = 48
 Def_Effect_SkillAtkRateReduce = 49 #20032
 #增加HP(A值填万分率)
 Def_Effect_MaxHPPer = 50 #20023
@@ -430,20 +442,45 @@
 Def_Effect_StoneMaxHPPer = 58
 #宝石攻击百分比
 Def_Effect_StoneAtkPer = 59
-#装备基础百分比
+#装备基础百分比 - 含特殊装备位
 Def_Effect_EquipBaseAddPer = 60
+#基础装备百分比
+Def_Effect_BaseEquipAddPer = 64
 #冰攻百分比(A值为万分率)
 Def_Effect_IceAtkPer = 61
 #冰防百分比(A值为万分率)
 Def_Effect_IceDefPer = 62
-#防具生命百分比
-Def_Effect_ArmorMaxHPAddPer = 63
-#圣器攻击百分比
-Def_Effect_RelicsAtkAddPer = 64
-#武器攻击百分比
-Def_Effect_WeaponAtkAddPer = 65
-#防具防御百分比
+#基础装备生命百分比
+Def_Effect_BaseEquipMaxHPAddPer = 63
+#基础装备攻击百分比
+Def_Effect_BaseEquipAtkAddPer = 65
+#防具防御百分比 - 废弃
 Def_Effect_ArmorDefAddPer = 66
+#主手基础属性值 百分比
+Def_Effect_WeaponAddPer = 121
+#副手基础属性值 百分比
+Def_Effect_Weapon2AddPer = 122
+#腰带基础属性值 百分比
+Def_Effect_BeltAddPer = 123
+#手套基础属性值 百分比
+Def_Effect_GloveAddPer = 124
+#衣袍基础属性值 百分比
+Def_Effect_ClothesAddPer = 125
+#帽子基础属性值 百分比
+Def_Effect_HatAddPer = 126
+#下装基础属性值 百分比
+Def_Effect_TrousersAddPer = 127
+#鞋履基础属性值 百分比
+Def_Effect_ShoesAddPer = 128
+#仙器A基础属性值 百分比
+Def_Effect_FairyCanAddPer = 129
+#仙器B基础属性值 百分比
+Def_Effect_FairyCan2AddPer = 130
+#仙绳基础属性值 百分比
+Def_Effect_NeckAddPer = 131
+#莲台基础属性值 百分比
+Def_Effect_JadeAddPer = 132
+
 Def_Effect_MinAtk = 67 # 最小攻击
 Def_Effect_MaxAtk = 68 # 最大攻击
 
@@ -477,6 +514,41 @@
 Def_Effect_PlusBaseAtkPer = 88 # 强化基础攻击百分比
 
 Def_Effect_NPCHurtAddPer = 89 # 对怪物伤害加成
+
+Def_Effect_JobAHurtAddPer = 90 # 对目标战士伤害加成
+Def_Effect_JobBHurtAddPer = 91 # 对目标法师伤害加成
+Def_Effect_JobCHurtAddPer = 92 # 对目标弓箭伤害加成
+Def_Effect_JobAAtkReducePer = 93 # 战士攻击伤害减免
+Def_Effect_JobBAtkReducePer = 94 # 法师攻击伤害减免
+Def_Effect_JobCAtkReducePer = 95 # 弓箭攻击伤害减免
+
+Def_Effect_ZXCloakAttrPer = 96 # 诛仙披风属性加成百分比
+Def_Effect_ZXMaskAttrPer = 97 # 诛仙面具属性加成百分比
+Def_Effect_ZXGloveAttrPer = 98 # 诛仙手套属性加成百分比
+Def_Effect_ZXRuyiAttrPer = 99 # 诛仙如意属性加成百分比
+Def_Effect_ZXPendantAttrPer = 100 # 诛仙吊坠属性加成百分比
+Def_Effect_ZXRingAttrPer = 101 # 诛仙戒指属性加成百分比
+
+Def_Effect_SkillAddPer1 = 102 # 技能伤害增强1
+Def_Effect_SkillAddPer2 = 103 # 技能伤害增强2
+Def_Effect_SkillAddPer3 = 104 # 技能伤害增强3
+Def_Effect_SkillAddPer4 = 105 # 技能伤害增强4
+Def_Effect_SkillAddPer5 = 106 # 技能伤害增强5
+Def_Effect_SkillAddPer6 = 107 # 技能伤害增强6
+Def_Effect_SkillAddPer7 = 108 # 技能伤害增强7
+
+Def_Effect_SkillReducePer1 = 109 # 受到技能伤害减少1
+Def_Effect_SkillReducePer2 = 110 # 受到技能伤害减少2
+Def_Effect_SkillReducePer3 = 111 # 受到技能伤害减少3
+Def_Effect_SkillReducePer4 = 112 # 受到技能伤害减少4
+Def_Effect_SkillReducePer5 = 113 # 受到技能伤害减少5
+Def_Effect_SkillReducePer6 = 114 # 受到技能伤害减少6
+Def_Effect_SkillReducePer7 = 115 # 受到技能伤害减少7
+
+Def_Effect_ZXWeaponAttrPer = 116 # 诛仙剑1属性加成百分比
+Def_Effect_LXWeaponAttrPer = 117 # 诛仙剑2属性加成百分比
+Def_Effect_XXWeaponAttrPer = 118 # 诛仙剑3属性加成百分比
+Def_Effect_JXWeaponAttrPer = 119 # 诛仙剑4属性加成百分比
 
 #增加%d物理伤害值,其中a值为伤害值
 Def_Effect_AddAtk = 1005
@@ -571,22 +643,18 @@
     Def_BT_Campaign_PetLV,                    #灵宠等级(开服活动榜)
     
     Def_BT_ZhuXianTower,                      #诛仙塔榜
+    Def_BT_NewFCCostGold,                     #消费排行榜(新仙界盛典)
     
     Def_BT_HighLadder,                        #天梯竞技场排行
     Def_BT_HighLadder_Yester,                 #天梯竞技场昨日排行
     Def_BT_RechargeTeHuiLast,                 #充值特惠活动排行榜-上一期记录
     Def_BT_RechargeTeHui,                     #充值特惠活动排行榜-当前期记录
     
-    Def_BT_MixCampaign_PlayerBattle,          #总战斗力(合服活动)
-    Def_BT_MixCampaign_Recharge,              #累计充值(合服活动)
-    Def_BT_MixCampaign_WinFamilyMember,       #获胜战盟成员,按职位排(合服活动)
-    Def_BT_MixCampaign_FamilyKillBoss,        #战盟击杀boss(合服活动)
-    
     Def_BT_CostTeHui,                         #消费特惠排行榜
     Def_BT_CostTeHuiLast,                     #消费特惠排行榜上一期
     
     Def_BT_Max,                               #排行榜最大类型
-) = range(0, 33 + 2) 
+) = range(0, 30 + 2) 
     
 #职业对应战力排行榜类型
 JobFightPowerBillboardDict = {
@@ -970,7 +1038,7 @@
                                 Def_UniversalGameRecType_FBHelpBattleCheckInPlayer, #助战玩家登记记录9
                                 Def_UniversalGameRecType_FBHelpBattleRecord, #助战未同步记录10
                                 Def_UniversalGameRecType_ZhuXianBossRecord, #诛仙BOSS结算记录11
-                                Def_UniversalGameRecType_12,
+                                Def_UniversalGameRecType_LuckyTreasure, #幸运鉴宝大奖记录12
                                 Def_UniversalGameRecType_13,
                                 Def_UniversalGameRecType_Reward,    # 通用奖励表(TopBar)14
                                 Def_UniversalGameRecType_15,
@@ -1107,9 +1175,6 @@
 Def_Enter_Truck,  #进入骠车
 ) = range(1, 3)
 
-Def_OSC_ValidDay = 6 # 开服活动有效活动天
-Def_MSC_ValidDay = 5 # 合服活动有效活动天
-
 # 开服活动类型标识, 不可超过32
 Def_Campaign_Type_List = (
 Def_Campaign_Type_PlusLV,           # 强化等级排行 1
@@ -1150,40 +1215,6 @@
 Def_CampaignAwardState_None, # 无
 Def_CampaignAwardState_Allow, # 允许领奖
 Def_CampaignAwardState_Over, # 领奖结束
-) = range(3)
-
-#合服活动类型标识
-Def_MixCampaign_Type_List = (
-    Def_MixCampaign_Type_PlayerBattle,     # 总战斗力0
-    Def_MixCampaign_Type_RechargeFirst,    # 首充奖励1
-    Def_MixCampaign_Type_RechargeRank,     # 累计充值排行奖励2
-    Def_MixCampaign_Type_RechargeCnt,      # 累计充值保底奖励3
-    Def_MixCampaign_Type_FamilyWar,        # 冰封王座家族战获胜家族成员奖励4
-    Def_MixCampaign_Type_FamilyWarEnter,   # 冰封王座参与奖5
-    Def_MixCampaign_Type_FamilyKillBoss,   # 战盟击杀boss排行
-    Def_MixCampaign_Type_PlayerKillBoss,   # 个人击杀boss
-) = range(8)
-
-#合服活动类型对应的奖励排行榜
-Def_MixCampaign_Billboard_Dict = {
-    Def_MixCampaign_Type_PlayerBattle:Def_BT_MixCampaign_PlayerBattle,  # 总战斗力
-    Def_MixCampaign_Type_RechargeRank:Def_BT_MixCampaign_Recharge,      # 累计充值排行 
-    Def_MixCampaign_Type_FamilyWar:Def_BT_MixCampaign_WinFamilyMember,  # 获胜战盟成员 
-    Def_MixCampaign_Type_FamilyKillBoss:Def_BT_MixCampaign_FamilyKillBoss,  # 战盟击杀boss排行 
-    }
-
-# 直接在MapServer中处理的合服活动类型
-DoOnMapServerMixCampaignTypeList = [
-                                 Def_MixCampaign_Type_RechargeFirst,
-                                 Def_MixCampaign_Type_RechargeCnt,
-                                 Def_MixCampaign_Type_FamilyWarEnter,
-                                 Def_MixCampaign_Type_PlayerKillBoss,
-                                 ]
-# 合服活动请求GameServer操作类型定义
-(
-Def_MSCGameServerQuery_QueryAward, # 查询
-Def_MSCGameServerQuery_GetAward, # 领奖
-Def_MSCGameServerQuery_MailAward, # 邮件发送奖励
 ) = range(3)
 
 #队伍最大人数
@@ -1288,6 +1319,8 @@
 Def_IudetCreateTime = 44 # 时效物品的创建时间
 Def_IudetGatherSoulLV = 46  # 聚魂等级
 Def_IudetExpireTime = 48 # 时效物品指定有效时间,时间单位由时效类型决定
+Def_IudetAuctionItemCreateTime = 50 # 拍品创建时间
+
 # 200~300 宠物数据用
 Def_IudetPet_NPCID = 200  # npcID
 Def_IudetPet_ClassLV = 202  # 阶级
@@ -1349,13 +1382,13 @@
 )=range(5)
 
 # 战斗力模块类型
-Def_MFPType_Max = 28
+Def_MFPType_Max = 44
 ModuleFightPowerTypeList = (
 Def_MFPType_Role, # 角色 0
-Def_MFPType_Equip, # 装备(基本装备位) 1
+Def_MFPType_Equip, # 装备(基本装备位) 1  - 废弃
 Def_MFPType_Plus, # 强化 2
 Def_MFPType_Stone, # 宝石 3
-Def_MFPType_Suit, # 套装 4
+Def_MFPType_Suit, # 套装 4 - 废弃
 Def_MFPType_Wing, # 翅膀 5
 Def_MFPType_Wash, # 洗练 6
 Def_MFPType_Pet, # 灵宠 7
@@ -1364,7 +1397,7 @@
 Def_MFPType_GodWeapon, # 神兵 10
 Def_MFPType_Dienstgrad, #称号 11
 Def_MFPType_Rune, # 符印 12
-Def_MFPType_Horcrux, # 魂器 13
+Def_MFPType_13, #
 Def_MFPType_MagicWeapon1, # 人族法宝 14
 Def_MFPType_StoveYao, # 炼丹炉丹药 15
 Def_MFPType_MagicWeapon2, # 魔族法宝 16
@@ -1376,6 +1409,22 @@
 Def_MFPType_GatherSoul, # 聚魂 22
 Def_MFPType_MagicWeapon4, # 王者法宝 23
 Def_MFPType_Coat, # 时装 24
+Def_MFPType_ZhuXian, # 诛仙 25  - 废弃
+Def_MFPType_Equip1, # 境界装备1阶 26
+Def_MFPType_Equip2, # 境界装备2阶 27
+Def_MFPType_Equip3, # 境界装备3阶 28
+Def_MFPType_Equip4, # 境界装备4阶 29
+Def_MFPType_Equip5, # 境界装备5阶 30
+Def_MFPType_Equip6, # 境界装备6阶 31
+Def_MFPType_Equip7, # 境界装备7阶 32
+Def_MFPType_Equip8, # 境界装备8阶 33
+Def_MFPType_Equip9, # 境界装备9阶 34
+Def_MFPType_Equip10, # 境界装备10阶 35
+Def_MFPType_Equip11, # 境界装备11阶 36
+Def_MFPType_Equip12, # 境界装备12阶 37
+Def_MFPType_Equip13, # 境界装备13阶 38
+Def_MFPType_Equip14, # 境界装备14阶 39
+Def_MFPType_Equip15, # 境界装备15阶 40
 Def_MFPType_Other, # 其他
 
 #以下暂时没用到,改时再处理
@@ -1528,8 +1577,9 @@
 DailyActionID_IceLode, # 冰晶矿脉
 DailyActionID_HelpBattleCheckIn, # 助战登记  20
 DailyActionID_CrossReamPK, # 跨服PK  21
-DailyActionID_ZhuXianBoss, # 诛仙BOSS  22
-) = range(1, 22 + 1)
+DailyActionID_FamilyBoss1, # 仙盟BOSS第一场  22
+DailyActionID_FamilyBoss2, # 仙盟BOSS第二场  23
+) = range(1, 23 + 1)
 
 
 
@@ -1669,10 +1719,19 @@
 SuccType_Collect, #采集X物品X次131
 SuccType_InlayGatherSoul, #镶嵌X枚X品质聚魂(不包含核心)132
 SuccType_GatherSoulLvUp, #累计聚魂总等级XX(不包含核心)133
-) = range(1, 134)
+SuccType_FeastRedPack_TalkWorld, #节日红包 - 世界频道发言 x次 134
+SuccType_FeastRedPack_Pray, # 节日红包 - 祈祷x次 135
+SuccType_FeastRedPack_KillSpecificNPC, # 节日红包 - 击杀特定NPC x次 136
+SuccType_FeastRedPack_KillBoss, # 节日红包 - 指定类型boss x次 137
+SuccType_FeastRedPack_EnterMap, # 节日红包 - 进入指定地图 x次  138
+SuccType_FeastRedPack_TaskCRun, # 节日红包 - 完成x次日常环任务成就 139
+SuccType_FeastRedPack_Dice, # 节日红包 - 天机摇骰子x次  140
+SuccType_FeastRedPack_CrossPK, # 节日红包 - 跨服PK x次  141
+SuccType_FeastRedPack_FBSweep, # 节日红包 - 副本扫荡 x次  142
+) = range(1, 143)
 
-
-
+# 节日红包成就类型
+FeastRedPackSuccessTypeList = range(SuccType_FeastRedPack_TalkWorld, SuccType_FeastRedPack_FBSweep + 1)
 
 # 连续天规则的成就类型
 ContinueSuccessTypeList = []
@@ -1687,6 +1746,8 @@
                               SuccType_EquipSuit,SuccType_Collect,SuccType_DogzBattle,
                               SuccType_UseItem,SuccType_FamilyTechLV,
                               SuccType_GetSpecialItem,SuccType_GetMagicWeapon,SuccType_FBEncourage,SuccType_XBXZ,
+                              SuccType_FeastRedPack_KillSpecificNPC,SuccType_FeastRedPack_KillBoss,
+                              SuccType_FeastRedPack_EnterMap, SuccType_FeastRedPack_FBSweep,
                               ]
 #传进来的条件满足配置的条件列表中的一个就行的成就类型
 ContainSuccessTypeList = [SuccType_CompoundItemEx, SuccType_PickUpItem, SuccType_MWSkillUp]
@@ -1714,30 +1775,32 @@
 # 手游不使用C++定义 enum            RoleEquipType
 # 装备位定义
 RoleEquipType = (
-    retWeapon,      #1 主手
-    retWeapon2,     #2 副手
-    retHat,         #3 帽子
-    retClothes,     #4 衣服
-    retBelt,        #5 腰带
-    retTrousers,    #6 裤子
-    retShoes,       #7 鞋子
-    retNeck,        #8 项链
-    retFairyCan,       #9 仙器
-    retFairyCan2,       #10 仙器
-    retWing,        #11 翅膀
-    retGuard,    #12 守护
-    retBaldric1,     #13 佩饰
-    retBaldric2,     #14 佩饰
-    retBaldric3,     #15 佩饰
-    retBaldric4,     #16 佩饰
-    retBaldric5,     #17 佩饰
-    retBaldric6,     #18 佩饰
-    retHorse,        #19 坐骑
-    retWeaponSkin,   #20 时装武器
-    retClothesSkin,  #21 时装衣服
-    retWeapon2Skin,  #22 时装副手
+    retWeapon,          #1 主手
+    retWeapon2,         #2 副手
+    retHat,             #3 帽子
+    retClothes,         #4 衣服
+    retBelt,            #5 腰带
+    retTrousers,        #6 裤子
+    retShoes,           #7 鞋子
+    retGlove,           #8 手套
+    retNeck,            #9 项链
+    retFairyCan,        #10 仙器1
+    retFairyCan2,       #11 仙器2
+    retJade,            #12 玉佩
+    retWing,            #13 翅膀
+    retGuard1,          #14 守护1
+    retGuard2,          #15 守护2
+    retPeerlessWeapon,  #16 绝世武器
+    retPeerlessWeapon2, #17 绝世副手
+    retXXX18,           #18 暂无
+    retHorse,           #19 坐骑
+    retWeaponSkin,      #20 时装武器
+    retClothesSkin,     #21 时装衣服
+    retWeapon2Skin,     #22 时装副手
     retMax,
 ) = range(1, 24)
+
+
 
 
 # 神兽装备位定义
@@ -1765,6 +1828,11 @@
     zxetWeapon4,    # 诛仙剑4 132
 ) = range(121, 121 + 12)
 
+# 共享通用装备位,可装备同一类型装备
+ShareEquipPlace = [
+                   [zxetGlove, zxetGlove2],
+                   [zxetRing, zxetRing2],
+                   ]
 
 # 请求进入副本通用检查结果,优先提示的放前面(即索引越大,提示优先级越低)
 EnterFBAskResult = (
@@ -1807,3 +1875,16 @@
 Def_Boss_Func_Dogz, # 神兽功能BOSS
 ) = range(3)
 
+# 红包类型定义
+RedPackType_GoldPacket = 0 # 主动发钻石红包
+RedPackType_OpenServer = 5 # 开服红包
+RedPackType_FeastSysBig = 31 # 节日系统大红包
+RedPackType_FeastSysSmall = 32 # 节日系统小红包
+RedPackType_FeastSucc = 33 # 节日成就红包
+# 节日红包类型
+FeastRedPackType = [RedPackType_FeastSysBig, RedPackType_FeastSysSmall, RedPackType_FeastSucc]
+# 需要限制服务器最大红包数的红包类型 {统计个数编号:[红包类型, ...], ...}
+RedPackMaxCountDict = {1:[RedPackType_OpenServer],
+                       2:[RedPackType_FeastSucc],
+                       }
+

--
Gitblit v1.8.0