From 19845faa33cd9f9017fb24ce8e36f1b25fbe0a3b Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 16 七月 2019 16:56:19 +0800
Subject: [PATCH] 8101 【主干】【后端】全民冲榜的神兵排行榜改成升星排行榜（增加升星排行支持）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetOSCRecordData.py | 1 +
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.py | 3 +++
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py | 7 +++++--
ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py | 1 +
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/OpenServerCampaign.py | 2 +-
ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py | 7 +++++--
6 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py b/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py
index b94a639..a0864ca 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py
@@ -583,6 +583,7 @@
ShareDefine.Def_BT_Campaign_Recharge : 100, #累计充值(开服活动榜)
ShareDefine.Def_BT_Campaign_PetLV : 100, #灵宠等级(开服活动榜)
ShareDefine.Def_BT_Campaign_LingGen : 100, #灵根总点(开服活动榜)
+ ShareDefine.Def_BT_Campaign_StarLV : 100, #升星等级(开服活动榜)
ShareDefine.Def_BT_FCCostGold : 5, #消费排行榜(仙界盛典)
ShareDefine.Def_BT_NewFCCostGold : 5, #消费排行榜(仙界盛典)
ShareDefine.Def_BT_FBHelpBattle : 100, #助战次数榜
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index 7649a86..69cc74b 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
@@ -619,9 +619,10 @@
Def_BT_NewFCCostGold, #消费排行榜(新仙界盛典)
Def_BT_Campaign_LingGen, #灵根总点(开服活动榜)
+ Def_BT_Campaign_StarLV, #升星等级(开服活动榜) 25
Def_BT_Max, #排行榜最大类型
-) = range(0, 24 + 2)
+) = range(0, 25 + 2)
#职业对应战力排行榜类型
JobFightPowerBillboardDict = {
@@ -1144,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 = {
@@ -1159,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,
}
#队伍最大人数
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 a12e25e..941cf2d 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
@@ -42,6 +42,7 @@
ShareDefine.Def_Campaign_Type_Recharge:"充值",
ShareDefine.Def_Campaign_Type_PetLV:"灵宠",
ShareDefine.Def_Campaign_Type_LingGen:"灵根",
+ ShareDefine.Def_Campaign_Type_StarLV:"升星",
}
if len(cmdList) == 1:
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.py
index 5f8b256..e0a6167 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.py
@@ -32,6 +32,7 @@
import IpyGameDataPY
import PlayerWing
import Operate_EquipStone
+import OpenServerCampaign
import PassiveBuffEffMng
import time
import json
@@ -1492,6 +1493,8 @@
befTotalStarLV = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_TotalEquipStar)
updTotalStarLV = max(0, befTotalStarLV + setStarLV - befStarLV)
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_TotalEquipStar, updTotalStarLV)
+ # 开服活动数据
+ OpenServerCampaign.UpdOpenServerCampaignRecordData(curPlayer, ShareDefine.Def_Campaign_Type_StarLV, updTotalStarLV)
GameWorld.DebugLog("设置部位星级: index=%s,befStarLV=%s,setStarLV=%s,befTotalStarLV=%s,updTotalStarLV=%s"
% (index, befStarLV, setStarLV, befTotalStarLV, updTotalStarLV))
return
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 03f4d8f..76d9f06 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/OpenServerCampaign.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/OpenServerCampaign.py
@@ -86,7 +86,7 @@
return
if campaignType not in [ShareDefine.Def_Campaign_Type_StoneLV, ShareDefine.Def_Campaign_Type_FightPower,
- ShareDefine.Def_Campaign_Type_RuneLV, ShareDefine.Def_Campaign_Type_LingGen] and value < recordData:
+ ShareDefine.Def_Campaign_Type_RuneLV, ShareDefine.Def_Campaign_Type_LingGen, ShareDefine.Def_Campaign_Type_StarLV] 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/ShareDefine.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
index 7649a86..d09fbab 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
@@ -619,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 = {
@@ -1144,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 = {
@@ -1159,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,
}
#队伍最大人数
--
Gitblit v1.8.0