From 5cb668b8883cc0f8c8930a1d4ed3db632eae7abf Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 10 一月 2020 16:04:29 +0800
Subject: [PATCH] 8368 【开发】开服排行榜活动修改（强化、坐骑改为战力榜；增加洗练战力榜26）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetOSCRecordData.py | 5 +-
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py | 19 +++++----
ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py | 5 +-
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipPlus.py | 4 +-
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.py | 2
ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py | 19 +++++----
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py | 7 +++
7 files changed, 38 insertions(+), 23 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py b/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py
index c10145a..dd4965b 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py
@@ -572,8 +572,8 @@
ShareDefine.Def_BT_Realm : 100, #境界榜
ShareDefine.Def_BT_TotalRecharge : 100, #充值榜
- ShareDefine.Def_BT_Campaign_PlusLV : 100, #强化等级(开服活动榜)
- ShareDefine.Def_BT_Campaign_HorseLV : 100, #坐骑等级(开服活动榜)
+ ShareDefine.Def_BT_Campaign_Plus : 100, #强化战力(开服活动榜)
+ ShareDefine.Def_BT_Campaign_Horse : 100, #坐骑战力(开服活动榜)
ShareDefine.Def_BT_Campaign_StoneLV : 100, #宝石等级(开服活动榜)
ShareDefine.Def_BT_Campaign_LV : 100, #冲级排行(开服活动榜)
ShareDefine.Def_BT_Campaign_RealmLV : 100, #境界等级(开服活动榜)
@@ -584,6 +584,7 @@
ShareDefine.Def_BT_Campaign_PetLV : 100, #灵宠等级(开服活动榜)
ShareDefine.Def_BT_Campaign_LingGen : 100, #灵根总点(开服活动榜)
ShareDefine.Def_BT_Campaign_StarLV : 100, #升星等级(开服活动榜)
+ ShareDefine.Def_BT_Campaign_Wash : 100, #洗练战力(开服活动榜)
ShareDefine.Def_BT_FCCostGold : 5, #消费排行榜(仙界盛典)
ShareDefine.Def_BT_NewFCCostGold : 5, #消费排行榜(仙界盛典)
}
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index 092bb98..807f209 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
@@ -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 = {
@@ -1178,8 +1179,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
@@ -1190,12 +1191,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,
@@ -1206,6 +1208,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,
}
#队伍最大人数
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipPlus.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipPlus.py
index c57109d..ba3dab5 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipPlus.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipPlus.py
@@ -176,9 +176,9 @@
# 增加强化成就
PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_EquipPlus, 1)
EventShell.EventRespons_EquipPlus(curPlayer, classLV, updPlusLV)
-
+
# 开服活动数据
- OpenServerCampaign.UpdOpenServerCampaignRecordData(curPlayer, ShareDefine.Def_Campaign_Type_PlusLV, ChEquip.GetTotalPlusLV(curPlayer))
+ #OpenServerCampaign.UpdOpenServerCampaignRecordData(curPlayer, ShareDefine.Def_Campaign_Type_Plus, ChEquip.GetTotalPlusLV(curPlayer))
return
def DoLogic_OnEquipPartStarLVChange(curPlayer, packType, classLV):
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 941cf2d..b7051b7 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
@@ -31,8 +31,8 @@
def OnExec(curPlayer, cmdList):
oscTypeDict = {
- ShareDefine.Def_Campaign_Type_PlusLV:"强化",
- ShareDefine.Def_Campaign_Type_HorseLV:"坐骑",
+ ShareDefine.Def_Campaign_Type_Plus:"强化",
+ ShareDefine.Def_Campaign_Type_Horse:"坐骑",
ShareDefine.Def_Campaign_Type_StoneLV:"宝石",
ShareDefine.Def_Campaign_Type_LV:"等级",
ShareDefine.Def_Campaign_Type_RealmLV:"境界",
@@ -43,6 +43,7 @@
ShareDefine.Def_Campaign_Type_PetLV:"灵宠",
ShareDefine.Def_Campaign_Type_LingGen:"灵根",
ShareDefine.Def_Campaign_Type_StarLV:"升星",
+ ShareDefine.Def_Campaign_Type_Wash:"洗练",
}
if len(cmdList) == 1:
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
index 0e46c87..6e85afb 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
@@ -4633,6 +4633,13 @@
mfpTotal = mfpValue + mfpSkill + mfpEx
mfpDict[mfpObj.mfpType] = mfpTotal
+ if mfpType == ShareDefine.Def_MFPType_Plus:
+ OpenServerCampaign.UpdOpenServerCampaignRecordData(curPlayer, ShareDefine.Def_Campaign_Type_Plus, mfpTotal)
+ elif mfpType == ShareDefine.Def_MFPType_Horse:
+ OpenServerCampaign.UpdOpenServerCampaignRecordData(curPlayer, ShareDefine.Def_Campaign_Type_Horse, mfpTotal)
+ elif mfpType == ShareDefine.Def_MFPType_Wash:
+ OpenServerCampaign.UpdOpenServerCampaignRecordData(curPlayer, ShareDefine.Def_Campaign_Type_Wash, mfpTotal)
+
#GameWorld.DebugLog("整体层级线性属性: %s" % allAttrList)
# 5.被动技能附加属性，不算战力
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.py
index 6eeae00..cf72660 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.py
@@ -493,7 +493,7 @@
# 玩家马匹进阶
DataRecordPack.DR_NewHorseByClassUp(curPlayer, updClassLV, 0)
# 记录开服活动马匹阶级
- OpenServerCampaign.UpdOpenServerCampaignRecordData(curPlayer, ShareDefine.Def_Campaign_Type_HorseLV, updClassLV)
+ #OpenServerCampaign.UpdOpenServerCampaignRecordData(curPlayer, ShareDefine.Def_Campaign_Type_Horse, updClassLV)
Sync_HorseClassData(curPlayer)
# 刷属性，更新排行榜
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
index 092bb98..807f209 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/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
@@ -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 = {
@@ -1178,8 +1179,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
@@ -1190,12 +1191,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,
@@ -1206,6 +1208,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