diff --git a/Assets/Resources/Fgui/Common/Common_atlas0.png b/Assets/Resources/Fgui/Common/Common_atlas0.png index 4faa40276..84260b314 100644 Binary files a/Assets/Resources/Fgui/Common/Common_atlas0.png and b/Assets/Resources/Fgui/Common/Common_atlas0.png differ diff --git a/Assets/Resources/Fgui/Common/Common_fui.bytes b/Assets/Resources/Fgui/Common/Common_fui.bytes index 224655329..5d1c247f3 100644 Binary files a/Assets/Resources/Fgui/Common/Common_fui.bytes and b/Assets/Resources/Fgui/Common/Common_fui.bytes differ diff --git a/Assets/Resources/Fgui/Fishing/Fishing_fui.bytes b/Assets/Resources/Fgui/Fishing/Fishing_fui.bytes index dc9ad766c..f24fcf4d1 100644 Binary files a/Assets/Resources/Fgui/Fishing/Fishing_fui.bytes and b/Assets/Resources/Fgui/Fishing/Fishing_fui.bytes differ diff --git a/Assets/Resources/Fgui/Main/Main_atlas0.png b/Assets/Resources/Fgui/Main/Main_atlas0.png new file mode 100644 index 000000000..97d59d0ad Binary files /dev/null and b/Assets/Resources/Fgui/Main/Main_atlas0.png differ diff --git a/Assets/Resources/Fgui/Main/Main_atlas0.png.meta b/Assets/Resources/Fgui/Main/Main_atlas0.png.meta new file mode 100644 index 000000000..0ce3f0a37 --- /dev/null +++ b/Assets/Resources/Fgui/Main/Main_atlas0.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: b3aecf52a4fd7cb42813dc565dc02e37 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Fgui/Main/Main_fui.bytes b/Assets/Resources/Fgui/Main/Main_fui.bytes index aca4619fd..db30877b5 100644 Binary files a/Assets/Resources/Fgui/Main/Main_fui.bytes and b/Assets/Resources/Fgui/Main/Main_fui.bytes differ diff --git a/Assets/Resources/Fgui/Shop/Shop_fui.bytes b/Assets/Resources/Fgui/Shop/Shop_fui.bytes index ca693ff3f..8d246ea7a 100644 Binary files a/Assets/Resources/Fgui/Shop/Shop_fui.bytes and b/Assets/Resources/Fgui/Shop/Shop_fui.bytes differ diff --git a/Assets/Resources/Shaders.meta b/Assets/Resources/Shaders.meta deleted file mode 100644 index ad36e32b3..000000000 --- a/Assets/Resources/Shaders.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: e829b894bb774259bd3d518f066f6130 -timeCreated: 1748827749 \ No newline at end of file diff --git a/Assets/Scripts/NBC/UI/Runtime/UIKitFacade.cs b/Assets/Scripts/NBC/UI/Runtime/UIKitFacade.cs index ba9fd3263..a8097c487 100644 --- a/Assets/Scripts/NBC/UI/Runtime/UIKitFacade.cs +++ b/Assets/Scripts/NBC/UI/Runtime/UIKitFacade.cs @@ -2,7 +2,7 @@ { public class UI { - public static UIManager _inst; + private static UIManager _inst; public static UIManager Inst { diff --git a/Assets/Scripts/UI/Binders/FishingBinder.cs b/Assets/Scripts/UI/Binders/FishingBinder.cs index c944bbd7f..a08c5512a 100644 --- a/Assets/Scripts/UI/Binders/FishingBinder.cs +++ b/Assets/Scripts/UI/Binders/FishingBinder.cs @@ -11,7 +11,6 @@ namespace NBF UIObjectFactory.SetPackageItemExtension(FishingStateInfo.URL, typeof(FishingStateInfo)); UIObjectFactory.SetPackageItemExtension(InteractiveTag.URL, typeof(InteractiveTag)); UIObjectFactory.SetPackageItemExtension(FishingPower.URL, typeof(FishingPower)); - UIObjectFactory.SetPackageItemExtension(WeatherInfo.URL, typeof(WeatherInfo)); } } } \ No newline at end of file diff --git a/Assets/Scripts/UI/Binders/MainBinder.cs b/Assets/Scripts/UI/Binders/MainBinder.cs index e05c64ec6..6afbd25de 100644 --- a/Assets/Scripts/UI/Binders/MainBinder.cs +++ b/Assets/Scripts/UI/Binders/MainBinder.cs @@ -10,6 +10,7 @@ namespace NBF { UIObjectFactory.SetPackageItemExtension(SettingItem.URL, typeof(SettingItem)); UIObjectFactory.SetPackageItemExtension(IntroduceTag.URL, typeof(IntroduceTag)); + UIObjectFactory.SetPackageItemExtension(HomeButtonGroups.URL, typeof(HomeButtonGroups)); } } } \ No newline at end of file diff --git a/Assets/Scripts/UI/Fishing/FishingPanel.Designer.cs b/Assets/Scripts/UI/Fishing/FishingPanel.Designer.cs index 681fa48e7..93387e831 100644 --- a/Assets/Scripts/UI/Fishing/FishingPanel.Designer.cs +++ b/Assets/Scripts/UI/Fishing/FishingPanel.Designer.cs @@ -22,14 +22,14 @@ namespace NBF [AutoFind(Name = "TextFPS")] public GTextField TextFPS; [AutoFind(Name = "TextTime")] - public WeatherInfo TextTime; + public GLabel TextTime; [AutoFind(Name = "FishingState")] public FishingStateInfo FishingState; [AutoFind(Name = "Interactive")] public InteractiveTag Interactive; [AutoFind(Name = "OperationTips")] public GList OperationTips; - public override string[] GetDependPackages(){ return new string[] {}; } + public override string[] GetDependPackages(){ return new string[] {"Common"}; } } diff --git a/Assets/Scripts/UI/Home/HomeButtonGroups.Designer.cs b/Assets/Scripts/UI/Home/HomeButtonGroups.Designer.cs new file mode 100644 index 000000000..92f9b2ccd --- /dev/null +++ b/Assets/Scripts/UI/Home/HomeButtonGroups.Designer.cs @@ -0,0 +1,43 @@ +/**本脚本为自动生成，每次生成会覆盖！请勿手动修改，生成插件文档及项目地址：https://git.whoot.com/whoot-games/whoot.fguieditorplugin**/ + + +using FairyGUI; +using FairyGUI.Utils; +using NBC; + +namespace NBF +{ + public partial class HomeButtonGroups + { + public const string URL = "ui://hxr7rc7plvqln"; + + public GButton BtnMap; + public GButton BtnMessage; + public GButton BtnExit; + public GButton BtnSettings; + public GButton BtnStatistics; + public GButton BtnBag; + public GButton BtnSkill; + public GButton BtnPass; + public GButton BtnMission; + public GButton BtnTournament; + + public override void ConstructFromXML(XML xml) + { + base.ConstructFromXML(xml); + + BtnMap = (GButton)GetChild("BtnMap"); + BtnMessage = (GButton)GetChild("BtnMessage"); + BtnExit = (GButton)GetChild("BtnExit"); + BtnSettings = (GButton)GetChild("BtnSettings"); + BtnStatistics = (GButton)GetChild("BtnStatistics"); + BtnBag = (GButton)GetChild("BtnBag"); + BtnSkill = (GButton)GetChild("BtnSkill"); + BtnPass = (GButton)GetChild("BtnPass"); + BtnMission = (GButton)GetChild("BtnMission"); + BtnTournament = (GButton)GetChild("BtnTournament"); + OnInited(); + UILanguage.TrySetComponentLanguage(this); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/UI/Home/HomeButtonGroups.Designer.cs.meta b/Assets/Scripts/UI/Home/HomeButtonGroups.Designer.cs.meta new file mode 100644 index 000000000..e06891be8 --- /dev/null +++ b/Assets/Scripts/UI/Home/HomeButtonGroups.Designer.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 008c0b556690f1a4f9ea76cb05b6746e \ No newline at end of file diff --git a/Assets/Scripts/UI/Home/HomeButtonGroups.cs b/Assets/Scripts/UI/Home/HomeButtonGroups.cs new file mode 100644 index 000000000..ebcde9cbc --- /dev/null +++ b/Assets/Scripts/UI/Home/HomeButtonGroups.cs @@ -0,0 +1,31 @@ +// 本脚本只在不存在时会生成一次。组件逻辑写在当前脚本内。已存在不会再次生成覆盖 + +using UnityEngine; +using FairyGUI; +using NBC; + +namespace NBF +{ + public partial class HomeButtonGroups : GComponent + { + private void OnInited() + { + this.AutoAddClick(OnClick); + } + + private void OnClick(GComponent btn) + { + if (btn == BtnExit) + { + MessageBox.Show("确定推出到桌面吗？", (b) => + { + if (b) Application.Quit(); + }); + } + else if (btn == BtnSettings) + { + UI.Inst.OpenUI(); + } + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/UI/Home/HomeButtonGroups.cs.meta b/Assets/Scripts/UI/Home/HomeButtonGroups.cs.meta new file mode 100644 index 000000000..bc31aef81 --- /dev/null +++ b/Assets/Scripts/UI/Home/HomeButtonGroups.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 52070c9a16d995346a51eb093365c170 \ No newline at end of file diff --git a/Assets/Scripts/UI/Home/HomePanel.Designer.cs b/Assets/Scripts/UI/Home/HomePanel.Designer.cs index 41030c527..b42f90138 100644 --- a/Assets/Scripts/UI/Home/HomePanel.Designer.cs +++ b/Assets/Scripts/UI/Home/HomePanel.Designer.cs @@ -11,8 +11,12 @@ namespace NBF public partial class HomePanel { public GObject this[string aKey] => ContentPane.GetChild(aKey); - [AutoFind(Name = "Bottom")] - public BottomMenu Bottom; + [AutoFind(Name = "Menu")] + public CommonMenu Menu; + [AutoFind(Name = "BottomMenu")] + public BottomMenu BottomMenu; + [AutoFind(Name = "OpGroup")] + public HomeButtonGroups OpGroup; public override string[] GetDependPackages(){ return new string[] {"Common"}; } diff --git a/FGUIProject/assets/Common/Com/Buttons/BtnTitleInputControl.xml b/FGUIProject/assets/Common/Com/Buttons/BtnTitleInputControl.xml index a980d4a3e..7ab931411 100644 --- a/FGUIProject/assets/Common/Com/Buttons/BtnTitleInputControl.xml +++ b/FGUIProject/assets/Common/Com/Buttons/BtnTitleInputControl.xml @@ -2,9 +2,9 @@ - - + + -