提交完美

This commit is contained in:
PC-20230316NUNE\Administrator
2024-10-17 20:36:24 +08:00
parent 0d600a2786
commit b0a2e4a900
1522 changed files with 40000 additions and 15615 deletions

View File

@@ -3,6 +3,8 @@ using System.Threading.Tasks;
using Common;
using Cysharp.Threading.Tasks;
using FairyGUI;
using Hall;
using HotScripts.GameScripts.FGui.Scripts.Common;
// using HotScripts.GameLauncher;
using JNGame.Runtime.System;
using MainUI;
@@ -13,12 +15,14 @@ namespace HotScripts.GameScripts.FGui
public enum UILayerEnum
{
View,
View, //页面
Tip, //提示
}
public enum UIID
{
Component1
Tip,
Hall
}
/**
@@ -29,12 +33,14 @@ namespace HotScripts.GameScripts.FGui
public readonly string PkgName;
public readonly string ResName;
public readonly UILayerEnum Layer;
public readonly bool IsOnce;
public UIConfigStruct(string pkgName, string resName, UILayerEnum layer)
public UIConfigStruct(string pkgName, string resName, UILayerEnum layer, bool isOnce)
{
PkgName = pkgName;
ResName = resName;
Layer = layer;
IsOnce = isOnce;
}
}
@@ -63,15 +69,20 @@ namespace HotScripts.GameScripts.FGui
_mainUI.Center();
LayerMap.Add(UILayerEnum.View,_mainUI.m_View);
LayerMap.Add(UILayerEnum.Tip,_mainUI.m_Tip);
}
/// <summary>
/// 绑定UI包
/// </summary>
private void BindAll()
private async void BindAll()
{
MainUIBinder.BindAll();
//加载依赖包
await SHFrameModule.UI.AddPackageASync("Common");
CommonBinder.BindAll();
MainUIBinder.BindAll();
HallBinder.BindAll();
}
/// <summary>
@@ -79,10 +90,13 @@ namespace HotScripts.GameScripts.FGui
/// </summary>
private void BindUI()
{
UIConfigMap.Add(UIID.Component1,new UIConfigStruct("Common", "Component1", UILayerEnum.View));
UIConfigMap.Add(UIID.Tip,new UIConfigStruct("Common", "TipTitleUI", UILayerEnum.Tip,false));
UIConfigMap.Add(UIID.Hall,new UIConfigStruct("Hall", "HallUI", UILayerEnum.View,true));
}
/// <summary>
/// 打开页面
/// </summary>
public async UniTask Open<TClassType>(UIID id, params object[] param)
where TClassType : UIBase, new()
{
@@ -91,5 +105,13 @@ namespace HotScripts.GameScripts.FGui
await SHFrameModule.UI.Open<TClassType>(config.PkgName, config.ResName, LayerMap[config.Layer], param);
}
/// <summary>
/// 打开提示
/// </summary>
public void Tip(string title)
{
Open<TipTitleUI>(UIID.Tip,title).Forget();
}
}
}

View File

@@ -8,7 +8,9 @@ namespace Common
{
public static void BindAll()
{
UIObjectFactory.SetPackageItemExtension(UI_Component1.URL, typeof(UI_Component1));
UIObjectFactory.SetPackageItemExtension(UI_TipTitleUI.URL, typeof(UI_TipTitleUI));
UIObjectFactory.SetPackageItemExtension(UI_TipTitleItem.URL, typeof(UI_TipTitleItem));
UIObjectFactory.SetPackageItemExtension(UI_ButtonDefault.URL, typeof(UI_ButtonDefault));
}
}
}

View File

@@ -0,0 +1,27 @@
/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
using FairyGUI;
using FairyGUI.Utils;
namespace Common
{
public partial class UI_ButtonDefault : GButton
{
public GGraph m_bg;
public GTextField m_name;
public const string URL = "ui://k5vyqumw125l36";
public static UI_ButtonDefault CreateInstance()
{
return (UI_ButtonDefault)UIPackage.CreateObject("Common", "ButtonDefault");
}
public override void ConstructFromXML(XML xml)
{
base.ConstructFromXML(xml);
m_bg = (GGraph)GetChildAt(0);
m_name = (GTextField)GetChildAt(1);
}
}
}

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 2944078da6fa13c44aa673e785abacc3
guid: 401eada678af73d4ab55c21787937929
MonoImporter:
externalObjects: {}
serializedVersion: 2

View File

@@ -1,25 +0,0 @@
/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
using FairyGUI;
using FairyGUI.Utils;
namespace Common
{
public partial class UI_Component1 : GComponent
{
public GTextField m_text;
public const string URL = "ui://k5vyqumwed8i0";
public static UI_Component1 CreateInstance()
{
return (UI_Component1)UIPackage.CreateObject("Common", "Component1");
}
public override void ConstructFromXML(XML xml)
{
base.ConstructFromXML(xml);
m_text = (GTextField)GetChildAt(1);
}
}
}

View File

@@ -0,0 +1,25 @@
/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
using FairyGUI;
using FairyGUI.Utils;
namespace Common
{
public partial class UI_TipTitleItem : GComponent
{
public GTextField m_title;
public const string URL = "ui://k5vyqumw125l35";
public static UI_TipTitleItem CreateInstance()
{
return (UI_TipTitleItem)UIPackage.CreateObject("Common", "TipTitleItem");
}
public override void ConstructFromXML(XML xml)
{
base.ConstructFromXML(xml);
m_title = (GTextField)GetChildAt(1);
}
}
}

View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 9b9b4706c808ee34498a3777e5c73d57
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,25 @@
/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
using FairyGUI;
using FairyGUI.Utils;
namespace Common
{
public partial class UI_TipTitleUI : GComponent
{
public UI_TipTitleItem m_item;
public const string URL = "ui://k5vyqumw125l34";
public static UI_TipTitleUI CreateInstance()
{
return (UI_TipTitleUI)UIPackage.CreateObject("Common", "TipTitleUI");
}
public override void ConstructFromXML(XML xml)
{
base.ConstructFromXML(xml);
m_item = (UI_TipTitleItem)GetChildAt(0);
}
}
}

View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 5aad823f165c04142800ef150073459c
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 2d8e02955f4f5c746acb4b464783ae3e
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,15 @@
/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
using FairyGUI;
namespace Hall
{
public class HallBinder
{
public static void BindAll()
{
UIObjectFactory.SetPackageItemExtension(UI_HallUI.URL, typeof(UI_HallUI));
UIObjectFactory.SetPackageItemExtension(UI_HallSeason.URL, typeof(UI_HallSeason));
}
}
}

View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: b46217f175df58d46822912efa0acf8f
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,25 @@
/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
using FairyGUI;
using FairyGUI.Utils;
namespace Hall
{
public partial class UI_HallSeason : GComponent
{
public GTextField m_SeasonName;
public const string URL = "ui://qz3gmoo8125l31";
public static UI_HallSeason CreateInstance()
{
return (UI_HallSeason)UIPackage.CreateObject("Hall", "HallSeason");
}
public override void ConstructFromXML(XML xml)
{
base.ConstructFromXML(xml);
m_SeasonName = (GTextField)GetChildAt(1);
}
}
}

View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: db6d43739d3ff3946bc04178493e698b
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,25 @@
/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
using FairyGUI;
using FairyGUI.Utils;
namespace Hall
{
public partial class UI_HallUI : GComponent
{
public GButton m_StartSeason;
public const string URL = "ui://qz3gmoo8125l30";
public static UI_HallUI CreateInstance()
{
return (UI_HallUI)UIPackage.CreateObject("Hall", "HallUI");
}
public override void ConstructFromXML(XML xml)
{
base.ConstructFromXML(xml);
m_StartSeason = (GButton)GetChildAt(2);
}
}
}

View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 18aa8e0e5233875438e34afaaa30aadf
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -8,6 +8,7 @@ namespace MainUI
public partial class UI_MainUI : GComponent
{
public GComponent m_View;
public GComponent m_Tip;
public const string URL = "ui://r71rr38pue300";
public static UI_MainUI CreateInstance()
@@ -20,6 +21,7 @@ namespace MainUI
base.ConstructFromXML(xml);
m_View = (GComponent)GetChildAt(0);
m_Tip = (GComponent)GetChildAt(1);
}
}
}

View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 85b54dfd85b9427d879cbc1e60d07160
timeCreated: 1729145138

View File

@@ -0,0 +1,48 @@
using Common;
using Cysharp.Threading.Tasks;
using DG.Tweening;
using FairyGUI;
using SHFrame;
using UnityEngine;
namespace HotScripts.GameScripts.FGui.Scripts.Common
{
public class TipTitleUI : UIBase
{
private UI_TipTitleUI UIView => View as UI_TipTitleUI;
public override void OnInit()
{
}
public override async void OnOpen(params object[] param)
{
if (param.Length > 0)
{
UIView.m_item.m_title.text = $"{param[0]}";
}
UIView.m_item.pivot = new Vector2(0, 0);
DOTween.To(() => UIView.m_item.pivot.x, x => UIView.m_item.pivot = new Vector2(x, 0), 1, 0.25f);
await UniTask.Delay(1250);
DOTween.To(() => UIView.m_item.pivot.x, x => UIView.m_item.pivot = new Vector2(x,0), 0f, 0.25f)
.OnComplete(Close);
}
public override void AddListener()
{
}
public override void OnClose()
{
}
public override void RemoveListener()
{
}
}
}

View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: b9bbb422382e47b381fbc5ae2683336e
timeCreated: 1729145166

View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 0f96b21e921648a898ba796d5fe385fb
timeCreated: 1729145979

View File

@@ -0,0 +1,39 @@
using FairyGUI;
using Hall;
using SHFrame;
namespace HotScripts.GameScripts.FGui.Scripts.Hall
{
public class HallUI : UIBase
{
public UI_HallUI UIView => View as UI_HallUI;
public override void OnInit()
{
}
public override void OnOpen(params object[] param)
{
}
public override void AddListener()
{
UIView.m_StartSeason.onClick.Add(OnStartSeason);
}
public override void RemoveListener()
{
UIView.m_StartSeason.onClick.Remove(OnStartSeason);
}
private void OnStartSeason(EventContext context)
{
App.UI.Tip("暂时未开启赛季");
}
public override void OnClose()
{
}
}
}

View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 8ec13d47cad746748cb0a337fd707fd0
timeCreated: 1729145986

View File

@@ -4,11 +4,11 @@
"references": [
"GUID:f4270d81837019d47b93f11421168dae",
"GUID:2a81c6962524d424a8ef5072bd3b0fa0",
"GUID:a6f7937b7f28906409a3ea3ceb2316c6",
"GUID:e34a5702dd353724aa315fb8011f08c3",
"GUID:f51ebe6a0ceec4240a699833d6309b23",
"GUID:23aed7c57bb0a5d49aeaef92abb5bfff",
"GUID:b12e2c634b4214e4bab66a9cac501248"
"GUID:b12e2c634b4214e4bab66a9cac501248",
"GUID:a6f7937b7f28906409a3ea3ceb2316c6"
],
"includePlatforms": [],
"excludePlatforms": [],

View File

@@ -1,9 +1,10 @@
using System;
// using HotScripts.GameLauncher;
using DG.Tweening;
using HotScripts.GameLauncher;
using HotScripts.GameScripts.FGui;
using HotScripts.GameScripts.FGui.Scripts;
using HotScripts.GameScripts.FGui.Scripts.Hall;
using JNGame.Runtime;
using JNGame;
using SHFrame;
using UnityEngine;
using EventArgs = SHFrame.EventArgs;
@@ -20,8 +21,8 @@ namespace HotScripts.GameScripts
//初始化系统
await JNetGame.Instance.Init(App.AllSystem());
// //初始化成功
// App.EventLauncher.DispatchEvent(HotLauncherEvent.InitSuccess);
//初始化成功
App.EventLauncher.DispatchEvent(HotLauncherEvent.InitSuccess);
}
@@ -33,19 +34,18 @@ namespace HotScripts.GameScripts
private void AddListener()
{
// App.EventLauncher.AddListener(HotLauncherEvent.GoGameMain,OnGoGameMain);
App.EventLauncher.AddListener(HotLauncherEvent.GoGameMain,OnGoGameMain);
}
private void RemoveListener()
{
// App.EventLauncher.RemoveListener(HotLauncherEvent.GoGameMain,OnGoGameMain);
App.EventLauncher.RemoveListener(HotLauncherEvent.GoGameMain,OnGoGameMain);
}
private async void OnGoGameMain(EventArgs eventargs)
{
Log.Debug($"进入游戏");
await App.UI.Open<UIScriptDefault>(UIID.Component1);
await App.UI.Open<HallUI>(UIID.Hall);
}
}
}