From 4b9c4d3d2696be4a64254458e07fead44e9a386d Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期一, 28 一月 2019 16:12:28 +0800
Subject: [PATCH] 5924 诛仙Boss血量通知增大精度

---
 ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py |   76 +++++++++++++++++++++++++++++++++++---
 1 files changed, 70 insertions(+), 6 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index 712fdd3..adf7808 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
@@ -225,20 +225,27 @@
 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" # 节日巡礼狂欢活动
+#节日活动类型列表 - 该类型无视开服天,日期到了就开启
+FeastOperationActionNameList = [OperationActionName_FeastWeekParty]
+#所有的运营活动列表,含节日活动
 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, ] \
+                           + FeastOperationActionNameList
 #需要记录开启活动时的世界等级的运营活动
-NeedWorldLVOperationActNameList = [OperationActionName_FairyCeremony, OperationActionName_WishingWell]
+NeedWorldLVOperationActNameList = [OperationActionName_FairyCeremony, OperationActionName_WishingWell, OperationActionName_NewFairyCeremony]
 
 #活动信息字典key定义
 ActKey_ID = "ID" # 活动ID,唯一标识的ID,一般是活动开启的time值
@@ -478,6 +485,36 @@
 
 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
+
 #增加%d物理伤害值,其中a值为伤害值
 Def_Effect_AddAtk = 1005
 #增加%d魔法伤害值,其中a值为伤害值
@@ -570,6 +607,9 @@
     Def_BT_Campaign_Recharge,                 #累计充值(开服活动榜)
     Def_BT_Campaign_PetLV,                    #灵宠等级(开服活动榜)
     
+    Def_BT_ZhuXianTower,                      #诛仙塔榜
+    Def_BT_NewFCCostGold,                     #消费排行榜(新仙界盛典)
+    
     Def_BT_HighLadder,                        #天梯竞技场排行
     Def_BT_HighLadder_Yester,                 #天梯竞技场昨日排行
     Def_BT_RechargeTeHuiLast,                 #充值特惠活动排行榜-上一期记录
@@ -584,7 +624,7 @@
     Def_BT_CostTeHuiLast,                     #消费特惠排行榜上一期
     
     Def_BT_Max,                               #排行榜最大类型
-) = range(0, 32 + 2) 
+) = range(0, 34 + 2) 
     
 #职业对应战力排行榜类型
 JobFightPowerBillboardDict = {
@@ -596,7 +636,7 @@
 #排行榜Value1存储境界信息的榜单列表
 BTValue1_OfficialRankList = [Def_BT_FightPower, Def_BT_FightPower_Warrior, Def_BT_FightPower_Wizard, Def_BT_FightPower_Assassin, 
                              Def_BT_LV, Def_BT_FightPower_Horse, Def_BT_FightPower_Pet, Def_BT_TrialTower, Def_BT_OffLineEfficient,
-                             Def_BT_FBHelpBattle,
+                             Def_BT_FBHelpBattle, Def_BT_ZhuXianTower,
                              ]
 
 ##---比率---
@@ -935,8 +975,10 @@
 rptPet,             # 宠物背包(用物品存储宠物的数据) 31
 rptDogzItem,        # 神兽物品背包 32
 rptDogzEquip,       # 神兽装备背包 33
+rptZhuXianItem,     # 诛仙物品背包 34
+rptZhuXianEquip,    # 诛仙装备背包 35
 rptMax,             # 最大背包类型数量,放在最后一个
-) = range(28, 28 + 7)  #C++定义的枚举到27
+) = range(28, 28 + 9)  #C++定义的枚举到27
 
 #虚拟背包类型, 从255递减
 Def_VPack_TypeList = (
@@ -1345,7 +1387,7 @@
 )=range(5)
 
 # 战斗力模块类型
-Def_MFPType_Max = 28
+Def_MFPType_Max = 29
 ModuleFightPowerTypeList = (
 Def_MFPType_Role, # 角色 0
 Def_MFPType_Equip, # 装备(基本装备位) 1
@@ -1372,6 +1414,7 @@
 Def_MFPType_GatherSoul, # 聚魂 22
 Def_MFPType_MagicWeapon4, # 王者法宝 23
 Def_MFPType_Coat, # 时装 24
+Def_MFPType_ZhuXian, # 诛仙 25
 Def_MFPType_Other, # 其他
 
 #以下暂时没用到,改时再处理
@@ -1745,6 +1788,27 @@
     dogzetScute,    # 神兽鳞甲
 ) = range(101, 101 + 5)
 
+# 诛仙装备位定义
+ZhuXianEquipPlace = (
+    zxetCloak,      # 诛仙披风 121
+    zxetMask,       # 诛仙面具 122
+    zxetGlove,      # 诛仙手套 123
+    zxetGlove2,     # 诛仙手套 124
+    zxetRuyi,       # 诛仙如意 125
+    zxetPendant,    # 诛仙吊坠 126
+    zxetRing,       # 诛仙戒指 127
+    zxetRing2,      # 诛仙戒指 128
+    zxetWeapon1,    # 诛仙剑1 129
+    zxetWeapon2,    # 诛仙剑2 130
+    zxetWeapon3,    # 诛仙剑3 131
+    zxetWeapon4,    # 诛仙剑4 132
+) = range(121, 121 + 12)
+
+# 共享通用装备位,可装备同一类型装备
+ShareEquipPlace = [
+                   [zxetGlove, zxetGlove2],
+                   [zxetRing, zxetRing2],
+                   ]
 
 # 请求进入副本通用检查结果,优先提示的放前面(即索引越大,提示优先级越低)
 EnterFBAskResult = (

--
Gitblit v1.8.0