Fishing-Travel/ft
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(upserver): 接入认证与KV存档并完成限定钓鱼闭环

Browse Source
This commit is contained in:
Liubing\LB
2026-09-28 18:14:01 +08:00
parent f40a816cc4
commit 0eb43b2b40
129 changed files with 11612 additions and 573 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Client/Assets/Scripts/UI/Social/ClubApplyPopupPanel.cs
View File

@@ -97,7 +97,7 @@ class ApplyItem : MonoBehaviour
//entityKey = data.entityKey;
//head.SetData(data.avatarUrl);
IUserService userService = GContext.container.Resolve<IUserService>();
if (data.playFabId == userService.UserId)
if (data.playFabId == userService.ApiPlayerId)
{
text_name.text = userService.DisplayName;
head.SetData(userService.AvatarUrl);

2
Client/Assets/Scripts/UI/Social/ClubChooseHeirPopupPanel.cs
View File

@@ -54,7 +54,7 @@ public class ClubChooseHeirPopupPanel : MonoBehaviour
for (int i = 0; i < datas.Count; i++)
{
SocialInfoItemData clubPlayerInfoData = datas[i];
if (clubPlayerInfoData.playFabId == userService.UserId)
if (clubPlayerInfoData.playFabId == userService.ApiPlayerId)
{
continue;
}

6
Client/Assets/Scripts/UI/Social/ClubInfoPopupPanel.cs
View File

@@ -126,7 +126,7 @@ public class ClubInfoPopupPanel : MonoBehaviour
for (int i = 0; i < data.Count; i++)
{
bool isMore = showMore;
if (data[i].playFabId != userService.UserId)
if (data[i].playFabId != userService.ApiPlayerId)
{
if (_socialData.memberRole == EMemberRole.Vice)
{
@@ -170,8 +170,8 @@ public class ClubInfoPopupPanel : MonoBehaviour
more_tips.transform.position = memberItem.btn_more.transform.position;
more_tips.SetActive(true);
btn_leave.transform.parent.gameObject.SetActive(curSocialInfoItemData.playFabId == userService.UserId);
bool iskickout = curSocialInfoItemData.playFabId != userService.UserId;/*_socialData.ClubItemData.id == _socialData.myClubInfo.id*/;
btn_leave.transform.parent.gameObject.SetActive(curSocialInfoItemData.playFabId == userService.ApiPlayerId);
bool iskickout = curSocialInfoItemData.playFabId != userService.ApiPlayerId;/*_socialData.ClubItemData.id == _socialData.myClubInfo.id*/;
bool isPromote = false;
bool isDemote = false;
EMemberRole role = curSocialInfoItemData.role;

24
Client/Assets/Scripts/UI/Social/SocialClubJoined.cs
View File

@@ -171,9 +171,9 @@ public class SocialClubJoined : MonoBehaviour
void SetSignCD()
{
var timer = ZZTimeHelper.UtcNow().UtcNowOffset();
btn_sign.gameObject.SetActive(_socialData.signTime?.DayOfYear != timer.DayOfYear);
sign_cd.SetActive(_socialData.signTime?.DayOfYear == timer.DayOfYear);
if (_socialData.signTime?.DayOfYear == timer.DayOfYear)
btn_sign.gameObject.SetActive(_socialData.signTime?.Date != timer.Date);
sign_cd.SetActive(_socialData.signTime?.Date == timer.Date);
if (_socialData.signTime?.Date == timer.Date)
{
StartTimer();
}
@@ -258,11 +258,21 @@ public class SocialClubJoined : MonoBehaviour
{
emojio_tips.SetActive(!emojio_tips.activeSelf);
}
void OnSign()
async void OnSign()
{
//签到
_socialData.ClubSingin();
SetSignCD();
if (!btn_sign.interactable) return;
var version = _socialData.customServerMgr.SessionVersion;
btn_sign.interactable = false;
try { await _socialData.ClubSingin(); }
catch (Exception ex) { Debug.LogException(ex); }
finally
{
if (this != null && version == _socialData.customServerMgr.SessionVersion)
{
btn_sign.interactable = true;
SetSignCD();
}
}
}
void ClickHelpEnergyGray()
{