sin365/AxibugEmuOnline
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

master #34

Merged
sin365 merged 11 commits from Alienjack/AxibugEmuOnline:master into master 2024-09-13 10:05:08 +08:00
Conversation 0 Commits 11 Files Changed 32 +19 -4
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 86ec353733 - Show all commits

6
AxibugEmuOnline.Client/Assets/Script/UI/Game_NES.cs
View File

@ -13,8 +13,10 @@ namespace AxibugEmuOnline.Client
CanvasGroup RomGroupRoot;
private TweenerCore<float, float, FloatOptions> m_showTween;
private void Awake()
protected override void Awake()
{
base.Awake();
RomGroupRoot.gameObject.SetActive(false);
RomGroupRoot.alpha = 0;
}
@ -58,7 +60,7 @@ namespace AxibugEmuOnline.Client
thirdMenuGroup.itemGroup.UpdateDependencyProperty(thirdMenuGroup);
thirdMenuGroup.itemGroup.SetData(roms);
thirdMenuGroup.itemGroup.UpdateProxyVisualState();
thirdMenuGroup.SelectIndex = 0;
thirdMenuGroup.ResetToFirst();
});
if (SubMenuItemGroup != null) SubMenuItemGroup.SetSelect(true);

6
AxibugEmuOnline.Client/Assets/Script/UI/MenuItem.cs
View File

@ -33,6 +33,11 @@ namespace AxibugEmuOnline.Client.UI
protected TweenerCore<float, float, FloatOptions> progressTween;
protected float m_progress;
protected virtual void Awake()
{
Reset();
}
public void SetData(MenuData data)
{
Reset();
@ -47,7 +52,6 @@ namespace AxibugEmuOnline.Client.UI
m_select = false;
m_progress = 0f;
if (InfoNode != null) InfoNode.alpha = 0;
Root.localScale = Vector3.one * UnSelectScale;
if (progressTween != null) { progressTween.Kill(); progressTween = null; }

11
AxibugEmuOnline.Client/Assets/Script/UI/ThirdMenuRoot.cs
View File

@ -39,6 +39,12 @@ namespace AxibugEmuOnline.Client
}
}
public void ResetToFirst()
{
m_selectIndex = -1;
SelectIndex = 0;
}
protected override MenuItem GetItemUIByIndex(int index)
{
return itemGroup.GetItemUIByDataIndex(index).GetComponent<MenuItem>();
@ -89,7 +95,10 @@ namespace AxibugEmuOnline.Client
if (!useAnim)
srollRect.content.anchoredPosition += new Vector2(0, gap);
else
srollRect.content.anchoredPosition += new Vector2(0, gap);
{
var endValue = srollRect.content.anchoredPosition + new Vector2(0, gap);
DOTween.To(() => srollRect.content.anchoredPosition, (x) => srollRect.content.anchoredPosition = x, endValue, 0.125f);
}
}
Vector3[] corner = new Vector3[4];