From 1d3b44ba8b959cb66322d896efd3a03f6ee03feb Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 10 十二月 2021 14:13:46 +0800
Subject: [PATCH] 9341 【BT5】【主干】【后端】情缘系统(1.删除拉黑伴侣限制提示;2.邮件支持配置物品邮件过天不删除;3.礼物魅力字段改为支持小数;4.合服首登同步魅力榜)

---
 ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerCompensation.py |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerCompensation.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerCompensation.py
index 97cba28..464f830 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerCompensation.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerCompensation.py
@@ -1234,13 +1234,15 @@
         mailText = curMail.Text
         # 通知类模板邮件,过天可直接删除
         if tempSign in mailText and tempSignEnd in mailText and CheckCanDelCompensation(curMail, curMail.GUID):
-            #tempKey = mailText[mailText.index(tempSign) + len(tempSign):mailText.index(tempSignEnd)]
-            #GameWorld.DebugLog("过天删除无附件通知类邮件模板! tempKey=%s %s, %s" % (tempKey, curMail.PlayerID, curMail.GUID))
-            needClearGUIDList.append([curMail.PlayerID, curMail.GUID])
-            player = GameWorld.GetPlayerManager().FindPlayerByID(curMail.PlayerID)
-            if player and player.GetInitOK():
-                NotifyCompensationResult(player, curMail.GUID, 1)
-            continue
+            tempKey = mailText[mailText.index(tempSign) + len(tempSign):mailText.index(tempSignEnd)]
+            notClearMailKeyList = IpyGameDataPY.GetFuncEvalCfg("MailSet", 1)
+            if tempKey not in notClearMailKeyList:
+                #GameWorld.DebugLog("过天删除无附件通知类邮件模板! tempKey=%s %s, %s" % (tempKey, curMail.PlayerID, curMail.GUID))
+                needClearGUIDList.append([curMail.PlayerID, curMail.GUID])
+                player = GameWorld.GetPlayerManager().FindPlayerByID(curMail.PlayerID)
+                if player and player.GetInitOK():
+                    NotifyCompensationResult(player, curMail.GUID, 1)
+                continue
         
         # 超过接收邮件30天则完全删除此邮件
         limitTime = datetime.datetime.strptime(curMail.CreateTime, ChConfig.TYPE_Time_Format) + datetime.timedelta(days = 30)

--
Gitblit v1.8.0