diff --git a/Assets/Art/UI/模块展示.png b/Assets/Art/UI/模块展示.png new file mode 100644 index 0000000..c6aff51 Binary files /dev/null and b/Assets/Art/UI/模块展示.png differ diff --git a/Assets/Art/UI/模块展示.png.meta b/Assets/Art/UI/模块展示.png.meta new file mode 100644 index 0000000..aa648ab --- /dev/null +++ b/Assets/Art/UI/模块展示.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: aa3b5413c97b7ac48accb687a8f0a3d9 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + 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: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + 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: 3 + buildTarget: WebGL + 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: 3 + 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 + - serializedVersion: 3 + buildTarget: Server + 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: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/UIPrefabs/ShowTitleUIPrefab.prefab b/Assets/Resources/UIPrefabs/ShowTitleUIPrefab.prefab index 8bec9b7..0b1425b 100644 --- a/Assets/Resources/UIPrefabs/ShowTitleUIPrefab.prefab +++ b/Assets/Resources/UIPrefabs/ShowTitleUIPrefab.prefab @@ -235,7 +235,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 200, y: 76} + m_SizeDelta: {x: 200, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3763780501063627421 CanvasRenderer: @@ -258,14 +258,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 0.42745098} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: aa3b5413c97b7ac48accb687a8f0a3d9, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -307,11 +307,11 @@ RectTransform: m_Children: [] m_Father: {fileID: 1397685134597467924} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0.0000076293945, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.05, y: 0.5} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0.3362, y: -0.3362} + m_SizeDelta: {x: 106.9017, y: 65.246} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &439953560179768930 CanvasRenderer: m_ObjectHideFlags: 0 @@ -344,13 +344,13 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 20ebdb412ee9aec4a9d3005965d9c962, type: 3} m_FontSize: 18 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 + m_BestFit: 1 + m_MinSize: 15 + m_MaxSize: 18 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u6D4B\u8BD5\u6587\u5B57" + m_Text: "\u6D4B\u8BD5" diff --git a/Assets/_Scripts/Application/UI/ShowTitleUIPrefab.cs b/Assets/_Scripts/Application/UI/ShowTitleUIPrefab.cs index 09b3aac..ba86b53 100644 --- a/Assets/_Scripts/Application/UI/ShowTitleUIPrefab.cs +++ b/Assets/_Scripts/Application/UI/ShowTitleUIPrefab.cs @@ -15,6 +15,8 @@ namespace ZXK.LouDiXvMuNiu public class ShowTitleUIPrefab : UIBase { private AudioEffectCtrl _audioClipCtrl = null; + private bool _playAuding = false; + private Action _finishCallback = null; protected override void Awake() { base.Awake(); @@ -25,13 +27,15 @@ namespace ZXK.LouDiXvMuNiu } public void SetTextAudMsg(string content, string audName,Action callback = null) { - Sequence sequence = DOTween.Sequence(); - sequence.Append(transform.GetComponent().DOFade(1.0f, 0.5f)) - .Append(transform.GetComponent().DOFade(0.0f, 0.5f).SetDelay(1.0f).OnComplete(()=> { - if (callback != null) callback(); - Destroy(gameObject); - })); - + // Sequence sequence = DOTween.Sequence(); + // sequence.Append(transform.GetComponent().DOFade(1.0f, 0.2f)) + // .Append(transform.GetComponent().DOFade(0.0f, 0.2f).SetDelay(1.5f).OnComplete(()=> { + // if (callback != null) callback(); + // Destroy(gameObject); + // })); + if (callback != null) + _finishCallback = callback; + transform.GetComponent().DOFade(1.0f, 0.2f); Text textTemp = transform.Find("TxtBG/Text").GetComponent(); if (UtilitiesMng.GetTransCharNum(content) > 68) { @@ -50,8 +54,22 @@ namespace ZXK.LouDiXvMuNiu { GetComponent().clip = clip; GetComponent().Play(); + _playAuding = true; } }); } + + private void Update() + { + if (_playAuding) + { + if (!GetComponent().isPlaying) + { + _finishCallback?.Invoke(); + GetComponent().DOFade(0.0f, 0.2f); + Destroy(gameObject); + } + } + } } } \ No newline at end of file diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 4d5d77e..e622367 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -26,7 +26,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 100} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 9357 + controlID: 4744 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -50,7 +50,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 528 - width: 843 + width: 710 height: 463 m_SerializedDataModeController: m_DataMode: 0 @@ -104,23 +104,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 843 + width: 710 height: 442 - m_Scale: {x: 0.40925923, y: 0.40925926} - m_Translation: {x: 421.5, y: 221} + m_Scale: {x: 0.36979166, y: 0.3697917} + m_Translation: {x: 355, y: 221} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -1029.9095 - y: -540 - width: 2059.819 - height: 1080 + x: -960 + y: -597.6338 + width: 1920 + height: 1195.2676 m_MinimalGUI: 1 - m_defaultScale: 0.40925926 - m_LastWindowPixelSize: {x: 843, y: 463} + m_defaultScale: 0.36979166 + m_LastWindowPixelSize: {x: 710, y: 463} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -145,12 +145,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 844 + width: 711 height: 939 m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 9358 + controlID: 4745 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -168,7 +168,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 844 + width: 711 height: 455 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} @@ -201,7 +201,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73 - width: 843 + width: 710 height: 434 m_SerializedDataModeController: m_DataMode: 0 @@ -634,14 +634,14 @@ MonoBehaviour: m_OverrideSceneCullingMask: 6917529027641081856 m_SceneIsLit: 1 m_SceneLighting: 1 - m_2DMode: 1 + m_2DMode: 0 m_isRotationLocked: 0 m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 669.6567, y: 687.9023, z: 10.247613} + m_Target: {x: 2.4508061, y: -2.968123, z: 1.1934283} speed: 2 - m_Value: {x: 669.6567, y: 687.9023, z: 10.247613} + m_Value: {x: 2.4508061, y: -2.968123, z: 1.1934283} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -669,7 +669,7 @@ MonoBehaviour: m_Size: {x: 1, y: 1} yGrid: m_Fade: - m_Target: 0 + m_Target: 1 speed: 2 m_Value: 1 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} @@ -677,9 +677,9 @@ MonoBehaviour: m_Size: {x: 1, y: 1} zGrid: m_Fade: - m_Target: 1 + m_Target: 0 speed: 2 - m_Value: 1 + m_Value: 0 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} m_Size: {x: 1, y: 1} @@ -687,18 +687,17 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0, y: 0, z: 0, w: 1} + m_Target: {x: -0.30122638, y: -0.102158114, z: 0.032477316, w: -0.9475087} speed: 2 - m_Value: {x: 0.000000044703484, y: -0.000000014901161, z: 0.0000000027939677, - w: 1} + m_Value: {x: -0.30122623, y: -0.10215806, z: 0.0324773, w: -0.9475082} m_Size: - m_Target: 79.651344 + m_Target: 0.6093184 speed: 2 - m_Value: 79.651344 + m_Value: 0.6093184 m_Ortho: - m_Target: 1 + m_Target: 0 speed: 2 - m_Value: 1 + m_Value: 0 m_CameraSettings: m_Speed: 1 m_SpeedNormalized: 0.5 @@ -712,7 +711,7 @@ MonoBehaviour: m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: 0.17461374, y: -0.05726064, z: 0.0101775015, w: 0.98294526} + m_LastSceneViewRotation: {x: -0.30122638, y: -0.102158114, z: 0.032477316, w: -0.9475087} m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} m_ReplacementString: @@ -809,10 +808,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 455 - width: 844 + width: 711 height: 484 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 2} m_Panes: - {fileID: 2} @@ -878,12 +877,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 844 + x: 711 y: 0 - width: 354 + width: 373 height: 939 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 10} m_Panes: - {fileID: 10} @@ -910,9 +909,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 844 + x: 711 y: 73 - width: 352 + width: 371 height: 918 m_SerializedDataModeController: m_DataMode: 0 @@ -927,9 +926,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 6281f8ff - m_LastClickedID: -491166 - m_ExpandedIDs: 7881f8ff8481f8ff9481f8ffc281f8ffca81f8ffce81f8ff8e87f8ffae87f8ffc807f9ff8808f9ffb46ef9ffd66ef9ffe670f9ff7cdef9ff54ebf9ff14ecf9ff6452faff7e52faff1a0ffcff2867fdff366cfdfff0d0fdfff2d5fdff844afeffa0bbfeffb22effff0434ffffca52ffff6669ffff0c8bffffe4dbffff00f8ffff2efbfffff4ffffff4e81000052810000848400002c85000014880000a88b0000c8440100f24401001a450100c4470100464c010096820100c0820100e882010092850100148a0100a29e0100cea50100b2d401005cd90100cedd0100ece1010032c50200fcc6020028ce02008af8020090f80200a8f80200b0f80200 + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 2efbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -968,9 +967,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1198 + x: 1084 y: 0 - width: 279 + width: 393 height: 939 m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} @@ -1000,9 +999,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1198 + x: 1084 y: 73 - width: 277 + width: 391 height: 918 m_SerializedDataModeController: m_DataMode: 0 @@ -1024,8 +1023,7 @@ MonoBehaviour: m_ShowAllHits: 0 m_SkipHidden: 0 m_SearchArea: 1 - m_Folders: - - Assets/_Scenes + m_Folders: [] m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -1042,7 +1040,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: 5e780000 m_LastClickedID: 30814 - m_ExpandedIDs: ffffffff0000000086780000887800008a7800008c7800008e780000907800009278000094780000987800009a7800009c7800009e780000a0780000a2780000a4780000a6780000a8780000aa780000ac780000ae780000b0780000b2780000b4780000b6780000b8780000ba780000bc780000be780000c0780000c8780000cc780000ce780000d0780000d2780000d4780000d6780000d8780000e87b0000da040100f40401001c6001001e6001007cbf0200 + m_ExpandedIDs: ffffffff000000008a7800008c7800008e78000090780000927800009478000096780000987800009a7800009c7800009e780000a0780000a2780000a4780000a6780000a8780000aa780000ac780000ae780000b0780000b2780000b4780000b6780000b8780000ba780000bc780000be780000c0780000c2780000c4780000c6780000c8780000ca780000cc780000ce780000d07b0000d27b0000e07b0000147c00005082000072820000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1067,10 +1065,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_AssetTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: 6281f8ff + scrollPos: {x: 0, y: 760} + m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: ffffffff0000000086780000887800008a7800008c7800008e780000907800009278000094780000987800009a7800009c7800009e780000a0780000a2780000a4780000a6780000a8780000aa780000ac780000ae780000b0780000b2780000b4780000b6780000b8780000ba780000bc780000be780000c0780000c8780000cc780000ce780000d0780000d2780000d4780000d6780000d8780000e87b0000da040100f40401001c6001001e6001007cbf0200 + m_ExpandedIDs: ffffffff000000008a7800008c7800008e78000090780000927800009478000096780000987800009a7800009c7800009e780000a0780000a2780000a4780000a6780000a8780000aa780000ac780000ae780000b0780000b2780000b4780000b6780000b8780000ba780000bc780000be780000c0780000c2780000c4780000c6780000c8780000ca780000cc780000ce780000d0780000d4780000d07b0000d27b0000147c00005082000072820000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1095,8 +1093,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 6281f8ff - m_LastClickedInstanceID: -491166 + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: m_RenameOverlay: @@ -1145,8 +1143,8 @@ MonoBehaviour: y: 0 width: 443 height: 939 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 14} m_Panes: - {fileID: 14}