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/PhantasmPavilion/PhantasmPavilionModelWin.cs | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/Main/System/PhantasmPavilion/PhantasmPavilionModelWin.cs b/Main/System/PhantasmPavilion/PhantasmPavilionModelWin.cs
index 580589a..cb4ec90 100644
--- a/Main/System/PhantasmPavilion/PhantasmPavilionModelWin.cs
+++ b/Main/System/PhantasmPavilion/PhantasmPavilionModelWin.cs
@@ -1,5 +1,6 @@
锘縰sing System;
using System.Collections.Generic;
+using Cysharp.Threading.Tasks;
using UnityEngine;
public class PhantasmPavilionModelWin : UIBase
@@ -45,7 +46,7 @@
base.InitComponent();
btnTabType1.AddListener(() => { SelectTeamFunc(PhantasmPavilionType.Model, 0, true); });
btnTabType2.AddListener(() => { SelectTeamFunc(PhantasmPavilionType.Model, 1, true); });
- btnAllAdd.AddListener(() => { AttributeManager.Instance.OpenTotalAttributeWin(manager.GetTotalAttr()); });
+ btnAllAdd.AddListener(() => { AttributeManager.Instance.OpenSimpleAttributeWin(manager.GetTotalAttr()); });
}
protected override void OnPreOpen()
@@ -60,6 +61,8 @@
manager.OnUpdateModelInfoEvent += OnUpdateModelInfoEvent;
manager.OnTimeOut += OnTimeOut;
manager.OnUpdateModelStarAdd += OnUpdateModelStarAdd;
+ TimeMgr.Instance.OnDayEvent += OnDayEvent;
+
InitRedPoint();
TabSetActive();
SelectTiltleBtn();
@@ -77,9 +80,15 @@
manager.OnUpdateModelInfoEvent -= OnUpdateModelInfoEvent;
manager.OnTimeOut -= OnTimeOut;
manager.OnUpdateModelStarAdd -= OnUpdateModelStarAdd;
+ TimeMgr.Instance.OnDayEvent -= OnDayEvent;
manager.RemoveAllNewHeroByTabType(PhantasmPavilionType.Model, functionOrder + 1);
manager.UpdateRedPoint();
+ }
+
+ private void OnDayEvent()
+ {
+ SelectTiltleBtn();
}
private void OnTimeOut()
@@ -112,15 +121,17 @@
void SelectTeamFunc(PhantasmPavilionType type, int order, bool isRemove = false)
{
+ var lastType = manager.nowType;
+ var lastOrder = functionOrder;
+ manager.nowType = type;
+ functionOrder = order;
manager.SetSelectItemId(type, order + 1);
if (isRemove)
{
- manager.RemoveAllNewHeroByTabType(manager.nowType, functionOrder + 1);
+ manager.RemoveAllNewHeroByTabType(lastType, lastOrder + 1);
manager.UpdateRedPoint();
- RefreshAll(manager.nowType, functionOrder + 1, false);
+ RefreshAll(lastType, lastOrder + 1, false);
}
- manager.nowType = type;
- functionOrder = order;
CreateAll();
}
@@ -191,8 +202,8 @@
ModelConfig model = ModelConfig.Get(id);
int skinID = model.SkinID;
lhframe.transform.localScale = new Vector3(lhSize, lhSize, lhSize);
- heroIh.Create(skinID, motionName: "", isLh: true);
- heroModel.Create(skinID, modelSize);
+ heroIh.Create(skinID, motionName: "", isLh: true).Forget();
+ heroModel.Create(skinID, modelSize).Forget();
PhantasmPavilionState state = manager.GetUnLockState(type, id);
--
Gitblit v1.8.0