From e3e02e749761fd568ec2736790bcadcde143aeca Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 03 十二月 2018 20:59:23 +0800
Subject: [PATCH] 5174 【后端】【1.3】【1.3.100】全民冲榜榜单调整(增加神兵、充值活动)

---
 ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py |   44 ++++++++++++++++++++++++++++++--------------
 1 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index 086c7e5..4040f8b 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
@@ -311,7 +311,8 @@
     Def_mitMWUpLevel,         # 法宝进阶
     Def_mitRecycleAttrFruit,  # 回收魂石
     Def_mitDogzEquipPlus,     # 神兽装备强化
-) = range(1, 22)
+    Def_mitRuneCompound,      # 符印合成
+) = range(1, 23)
 
 #---写死的技能ID---
 Def_SkillID_AutoTruck = 62220   # 自动运镖buff
@@ -565,16 +566,19 @@
     
     Def_BT_FCCostGold,                        #消费排行榜(仙界盛典)
     Def_BT_Campaign_RuneLV,                   #符印等级(开服活动榜)
+    Def_BT_FBHelpBattle,                      #助战次数排行榜
+    Def_BT_Campaign_GodWeaponLV,              #神兵等级(开服活动榜) 20
+    Def_BT_Campaign_Recharge,                 #累计充值(开服活动榜)
     
     Def_BT_HighLadder,                        #天梯竞技场排行
     Def_BT_HighLadder_Yester,                 #天梯竞技场昨日排行
-    Def_BT_RechargeTeHuiLast,                 #充值特惠活动排行榜-上一期记录 20
+    Def_BT_RechargeTeHuiLast,                 #充值特惠活动排行榜-上一期记录
     Def_BT_RechargeTeHui,                     #充值特惠活动排行榜-当前期记录
     
     Def_BT_MixCampaign_PlayerBattle,          #总战斗力(合服活动)
     Def_BT_MixCampaign_Recharge,              #累计充值(合服活动)
     Def_BT_MixCampaign_WinFamilyMember,       #获胜战盟成员,按职位排(合服活动)
-    Def_BT_MixCampaign_FamilyKillBoss,        #战盟击杀boss(合服活动) 25
+    Def_BT_MixCampaign_FamilyKillBoss,        #战盟击杀boss(合服活动)
     
     Def_BT_CostTeHui,                         #消费特惠排行榜
     Def_BT_CostTeHuiLast,                     #消费特惠排行榜上一期
@@ -582,7 +586,7 @@
     Def_BT_MergePKWeek,                       #跨服PK周积分榜
     
     Def_BT_Max,                               #排行榜最大类型
-) = range(0, 30 + 2) 
+) = range(0, 33 + 2) 
     
 #职业对应战力排行榜类型
 JobFightPowerBillboardDict = {
@@ -758,7 +762,7 @@
 CDBPlayerRefresh_RealmPoint,            # 境界修炼点
 CDBPlayerRefresh_Ysog,                  # 魔精
 CDBPlayerRefresh_FamilyActivity,        # 仙盟活跃令
-CDBPlayerRefresh_FBHelpPoint,           # 副本助战积分
+CDBPlayerRefresh_Xianyuancoin,          # 仙缘币
 CDBPlayerRefresh_PKState,               # 战斗状态 175
 CDBPlayerRefresh_BossState,             # boss状态
 CDBPlayerRefresh_BaseAtkMin,            # 基础最小攻击
@@ -773,10 +777,14 @@
 CDBPlayerRefresh_TreasureScore,         # 寻宝积分
 CDBPlayerRefresh_Danjing,               # 丹精
 CDBPlayerRefresh_NPCHurtAddPer,         # 对怪物伤害加成
-CDBPlayerRefresh_FinalHurtPer,             # 最终输出伤害百分比
+CDBPlayerRefresh_FinalHurtPer,          # 最终输出伤害百分比
 CDBPlayerRefresh_TalentPoint,           # 天赋点数 190
-CDBPlayerRefresh_DayFBHelpPoint,        # 今日副本助战点数 191
-) = range(146, 192)
+CDBPlayerRefresh_191,                   # 废弃 191
+CDBPlayerRefresh_GodWeaponLV_1,         # 神兵等级 - 类型1 192
+CDBPlayerRefresh_GodWeaponLV_2,         # 神兵等级 - 类型2 193
+CDBPlayerRefresh_GodWeaponLV_3,         # 神兵等级 - 类型3 194
+CDBPlayerRefresh_GodWeaponLV_4,         # 神兵等级 - 类型4 195
+) = range(146, 196)
 
 TYPE_Price_Gold_Paper_Money = 5    # 金钱类型,(先用礼券,再用金子)
 TYPE_Price_Family_Contribution = 6 # 战盟贡献度(活跃度转换得来)
