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/SkillUI/SkillWordCell.cs | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/Main/System/SkillUI/SkillWordCell.cs b/Main/System/SkillUI/SkillWordCell.cs
index fa00e2e..6ffe0f3 100644
--- a/Main/System/SkillUI/SkillWordCell.cs
+++ b/Main/System/SkillUI/SkillWordCell.cs
@@ -54,6 +54,7 @@
public async UniTask Init(int skillID, UnityAction onclick = null, bool showType = false)
{
await LoadPrefab(); //瀛樺湪琚嵏杞界殑鍙兘锛岄噸鏂板姞杞�
+ if (this == null) return;
var config = SkillConfig.Get(skillID);
if (config == null)
{
@@ -91,19 +92,23 @@
}
if (cellContainer == null)
{
- cellContainer = await UIUtility.CreateWidget("SkillWordCell", "Container_SkillCell");
+ var inst = await UIUtility.CreateWidget("SkillWordCell", "Container_SkillCell");
if (this == null)
{
- if (null != cellContainer)
- {
- DestroyImmediate(cellContainer);
- }
+ if (null != inst) DestroyImmediate(inst);
return;
}
if (cellContainer != null)
{
+ DestroyImmediate(inst);
+ return;
+ }
+ cellContainer = inst;
+
+ if (cellContainer != null)
+ {
cellContainer.transform.SetParentEx(this.transform, Vector3.zero, Quaternion.identity, Vector3.one);
cellContainer.transform.SetAsFirstSibling();
}
--
Gitblit v1.8.0