From 1554540dadfe8a948ed1557e4849be7a8a994aef Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期三, 14 一月 2026 18:37:30 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/Guild/GuildMemberCell.cs | 40 ++++++++++++++++++++++++++++++++++------
1 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/Main/System/Guild/GuildMemberCell.cs b/Main/System/Guild/GuildMemberCell.cs
index 320cc00..51c59fb 100644
--- a/Main/System/Guild/GuildMemberCell.cs
+++ b/Main/System/Guild/GuildMemberCell.cs
@@ -1,3 +1,4 @@
+using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
@@ -16,7 +17,6 @@
[SerializeField] Image guildJobImg;
[SerializeField] Text nameText;
[SerializeField] Text fightPowerText;
- [SerializeField] Button seePlayerBtn;
[SerializeField] Text contribText;
[SerializeField] Text loginTimeText;
@@ -47,10 +47,9 @@
fightPowerText.text = UIHelper.ReplaceLargeArtNum(playerInfo.FightPower);
- seePlayerBtn.AddListener(() =>
+ avatarCell.AddListener(() =>
{
OtherPlayerDetailManager.Instance.ViewPlayerDetail(playerID);
- GuildManager.Instance.memberOPIndex = -1; //闄勫甫鍏抽棴鑱屼綅璋冩暣鎿嶄綔
});
contribText.text = playerInfo.ContribDay + "/" + playerInfo.ContribTotal;
@@ -65,8 +64,8 @@
}
else
{
- loginTimeText.text = Language.Get("Guild_61", TimeUtility.SecondsToConsumeRebate(leftTime));
- }
+ loginTimeText.text = Language.Get("Guild_61", SecondsToOnlyTime(leftTime));
+ }
showOpBtn.SetActive(PlayerDatas.Instance.fairyData.mine.FmLV >= GuildManager.Instance.GetNeedGuildJobLV((int)GuildFuncType.ChangeJob)
@@ -92,5 +91,34 @@
showArrowImg.transform.localScale = new Vector3(1, -1, 1);
}
}
-
+
+ //渚嬪瓙 鍙栨暣澶勭悊锛� 1.5澶� 鏄剧ず1澶�; 鏈�澶�7澶╃壒娈婂鐞�
+ //x澶�
+ //x鏃�
+ //x鍒�
+ //x绉�
+ public static string SecondsToOnlyTime(int _seconds)
+ {
+ float days = (float)_seconds / 86400;
+ float hours = (float)_seconds % 86400 / 3600;
+ int mins = _seconds % 3600 / 60;
+ float seconds = (float)_seconds % 60;
+ if (days >= 1)
+ {
+ days = Math.Min(days, 7);
+ return StringUtility.Concat(((int)days).ToString(), Language.Get("L1074"));
+ }
+ else if (hours >= 1)
+ {
+ return StringUtility.Concat(((int)hours).ToString(), Language.Get("L1072"));
+ }
+ else if (mins >= 1)
+ {
+ return StringUtility.Concat(mins.ToString(), Language.Get("L1073"));
+ }
+ else
+ {
+ return StringUtility.Concat(seconds.ToString(), Language.Get("L1075"));
+ }
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0