From 0251fbd65e4aae945cb57d3c325cbd5f9ceb43ff Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 11 六月 2024 11:38:24 +0800
Subject: [PATCH] 9912 [BT0.1]BOSS凭证(提交boss凭证改为实时刷新榜单;活动表增加字段配置发奖邮件模版;增加活动结束结算后备份榜单35;)

---
 ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerActBossTrial.py        |    4 +++-
 ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py                    |    4 +++-
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py |    6 ++++--
 ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py                         |    1 +
 ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py                      |    4 +++-
 PySysDB/PySysDBG.h                                                                 |    1 +
 6 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/PySysDB/PySysDBG.h b/PySysDB/PySysDBG.h
index 7e8b811..e78dbb8 100644
--- a/PySysDB/PySysDBG.h
+++ b/PySysDB/PySysDBG.h
@@ -555,6 +555,7 @@
 	BYTE		IsDayReset;	//是否每天重置
 	BYTE		ResetType;	//重置类型,0-0点重置;1-5点重置
 	list		TemplateIDList;	//榜单模板编号列表
+	char		MailKey;	//奖励邮件模板
 };
 
 //Boss历练榜单模版表
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py b/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py
index c8f0cb2..0b90a68 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py
@@ -602,6 +602,7 @@
             ShareDefine.Def_BT_CharmWeek                : 100,           #魅力周榜
             ShareDefine.Def_BT_CharmDay                 : 100,           #魅力日榜
             ShareDefine.Def_BT_BossTrialSubmit          : 1000,          #boss凭证 (boss历练活动)
+            ShareDefine.Def_BT_BossTrialSubmitBak       : 1000,          #boss凭证 (boss历练活动 - 上一期)
             }
 
 #排行榜保存类型(和BillboardType匹配), 默认保存, 如果不保存,可配置进去
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py b/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py
index 4147fda..b400296 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py
@@ -463,6 +463,7 @@
                         ("BYTE", "IsDayReset", 0),
                         ("BYTE", "ResetType", 0),
                         ("list", "TemplateIDList", 0),
+                        ("char", "MailKey", 0),
                         ),
 
                 "ActBossTrialTemplate":(
@@ -1642,7 +1643,8 @@
     def GetNotifyInfoLoop(self): return self.attrTuple[8] # 全服提示信息 - 循环广播[间隔分钟, 广播key] list
     def GetIsDayReset(self): return self.attrTuple[9] # 是否每天重置 BYTE
     def GetResetType(self): return self.attrTuple[10] # 重置类型,0-0点重置;1-5点重置 BYTE
-    def GetTemplateIDList(self): return self.attrTuple[11] # 榜单模板编号列表 list
+    def GetTemplateIDList(self): return self.attrTuple[11] # 榜单模板编号列表 list
+    def GetMailKey(self): return self.attrTuple[12] # 奖励邮件模板 char
 
 # Boss历练榜单模版表
 class IPY_ActBossTrialTemplate():
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerActBossTrial.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerActBossTrial.py
index b2bce75..cd21cb0 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerActBossTrial.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerActBossTrial.py
@@ -39,6 +39,7 @@
     billBoard = GameWorld.GetBillboard().FindBillboard(BillboardType)
     if not billBoard:
         return
+    mailKey = ipyData.GetMailKey()
     templateID = GameWorld.GetTemplateID(ipyData, cfgID, dayIndex)
     if not templateID:
         return
@@ -70,9 +71,10 @@
         GameWorld.Log("    发放boss历练榜单奖励: rank=%s,playerID=%s,cmpValue=%s,awardItemList=%s, %s" 
                       % (rank, playerID, cmpValue, awardItemList, name2))
         
-        PlayerCompensation.SendMailByKey("BossTrialMail%s" % actNum, [playerID], awardItemList, [rank])
+        PlayerCompensation.SendMailByKey(mailKey, [playerID], awardItemList, [rank])
         
     DataRecordPack.DR_BillboardData(BillboardType, "BossTrial", {"actNum":actNum, "cfgID":cfgID, "dayIndex":dayIndex, "templateID":templateID})
+    PlayerBillboard.CopyBillboard(ShareDefine.Def_BT_BossTrialSubmitBak, BillboardType)
     PlayerBillboard.ClearBillboardByIndex(BillboardType)
     GameWorld.Log("=================================================================================")
     return
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index 0cdecf0..183fad9 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
@@ -803,9 +803,11 @@
     Def_BT_CharmWeek, #魅力周榜
     Def_BT_CharmDay, #魅力日榜
     Def_BT_BossTrialSubmit,                   #提交boss凭证榜 (boss历练活动)
+    Def_BT_AlineInvade,                       #异兽入侵
+    Def_BT_BossTrialSubmitBak,                #提交boss凭证榜 (boss历练活动 - 上一期) 35
     
     Def_BT_Max, #排行榜最大类型
-) = range(0, 33 + 2) 
+) = range(0, 35 + 2) 
 
 ''' 跨服排行榜类型, 从 150 开始
 与本服榜单存储的是不一样的数据库表格,理论上类型可以和本服榜单类型重复,为了做下区分防误导,跨服榜单从 150 开始
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
index 0cdecf0..f1cbbeb 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
@@ -803,9 +803,11 @@
     Def_BT_CharmWeek, #魅力周榜
     Def_BT_CharmDay, #魅力日榜
     Def_BT_BossTrialSubmit,                   #提交boss凭证榜 (boss历练活动)
+    Def_BT_AlineInvade,                       #异兽入侵
+    Def_BT_BossTrialSubmitBak,                #提交boss凭证榜 (boss历练活动 - 上一期) 35
     
     Def_BT_Max, #排行榜最大类型
-) = range(0, 33 + 2) 
+) = range(0, 35 + 2) 
 
 ''' 跨服排行榜类型, 从 150 开始
 与本服榜单存储的是不一样的数据库表格,理论上类型可以和本服榜单类型重复,为了做下区分防误导,跨服榜单从 150 开始
@@ -1188,7 +1190,7 @@
 GameFuncID_FaQi = 199           # 法器
 GameFuncID_LianTi = 207         # 炼体
 GameFuncID_Championship = 210   # 排位
-GameFuncID_MineArea = 227   	# 福地
+GameFuncID_MineArea = 227       # 福地
 # 以下为暂时无用的
 GameFuncID_Truck = 33           # 运镖
 GameFuncID_RunDaily = 34        # 日常跑环

--
Gitblit v1.8.0