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/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetOSCRecordData.py |    2 ++
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py                  |   10 ++++++++--
 ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py                                          |    2 ++
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.py            |    3 +++
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.py       |   10 ++++++++++
 ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py                                       |   10 ++++++++--
 6 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py b/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py
index d32747a..62d3ca1 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py
@@ -573,6 +573,8 @@
             ShareDefine.Def_BT_Campaign_RealmLV         : 100,           #境界等级(开服活动榜)
             ShareDefine.Def_BT_Campaign_FightPower      : 100,           #战力排行(开服活动榜)
             ShareDefine.Def_BT_Campaign_RuneLV          : 100,           #符印等级(开服活动榜)
+            ShareDefine.Def_BT_Campaign_GodWeaponLV     : 100,           #神兵等级(开服活动榜)
+            ShareDefine.Def_BT_Campaign_Recharge        : 100,           #累计充值(开服活动榜)
             ShareDefine.Def_BT_FCCostGold               : 5,             #消费排行榜(仙界盛典)
             ShareDefine.Def_BT_FBHelpBattle             : 100,           #助战次数榜
             
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index 84cdb72..4040f8b 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
@@ -567,6 +567,8 @@
     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,                 #天梯竞技场昨日排行
@@ -584,7 +586,7 @@
     Def_BT_MergePKWeek,                       #跨服PK周积分榜
     
     Def_BT_Max,                               #排行榜最大类型
-) = range(0, 31 + 2) 
+) = range(0, 33 + 2) 
     
 #职业对应战力排行榜类型
 JobFightPowerBillboardDict = {
@@ -1098,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 = {
@@ -1109,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,
                                }
 
 # 活动数据状态
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 e5c8cd1..b219388 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
@@ -38,6 +38,8 @@
                    ShareDefine.Def_Campaign_Type_RealmLV:"境界",
                    ShareDefine.Def_Campaign_Type_FightPower:"战力",
                    ShareDefine.Def_Campaign_Type_RuneLV:"符印",
+                   ShareDefine.Def_Campaign_Type_GodWeaponLV:"神兵",
+                   ShareDefine.Def_Campaign_Type_Recharge:"充值",
                    }
     
     if len(cmdList) == 1:
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.py
index 52a5a24..4ecf0bd 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.py
@@ -46,6 +46,7 @@
 import PlayerFairyCeremony
 import PlayerGoldGift
 import PlayerActTotalRecharge
+import OpenServerCampaign
 import ItemCommon
 
 #---------------------------------------------------------------------
@@ -267,6 +268,8 @@
     PlayerGoldGift.DayChargeRedPackAward(curPlayer)
     #累积充值X元
     PlayerActTotalRecharge.AddTotalRechargeGold(curPlayer, orderCoin/100)
+    #开服活动
+    OpenServerCampaign.AddOpenServerCampaignRecordData(curPlayer, ShareDefine.Def_Campaign_Type_Recharge, orderCoin)
     GameWorld.Log("Billing: eventName=%s, %s" % (eventName, addDRDict), curPlayer.GetPlayerID())
     return
 
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.py
index b4f9014..d6acc7c 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.py
@@ -36,6 +36,7 @@
 #import EventReport
 import IpyGameDataPY
 import PassiveBuffEffMng
+import OpenServerCampaign
 
 import random
 
@@ -86,6 +87,15 @@
         setFunc, notifyType = sceneEffectsDict[weaponType]
         setFunc(curPlayer, lv)
         curPlayer.SendPropertyRefresh(notifyType, lv, False)
+        
+    totalLV = 0
+    ipyDataMgr = IpyGameDataPY.IPY_Data()
+    maxType = ipyDataMgr.GetGodWeaponByIndex(ipyDataMgr.GetGodWeaponCount()-1).GetType()
+    for gwType in xrange(1, maxType + 1):
+        totalLV += curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_GodWeaponLV % gwType)
+        
+    # 开服活动数据
+    OpenServerCampaign.UpdOpenServerCampaignRecordData(curPlayer, ShareDefine.Def_Campaign_Type_GodWeaponLV, totalLV)
     return
 
 ## 神器开启
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
index 84cdb72..4040f8b 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
@@ -567,6 +567,8 @@
     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,                 #天梯竞技场昨日排行
@@ -584,7 +586,7 @@
     Def_BT_MergePKWeek,                       #跨服PK周积分榜
     
     Def_BT_Max,                               #排行榜最大类型
-) = range(0, 31 + 2) 
+) = range(0, 33 + 2) 
     
 #职业对应战力排行榜类型
 JobFightPowerBillboardDict = {
@@ -1098,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 = {
@@ -1109,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,
                                }
 
 # 活动数据状态

--
Gitblit v1.8.0