From 78f005e3fe86b6033255b37b03061cb491812dcb Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期四, 24 一月 2019 15:07:35 +0800
Subject: [PATCH] 2936 【1.5.100】诛仙塔挑战失败也会给予奖励并扣除次数
---
ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py | 97 +++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 87 insertions(+), 10 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index 7dbdb73..1edec26 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
@@ -230,12 +230,13 @@
OperationActionName_WishingWell = "ActWishingWell" # 许愿池活动
OperationActionName_TotalRecharge = "ActTotalRecharge" # 累计充值活动
OperationActionName_WeekParty = "ActWeekParty" # 周狂欢活动
+OperationActionName_LoginAward = "ActLoginAward" # 登录奖励活动
OperationActionNameList = [OperationActionName_ExpRate, OperationActionName_CostRebate,
OperationActionName_BossReborn,OperationActionName_SpringSale,
OperationActionName_FlashGiftbag, OperationActionName_FairyCeremony,
OperationActionName_RealmPoint, OperationActionName_FlashSale,
OperationActionName_WishingWell, OperationActionName_TotalRecharge,
- OperationActionName_WeekParty, ]
+ OperationActionName_WeekParty, OperationActionName_LoginAward, ]
#需要记录开启活动时的世界等级的运营活动
NeedWorldLVOperationActNameList = [OperationActionName_FairyCeremony, OperationActionName_WishingWell]
@@ -477,6 +478,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值为伤害值
@@ -569,6 +600,8 @@
Def_BT_Campaign_Recharge, #累计充值(开服活动榜)
Def_BT_Campaign_PetLV, #灵宠等级(开服活动榜)
+ Def_BT_ZhuXianTower, #诛仙塔榜
+
Def_BT_HighLadder, #天梯竞技场排行
Def_BT_HighLadder_Yester, #天梯竞技场昨日排行
Def_BT_RechargeTeHuiLast, #充值特惠活动排行榜-上一期记录
@@ -583,7 +616,7 @@
Def_BT_CostTeHuiLast, #消费特惠排行榜上一期
Def_BT_Max, #排行榜最大类型
-) = range(0, 32 + 2)
+) = range(0, 33 + 2)
#职业对应战力排行榜类型
JobFightPowerBillboardDict = {
@@ -595,7 +628,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,
]
##---比率---
@@ -786,7 +819,9 @@
CDBPlayerRefresh_SoulSplinters, # 聚魂碎片 197
CDBPlayerRefresh_SoulCore, # 核心环 198
CDBPlayerRefresh_Honor, # 荣誉 199
-) = range(146, 200)
+CDBPlayerRefresh_ZhuxianRate, # 诛仙一击概率 200
+CDBPlayerRefresh_ZhuxianHurtPer, # 诛仙一击伤害百分比 201
+) = range(146, 202)
TYPE_Price_Gold_Paper_Money = 5 # 金钱类型，（先用礼券，再用金子）
TYPE_Price_Family_Contribution = 6 # 战盟贡献度（活跃度转换得来）
@@ -877,6 +912,7 @@
GameFuncID_LittleHelper = 146 # 小助手
GameFuncID_TJG = 147 # 脱机挂
GameFuncID_SuperGift = 150 # 超值礼包
+GameFuncID_ZhuXianBoss = 163 # 诛仙BOSS
# 以下为暂时无用的
GameFuncID_Truck = 33 # 运镖
GameFuncID_RunDaily = 34 # 日常跑环
@@ -900,7 +936,9 @@
Def_TalkExtraValue_Bit_GM, #GM
Def_TalkExtraValue_Bit_JOB, #job
Def_TalkExtraValue_Bit_BubbleBox, #气泡框
-) = range(0, 4)
+Def_TalkExtraValue_Bit_ServerGroupID, #服务器组ID
+Def_TalkExtraValue_Bit_LV, #等级
+) = range(0, 6)
#聊天信息附加值中某信息数据所占位置
#{聊天信息附加值类型:[起始位置(从左往右), 结束位置(不包含)]}
@@ -909,6 +947,8 @@
Def_TalkExtraValue_Bit_GM:[2, 3], # GM
Def_TalkExtraValue_Bit_JOB:[3, 4], # job
Def_TalkExtraValue_Bit_BubbleBox:[4, 6], # 气泡框
+ Def_TalkExtraValue_Bit_ServerGroupID:[6, 13], # 服务器组ID
+ Def_TalkExtraValue_Bit_LV:[13, 17], # 等级
}
# 聊天频道 暂用语音
@@ -927,8 +967,10 @@
rptPet, # 宠物背包(用物品存储宠物的数据) 31
rptDogzItem, # 神兽物品背包 32
rptDogzEquip, # 神兽装备背包 33
+rptZhuXianItem, # 诛仙物品背包 34
+rptZhuXianEquip, # 诛仙装备背包 35
rptMax, # 最大背包类型数量，放在最后一个
-) = range(28, 28 + 7) #C++定义的枚举到２７
+) = range(28, 28 + 9) #C++定义的枚举到２７
#虚拟背包类型, 从255递减
Def_VPack_TypeList = (
@@ -957,7 +999,7 @@
Def_UniversalGameRecType_StoreServerCntRecord, #商店全服购买记录 8,
Def_UniversalGameRecType_FBHelpBattleCheckInPlayer, #助战玩家登记记录9
Def_UniversalGameRecType_FBHelpBattleRecord, #助战未同步记录10
- Def_UniversalGameRecType_11,
+ Def_UniversalGameRecType_ZhuXianBossRecord, #诛仙BOSS结算记录11
Def_UniversalGameRecType_12,
Def_UniversalGameRecType_13,
Def_UniversalGameRecType_Reward, # 通用奖励表(TopBar)14
@@ -1191,6 +1233,7 @@
CrossServerMsg_CrossServerState = "CrossServerState" # 跨服服务器状态变更
CrossServerMsg_ExitCrossServer = "ExitCrossServer" # 退出跨服服务器
CrossServerMsg_Notify = "Notify" # 提示信息
+CrossServerMsg_ChatCrossWorld = "ChatCrossWorld" # 跨服世界聊天
CrossServerMsg_ViewPlayerCacheRet = "ViewPlayerCacheRet"# 查看跨服玩家信息结果
CrossServerMsg_PKMatchReqRet = "PKMatchReqRet" # 跨服PK匹配请求结果
CrossServerMsg_PKMatchResult = "PKMatchResult" # 跨服PK匹配结果
@@ -1205,9 +1248,12 @@
CrossServerMsg_GiveMoney = "GiveMoney" # 获得货币
CrossServerMsg_DropGoodItem = "DropGoodItem" # 掉落好物品
CrossServerMsg_RebornRet = "RebornRet" # 复活结果
+CrossServerMsg_NPCInfoRet = "NPCInfoRet" # 跨服地图NPC信息
+CrossServerMsg_CollectNPCOK = "CollectNPCOK" # 采集NPC完成
# 子服发送跨服信息定义
ClientServerMsg_ServerInitOK = "ServerInitOK" # 子服启动成功
+ClientServerMsg_ChatCrossWorld = "ChatCrossWorld" # 跨服世界聊天
ClientServerMsg_GMCMD = "GMCMD" # GM命令
ClientServerMsg_ViewPlayerCache = "ViewPlayerCache" # 查看跨服玩家信息
ClientServerMsg_PKMatch = "PKMatch" # 跨服PK匹配
@@ -1215,6 +1261,13 @@
ClientServerMsg_PKPrepareOK = "PKPrepareOK" # 跨服PK准备完毕
ClientServerMsg_PKBillboard = "PKBillboard" # 跨服PK排行榜
ClientServerMsg_Reborn = "Reborn" # 复活
+ClientServerMsg_QueryNPCInfo = "QueryNPCInfo" # 查询跨服地图NPC信息
+ClientServerMsg_SetPlayerAttrValue = "SetPlayerAttrValue" # 玩家属性数值更新
+ClientServerMsg_CollectNPC = "CollectNPC" # 采集NPC
+
+#跨服广播类型定义
+CrossNotify_World = "World"
+CrossNotify_Family = "Family"
#角色改名结果
(
@@ -1326,7 +1379,7 @@
)=range(5)
# 战斗力模块类型
-Def_MFPType_Max = 28
+Def_MFPType_Max = 29
ModuleFightPowerTypeList = (
Def_MFPType_Role, # 角色 0
Def_MFPType_Equip, # 装备(基本装备位) 1
@@ -1353,6 +1406,7 @@
Def_MFPType_GatherSoul, # 聚魂 22
Def_MFPType_MagicWeapon4, # 王者法宝 23
Def_MFPType_Coat, # 时装 24
+Def_MFPType_ZhuXian, # 诛仙 25
Def_MFPType_Other, # 其他
#以下暂时没用到，改时再处理
@@ -1505,7 +1559,8 @@
DailyActionID_IceLode, # 冰晶矿脉
DailyActionID_HelpBattleCheckIn, # 助战登记 20
DailyActionID_CrossReamPK, # 跨服PK 21
-) = range(1, 21 + 1)
+DailyActionID_ZhuXianBoss, # 诛仙BOSS 22
+) = range(1, 22 + 1)
@@ -1725,6 +1780,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 = (
@@ -1743,9 +1819,10 @@
EntFBAskRet_TJG, # 12 脱机挂中
EntFBAskRet_Sit, # 13 打坐中
EntFBAskRet_CrossPKMatching,# 14 跨服匹配中
+ EntFBAskRet_InCrossMap, # 15 跨服地图中
EntFBAskRet_Other, # xx 其他限制
EntFBAskRet_Max,
-) = range(17)
+) = range(18)
#增加仙盟活跃的活动类型
--
Gitblit v1.8.0