From 51b0f6ed9f4e1d3bb6f8144470b46908c7699a96 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期一, 11 五月 2026 16:20:37 +0800
Subject: [PATCH] Merge branch 'master' into h5version
---
Main/System/Guild/GuildJoinWin.cs | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/Main/System/Guild/GuildJoinWin.cs b/Main/System/Guild/GuildJoinWin.cs
index ce028c5..5e0b9f4 100644
--- a/Main/System/Guild/GuildJoinWin.cs
+++ b/Main/System/Guild/GuildJoinWin.cs
@@ -1,7 +1,8 @@
-using System.Collections;
+锘縰sing System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
+using Cysharp.Threading.Tasks;
/// <summary>
/// 鍔犲叆鍏細鐣岄潰 锛氬叕浼氭煡鎵惧垪琛紝涔熸槸鎺掕姒�
@@ -14,6 +15,7 @@
[SerializeField] Button quicklyJoinGuildBtn;
[SerializeField] ScrollerController guildListScroller;
[SerializeField] Transform noGuildTf;
+ [SerializeField] Button serversBtn;
string lastQuery = "";
int lastPage = 0;
@@ -22,6 +24,10 @@
findBtn.AddListener(() => OnFindBtnClick());
createGuildBtn.AddListener(OnCreateGuildBtnClick);
quicklyJoinGuildBtn.AddListener(OnQuicklyJoinGuildBtnClick);
+ serversBtn.AddListener(()=>
+ {
+ UIHelper.ShowServersPanel(GuildManager.Instance.crossServerIDList);
+ });
}
protected override void OnPreOpen()
{
@@ -55,6 +61,7 @@
void Display()
{
+ serversBtn.SetActive(GuildManager.Instance.zoneID != 0);
CreateScroller();
}
@@ -132,7 +139,7 @@
private void OnCreateGuildBtnClick()
{
- UIManager.Instance.OpenWindow<GuildCreateWin>();
+ UIManager.Instance.OpenWindowAsync<GuildCreateWin>().Forget();
}
private void OnQuicklyJoinGuildBtnClick()
--
Gitblit v1.8.0