@@ -784,7 +792,8 @@
 TYPE_Price_RealmPoint = 13    # 境界修炼点
 TYPE_Price_Ysog = 14    # 魔精
 TYPE_Price_FamilyActivity = 15    # 仙盟活跃令
-TYPE_Price_FBHelpPoint = 16    # 副本助战积分
+TYPE_Price_FBHelpPoint = 16    # 副本助战积分, 废弃
+TYPE_Price_XianyuanCoin = 17    # 仙缘币
 TYPE_Price_Rune = 23    # 符印精华点
 TYPE_Price_RuneSplinters = 24    # 符印碎片
 TYPE_Price_TreasureScore = 25    # 寻宝积分
@@ -815,7 +824,7 @@
                            TYPE_Price_RealmPoint:CDBPlayerRefresh_RealmPoint,
                            TYPE_Price_Ysog:CDBPlayerRefresh_Ysog,
                            TYPE_Price_FamilyActivity:CDBPlayerRefresh_FamilyActivity,
-                           TYPE_Price_FBHelpPoint:CDBPlayerRefresh_FBHelpPoint,
+                           TYPE_Price_XianyuanCoin:CDBPlayerRefresh_Xianyuancoin,
                            TYPE_Price_Danjing:CDBPlayerRefresh_Danjing,
                            }
 
@@ -858,6 +867,7 @@
 GameFuncID_AddPoint = 145       # 加点功能
 GameFuncID_LittleHelper = 146   # 小助手
 GameFuncID_TJG = 147            # 脱机挂
+GameFuncID_SuperGift = 150      # 超值礼包
 # 以下为暂时无用的
 GameFuncID_Truck = 33           # 运镖
 GameFuncID_RunDaily = 34        # 日常跑环
@@ -935,8 +945,8 @@
                                 Def_UniversalGameRecType_TodayPlayerLVInfo, #今日活跃玩家等级信息6
                                 Def_UniversalGameRecType_YesterdayPlayerLVInfo,#昨日活跃玩家等级信息7
                                 Def_UniversalGameRecType_StoreServerCntRecord,  #商店全服购买记录 8,
-                                Def_UniversalGameRecType_9,
-                                Def_UniversalGameRecType_10,
+                                Def_UniversalGameRecType_FBHelpBattleCheckInPlayer, #助战玩家登记记录9
+                                Def_UniversalGameRecType_FBHelpBattleRecord, #助战未同步记录10
                                 Def_UniversalGameRecType_11,
                                 Def_UniversalGameRecType_MergeRegister, # 上传数据报名信息12
                                 Def_UniversalGameRecType_13,
@@ -1090,7 +1100,9 @@
 Def_Campaign_Type_RealmLV,          # 境界等级排行 5
 Def_Campaign_Type_FightPower,       # 总战斗力排行 6
 Def_Campaign_Type_RuneLV,           # 符印等级排行 7
-) = range(1, 1 + 7)
+Def_Campaign_Type_GodWeaponLV,      # 神兵等级排行 8
+Def_Campaign_Type_Recharge,         # 累计充值排行 9
+) = range(1, 1 + 9)
 
 # 活动类型对应的奖励排行榜{活动类型:排行榜, ...}
 Def_Campaign_Billboard_Dict = {
@@ -1101,6 +1113,8 @@
                                Def_Campaign_Type_RealmLV:Def_BT_Campaign_RealmLV,
                                Def_Campaign_Type_FightPower:Def_BT_Campaign_FightPower,
                                Def_Campaign_Type_RuneLV:Def_BT_Campaign_RuneLV,
+                               Def_Campaign_Type_GodWeaponLV:Def_BT_Campaign_GodWeaponLV,
+                               Def_Campaign_Type_Recharge:Def_BT_Campaign_Recharge,
                                }
 
 # 活动数据状态
@@ -1485,7 +1499,9 @@
 DailyActionID_BOSSHome, # BOSS之家
 DailyActionID_FamilyRobBoss, # 仙盟抢boss
 DailyActionID_KillNPC, # 野外怪物
-) = range(1, 18 + 1)
+DailyActionID_IceLode, # 冰晶矿脉
+DailyActionID_HelpBattleCheckIn, # 助战登记  20
+) = range(1, 20 + 1)
 
 
 

--
Gitblit v1.8.0