From 45d3d873a7740886fa09f35c9fea2830f4563072 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期三, 11 二月 2026 11:04:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into h5version
---
Main/System/Guild/GuildChangeNameWin.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Main/System/Guild/GuildChangeNameWin.cs b/Main/System/Guild/GuildChangeNameWin.cs
index 8992a21..0b1e90b 100644
--- a/Main/System/Guild/GuildChangeNameWin.cs
+++ b/Main/System/Guild/GuildChangeNameWin.cs
@@ -46,10 +46,10 @@
void ShowTime()
{
- if (GuildManager.Instance.TryGetFamilyActions(GuildManager.CustomyActionType, out var familyActions))
+ if (PlayerDatas.Instance.fairyData.fairy != null)
{
- var lastTime = familyActions.IsNullOrEmpty() ? 0 : familyActions[0].Value1;
- var cdTime = GuildManager.Instance.renameFairyNameCD * 3600 - (TimeUtility.AllSeconds - (int)lastTime);
+ var lastTime = PlayerDatas.Instance.fairyData.fairy.lastChangeNameTick;
+ var cdTime = GuildManager.Instance.renameFairyNameCD * 3600 - (TimeUtility.AllSeconds - lastTime);
if (cdTime <= 0)
{
cdTimeText.text = Language.Get("Guild_51", GuildManager.Instance.renameFairyNameCD);
--
Gitblit v1.8.0