From 7183d0b21074403350b355672d2ef2f78159cdb2 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 14 一月 2020 16:26:53 +0800
Subject: [PATCH] 4627 【主干】分解跟升星同时触发有概率扣除失败或者扣除了错误的物品（优化升星扣除装备、材料逻辑）
---
ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index a520f4d..7de36d7 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
@@ -633,8 +633,8 @@
Def_BT_Realm, #境界榜
Def_BT_TotalRecharge, #充值排行榜 10
- Def_BT_Campaign_PlusLV, #强化等级(开服活动榜)
- Def_BT_Campaign_HorseLV, #坐骑等级(开服活动榜)
+ Def_BT_Campaign_Plus, #强化战力(开服活动榜)
+ Def_BT_Campaign_Horse, #坐骑战力(开服活动榜)
Def_BT_Campaign_StoneLV, #宝石等级(开服活动榜)
Def_BT_Campaign_LV, #冲级排行(开服活动榜)
Def_BT_Campaign_RealmLV, #境界等级(开服活动榜) 15
@@ -642,7 +642,7 @@
Def_BT_FCCostGold, #消费排行榜(仙界盛典)
Def_BT_Campaign_RuneLV, #符印等级(开服活动榜)
- Def_BT_FBHelpBattle, #助战次数排行榜
+ Def_BT_19,
Def_BT_Campaign_GodWeaponLV, #神兵等级(开服活动榜) 20
Def_BT_Campaign_Recharge, #累计充值(开服活动榜)
Def_BT_Campaign_PetLV, #灵宠等级(开服活动榜)
@@ -650,9 +650,10 @@
Def_BT_NewFCCostGold, #消费排行榜(新仙界盛典)
Def_BT_Campaign_LingGen, #灵根总点(开服活动榜)
Def_BT_Campaign_StarLV, #升星等级(开服活动榜) 25
+ Def_BT_Campaign_Wash, #洗练战力(开服活动榜)
Def_BT_Max, #排行榜最大类型
-) = range(0, 25 + 2)
+) = range(0, 26 + 2)
#职业对应战力排行榜类型
JobFightPowerBillboardDict = {
@@ -664,7 +665,6 @@
#排行榜Value1存储境界信息的榜单列表
BTValue1_OfficialRankList = [Def_BT_FightPower, Def_BT_FightPower_Warrior, Def_BT_FightPower_Wizard, Def_BT_FightPower_Assassin,
Def_BT_LV, Def_BT_FightPower_Horse, Def_BT_FightPower_Pet, Def_BT_TrialTower, Def_BT_OffLineEfficient,
- Def_BT_FBHelpBattle,
]
##---比率---
@@ -826,7 +826,7 @@
CDBPlayerRefresh_RealmPoint, # 境界修炼点
CDBPlayerRefresh_Ysog, # 魔精
CDBPlayerRefresh_FamilyActivity, # 仙盟活跃令
-CDBPlayerRefresh_Xianyuancoin, # 仙缘币
+CDBPlayerRefresh_174,
CDBPlayerRefresh_PKState, # 战斗状态 175
CDBPlayerRefresh_BossState, # boss状态
CDBPlayerRefresh_BaseAtkMin, # 基础最小攻击
@@ -891,7 +891,6 @@
TYPE_Price_Ysog = 14 # 魔精
TYPE_Price_FamilyActivity = 15 # 仙盟活跃令
TYPE_Price_FBHelpPoint = 16 # 副本助战积分, 废弃
-TYPE_Price_XianyuanCoin = 17 # 仙缘币
TYPE_Price_Honor = 18 # 荣誉
TYPE_Price_Rune = 23 # 符印精华点
TYPE_Price_RuneSplinters = 24 # 符印碎片
@@ -919,7 +918,6 @@
TYPE_Price_RealmPoint:CDBPlayerRefresh_RealmPoint,
TYPE_Price_Ysog:CDBPlayerRefresh_Ysog,
TYPE_Price_FamilyActivity:CDBPlayerRefresh_FamilyActivity,
- TYPE_Price_XianyuanCoin:CDBPlayerRefresh_Xianyuancoin,
TYPE_Price_Danjing:CDBPlayerRefresh_Danjing,
TYPE_Price_SoulDust:CDBPlayerRefresh_SoulDust,
TYPE_Price_SoulSplinters:CDBPlayerRefresh_SoulSplinters,
@@ -1046,7 +1044,7 @@
Def_UniversalGameRecType_YesterdayPlayerLVInfo,#昨日活跃玩家等级信息7
Def_UniversalGameRecType_StoreServerCntRecord, #商店全服购买记录 8,
Def_UniversalGameRecType_FBHelpBattleCheckInPlayer, #助战玩家登记记录9
- Def_UniversalGameRecType_FBHelpBattleRecord, #助战未同步记录10
+ Def_UniversalGameRecType_10,
Def_UniversalGameRecType_ZhuXianBossRecord, #诛仙BOSS结算记录11
Def_UniversalGameRecType_LuckyTreasure, #幸运鉴宝大奖记录12
Def_UniversalGameRecType_FairyDomain, #缥缈仙域事件次数记录13
@@ -1180,8 +1178,8 @@
# 开服活动类型标识, 不可超过32
Def_Campaign_Type_List = (
-Def_Campaign_Type_PlusLV, # 强化等级排行 1
-Def_Campaign_Type_HorseLV, # 坐骑等级排行 2
+Def_Campaign_Type_Plus, # 强化战力排行 1
+Def_Campaign_Type_Horse, # 坐骑战力排行 2
Def_Campaign_Type_StoneLV, # 宝石等级排行 3
Def_Campaign_Type_LV, # 冲级等级排行 4
Def_Campaign_Type_RealmLV, # 境界等级排行 5
@@ -1192,12 +1190,13 @@
Def_Campaign_Type_PetLV, # 灵宠等级排行 10
Def_Campaign_Type_LingGen, # 灵根点数排行 11
Def_Campaign_Type_StarLV, # 升星等级排行 12
-) = range(1, 1 + 12)
+Def_Campaign_Type_Wash, # 洗练战力排行 13
+) = range(1, 1 + 13)
# 活动类型对应的奖励排行榜{活动类型:排行榜, ...}
Def_Campaign_Billboard_Dict = {
- Def_Campaign_Type_PlusLV:Def_BT_Campaign_PlusLV,
- Def_Campaign_Type_HorseLV:Def_BT_Campaign_HorseLV,
+ Def_Campaign_Type_Plus:Def_BT_Campaign_Plus,
+ Def_Campaign_Type_Horse:Def_BT_Campaign_Horse,
Def_Campaign_Type_StoneLV:Def_BT_Campaign_StoneLV,
Def_Campaign_Type_LV:Def_BT_Campaign_LV,
Def_Campaign_Type_RealmLV:Def_BT_Campaign_RealmLV,
@@ -1208,6 +1207,7 @@
Def_Campaign_Type_PetLV:Def_BT_Campaign_PetLV,
Def_Campaign_Type_LingGen:Def_BT_Campaign_LingGen,
Def_Campaign_Type_StarLV:Def_BT_Campaign_StarLV,
+ Def_Campaign_Type_Wash:Def_BT_Campaign_Wash,
}
#队伍最大人数
--
Gitblit v1.8.0