From a608566d51391f045aa3ea595fc7bea6c72c75f2 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期二, 23 十月 2018 21:09:35 +0800
Subject: [PATCH] 2197 【1.2】【1.1】封魔坛报错修复

---
 ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index 557b029..a4130f2 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
@@ -143,7 +143,7 @@
 Def_Notify_WorldKey_ReloadJpegCaptcha = 'ReloadJpegCaptcha'           # 重读tex图形验证码
 Def_Notify_WorldKey_GameServerScriptReloadVersion = 'GameServerScriptReloadVersion' # GameServer 脚本重读版本标记
 Def_Notify_WorldKey_MapServerScriptReloadVersion = 'MapServerScriptReloadVersion'  # MapServer 脚本重读版本标记
-
+Def_Notify_WorldKey_InitGameWorldTime = "InitGameWorldTime"  #启动服务器时间
 Def_Notify_WorldKey_OperationActionInfo = "OperationActionInfo_%s" # 运营活动信息,参数为运营活动名
 Def_Notify_WorldKey_DailyActionState = "DailyActionState_%s" # 日常活动状态,参数为日常活动ID
 Def_Notify_WorldKey_FBEnterTimeLimiitMapID = "FBEnterTimeLimiitMapID" # 进入副本有时间限制的地图ID列表
@@ -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]
 
@@ -923,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,
@@ -1221,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亿,目前仅特殊转化物品会用到
@@ -1504,7 +1506,7 @@
 SuccType_XXX24 , # 废弃24
 SuccType_XXX25, # 废弃25
 SuccType_EquipPlus, # 强化x次成就26
-SuccType_EquipPlusLV, # x件装备强化等级达到x级27
+SuccType_EquipPlusLV, # x件装备强化等级达到x级27 (已废弃)
 SuccType_KillWorldBoss, # 击杀世界bossx次成就(有伤害就算)28
 SuccType_XXX29, # 废弃29
 SuccType_PassWagicWeapon, # 通关法宝副本30
@@ -1638,6 +1640,7 @@
 NeedResetSuccessTypeList = [
                             SuccType_InlayStone1,SuccType_InlayStone2,SuccType_EquipSuit,SuccType_InlayRune,
                             SuccType_EquipColorItem,SuccType_EquipArmor,SuccType_EquipWeapon,SuccType_DogzEquipPlus,
+                            SuccType_HorseAllLV, SuccType_EquipPlusLV,SuccType_PetClassLV,
                             ]
 
 # 聊天类型, 从100开始, 前100个给c++用

--
Gitblit v1.8.0