From 94bb5ab94e98fb616137f9c143e702aae10df8a6 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期三, 17 七月 2019 14:32:17 +0800
Subject: [PATCH] 8125 子 【主干】新功能：累计充值 / 【后端】【主干】累计充值
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py | 74 ++++++++-----------------------------
1 files changed, 16 insertions(+), 58 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
index 6938d3f..d09fbab 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
@@ -274,7 +274,8 @@
Def_ViewExpType_Sys , #系统给经验-需要展示倍率，实际不享受 5
Def_ViewExpType_RealmBuff, #境界全服福利经验(玄女天花) 6
Def_ViewExpType_SysEx, #系统给经验-不需要展示倍率 用来区别于类型0 7
-) = range(0, 8)
+ Def_ViewExpType_LYZS, #烈焰战神 特殊特效
+) = range(0, 9)
#物品相关操作类型
@@ -506,34 +507,6 @@
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
-
-Def_Effect_ZXWeaponAttrPer = 116 # 诛仙剑1属性加成百分比
-Def_Effect_LXWeaponAttrPer = 117 # 诛仙剑2属性加成百分比
-Def_Effect_XXWeaponAttrPer = 118 # 诛仙剑3属性加成百分比
-Def_Effect_JXWeaponAttrPer = 119 # 诛仙剑4属性加成百分比
-
Def_Effect_Luck = 120 # 气运
Def_Effect_LuckPer = 133 # 气运百分率
@@ -646,9 +619,10 @@
Def_BT_NewFCCostGold, #消费排行榜(新仙界盛典)
Def_BT_Campaign_LingGen, #灵根总点(开服活动榜)
+ Def_BT_Campaign_StarLV, #升星等级(开服活动榜)
Def_BT_Max, #排行榜最大类型
-) = range(0, 24 + 2)
+) = range(0, 25 + 2)
#职业对应战力排行榜类型
JobFightPowerBillboardDict = {
@@ -997,10 +971,8 @@
rptPet, # 宠物背包(用物品存储宠物的数据) 31
rptDogzItem, # 神兽物品背包 32
rptDogzEquip, # 神兽装备背包 33
-rptZhuXianItem, # 诛仙物品背包 34
-rptZhuXianEquip, # 诛仙装备背包 35
rptMax, # 最大背包类型数量，放在最后一个
-) = range(28, 28 + 9) #C++定义的枚举到２７
+) = range(28, 28 + 7) #C++定义的枚举到２７
#虚拟背包类型, 从255递减
Def_VPack_TypeList = (
@@ -1173,7 +1145,8 @@
Def_Campaign_Type_Recharge, # 累计充值排行 9
Def_Campaign_Type_PetLV, # 灵宠等级排行 10
Def_Campaign_Type_LingGen, # 灵根点数排行 11
-) = range(1, 1 + 11)
+Def_Campaign_Type_StarLV, # 升星等级排行 12
+) = range(1, 1 + 12)
# 活动类型对应的奖励排行榜{活动类型:排行榜, ...}
Def_Campaign_Billboard_Dict = {
@@ -1188,6 +1161,7 @@
Def_Campaign_Type_Recharge:Def_BT_Campaign_Recharge,
Def_Campaign_Type_PetLV:Def_BT_Campaign_PetLV,
Def_Campaign_Type_LingGen:Def_BT_Campaign_LingGen,
+ Def_Campaign_Type_StarLV:Def_BT_Campaign_StarLV,
}
#队伍最大人数
@@ -1236,6 +1210,7 @@
ClientServerMsg_GMCMD = "GMCMD" # GM命令
ClientServerMsg_ViewPlayerCache = "ViewPlayerCache" # 查看跨服玩家信息
ClientServerMsg_PKMatch = "PKMatch" # 跨服PK匹配
+ClientServerMsg_PKRobotOver = "PKRobotOver" # 跨服PK机器人结算
ClientServerMsg_PKCancel = "PKCancel" # 跨服PK取消匹配
ClientServerMsg_PKPrepareOK = "PKPrepareOK" # 跨服PK准备完毕
ClientServerMsg_PKBillboard = "PKBillboard" # 跨服PK排行榜
@@ -1307,6 +1282,8 @@
Def_IudetPet_QualityLV = 206 # 品质
Def_IudetPet_Exp = 208 # 经验
Def_IudetPet_Skill = 201 # 技能列表
+
+Def_IudetHorsePetSkinIndex = 210 # 骑宠觉醒外观索引
# ----------------------------------------------------
# 宠物物品数据状态
@@ -1444,7 +1421,7 @@
DailyActionID_EquipPlus, # 强化
DailyActionID_FieldFight, # 野外挂机
DailyActionID_OfflineFight, # 脱机挂机
-DailyActionID_RefineStove, # 炼丹材料消耗 6
+DailyActionID_RefineStove, # 炼丹材料消耗 6(废弃)
DailyActionID_Dice, # 我要太极
DailyActionID_Pray, # 祈愿
DailyActionID_WorldBOSS, # 世界BOSS
@@ -1464,7 +1441,10 @@
DailyActionID_SkyTower, # 天星塔 23
DailyActionID_HorsePetBoss, # 骑宠BOSS 24
DailyActionID_FairyDomain, # 缥缈仙域 25
-) = range(1, 25 + 1)
+DailyActionID_AuctionItem, # 拍卖行上架/竞拍 26
+DailyActionID_LeiFaBoss, # 雷罚boss 27
+DailyActionID_CrossPenglai, # 跨服蓬莱仙境Boss 28
+) = range(1, 28 + 1)
@@ -1696,28 +1676,6 @@
dogzetClaw, # 神兽兽爪
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 = (
--
Gitblit v1.8.0