From 43415c0b60c20de98caa35768f01dddd8fea38eb Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期一, 15 十月 2018 21:02:17 +0800
Subject: [PATCH] 2145 bug:法师噬天斧技能学习3个潜力在和平状态下释放技能会提示当前模式不可PK
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
index 0f80fd4..367e6e4 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
@@ -232,10 +232,11 @@
OperationActionName_FlashGiftbag = "ActFlashGiftbag" # 限时礼包活动
OperationActionName_FairyCeremony = "ActFairyCeremony" # 仙界盛典活动
OperationActionName_RealmPoint = "ActRealmPoint" # 多倍修行点活动
+OperationActionName_FlashSale = "ActFlashSale" # 限时抢购活动
OperationActionNameList = [OperationActionName_ExpRate, OperationActionName_CostRebate,
OperationActionName_BossReborn,OperationActionName_SpringSale,
OperationActionName_FlashGiftbag, OperationActionName_FairyCeremony,
- OperationActionName_RealmPoint]
+ OperationActionName_RealmPoint, OperationActionName_FlashSale]
#需要记录开启活动时的世界等级的运营活动
NeedWorldLVOperationActNameList = [OperationActionName_FairyCeremony]
@@ -769,7 +770,8 @@
CDBPlayerRefresh_Danjing, # 丹精
CDBPlayerRefresh_NPCHurtAddPer, # 对怪物伤害加成
CDBPlayerRefresh_FinalHurtPer, # 最终输出伤害百分比
-) = range(146, 190)
+CDBPlayerRefresh_TalentPoint, # 天赋点数 190
+) = range(146, 191)
TYPE_Price_Gold_Paper_Money = 5 # 金钱类型，（先用礼券，再用金子）
TYPE_Price_Family_Contribution = 6 # 战盟贡献度（活跃度转换得来）
@@ -820,9 +822,6 @@
) = range(1, 4)
-#无限飞buff id--->新手体验VIPBUFF
-Def_FreedomTransBuffID = 11503
-
#区域类型定义, 从5开始, C++定义到 IPY_GameWorld.gatMax 4
(
gatManor, # 领地区域, 领地战期间可PK, 反之为普通区域
@@ -836,6 +835,7 @@
GameFuncID_Official = 12 # 官爵，境界
GameFuncID_Family = 15 # 战盟，仙盟
GameFuncID_GodWeapon = 20 # 神器
+GameFuncID_Talent = 28 # 天赋
GameFuncID_RefineExp = 60 # 经验炼制，祈愿
GameFuncID_RefineMoney = 61 # 金币炼制，祈愿
GameFuncID_WorldLV = 71 # 世界等级
@@ -851,7 +851,6 @@
GameFuncID_OSSail = 132 # 开服特惠
GameFuncID_HorsePetRobBoss = 139# 骑宠争夺
# 以下为暂时无用的
-GameFuncID_GreatMaster = 28 # 大师
GameFuncID_Truck = 33 # 运镖
GameFuncID_RunDaily = 34 # 日常跑环
GameFuncID_RunFamily = 53 # 战盟跑环
@@ -925,7 +924,7 @@
Def_UniversalGameRecType_DujieHelpCntRecord, # 渡劫副本护法次数5
Def_UniversalGameRecType_TodayPlayerLVInfo, #今日活跃玩家等级信息6
Def_UniversalGameRecType_YesterdayPlayerLVInfo,#昨日活跃玩家等级信息7
- Def_UniversalGameRecType_8,
+ Def_UniversalGameRecType_StoreServerCntRecord, #商店全服购买记录 8,
Def_UniversalGameRecType_9,
Def_UniversalGameRecType_10,
Def_UniversalGameRecType_11,
@@ -1223,6 +1222,7 @@
Def_IudetWingMaterialItemID = 27 # 翅膀精炼材料ID列表
Def_IudetWingMaterialItemCount = 29 # 翅膀精炼材料个数列表
Def_IudetDogzEquipPlus = 31 # 神兽装备强化信息列表 [强化等级, 累计总熟练度]
+Def_IudetItemDecompound = 33 # 拆解返还物品列表 [装备ID,材料1ID,个数,是否绑定,材料2ID,个数,是否绑定,...]
Def_IudetItemColor = 16 # 物品颜色，如果该值没有就取物品
Def_IudetItemCount = 18 # 物品个数，支持20亿，目前仅特殊转化物品会用到
@@ -1608,7 +1608,10 @@
SuccType_RefineStoveColor, #炼制X品质丹药X枚126
SuccType_UseStoveBylv, #使用X品丹药X枚127
SuccType_QueenRelicsEx, #通关娲皇遗迹128
-) = range(1, 129)
+SuccType_DogzBattle, #x神兽出战129
+SuccType_DogzEquipPlus, #出战神兽装备总强化X级130
+SuccType_Collect, #采集X物品X次131
+) = range(1, 132)
@@ -1623,7 +1626,7 @@
SuccType_KillSpecificNPC, SuccType_UseStoveBylv,
SuccType_Pray,SuccType_PetClassLV,
SuccType_HorseAllLV, SuccType_QueenRelics,SuccType_XMZZConWin,
- SuccType_EquipSuit,
+ SuccType_EquipSuit,SuccType_Collect,SuccType_DogzBattle,
SuccType_UseItem,SuccType_FamilyTechLV,
SuccType_GetSpecialItem,SuccType_GetMagicWeapon,SuccType_FBEncourage,SuccType_XBXZ,
]
@@ -1636,7 +1639,7 @@
#增加进度前需要重置的成就类型
NeedResetSuccessTypeList = [
SuccType_InlayStone1,SuccType_InlayStone2,SuccType_EquipSuit,SuccType_InlayRune,
- SuccType_EquipColorItem,SuccType_EquipArmor,SuccType_EquipWeapon,
+ SuccType_EquipColorItem,SuccType_EquipArmor,SuccType_EquipWeapon,SuccType_DogzEquipPlus,
]
# 聊天类型, 从100开始, 前100个给c++用
--
Gitblit v1.8.0