From 34179ffa10e510ba71522cb2bd1fd978b7fcbbe1 Mon Sep 17 00:00:00 2001
From: lcy <1459594991@qq.com>
Date: 星期四, 16 七月 2026 11:26:37 +0800
Subject: [PATCH] Revert "634 H5适配 获得英雄展示动态立绘的时机放到OnOpen"
---
Main/System/GuildAtkDefBat/GuildAtkDefBatWin.cs | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/Main/System/GuildAtkDefBat/GuildAtkDefBatWin.cs b/Main/System/GuildAtkDefBat/GuildAtkDefBatWin.cs
index 75363a0..9e73c03 100644
--- a/Main/System/GuildAtkDefBat/GuildAtkDefBatWin.cs
+++ b/Main/System/GuildAtkDefBat/GuildAtkDefBatWin.cs
@@ -1,6 +1,5 @@
using System.Collections.Generic;
using Cysharp.Threading.Tasks;
-using DG.DemiEditor;
using UnityEngine;
public class GuildAtkDefBatWin : UIBase
@@ -40,6 +39,7 @@
[SerializeField] ButtonEx myEmblemBtn;
[SerializeField] ButtonEx enemyEmblemBtn;
+ [SerializeField] ButtonEx ruleButton;
protected override void InitComponent()
{
@@ -60,6 +60,12 @@
{
UIManager.Instance.OpenWindow<GuildAtkDefBatTreasureWin>();
});
+ ruleButton.AddListener(() =>
+ {
+ SmallTipWin.showText = Language.Get("GuildAtkDefBatRule2");
+ SmallTipWin.worldPos = ruleButton.transform.position;
+ UIManager.Instance.OpenWindow<SmallTipWin>();
+ });
goButton.AddListener(async () =>
{
// 妫�鏌ユ槸鍚︽湁姝ｅ湪杩涜鐨勬垬鏂楋紙鍙傝�傾renaTabHandler鐨勬ā寮忥級
@@ -77,14 +83,6 @@
}
battleWin.SetBattleField(guildAtkDefBatBattle);
CloseWindow();
- return;
- }
-
- // 瀵规墜鍏細宸茶В鏁ｏ紝涓嶅彲杩涘叆鎴樻枟
- var enemyInfo = GuildAtkDefBatManager.Instance.EnemyFamilyInfo;
- if (enemyInfo != null && enemyInfo.IsDismiss == 1)
- {
- SysNotifyMgr.Instance.ShowTip("GuildAtkDefBat6");
return;
}
@@ -303,7 +301,7 @@
{
string enemyName = Language.Get("GuildAtkDefBat31");
enemyNameText.text = enemyName;
- enemyEmblemCell.Display(FamilyEmblemConfig.GetFirstDefaultEmblem(), !enemyName.IsNullOrEmpty() ? enemyName[0].ToString() : string.Empty, 0.7f);
+ enemyEmblemCell.Display(FamilyEmblemConfig.GetFirstDefaultEmblem(), GuildManager.Instance.LimitEmblemWord(enemyName), 0.7f);
enemyServerText.text = ServerListCenter.Instance.GetServerName(UIHelper.GetServerIDByAccount(PlayerDatas.Instance.baseData.AccID));
enemyStarCntText.text = enemyFamilyInfo.TotalStar.ToString();
}
--
Gitblit v1.8.0