From 22bb99e929439653669b8b2e14325dcc865c7fe3 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 17 十月 2025 16:05:08 +0800
Subject: [PATCH] 66 【公会】基础主体-服务端(快速加入公会失败提示)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/Mail.py |   65 +++++++++++++++++++++++++++++++-
 1 files changed, 62 insertions(+), 3 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/Mail.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/Mail.py
index eb1d801..e4848fb 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/Mail.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/Mail.py
@@ -19,7 +19,10 @@
 import PlayerMail
 import ShareDefine
 import DataRecordPack
+import IpyGameDataPY
 import DBDataMgr
+import ItemCommon
+import CommFunc
 import random
 
 ## 执行逻辑
@@ -33,6 +36,8 @@
         GameWorld.DebugAnswer(curPlayer, "发送邮件: Mail 几封 物品数 [模板key 参数1 ...]")
         GameWorld.DebugAnswer(curPlayer, "输出邮件: Mail p")
         GameWorld.DebugAnswer(curPlayer, "发送全服: Mail s 物品数 [天数]")
+        GameWorld.DebugAnswer(curPlayer, "发送邮件: Mail pw 天数 物品ID 个数 [ID 个数 ...]")
+        GameWorld.DebugAnswer(curPlayer, "个数:如果是装备则个数默认1个,个数参数改为定制属性ID")
         return
     
     value = gmList[0]
@@ -49,10 +54,46 @@
         SendServerMail(curPlayer, gmList)
         return
     
+    if value == "pw":
+        SendPlayerMailItem(curPlayer, gmList)
+        return
+    
     if value > 0:
         SendPlayerMail(curPlayer, gmList)
         return
     
+    return
+
+def SendPlayerMailItem(curPlayer, gmList):
+    playerID = curPlayer.GetPlayerID()
+    limitDays = gmList[1] if len(gmList) > 1 else 1
+    itemList = gmList[2:]
+    
+    mailItemList = []
+    while len(itemList) >= 2:
+        itemID = itemList.pop(0)
+        itemCount = itemList.pop(0)
+        
+        itemData = GameWorld.GetGameData().GetItemByTypeID(itemID)
+        if not itemData:
+            GameWorld.DebugAnswer(curPlayer, "物品ID不存在! %s" % itemID)
+            continue
+        
+        if ItemCommon.GetIsEquip(itemData):
+            appointID = itemCount
+            ipyData = IpyGameDataPY.GetIpyGameData("AppointItem", appointID)
+            if not ipyData:
+                GameWorld.DebugAnswer(curPlayer, "定制属性ID不存在! %s" % appointID)
+                continue
+            userData = CommFunc.JsonDump({ShareDefine.Def_CItemKey_AppointID:appointID})
+            itemInfo = [itemID, 1, 0, userData] # 装备默认1个
+        else:
+            itemInfo = [itemID, itemCount]
+                
+        mailItemList.append(itemInfo)
+        
+    PlayerMail.SendMailByKey("", playerID, mailItemList, limitDays=limitDays)
+    GameWorld.DebugAnswer(curPlayer, "发送个人邮件物品OK")
     return
 
 def SendPlayerMail(curPlayer, gmList):
@@ -66,7 +107,7 @@
     mailCntBef = mailMgr.GetPersonalMailCount(playerID)
     for _ in range(sendCnt):
         itemList = __randMailItem(mailItemCnt)
-        PlayerMail.SendMailByKey(mailTypeKey, playerID, itemList, paramList)
+        PlayerMail.SendMailByKey(mailTypeKey, playerID, itemList, paramList, limitDays=random.randint(1, 7))
         
     mailCntAft = mailMgr.GetPersonalMailCount(playerID)
     GameWorld.DebugAnswer(curPlayer, "发送个人邮件OK:%s, %s~%s" % (sendCnt, mailCntBef, mailCntAft))
@@ -90,8 +131,10 @@
     return
 
 def __randMailItem(mailItemCnt):
-    itemIDList = range(3501, 3530 + 1)
-    moneyIDList = [20, 30]
+    moneyIDList = [1, 2, 3]
+    equipIDList = range(100501, 100512)
+    heroIDList = range(510001, 510016)
+    itemIDList = [4, 5, 7, 8, 9, 10, 11, 12, 13, 1000, 1001, 1002] #range(3501, 3530 + 1)
     
     isBind = 0
     itemList = []
@@ -102,6 +145,22 @@
             if len(itemList) >= mailItemCnt:
                 break
             
+        random.shuffle(equipIDList)
+        for i in range(3):
+            itemID = equipIDList[i%len(equipIDList)]
+            itemCount = 1
+            itemList.append([itemID, itemCount, isBind])
+            if len(itemList) >= mailItemCnt:
+                break
+            
+        random.shuffle(heroIDList)
+        for i in range(3):
+            itemID = heroIDList[i%len(heroIDList)]
+            itemCount = 1
+            itemList.append([itemID, itemCount, isBind])
+            if len(itemList) >= mailItemCnt:
+                break
+            
         random.shuffle(itemIDList)
         for i in range(mailItemCnt):
             itemID = itemIDList[i%len(itemIDList)]

--
Gitblit v1.8.0