From 4d05b52d78b592673bd93dd29f1668147cf89039 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期二, 16 十月 2018 15:04:06 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index a8efaf8..367e6e4 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
+++ b/ServerPython/CoreServerGroup/GameServer/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]
@@ -834,6 +835,7 @@
GameFuncID_Official = 12 # 官爵，境界
GameFuncID_Family = 15 # 战盟，仙盟
GameFuncID_GodWeapon = 20 # 神器
+GameFuncID_Talent = 28 # 天赋
GameFuncID_RefineExp = 60 # 经验炼制，祈愿
GameFuncID_RefineMoney = 61 # 金币炼制，祈愿
GameFuncID_WorldLV = 71 # 世界等级
@@ -849,7 +851,6 @@
GameFuncID_OSSail = 132 # 开服特惠
GameFuncID_HorsePetRobBoss = 139# 骑宠争夺
# 以下为暂时无用的
-GameFuncID_GreatMaster = 28 # 大师
GameFuncID_Truck = 33 # 运镖
GameFuncID_RunDaily = 34 # 日常跑环
GameFuncID_RunFamily = 53 # 战盟跑环
@@ -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亿，目前仅特殊转化物品会用到
--
Gitblit v1.8.0