From cba51cf8ff175e277f628a2ac5a6aaa162ac472f Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 13 九月 2024 16:27:57 +0800
Subject: [PATCH] 10261 【越南】【砍树】【英文】仙盟徽章增加定制仙盟ID支持； 增加聊天气泡，聊天表情；
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyEmblem.py | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyEmblem.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyEmblem.py
index da087bb..50df712 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyEmblem.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyEmblem.py
@@ -123,6 +123,9 @@
ipyData = IpyGameDataPY.GetIpyGameData("FamilyEmblem", emblemID)
if not ipyData:
return
+ if ipyData.GetCustomFamilyID():
+ GameWorld.Log("仙盟定制徽章不需要添加! familyID=%s,emblemID=%s" % (familyID, emblemID))
+ return
unlockFamilyLV = ipyData.GetUnlockFamilyLV()
if unlockFamilyLV:
GameWorld.Log("仙盟解锁的徽章不需要添加! familyID=%s,emblemID=%s" % (familyID, emblemID))
@@ -180,8 +183,15 @@
if not ipyData:
return
unlockFamilyLV = ipyData.GetUnlockFamilyLV()
+ customFamilyID = ipyData.GetCustomFamilyID()
- if unlockFamilyLV:
+ if customFamilyID:
+ if familyID != customFamilyID:
+ GameWorld.DebugLog("不是该定制徽章所属仙盟，无法使用该徽章! emblemID=%s,customFamilyID=%s != %s"
+ % (emblemID, customFamilyID, familyID), playerID)
+ return
+
+ elif unlockFamilyLV:
if curFamily.GetLV() < unlockFamilyLV:
GameWorld.DebugLog("仙盟等级不足，无法使用该徽章! emblemID=%s,unlockFamilyLV=%s"
% (emblemID, unlockFamilyLV), playerID)
--
Gitblit v1.8.0