From da703bbc7bc857362753504d9b82ce8d2250a9b6 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期五, 15 三月 2019 16:32:02 +0800
Subject: [PATCH] 6307 【后端】【2.0】多套装备开发单(外观设置修改)
---
ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py | 58 +++++++++++++++++++++++++++++++++-------------------------
1 files changed, 33 insertions(+), 25 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index ef34332..0eea719 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
+++ b/ServerPython/CoreServerGroup/GameServer/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点过月
@@ -213,6 +214,7 @@
Def_Notify_WorldKey_LoginAwardEndDate = 'LoginAwardEndDate_%s' # 登录领取奖励结束时间，参数为活动类型
Def_Notify_WorldKey_RedPacketOutput = 'RedPacketOutput' # 红包产出信息
+Def_Notify_WorldKey_HurtLog = 'HurtLog' # 战斗伤害日志
#运营活动表名定义
OperationActionName_ExpRate = "ActExpRate" # 多倍经验活动
@@ -256,6 +258,7 @@
ActKey_CfgID = "CfgID" # 活动表配置ID
ActKey_DayIndex = "DayIndex" # 活动表配置ID
ActKey_WorldLV = "WorldLV" # 活动开启时世界等级
+ActKey_WorldLVList = "WorldLVList" # 活动每天的世界等级列表
#答题类型枚举
Def_Game_ExamTypeList = range(1, 4 + 1)
@@ -304,7 +307,7 @@
Def_mitProduceResult, # 生产采集结果回应
Def_mitPetEquipMerge, # 宠物装备合成回应
Def_mitEquipInherit, # 装备继承
- Def_mitEquipPlus, # 装备加强
+ Def_mitEquipStarUp, # 装备升星
Def_mitEquipMayaPlus, # 装备玛雅加强
Def_mitEquipAddAttr, # 装备追加
Def_mitEquipSlotting, # 装备打孔
@@ -1292,6 +1295,8 @@
Def_IudetCreateTime = 44 # 时效物品的创建时间
Def_IudetGatherSoulLV = 46 # 聚魂等级
Def_IudetExpireTime = 48 # 时效物品指定有效时间，时间单位由时效类型决定
+Def_IudetAuctionItemCreateTime = 50 # 拍品创建时间
+
# 200~300 宠物数据用
Def_IudetPet_NPCID = 200 # npcID
Def_IudetPet_ClassLV = 202 # 阶级
@@ -1533,8 +1538,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)
@@ -1730,32 +1736,34 @@
# 手游不使用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)
+
+
# 神兽装备位定义
DogzEquipPlace = (
dogzetHorn, # 神兽兽角
--
Gitblit v1.8.0