From a54fba3894b5d528bed16147f096b6a706a1fc0c Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 27 六月 2019 15:58:03 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py | 90 ++++++++++++---------------------------------
1 files changed, 24 insertions(+), 66 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index 5ea3767..88cb957 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
@@ -168,6 +168,8 @@
Def_Notify_WorldKey_FamilyPartyInfo = "FamilyPartyInfo" # 仙盟宴会数据
+Def_Notify_WorldKey_AddFamilyAuctionItem = "AddFamilyAuctionItem" # 添加仙盟拍品
+
Def_Notify_WorldKey_CrossServerConnState = "CrossServerConnState" # 跨服服务器链接状态
Def_Notify_WorldKey_CrossServerOpen = "CrossServerOpen" # 跨服服务器是否开启中
Def_Notify_WorldKey_CrossZoneName = "CrossZoneName" # 跨服分区名
@@ -270,8 +272,10 @@
Def_ViewExpType_Sit , #打坐获取经验 3
Def_ViewExpType_KillNPCSuper, #杀怪获得经验暴击 4
Def_ViewExpType_Sys , #系统给经验-需要展示倍率，实际不享受 5
- Def_ViewExpType_RealmBuff, #境界全服福利经验(玄女天花) 6
-) = range(0, 7)
+ Def_ViewExpType_RealmBuff, #境界全服福利经验(玄女天花) 6
+ Def_ViewExpType_SysEx, #系统给经验-不需要展示倍率 用来区别于类型0 7
+ Def_ViewExpType_LYZS, #烈焰战神 特殊特效
+) = range(0, 9)
#物品相关操作类型
@@ -306,6 +310,7 @@
Def_SkillID_AutoTruck = 62220 # 自动运镖buff
#---写死的物品属性效果ID---
+Def_Effect_FreePoint = 200 # 自由灵根，注意此属性ID不能在刷属性中加，只能在某个功能中一次性处理
Def_Effect_Metal = 201 # 金
Def_Effect_Wood = 202 # 木
Def_Effect_Water = 203 # 水
@@ -502,34 +507,6 @@
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属性加成百分比
-
Def_Effect_Luck = 120 # 气运
Def_Effect_LuckPer = 133 # 气运百分率
@@ -545,6 +522,10 @@
Def_Effect_FinalHurtPer = 142 # 最终伤害万分率
Def_Effect_FinalHurtReducePer = 143 # 最终伤害减少万分
Def_Effect_YinjiTime = 144 # 每X毫秒自动消失一个印记
+Def_Effect_TheFBSkillsCD = 145 # 减少指定技能组CD XX%
+Def_Effect_BurnValue = 146 # 灼烧固定伤害
+Def_Effect_BurnTimePer = 147 # 延长灼烧时间百分比
+Def_Effect_SubSpeedPer = 148 # 减移动速度百分比
#增加%d物理伤害值,其中a值为伤害值
Def_Effect_AddAtk = 1005
@@ -552,8 +533,6 @@
Def_Effect_AddMAtk = 20020
#增加内防
Def_Effect_MagicDef = 20001
-#暴击率抗性(A值为万分率, 永恒为具体数值)
-Def_Effect_SuperHitRateReduce = 20030
#减技能CD（A值固定值）
Def_Effect_ReduceSkillCD = 20031
# 卓越一击倍数(a值为万分率，直接加上)
@@ -638,8 +617,8 @@
Def_BT_Campaign_Recharge, #累计充值(开服活动榜)
Def_BT_Campaign_PetLV, #灵宠等级(开服活动榜)
- Def_BT_ZhuXianTower, #诛仙塔榜
Def_BT_NewFCCostGold, #消费排行榜(新仙界盛典)
+ Def_BT_Campaign_LingGen, #灵根总点(开服活动榜)
Def_BT_Max, #排行榜最大类型
) = range(0, 24 + 2)
@@ -654,7 +633,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_ZhuXianTower,
+ Def_BT_FBHelpBattle,
]
##---比率---
@@ -856,7 +835,7 @@
CDBPlayerRefresh_LuckyHitReduce, # 会心伤害减免固定值
CDBPlayerRefresh_FinalHurtReducePer, # 最终伤害减少百分比
CDBPlayerRefresh_YinjiTime, # 每X秒减少印记时间，毫秒
-CDBPlayerRefresh_YinjiCnt, # 当前印记数 215
+CDBPlayerRefresh_YinjiCnt, # 当前印记数 214
) = range(146, 215)
TYPE_Price_Gold_Paper_Money = 5 # 金钱类型，（先用礼券，再用金子）
@@ -991,10 +970,8 @@
rptPet, # 宠物背包(用物品存储宠物的数据) 31
rptDogzItem, # 神兽物品背包 32
rptDogzEquip, # 神兽装备背包 33
-rptZhuXianItem, # 诛仙物品背包 34
-rptZhuXianEquip, # 诛仙装备背包 35
rptMax, # 最大背包类型数量，放在最后一个
-) = range(28, 28 + 9) #C++定义的枚举到２７
+) = range(28, 28 + 7) #C++定义的枚举到２７
#虚拟背包类型, 从255递减
Def_VPack_TypeList = (
@@ -1166,7 +1143,8 @@
Def_Campaign_Type_GodWeaponLV, # 神兵等级排行 8
Def_Campaign_Type_Recharge, # 累计充值排行 9
Def_Campaign_Type_PetLV, # 灵宠等级排行 10
-) = range(1, 1 + 10)
+Def_Campaign_Type_LingGen, # 灵根点数排行 11
+) = range(1, 1 + 11)
# 活动类型对应的奖励排行榜{活动类型:排行榜, ...}
Def_Campaign_Billboard_Dict = {
@@ -1180,6 +1158,7 @@
Def_Campaign_Type_GodWeaponLV:Def_BT_Campaign_GodWeaponLV,
Def_Campaign_Type_Recharge:Def_BT_Campaign_Recharge,
Def_Campaign_Type_PetLV:Def_BT_Campaign_PetLV,
+ Def_Campaign_Type_LingGen:Def_BT_Campaign_LingGen,
}
#队伍最大人数
@@ -1270,8 +1249,6 @@
Def_IudetMapLoaction = 15 # 物品记录地图坐标[mapid, posx, posy]
Def_IudetLegendAttrID = 17 # 物品传奇属性ID列表
Def_IudetLegendAttrValue = 19 # 物品传奇属性值列表
-Def_IudetOutOfPrintAttrID = 21 # 物品绝版属性ID列表
-Def_IudetOutOfPrintAttrValue = 23 # 物品绝版属性值列表
Def_IudetPartSuiteLV = 25 # 部位套装等级 [套装类型1等级, 套装类型2等级, ...]
Def_IudetWingMaterialItemID = 27 # 翅膀精炼材料ID列表
Def_IudetWingMaterialItemCount = 29 # 翅膀精炼材料个数列表
@@ -1339,7 +1316,7 @@
Def_MFPType_Plus, # 强化 2
Def_MFPType_Stone, # 宝石 3
Def_MFPType_LingGen, # 灵根 4
-Def_MFPType_Wing, # 翅膀 5
+Def_MFPType_LingQi, # 灵器 5
Def_MFPType_Wash, # 洗练 6
Def_MFPType_Pet, # 灵宠 7
Def_MFPType_Horse, # 坐骑 8
@@ -1455,10 +1432,13 @@
DailyActionID_HelpBattleCheckIn, # 助战登记 20
DailyActionID_CrossReamPK, # 跨服PK 21
DailyActionID_FamilyBoss1, # 仙盟BOSS 22
-DailyActionID_FamilyBoss2, # 废弃 23
+DailyActionID_SkyTower, # 天星塔 23
DailyActionID_HorsePetBoss, # 骑宠BOSS 24
DailyActionID_FairyDomain, # 缥缈仙域 25
-) = range(1, 25 + 1)
+DailyActionID_AuctionItem, # 拍卖行上架/竞拍 26
+DailyActionID_LeiFaBoss, # 雷罚boss 27
+DailyActionID_CrossPenglai, # 跨服蓬莱仙境Boss 28
+) = range(1, 28 + 1)
@@ -1690,28 +1670,6 @@
dogzetClaw, # 神兽兽爪
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