From 13593cbcea1d674c51bcd11c1ef01003e428bf58 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 01 十一月 2018 15:55:27 +0800
Subject: [PATCH] 4491 【后端】【1.2】全民冲榜第三天榜单改成符印排行(增加符印排行活动类型7,排行榜18)
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetOSCRecordData.py | 1 +
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRune.py | 3 +++
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py | 7 +++++--
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/OpenServerCampaign.py | 3 ++-
ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py | 7 +++++--
5 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index 426b90a..f632da2 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
@@ -563,6 +563,7 @@
Def_BT_Campaign_FightPower, #战力排行(开服活动榜)
Def_BT_FCCostGold, #消费排行榜(仙界盛典)
+ Def_BT_Campaign_RuneLV, #符印等级(开服活动榜)
Def_BT_HighLadder, #天梯竞技场排行
Def_BT_HighLadder_Yester, #天梯竞技场昨日排行
@@ -580,7 +581,7 @@
Def_BT_MergePKWeek, #跨服PK周积分榜
Def_BT_Max, #排行榜最大类型
-) = range(0, 29 + 2)
+) = range(0, 30 + 2)
#职业对应战力排行榜类型
JobFightPowerBillboardDict = {
@@ -1084,7 +1085,8 @@
Def_Campaign_Type_LV, # 冲级等级排行 4
Def_Campaign_Type_RealmLV, # 境界等级排行 5
Def_Campaign_Type_FightPower, # 总战斗力排行 6
-) = range(1, 1 + 6)
+Def_Campaign_Type_RuneLV, # 符印等级排行 7
+) = range(1, 1 + 7)
# 活动类型对应的奖励排行榜{活动类型:排行榜, ...}
Def_Campaign_Billboard_Dict = {
@@ -1094,6 +1096,7 @@
Def_Campaign_Type_LV:Def_BT_Campaign_LV,
Def_Campaign_Type_RealmLV:Def_BT_Campaign_RealmLV,
Def_Campaign_Type_FightPower:Def_BT_Campaign_FightPower,
+ Def_Campaign_Type_RuneLV:Def_BT_Campaign_RuneLV,
}
# 活动数据状态
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetOSCRecordData.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetOSCRecordData.py
index 9afe608..e5c8cd1 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetOSCRecordData.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetOSCRecordData.py
@@ -37,6 +37,7 @@
ShareDefine.Def_Campaign_Type_LV:"等级",
ShareDefine.Def_Campaign_Type_RealmLV:"境界",
ShareDefine.Def_Campaign_Type_FightPower:"战力",
+ ShareDefine.Def_Campaign_Type_RuneLV:"符印",
}
if len(cmdList) == 1:
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/OpenServerCampaign.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/OpenServerCampaign.py
index a9e6ec7..2b9eb86 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/OpenServerCampaign.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/OpenServerCampaign.py
@@ -80,7 +80,8 @@
recordData = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_OSC_RecordData % campaignType)
- if campaignType not in [ShareDefine.Def_Campaign_Type_StoneLV, ShareDefine.Def_Campaign_Type_FightPower] and value <= recordData:
+ if campaignType not in [ShareDefine.Def_Campaign_Type_StoneLV, ShareDefine.Def_Campaign_Type_FightPower,
+ ShareDefine.Def_Campaign_Type_RuneLV] and value <= recordData:
GameWorld.DebugLog(" 开服活动数据小于历史记录, 不更新 campaignType=%s,recordData=%s,updValue=%s"
% (campaignType, recordData, value), curPlayer.GetPlayerID())
return
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRune.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRune.py
index c6acf5e..1f6e86f 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRune.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRune.py
@@ -28,6 +28,7 @@
import PlayerSuccess
import PlayerMagicWeapon
import IPY_GameWorld
+import OpenServerCampaign
g_runeLVExpDict = {}
@@ -365,6 +366,8 @@
totalLV += runeItemPlusLV
PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_InlayRune, 1, [itemColor])
PlayerSuccess.UptateSuccessProgress(curPlayer, ShareDefine.SuccType_RuneLvUp, totalLV)
+ # 开服活动数据
+ OpenServerCampaign.UpdOpenServerCampaignRecordData(curPlayer, ShareDefine.Def_Campaign_Type_RuneLV, totalLV)
return
#// A5 66 符印分解 #tagCMRuneDecompose
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
index 426b90a..f632da2 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
@@ -563,6 +563,7 @@
Def_BT_Campaign_FightPower, #战力排行(开服活动榜)
Def_BT_FCCostGold, #消费排行榜(仙界盛典)
+ Def_BT_Campaign_RuneLV, #符印等级(开服活动榜)
Def_BT_HighLadder, #天梯竞技场排行
Def_BT_HighLadder_Yester, #天梯竞技场昨日排行
@@ -580,7 +581,7 @@
Def_BT_MergePKWeek, #跨服PK周积分榜
Def_BT_Max, #排行榜最大类型
-) = range(0, 29 + 2)
+) = range(0, 30 + 2)
#职业对应战力排行榜类型
JobFightPowerBillboardDict = {
@@ -1084,7 +1085,8 @@
Def_Campaign_Type_LV, # 冲级等级排行 4
Def_Campaign_Type_RealmLV, # 境界等级排行 5
Def_Campaign_Type_FightPower, # 总战斗力排行 6
-) = range(1, 1 + 6)
+Def_Campaign_Type_RuneLV, # 符印等级排行 7
+) = range(1, 1 + 7)
# 活动类型对应的奖励排行榜{活动类型:排行榜, ...}
Def_Campaign_Billboard_Dict = {
@@ -1094,6 +1096,7 @@
Def_Campaign_Type_LV:Def_BT_Campaign_LV,
Def_Campaign_Type_RealmLV:Def_BT_Campaign_RealmLV,
Def_Campaign_Type_FightPower:Def_BT_Campaign_FightPower,
+ Def_Campaign_Type_RuneLV:Def_BT_Campaign_RuneLV,
}
# 活动数据状态
--
Gitblit v1.8.0