Showing
20 changed files
with
1002 additions
and
185 deletions
| @@ -12,7 +12,7 @@ | @@ -12,7 +12,7 @@ | ||
| 12 | <ProductVersion>10.0.20506</ProductVersion> | 12 | <ProductVersion>10.0.20506</ProductVersion> |
| 13 | <SchemaVersion>2.0</SchemaVersion> | 13 | <SchemaVersion>2.0</SchemaVersion> |
| 14 | <RootNamespace></RootNamespace> | 14 | <RootNamespace></RootNamespace> |
| 15 | - <ProjectGuid>{fe102f6a-9808-1c9c-9897-d62f3a6958cf}</ProjectGuid> | 15 | + <ProjectGuid>{0fb0da77-85a4-96d4-1dc2-8ddaab877745}</ProjectGuid> |
| 16 | <ProjectTypeGuids>{E097FAD1-6243-4DAD-9C02-E9B9EFC3FFC1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> | 16 | <ProjectTypeGuids>{E097FAD1-6243-4DAD-9C02-E9B9EFC3FFC1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> |
| 17 | <OutputType>Library</OutputType> | 17 | <OutputType>Library</OutputType> |
| 18 | <AppDesignerFolder>Properties</AppDesignerFolder> | 18 | <AppDesignerFolder>Properties</AppDesignerFolder> |
| @@ -304,13 +304,22 @@ | @@ -304,13 +304,22 @@ | ||
| 304 | <HintPath>D:\UnityEditor\2022.3.53f1c1\Editor\Data\Managed\UnityEngine\UnityEditor.UnityConnectModule.dll</HintPath> | 304 | <HintPath>D:\UnityEditor\2022.3.53f1c1\Editor\Data\Managed\UnityEngine\UnityEditor.UnityConnectModule.dll</HintPath> |
| 305 | </Reference> | 305 | </Reference> |
| 306 | <Reference Include="ReportGeneratorMerged"> | 306 | <Reference Include="ReportGeneratorMerged"> |
| 307 | - <HintPath>D:\UnityFrameWork\My project\Library\PackageCache\com.unity.testtools.codecoverage@1.2.6\lib\ReportGenerator\ReportGeneratorMerged.dll</HintPath> | 307 | + <HintPath>D:\U3DFrameWork\Library\PackageCache\com.unity.testtools.codecoverage@1.2.6\lib\ReportGenerator\ReportGeneratorMerged.dll</HintPath> |
| 308 | </Reference> | 308 | </Reference> |
| 309 | <Reference Include="DOTween"> | 309 | <Reference Include="DOTween"> |
| 310 | - <HintPath>D:\UnityFrameWork\My project\Assets\Plugins\Demigiant\DOTween\DOTween.dll</HintPath> | 310 | + <HintPath>D:\U3DFrameWork\Assets\Plugins\Demigiant\DOTween\DOTween.dll</HintPath> |
| 311 | </Reference> | 311 | </Reference> |
| 312 | <Reference Include="Unity.VisualScripting.Antlr3.Runtime"> | 312 | <Reference Include="Unity.VisualScripting.Antlr3.Runtime"> |
| 313 | - <HintPath>D:\UnityFrameWork\My project\Library\PackageCache\com.unity.visualscripting@1.9.4\Runtime\VisualScripting.Flow\Dependencies\NCalc\Unity.VisualScripting.Antlr3.Runtime.dll</HintPath> | 313 | + <HintPath>D:\U3DFrameWork\Library\PackageCache\com.unity.visualscripting@1.9.4\Runtime\VisualScripting.Flow\Dependencies\NCalc\Unity.VisualScripting.Antlr3.Runtime.dll</HintPath> |
| 314 | + </Reference> | ||
| 315 | + <Reference Include="Unity.Android.Types"> | ||
| 316 | + <HintPath>D:\UnityEditor\2022.3.53f1c1\Editor\Data\PlaybackEngines\AndroidPlayer\Unity.Android.Types.dll</HintPath> | ||
| 317 | + </Reference> | ||
| 318 | + <Reference Include="Unity.Android.Gradle"> | ||
| 319 | + <HintPath>D:\UnityEditor\2022.3.53f1c1\Editor\Data\PlaybackEngines\AndroidPlayer\Unity.Android.Gradle.dll</HintPath> | ||
| 320 | + </Reference> | ||
| 321 | + <Reference Include="Unity.Android.GradleProject"> | ||
| 322 | + <HintPath>D:\UnityEditor\2022.3.53f1c1\Editor\Data\PlaybackEngines\AndroidPlayer\Unity.Android.GradleProject.dll</HintPath> | ||
| 314 | </Reference> | 323 | </Reference> |
| 315 | <Reference Include="netstandard"> | 324 | <Reference Include="netstandard"> |
| 316 | <HintPath>D:\UnityEditor\2022.3.53f1c1\Editor\Data\NetStandard\ref\2.1.0\netstandard.dll</HintPath> | 325 | <HintPath>D:\UnityEditor\2022.3.53f1c1\Editor\Data\NetStandard\ref\2.1.0\netstandard.dll</HintPath> |
| @@ -679,73 +688,73 @@ | @@ -679,73 +688,73 @@ | ||
| 679 | <HintPath>D:\UnityEditor\2022.3.53f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Xml.Serialization.dll</HintPath> | 688 | <HintPath>D:\UnityEditor\2022.3.53f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Xml.Serialization.dll</HintPath> |
| 680 | </Reference> | 689 | </Reference> |
| 681 | <Reference Include="Unity.Timeline"> | 690 | <Reference Include="Unity.Timeline"> |
| 682 | - <HintPath>D:\UnityFrameWork\My project\Library\ScriptAssemblies\Unity.Timeline.dll</HintPath> | 691 | + <HintPath>D:\U3DFrameWork\Library\ScriptAssemblies\Unity.Timeline.dll</HintPath> |
| 683 | </Reference> | 692 | </Reference> |
| 684 | <Reference Include="Unity.TestTools.CodeCoverage.Editor.OpenCover.Mono.Reflection"> | 693 | <Reference Include="Unity.TestTools.CodeCoverage.Editor.OpenCover.Mono.Reflection"> |
| 685 | - <HintPath>D:\UnityFrameWork\My project\Library\ScriptAssemblies\Unity.TestTools.CodeCoverage.Editor.OpenCover.Mono.Reflection.dll</HintPath> | 694 | + <HintPath>D:\U3DFrameWork\Library\ScriptAssemblies\Unity.TestTools.CodeCoverage.Editor.OpenCover.Mono.Reflection.dll</HintPath> |
| 686 | </Reference> | 695 | </Reference> |
| 687 | <Reference Include="UnityEngine.UI"> | 696 | <Reference Include="UnityEngine.UI"> |
| 688 | - <HintPath>D:\UnityFrameWork\My project\Library\ScriptAssemblies\UnityEngine.UI.dll</HintPath> | 697 | + <HintPath>D:\U3DFrameWork\Library\ScriptAssemblies\UnityEngine.UI.dll</HintPath> |
| 689 | </Reference> | 698 | </Reference> |
| 690 | <Reference Include="Unity.EditorCoroutines.Editor"> | 699 | <Reference Include="Unity.EditorCoroutines.Editor"> |
| 691 | - <HintPath>D:\UnityFrameWork\My project\Library\ScriptAssemblies\Unity.EditorCoroutines.Editor.dll</HintPath> | 700 | + <HintPath>D:\U3DFrameWork\Library\ScriptAssemblies\Unity.EditorCoroutines.Editor.dll</HintPath> |
| 692 | </Reference> | 701 | </Reference> |
| 693 | <Reference Include="Unity.VisualScripting.SettingsProvider.Editor"> | 702 | <Reference Include="Unity.VisualScripting.SettingsProvider.Editor"> |
| 694 | - <HintPath>D:\UnityFrameWork\My project\Library\ScriptAssemblies\Unity.VisualScripting.SettingsProvider.Editor.dll</HintPath> | 703 | + <HintPath>D:\U3DFrameWork\Library\ScriptAssemblies\Unity.VisualScripting.SettingsProvider.Editor.dll</HintPath> |
| 695 | </Reference> | 704 | </Reference> |
| 696 | <Reference Include="Unity.Performance.Profile-Analyzer.Editor"> | 705 | <Reference Include="Unity.Performance.Profile-Analyzer.Editor"> |
| 697 | - <HintPath>D:\UnityFrameWork\My project\Library\ScriptAssemblies\Unity.Performance.Profile-Analyzer.Editor.dll</HintPath> | 706 | + <HintPath>D:\U3DFrameWork\Library\ScriptAssemblies\Unity.Performance.Profile-Analyzer.Editor.dll</HintPath> |
| 698 | </Reference> | 707 | </Reference> |
| 699 | <Reference Include="Unity.TestTools.CodeCoverage.Editor"> | 708 | <Reference Include="Unity.TestTools.CodeCoverage.Editor"> |
| 700 | - <HintPath>D:\UnityFrameWork\My project\Library\ScriptAssemblies\Unity.TestTools.CodeCoverage.Editor.dll</HintPath> | 709 | + <HintPath>D:\U3DFrameWork\Library\ScriptAssemblies\Unity.TestTools.CodeCoverage.Editor.dll</HintPath> |
| 701 | </Reference> | 710 | </Reference> |
| 702 | <Reference Include="Unity.TestTools.CodeCoverage.Editor.OpenCover.Model"> | 711 | <Reference Include="Unity.TestTools.CodeCoverage.Editor.OpenCover.Model"> |
| 703 | - <HintPath>D:\UnityFrameWork\My project\Library\ScriptAssemblies\Unity.TestTools.CodeCoverage.Editor.OpenCover.Model.dll</HintPath> | 712 | + <HintPath>D:\U3DFrameWork\Library\ScriptAssemblies\Unity.TestTools.CodeCoverage.Editor.OpenCover.Model.dll</HintPath> |
| 704 | </Reference> | 713 | </Reference> |
| 705 | <Reference Include="Unity.PlasticSCM.Editor"> | 714 | <Reference Include="Unity.PlasticSCM.Editor"> |
| 706 | - <HintPath>D:\UnityFrameWork\My project\Library\ScriptAssemblies\Unity.PlasticSCM.Editor.dll</HintPath> | 715 | + <HintPath>D:\U3DFrameWork\Library\ScriptAssemblies\Unity.PlasticSCM.Editor.dll</HintPath> |
| 707 | </Reference> | 716 | </Reference> |
| 708 | <Reference Include="Unity.VisualScripting.State.Editor"> | 717 | <Reference Include="Unity.VisualScripting.State.Editor"> |
| 709 | - <HintPath>D:\UnityFrameWork\My project\Library\ScriptAssemblies\Unity.VisualScripting.State.Editor.dll</HintPath> | 718 | + <HintPath>D:\U3DFrameWork\Library\ScriptAssemblies\Unity.VisualScripting.State.Editor.dll</HintPath> |
| 710 | </Reference> | 719 | </Reference> |
| 711 | <Reference Include="Unity.Timeline.Editor"> | 720 | <Reference Include="Unity.Timeline.Editor"> |
| 712 | - <HintPath>D:\UnityFrameWork\My project\Library\ScriptAssemblies\Unity.Timeline.Editor.dll</HintPath> | 721 | + <HintPath>D:\U3DFrameWork\Library\ScriptAssemblies\Unity.Timeline.Editor.dll</HintPath> |
| 713 | </Reference> | 722 | </Reference> |
| 714 | <Reference Include="Unity.VisualScripting.Shared.Editor"> | 723 | <Reference Include="Unity.VisualScripting.Shared.Editor"> |
| 715 | - <HintPath>D:\UnityFrameWork\My project\Library\ScriptAssemblies\Unity.VisualScripting.Shared.Editor.dll</HintPath> | 724 | + <HintPath>D:\U3DFrameWork\Library\ScriptAssemblies\Unity.VisualScripting.Shared.Editor.dll</HintPath> |
| 716 | </Reference> | 725 | </Reference> |
| 717 | <Reference Include="Unity.VisualStudio.Editor"> | 726 | <Reference Include="Unity.VisualStudio.Editor"> |
| 718 | - <HintPath>D:\UnityFrameWork\My project\Library\ScriptAssemblies\Unity.VisualStudio.Editor.dll</HintPath> | 727 | + <HintPath>D:\U3DFrameWork\Library\ScriptAssemblies\Unity.VisualStudio.Editor.dll</HintPath> |
| 719 | </Reference> | 728 | </Reference> |
| 720 | <Reference Include="Unity.TextMeshPro"> | 729 | <Reference Include="Unity.TextMeshPro"> |
| 721 | - <HintPath>D:\UnityFrameWork\My project\Library\ScriptAssemblies\Unity.TextMeshPro.dll</HintPath> | 730 | + <HintPath>D:\U3DFrameWork\Library\ScriptAssemblies\Unity.TextMeshPro.dll</HintPath> |
| 722 | </Reference> | 731 | </Reference> |
| 723 | <Reference Include="Unity.VisualScripting.Core"> | 732 | <Reference Include="Unity.VisualScripting.Core"> |
| 724 | - <HintPath>D:\UnityFrameWork\My project\Library\ScriptAssemblies\Unity.VisualScripting.Core.dll</HintPath> | 733 | + <HintPath>D:\U3DFrameWork\Library\ScriptAssemblies\Unity.VisualScripting.Core.dll</HintPath> |
| 725 | </Reference> | 734 | </Reference> |
| 726 | <Reference Include="Unity.TextMeshPro.Editor"> | 735 | <Reference Include="Unity.TextMeshPro.Editor"> |
| 727 | - <HintPath>D:\UnityFrameWork\My project\Library\ScriptAssemblies\Unity.TextMeshPro.Editor.dll</HintPath> | 736 | + <HintPath>D:\U3DFrameWork\Library\ScriptAssemblies\Unity.TextMeshPro.Editor.dll</HintPath> |
| 728 | </Reference> | 737 | </Reference> |
| 729 | <Reference Include="UnityEditor.UI"> | 738 | <Reference Include="UnityEditor.UI"> |
| 730 | - <HintPath>D:\UnityFrameWork\My project\Library\ScriptAssemblies\UnityEditor.UI.dll</HintPath> | 739 | + <HintPath>D:\U3DFrameWork\Library\ScriptAssemblies\UnityEditor.UI.dll</HintPath> |
| 731 | </Reference> | 740 | </Reference> |
| 732 | <Reference Include="Unity.VisualScripting.Core.Editor"> | 741 | <Reference Include="Unity.VisualScripting.Core.Editor"> |
| 733 | - <HintPath>D:\UnityFrameWork\My project\Library\ScriptAssemblies\Unity.VisualScripting.Core.Editor.dll</HintPath> | 742 | + <HintPath>D:\U3DFrameWork\Library\ScriptAssemblies\Unity.VisualScripting.Core.Editor.dll</HintPath> |
| 734 | </Reference> | 743 | </Reference> |
| 735 | <Reference Include="Unity.Rider.Editor"> | 744 | <Reference Include="Unity.Rider.Editor"> |
| 736 | - <HintPath>D:\UnityFrameWork\My project\Library\ScriptAssemblies\Unity.Rider.Editor.dll</HintPath> | 745 | + <HintPath>D:\U3DFrameWork\Library\ScriptAssemblies\Unity.Rider.Editor.dll</HintPath> |
| 737 | </Reference> | 746 | </Reference> |
| 738 | <Reference Include="Unity.VisualScripting.State"> | 747 | <Reference Include="Unity.VisualScripting.State"> |
| 739 | - <HintPath>D:\UnityFrameWork\My project\Library\ScriptAssemblies\Unity.VisualScripting.State.dll</HintPath> | 748 | + <HintPath>D:\U3DFrameWork\Library\ScriptAssemblies\Unity.VisualScripting.State.dll</HintPath> |
| 740 | </Reference> | 749 | </Reference> |
| 741 | <Reference Include="Unity.VSCode.Editor"> | 750 | <Reference Include="Unity.VSCode.Editor"> |
| 742 | - <HintPath>D:\UnityFrameWork\My project\Library\ScriptAssemblies\Unity.VSCode.Editor.dll</HintPath> | 751 | + <HintPath>D:\U3DFrameWork\Library\ScriptAssemblies\Unity.VSCode.Editor.dll</HintPath> |
| 743 | </Reference> | 752 | </Reference> |
| 744 | <Reference Include="Unity.VisualScripting.Flow"> | 753 | <Reference Include="Unity.VisualScripting.Flow"> |
| 745 | - <HintPath>D:\UnityFrameWork\My project\Library\ScriptAssemblies\Unity.VisualScripting.Flow.dll</HintPath> | 754 | + <HintPath>D:\U3DFrameWork\Library\ScriptAssemblies\Unity.VisualScripting.Flow.dll</HintPath> |
| 746 | </Reference> | 755 | </Reference> |
| 747 | <Reference Include="Unity.VisualScripting.Flow.Editor"> | 756 | <Reference Include="Unity.VisualScripting.Flow.Editor"> |
| 748 | - <HintPath>D:\UnityFrameWork\My project\Library\ScriptAssemblies\Unity.VisualScripting.Flow.Editor.dll</HintPath> | 757 | + <HintPath>D:\U3DFrameWork\Library\ScriptAssemblies\Unity.VisualScripting.Flow.Editor.dll</HintPath> |
| 749 | </Reference> | 758 | </Reference> |
| 750 | </ItemGroup> | 759 | </ItemGroup> |
| 751 | <ItemGroup> | 760 | <ItemGroup> |
| @@ -12,7 +12,7 @@ | @@ -12,7 +12,7 @@ | ||
| 12 | <ProductVersion>10.0.20506</ProductVersion> | 12 | <ProductVersion>10.0.20506</ProductVersion> |
| 13 | <SchemaVersion>2.0</SchemaVersion> | 13 | <SchemaVersion>2.0</SchemaVersion> |
| 14 | <RootNamespace></RootNamespace> | 14 | <RootNamespace></RootNamespace> |
| 15 | - <ProjectGuid>{e6bdc332-25e1-2831-82c1-25d0441455a3}</ProjectGuid> | 15 | + <ProjectGuid>{9864750c-93e8-aa72-e152-534ad74cab45}</ProjectGuid> |
| 16 | <ProjectTypeGuids>{E097FAD1-6243-4DAD-9C02-E9B9EFC3FFC1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> | 16 | <ProjectTypeGuids>{E097FAD1-6243-4DAD-9C02-E9B9EFC3FFC1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> |
| 17 | <OutputType>Library</OutputType> | 17 | <OutputType>Library</OutputType> |
| 18 | <AppDesignerFolder>Properties</AppDesignerFolder> | 18 | <AppDesignerFolder>Properties</AppDesignerFolder> |
| @@ -51,6 +51,8 @@ | @@ -51,6 +51,8 @@ | ||
| 51 | <Compile Include="Assets\Scripts\Main.cs" /> | 51 | <Compile Include="Assets\Scripts\Main.cs" /> |
| 52 | <Compile Include="Assets\Scripts\UI\Test1.cs" /> | 52 | <Compile Include="Assets\Scripts\UI\Test1.cs" /> |
| 53 | <Compile Include="Assets\Scripts\Manager\UIBase.cs" /> | 53 | <Compile Include="Assets\Scripts\Manager\UIBase.cs" /> |
| 54 | + <Compile Include="Assets\Scripts\Manager\ResourcesManager.cs" /> | ||
| 55 | + <Compile Include="Assets\Scripts\Manager\AudioManager.cs" /> | ||
| 54 | <Compile Include="Assets\Scripts\Manager\UIAnimation.cs" /> | 56 | <Compile Include="Assets\Scripts\Manager\UIAnimation.cs" /> |
| 55 | <Compile Include="Assets\Scripts\Manager\Singleton.cs" /> | 57 | <Compile Include="Assets\Scripts\Manager\Singleton.cs" /> |
| 56 | <Reference Include="UnityEngine"> | 58 | <Reference Include="UnityEngine"> |
| @@ -303,13 +305,22 @@ | @@ -303,13 +305,22 @@ | ||
| 303 | <HintPath>D:\UnityEditor\2022.3.53f1c1\Editor\Data\Managed\UnityEngine\UnityEditor.UnityConnectModule.dll</HintPath> | 305 | <HintPath>D:\UnityEditor\2022.3.53f1c1\Editor\Data\Managed\UnityEngine\UnityEditor.UnityConnectModule.dll</HintPath> |
| 304 | </Reference> | 306 | </Reference> |
| 305 | <Reference Include="ReportGeneratorMerged"> | 307 | <Reference Include="ReportGeneratorMerged"> |
| 306 | - <HintPath>D:\UnityFrameWork\My project\Library\PackageCache\com.unity.testtools.codecoverage@1.2.6\lib\ReportGenerator\ReportGeneratorMerged.dll</HintPath> | 308 | + <HintPath>D:\U3DFrameWork\Library\PackageCache\com.unity.testtools.codecoverage@1.2.6\lib\ReportGenerator\ReportGeneratorMerged.dll</HintPath> |
| 307 | </Reference> | 309 | </Reference> |
| 308 | <Reference Include="DOTween"> | 310 | <Reference Include="DOTween"> |
| 309 | - <HintPath>D:\UnityFrameWork\My project\Assets\Plugins\Demigiant\DOTween\DOTween.dll</HintPath> | 311 | + <HintPath>D:\U3DFrameWork\Assets\Plugins\Demigiant\DOTween\DOTween.dll</HintPath> |
| 310 | </Reference> | 312 | </Reference> |
| 311 | <Reference Include="Unity.VisualScripting.Antlr3.Runtime"> | 313 | <Reference Include="Unity.VisualScripting.Antlr3.Runtime"> |
| 312 | - <HintPath>D:\UnityFrameWork\My project\Library\PackageCache\com.unity.visualscripting@1.9.4\Runtime\VisualScripting.Flow\Dependencies\NCalc\Unity.VisualScripting.Antlr3.Runtime.dll</HintPath> | 314 | + <HintPath>D:\U3DFrameWork\Library\PackageCache\com.unity.visualscripting@1.9.4\Runtime\VisualScripting.Flow\Dependencies\NCalc\Unity.VisualScripting.Antlr3.Runtime.dll</HintPath> |
| 315 | + </Reference> | ||
| 316 | + <Reference Include="Unity.Android.Types"> | ||
| 317 | + <HintPath>D:\UnityEditor\2022.3.53f1c1\Editor\Data\PlaybackEngines\AndroidPlayer\Unity.Android.Types.dll</HintPath> | ||
| 318 | + </Reference> | ||
| 319 | + <Reference Include="Unity.Android.Gradle"> | ||
| 320 | + <HintPath>D:\UnityEditor\2022.3.53f1c1\Editor\Data\PlaybackEngines\AndroidPlayer\Unity.Android.Gradle.dll</HintPath> | ||
| 321 | + </Reference> | ||
| 322 | + <Reference Include="Unity.Android.GradleProject"> | ||
| 323 | + <HintPath>D:\UnityEditor\2022.3.53f1c1\Editor\Data\PlaybackEngines\AndroidPlayer\Unity.Android.GradleProject.dll</HintPath> | ||
| 313 | </Reference> | 324 | </Reference> |
| 314 | <Reference Include="netstandard"> | 325 | <Reference Include="netstandard"> |
| 315 | <HintPath>D:\UnityEditor\2022.3.53f1c1\Editor\Data\NetStandard\ref\2.1.0\netstandard.dll</HintPath> | 326 | <HintPath>D:\UnityEditor\2022.3.53f1c1\Editor\Data\NetStandard\ref\2.1.0\netstandard.dll</HintPath> |
| @@ -678,78 +689,78 @@ | @@ -678,78 +689,78 @@ | ||
| 678 | <HintPath>D:\UnityEditor\2022.3.53f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Xml.Serialization.dll</HintPath> | 689 | <HintPath>D:\UnityEditor\2022.3.53f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Xml.Serialization.dll</HintPath> |
| 679 | </Reference> | 690 | </Reference> |
| 680 | <Reference Include="Unity.Timeline"> | 691 | <Reference Include="Unity.Timeline"> |
| 681 | - <HintPath>D:\UnityFrameWork\My project\Library\ScriptAssemblies\Unity.Timeline.dll</HintPath> | 692 | + <HintPath>D:\U3DFrameWork\Library\ScriptAssemblies\Unity.Timeline.dll</HintPath> |
| 682 | </Reference> | 693 | </Reference> |
| 683 | <Reference Include="Unity.TestTools.CodeCoverage.Editor.OpenCover.Mono.Reflection"> | 694 | <Reference Include="Unity.TestTools.CodeCoverage.Editor.OpenCover.Mono.Reflection"> |
| 684 | - <HintPath>D:\UnityFrameWork\My project\Library\ScriptAssemblies\Unity.TestTools.CodeCoverage.Editor.OpenCover.Mono.Reflection.dll</HintPath> | 695 | + <HintPath>D:\U3DFrameWork\Library\ScriptAssemblies\Unity.TestTools.CodeCoverage.Editor.OpenCover.Mono.Reflection.dll</HintPath> |
| 685 | </Reference> | 696 | </Reference> |
| 686 | <Reference Include="UnityEngine.UI"> | 697 | <Reference Include="UnityEngine.UI"> |
| 687 | - <HintPath>D:\UnityFrameWork\My project\Library\ScriptAssemblies\UnityEngine.UI.dll</HintPath> | 698 | + <HintPath>D:\U3DFrameWork\Library\ScriptAssemblies\UnityEngine.UI.dll</HintPath> |
| 688 | </Reference> | 699 | </Reference> |
| 689 | <Reference Include="Unity.EditorCoroutines.Editor"> | 700 | <Reference Include="Unity.EditorCoroutines.Editor"> |
| 690 | - <HintPath>D:\UnityFrameWork\My project\Library\ScriptAssemblies\Unity.EditorCoroutines.Editor.dll</HintPath> | 701 | + <HintPath>D:\U3DFrameWork\Library\ScriptAssemblies\Unity.EditorCoroutines.Editor.dll</HintPath> |
| 691 | </Reference> | 702 | </Reference> |
| 692 | <Reference Include="Unity.VisualScripting.SettingsProvider.Editor"> | 703 | <Reference Include="Unity.VisualScripting.SettingsProvider.Editor"> |
| 693 | - <HintPath>D:\UnityFrameWork\My project\Library\ScriptAssemblies\Unity.VisualScripting.SettingsProvider.Editor.dll</HintPath> | 704 | + <HintPath>D:\U3DFrameWork\Library\ScriptAssemblies\Unity.VisualScripting.SettingsProvider.Editor.dll</HintPath> |
| 694 | </Reference> | 705 | </Reference> |
| 695 | <Reference Include="Unity.Performance.Profile-Analyzer.Editor"> | 706 | <Reference Include="Unity.Performance.Profile-Analyzer.Editor"> |
| 696 | - <HintPath>D:\UnityFrameWork\My project\Library\ScriptAssemblies\Unity.Performance.Profile-Analyzer.Editor.dll</HintPath> | 707 | + <HintPath>D:\U3DFrameWork\Library\ScriptAssemblies\Unity.Performance.Profile-Analyzer.Editor.dll</HintPath> |
| 697 | </Reference> | 708 | </Reference> |
| 698 | <Reference Include="Unity.TestTools.CodeCoverage.Editor"> | 709 | <Reference Include="Unity.TestTools.CodeCoverage.Editor"> |
| 699 | - <HintPath>D:\UnityFrameWork\My project\Library\ScriptAssemblies\Unity.TestTools.CodeCoverage.Editor.dll</HintPath> | 710 | + <HintPath>D:\U3DFrameWork\Library\ScriptAssemblies\Unity.TestTools.CodeCoverage.Editor.dll</HintPath> |
| 700 | </Reference> | 711 | </Reference> |
| 701 | <Reference Include="Unity.TestTools.CodeCoverage.Editor.OpenCover.Model"> | 712 | <Reference Include="Unity.TestTools.CodeCoverage.Editor.OpenCover.Model"> |
| 702 | - <HintPath>D:\UnityFrameWork\My project\Library\ScriptAssemblies\Unity.TestTools.CodeCoverage.Editor.OpenCover.Model.dll</HintPath> | 713 | + <HintPath>D:\U3DFrameWork\Library\ScriptAssemblies\Unity.TestTools.CodeCoverage.Editor.OpenCover.Model.dll</HintPath> |
| 703 | </Reference> | 714 | </Reference> |
| 704 | <Reference Include="Unity.PlasticSCM.Editor"> | 715 | <Reference Include="Unity.PlasticSCM.Editor"> |
| 705 | - <HintPath>D:\UnityFrameWork\My project\Library\ScriptAssemblies\Unity.PlasticSCM.Editor.dll</HintPath> | 716 | + <HintPath>D:\U3DFrameWork\Library\ScriptAssemblies\Unity.PlasticSCM.Editor.dll</HintPath> |
| 706 | </Reference> | 717 | </Reference> |
| 707 | <Reference Include="Unity.VisualScripting.State.Editor"> | 718 | <Reference Include="Unity.VisualScripting.State.Editor"> |
| 708 | - <HintPath>D:\UnityFrameWork\My project\Library\ScriptAssemblies\Unity.VisualScripting.State.Editor.dll</HintPath> | 719 | + <HintPath>D:\U3DFrameWork\Library\ScriptAssemblies\Unity.VisualScripting.State.Editor.dll</HintPath> |
| 709 | </Reference> | 720 | </Reference> |
| 710 | <Reference Include="Unity.Timeline.Editor"> | 721 | <Reference Include="Unity.Timeline.Editor"> |
| 711 | - <HintPath>D:\UnityFrameWork\My project\Library\ScriptAssemblies\Unity.Timeline.Editor.dll</HintPath> | 722 | + <HintPath>D:\U3DFrameWork\Library\ScriptAssemblies\Unity.Timeline.Editor.dll</HintPath> |
| 712 | </Reference> | 723 | </Reference> |
| 713 | <Reference Include="Unity.VisualScripting.Shared.Editor"> | 724 | <Reference Include="Unity.VisualScripting.Shared.Editor"> |
| 714 | - <HintPath>D:\UnityFrameWork\My project\Library\ScriptAssemblies\Unity.VisualScripting.Shared.Editor.dll</HintPath> | 725 | + <HintPath>D:\U3DFrameWork\Library\ScriptAssemblies\Unity.VisualScripting.Shared.Editor.dll</HintPath> |
| 715 | </Reference> | 726 | </Reference> |
| 716 | <Reference Include="Unity.VisualStudio.Editor"> | 727 | <Reference Include="Unity.VisualStudio.Editor"> |
| 717 | - <HintPath>D:\UnityFrameWork\My project\Library\ScriptAssemblies\Unity.VisualStudio.Editor.dll</HintPath> | 728 | + <HintPath>D:\U3DFrameWork\Library\ScriptAssemblies\Unity.VisualStudio.Editor.dll</HintPath> |
| 718 | </Reference> | 729 | </Reference> |
| 719 | <Reference Include="Unity.TextMeshPro"> | 730 | <Reference Include="Unity.TextMeshPro"> |
| 720 | - <HintPath>D:\UnityFrameWork\My project\Library\ScriptAssemblies\Unity.TextMeshPro.dll</HintPath> | 731 | + <HintPath>D:\U3DFrameWork\Library\ScriptAssemblies\Unity.TextMeshPro.dll</HintPath> |
| 721 | </Reference> | 732 | </Reference> |
| 722 | <Reference Include="Unity.VisualScripting.Core"> | 733 | <Reference Include="Unity.VisualScripting.Core"> |
| 723 | - <HintPath>D:\UnityFrameWork\My project\Library\ScriptAssemblies\Unity.VisualScripting.Core.dll</HintPath> | 734 | + <HintPath>D:\U3DFrameWork\Library\ScriptAssemblies\Unity.VisualScripting.Core.dll</HintPath> |
| 724 | </Reference> | 735 | </Reference> |
| 725 | <Reference Include="Unity.TextMeshPro.Editor"> | 736 | <Reference Include="Unity.TextMeshPro.Editor"> |
| 726 | - <HintPath>D:\UnityFrameWork\My project\Library\ScriptAssemblies\Unity.TextMeshPro.Editor.dll</HintPath> | 737 | + <HintPath>D:\U3DFrameWork\Library\ScriptAssemblies\Unity.TextMeshPro.Editor.dll</HintPath> |
| 727 | </Reference> | 738 | </Reference> |
| 728 | <Reference Include="UnityEditor.UI"> | 739 | <Reference Include="UnityEditor.UI"> |
| 729 | - <HintPath>D:\UnityFrameWork\My project\Library\ScriptAssemblies\UnityEditor.UI.dll</HintPath> | 740 | + <HintPath>D:\U3DFrameWork\Library\ScriptAssemblies\UnityEditor.UI.dll</HintPath> |
| 730 | </Reference> | 741 | </Reference> |
| 731 | <Reference Include="Unity.VisualScripting.Core.Editor"> | 742 | <Reference Include="Unity.VisualScripting.Core.Editor"> |
| 732 | - <HintPath>D:\UnityFrameWork\My project\Library\ScriptAssemblies\Unity.VisualScripting.Core.Editor.dll</HintPath> | 743 | + <HintPath>D:\U3DFrameWork\Library\ScriptAssemblies\Unity.VisualScripting.Core.Editor.dll</HintPath> |
| 733 | </Reference> | 744 | </Reference> |
| 734 | <Reference Include="Unity.Rider.Editor"> | 745 | <Reference Include="Unity.Rider.Editor"> |
| 735 | - <HintPath>D:\UnityFrameWork\My project\Library\ScriptAssemblies\Unity.Rider.Editor.dll</HintPath> | 746 | + <HintPath>D:\U3DFrameWork\Library\ScriptAssemblies\Unity.Rider.Editor.dll</HintPath> |
| 736 | </Reference> | 747 | </Reference> |
| 737 | <Reference Include="Unity.VisualScripting.State"> | 748 | <Reference Include="Unity.VisualScripting.State"> |
| 738 | - <HintPath>D:\UnityFrameWork\My project\Library\ScriptAssemblies\Unity.VisualScripting.State.dll</HintPath> | 749 | + <HintPath>D:\U3DFrameWork\Library\ScriptAssemblies\Unity.VisualScripting.State.dll</HintPath> |
| 739 | </Reference> | 750 | </Reference> |
| 740 | <Reference Include="Unity.VSCode.Editor"> | 751 | <Reference Include="Unity.VSCode.Editor"> |
| 741 | - <HintPath>D:\UnityFrameWork\My project\Library\ScriptAssemblies\Unity.VSCode.Editor.dll</HintPath> | 752 | + <HintPath>D:\U3DFrameWork\Library\ScriptAssemblies\Unity.VSCode.Editor.dll</HintPath> |
| 742 | </Reference> | 753 | </Reference> |
| 743 | <Reference Include="Unity.VisualScripting.Flow"> | 754 | <Reference Include="Unity.VisualScripting.Flow"> |
| 744 | - <HintPath>D:\UnityFrameWork\My project\Library\ScriptAssemblies\Unity.VisualScripting.Flow.dll</HintPath> | 755 | + <HintPath>D:\U3DFrameWork\Library\ScriptAssemblies\Unity.VisualScripting.Flow.dll</HintPath> |
| 745 | </Reference> | 756 | </Reference> |
| 746 | <Reference Include="Unity.VisualScripting.Flow.Editor"> | 757 | <Reference Include="Unity.VisualScripting.Flow.Editor"> |
| 747 | - <HintPath>D:\UnityFrameWork\My project\Library\ScriptAssemblies\Unity.VisualScripting.Flow.Editor.dll</HintPath> | 758 | + <HintPath>D:\U3DFrameWork\Library\ScriptAssemblies\Unity.VisualScripting.Flow.Editor.dll</HintPath> |
| 748 | </Reference> | 759 | </Reference> |
| 749 | </ItemGroup> | 760 | </ItemGroup> |
| 750 | <ItemGroup> | 761 | <ItemGroup> |
| 751 | <ProjectReference Include="Assembly-CSharp-firstpass.csproj"> | 762 | <ProjectReference Include="Assembly-CSharp-firstpass.csproj"> |
| 752 | - <Project>{fe102f6a-9808-1c9c-9897-d62f3a6958cf}</Project> | 763 | + <Project>{0fb0da77-85a4-96d4-1dc2-8ddaab877745}</Project> |
| 753 | <Name>Assembly-CSharp-firstpass</Name> | 764 | <Name>Assembly-CSharp-firstpass</Name> |
| 754 | </ProjectReference> | 765 | </ProjectReference> |
| 755 | </ItemGroup> | 766 | </ItemGroup> |
| @@ -190,7 +190,7 @@ Transform: | @@ -190,7 +190,7 @@ Transform: | ||
| 190 | m_Children: [] | 190 | m_Children: [] |
| 191 | m_Father: {fileID: 0} | 191 | m_Father: {fileID: 0} |
| 192 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | 192 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
| 193 | ---- !u!1 &538774233 | 193 | +--- !u!1 &602403930 |
| 194 | GameObject: | 194 | GameObject: |
| 195 | m_ObjectHideFlags: 0 | 195 | m_ObjectHideFlags: 0 |
| 196 | m_CorrespondingSourceObject: {fileID: 0} | 196 | m_CorrespondingSourceObject: {fileID: 0} |
| @@ -198,102 +198,158 @@ GameObject: | @@ -198,102 +198,158 @@ GameObject: | ||
| 198 | m_PrefabAsset: {fileID: 0} | 198 | m_PrefabAsset: {fileID: 0} |
| 199 | serializedVersion: 6 | 199 | serializedVersion: 6 |
| 200 | m_Component: | 200 | m_Component: |
| 201 | - - component: {fileID: 538774234} | ||
| 202 | - - component: {fileID: 538774236} | ||
| 203 | - - component: {fileID: 538774235} | ||
| 204 | - - component: {fileID: 538774237} | ||
| 205 | - - component: {fileID: 538774238} | ||
| 206 | - m_Layer: 0 | ||
| 207 | - m_Name: Test1 | 201 | + - component: {fileID: 602403931} |
| 202 | + - component: {fileID: 602403933} | ||
| 203 | + - component: {fileID: 602403932} | ||
| 204 | + m_Layer: 5 | ||
| 205 | + m_Name: Text (Legacy) | ||
| 208 | m_TagString: Untagged | 206 | m_TagString: Untagged |
| 209 | m_Icon: {fileID: 0} | 207 | m_Icon: {fileID: 0} |
| 210 | m_NavMeshLayer: 0 | 208 | m_NavMeshLayer: 0 |
| 211 | m_StaticEditorFlags: 0 | 209 | m_StaticEditorFlags: 0 |
| 212 | m_IsActive: 1 | 210 | m_IsActive: 1 |
| 213 | ---- !u!224 &538774234 | 211 | +--- !u!224 &602403931 |
| 214 | RectTransform: | 212 | RectTransform: |
| 215 | m_ObjectHideFlags: 0 | 213 | m_ObjectHideFlags: 0 |
| 216 | m_CorrespondingSourceObject: {fileID: 0} | 214 | m_CorrespondingSourceObject: {fileID: 0} |
| 217 | m_PrefabInstance: {fileID: 0} | 215 | m_PrefabInstance: {fileID: 0} |
| 218 | m_PrefabAsset: {fileID: 0} | 216 | m_PrefabAsset: {fileID: 0} |
| 219 | - m_GameObject: {fileID: 538774233} | 217 | + m_GameObject: {fileID: 602403930} |
| 220 | m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} | 218 | m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} |
| 221 | - m_LocalPosition: {x: 0, y: 0, z: 90} | 219 | + m_LocalPosition: {x: 0, y: 0, z: 0} |
| 222 | m_LocalScale: {x: 1, y: 1, z: 1} | 220 | m_LocalScale: {x: 1, y: 1, z: 1} |
| 223 | m_ConstrainProportionsScale: 0 | 221 | m_ConstrainProportionsScale: 0 |
| 224 | m_Children: [] | 222 | m_Children: [] |
| 225 | - m_Father: {fileID: 1917703921} | 223 | + m_Father: {fileID: 831899265} |
| 226 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | 224 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
| 227 | m_AnchorMin: {x: 0, y: 0} | 225 | m_AnchorMin: {x: 0, y: 0} |
| 228 | m_AnchorMax: {x: 1, y: 1} | 226 | m_AnchorMax: {x: 1, y: 1} |
| 229 | m_AnchoredPosition: {x: 0, y: 0} | 227 | m_AnchoredPosition: {x: 0, y: 0} |
| 230 | m_SizeDelta: {x: 0, y: 0} | 228 | m_SizeDelta: {x: 0, y: 0} |
| 231 | m_Pivot: {x: 0.5, y: 0.5} | 229 | m_Pivot: {x: 0.5, y: 0.5} |
| 232 | ---- !u!114 &538774235 | 230 | +--- !u!114 &602403932 |
| 233 | MonoBehaviour: | 231 | MonoBehaviour: |
| 234 | m_ObjectHideFlags: 0 | 232 | m_ObjectHideFlags: 0 |
| 235 | m_CorrespondingSourceObject: {fileID: 0} | 233 | m_CorrespondingSourceObject: {fileID: 0} |
| 236 | m_PrefabInstance: {fileID: 0} | 234 | m_PrefabInstance: {fileID: 0} |
| 237 | m_PrefabAsset: {fileID: 0} | 235 | m_PrefabAsset: {fileID: 0} |
| 238 | - m_GameObject: {fileID: 538774233} | 236 | + m_GameObject: {fileID: 602403930} |
| 239 | m_Enabled: 1 | 237 | m_Enabled: 1 |
| 240 | m_EditorHideFlags: 0 | 238 | m_EditorHideFlags: 0 |
| 241 | - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} | 239 | + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} |
| 242 | m_Name: | 240 | m_Name: |
| 243 | m_EditorClassIdentifier: | 241 | m_EditorClassIdentifier: |
| 244 | m_Material: {fileID: 0} | 242 | m_Material: {fileID: 0} |
| 245 | - m_Color: {r: 1, g: 0.09119487, b: 0.09119487, a: 1} | 243 | + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} |
| 246 | m_RaycastTarget: 1 | 244 | m_RaycastTarget: 1 |
| 247 | m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} | 245 | m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} |
| 248 | m_Maskable: 1 | 246 | m_Maskable: 1 |
| 249 | m_OnCullStateChanged: | 247 | m_OnCullStateChanged: |
| 250 | m_PersistentCalls: | 248 | m_PersistentCalls: |
| 251 | m_Calls: [] | 249 | m_Calls: [] |
| 252 | - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} | ||
| 253 | - m_Type: 1 | ||
| 254 | - m_PreserveAspect: 0 | ||
| 255 | - m_FillCenter: 1 | ||
| 256 | - m_FillMethod: 4 | ||
| 257 | - m_FillAmount: 1 | ||
| 258 | - m_FillClockwise: 1 | ||
| 259 | - m_FillOrigin: 0 | ||
| 260 | - m_UseSpriteMesh: 0 | ||
| 261 | - m_PixelsPerUnitMultiplier: 1 | ||
| 262 | ---- !u!222 &538774236 | 250 | + m_FontData: |
| 251 | + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} | ||
| 252 | + m_FontSize: 38 | ||
| 253 | + m_FontStyle: 0 | ||
| 254 | + m_BestFit: 0 | ||
| 255 | + m_MinSize: 3 | ||
| 256 | + m_MaxSize: 40 | ||
| 257 | + m_Alignment: 4 | ||
| 258 | + m_AlignByGeometry: 0 | ||
| 259 | + m_RichText: 1 | ||
| 260 | + m_HorizontalOverflow: 0 | ||
| 261 | + m_VerticalOverflow: 0 | ||
| 262 | + m_LineSpacing: 1 | ||
| 263 | + m_Text: 'Mute | ||
| 264 | + | ||
| 265 | +' | ||
| 266 | +--- !u!222 &602403933 | ||
| 263 | CanvasRenderer: | 267 | CanvasRenderer: |
| 264 | m_ObjectHideFlags: 0 | 268 | m_ObjectHideFlags: 0 |
| 265 | m_CorrespondingSourceObject: {fileID: 0} | 269 | m_CorrespondingSourceObject: {fileID: 0} |
| 266 | m_PrefabInstance: {fileID: 0} | 270 | m_PrefabInstance: {fileID: 0} |
| 267 | m_PrefabAsset: {fileID: 0} | 271 | m_PrefabAsset: {fileID: 0} |
| 268 | - m_GameObject: {fileID: 538774233} | 272 | + m_GameObject: {fileID: 602403930} |
| 269 | m_CullTransparentMesh: 1 | 273 | m_CullTransparentMesh: 1 |
| 270 | ---- !u!114 &538774237 | 274 | +--- !u!1 &658267399 |
| 275 | +GameObject: | ||
| 276 | + m_ObjectHideFlags: 0 | ||
| 277 | + m_CorrespondingSourceObject: {fileID: 0} | ||
| 278 | + m_PrefabInstance: {fileID: 0} | ||
| 279 | + m_PrefabAsset: {fileID: 0} | ||
| 280 | + serializedVersion: 6 | ||
| 281 | + m_Component: | ||
| 282 | + - component: {fileID: 658267400} | ||
| 283 | + - component: {fileID: 658267402} | ||
| 284 | + - component: {fileID: 658267401} | ||
| 285 | + m_Layer: 5 | ||
| 286 | + m_Name: Text (Legacy) | ||
| 287 | + m_TagString: Untagged | ||
| 288 | + m_Icon: {fileID: 0} | ||
| 289 | + m_NavMeshLayer: 0 | ||
| 290 | + m_StaticEditorFlags: 0 | ||
| 291 | + m_IsActive: 1 | ||
| 292 | +--- !u!224 &658267400 | ||
| 293 | +RectTransform: | ||
| 294 | + m_ObjectHideFlags: 0 | ||
| 295 | + m_CorrespondingSourceObject: {fileID: 0} | ||
| 296 | + m_PrefabInstance: {fileID: 0} | ||
| 297 | + m_PrefabAsset: {fileID: 0} | ||
| 298 | + m_GameObject: {fileID: 658267399} | ||
| 299 | + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} | ||
| 300 | + m_LocalPosition: {x: 0, y: 0, z: 0} | ||
| 301 | + m_LocalScale: {x: 1, y: 1, z: 1} | ||
| 302 | + m_ConstrainProportionsScale: 0 | ||
| 303 | + m_Children: [] | ||
| 304 | + m_Father: {fileID: 1017490211} | ||
| 305 | + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | ||
| 306 | + m_AnchorMin: {x: 0, y: 0} | ||
| 307 | + m_AnchorMax: {x: 1, y: 1} | ||
| 308 | + m_AnchoredPosition: {x: 0, y: 0} | ||
| 309 | + m_SizeDelta: {x: 0, y: 0} | ||
| 310 | + m_Pivot: {x: 0.5, y: 0.5} | ||
| 311 | +--- !u!114 &658267401 | ||
| 271 | MonoBehaviour: | 312 | MonoBehaviour: |
| 272 | m_ObjectHideFlags: 0 | 313 | m_ObjectHideFlags: 0 |
| 273 | m_CorrespondingSourceObject: {fileID: 0} | 314 | m_CorrespondingSourceObject: {fileID: 0} |
| 274 | m_PrefabInstance: {fileID: 0} | 315 | m_PrefabInstance: {fileID: 0} |
| 275 | m_PrefabAsset: {fileID: 0} | 316 | m_PrefabAsset: {fileID: 0} |
| 276 | - m_GameObject: {fileID: 538774233} | 317 | + m_GameObject: {fileID: 658267399} |
| 277 | m_Enabled: 1 | 318 | m_Enabled: 1 |
| 278 | m_EditorHideFlags: 0 | 319 | m_EditorHideFlags: 0 |
| 279 | - m_Script: {fileID: 11500000, guid: d1fd09980d036cb409213db9582bbd20, type: 3} | 320 | + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} |
| 280 | m_Name: | 321 | m_Name: |
| 281 | m_EditorClassIdentifier: | 322 | m_EditorClassIdentifier: |
| 282 | - isCanDestroy: 0 | ||
| 283 | - IsOpen: 0 | ||
| 284 | - animationType: 2 | ||
| 285 | ---- !u!225 &538774238 | ||
| 286 | -CanvasGroup: | 323 | + m_Material: {fileID: 0} |
| 324 | + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} | ||
| 325 | + m_RaycastTarget: 1 | ||
| 326 | + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} | ||
| 327 | + m_Maskable: 1 | ||
| 328 | + m_OnCullStateChanged: | ||
| 329 | + m_PersistentCalls: | ||
| 330 | + m_Calls: [] | ||
| 331 | + m_FontData: | ||
| 332 | + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} | ||
| 333 | + m_FontSize: 38 | ||
| 334 | + m_FontStyle: 0 | ||
| 335 | + m_BestFit: 0 | ||
| 336 | + m_MinSize: 3 | ||
| 337 | + m_MaxSize: 40 | ||
| 338 | + m_Alignment: 4 | ||
| 339 | + m_AlignByGeometry: 0 | ||
| 340 | + m_RichText: 1 | ||
| 341 | + m_HorizontalOverflow: 0 | ||
| 342 | + m_VerticalOverflow: 0 | ||
| 343 | + m_LineSpacing: 1 | ||
| 344 | + m_Text: Play | ||
| 345 | +--- !u!222 &658267402 | ||
| 346 | +CanvasRenderer: | ||
| 287 | m_ObjectHideFlags: 0 | 347 | m_ObjectHideFlags: 0 |
| 288 | m_CorrespondingSourceObject: {fileID: 0} | 348 | m_CorrespondingSourceObject: {fileID: 0} |
| 289 | m_PrefabInstance: {fileID: 0} | 349 | m_PrefabInstance: {fileID: 0} |
| 290 | m_PrefabAsset: {fileID: 0} | 350 | m_PrefabAsset: {fileID: 0} |
| 291 | - m_GameObject: {fileID: 538774233} | ||
| 292 | - m_Enabled: 1 | ||
| 293 | - m_Alpha: 1 | ||
| 294 | - m_Interactable: 1 | ||
| 295 | - m_BlocksRaycasts: 1 | ||
| 296 | - m_IgnoreParentGroups: 0 | 351 | + m_GameObject: {fileID: 658267399} |
| 352 | + m_CullTransparentMesh: 1 | ||
| 297 | --- !u!1 &705507993 | 353 | --- !u!1 &705507993 |
| 298 | GameObject: | 354 | GameObject: |
| 299 | m_ObjectHideFlags: 0 | 355 | m_ObjectHideFlags: 0 |
| @@ -388,6 +444,197 @@ Transform: | @@ -388,6 +444,197 @@ Transform: | ||
| 388 | m_Children: [] | 444 | m_Children: [] |
| 389 | m_Father: {fileID: 0} | 445 | m_Father: {fileID: 0} |
| 390 | m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} | 446 | m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} |
| 447 | +--- !u!1 &809232569 | ||
| 448 | +GameObject: | ||
| 449 | + m_ObjectHideFlags: 0 | ||
| 450 | + m_CorrespondingSourceObject: {fileID: 0} | ||
| 451 | + m_PrefabInstance: {fileID: 0} | ||
| 452 | + m_PrefabAsset: {fileID: 0} | ||
| 453 | + serializedVersion: 6 | ||
| 454 | + m_Component: | ||
| 455 | + - component: {fileID: 809232570} | ||
| 456 | + m_Layer: 5 | ||
| 457 | + m_Name: Top | ||
| 458 | + m_TagString: Untagged | ||
| 459 | + m_Icon: {fileID: 0} | ||
| 460 | + m_NavMeshLayer: 0 | ||
| 461 | + m_StaticEditorFlags: 0 | ||
| 462 | + m_IsActive: 1 | ||
| 463 | +--- !u!224 &809232570 | ||
| 464 | +RectTransform: | ||
| 465 | + m_ObjectHideFlags: 0 | ||
| 466 | + m_CorrespondingSourceObject: {fileID: 0} | ||
| 467 | + m_PrefabInstance: {fileID: 0} | ||
| 468 | + m_PrefabAsset: {fileID: 0} | ||
| 469 | + m_GameObject: {fileID: 809232569} | ||
| 470 | + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} | ||
| 471 | + m_LocalPosition: {x: 0, y: 0, z: 0} | ||
| 472 | + m_LocalScale: {x: 1, y: 1, z: 1} | ||
| 473 | + m_ConstrainProportionsScale: 0 | ||
| 474 | + m_Children: [] | ||
| 475 | + m_Father: {fileID: 1917703921} | ||
| 476 | + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | ||
| 477 | + m_AnchorMin: {x: 0, y: 0} | ||
| 478 | + m_AnchorMax: {x: 1, y: 1} | ||
| 479 | + m_AnchoredPosition: {x: 0, y: 0} | ||
| 480 | + m_SizeDelta: {x: 0, y: 0} | ||
| 481 | + m_Pivot: {x: 0.5, y: 0.5} | ||
| 482 | +--- !u!1 &831899264 | ||
| 483 | +GameObject: | ||
| 484 | + m_ObjectHideFlags: 0 | ||
| 485 | + m_CorrespondingSourceObject: {fileID: 0} | ||
| 486 | + m_PrefabInstance: {fileID: 0} | ||
| 487 | + m_PrefabAsset: {fileID: 0} | ||
| 488 | + serializedVersion: 6 | ||
| 489 | + m_Component: | ||
| 490 | + - component: {fileID: 831899265} | ||
| 491 | + - component: {fileID: 831899268} | ||
| 492 | + - component: {fileID: 831899267} | ||
| 493 | + - component: {fileID: 831899266} | ||
| 494 | + m_Layer: 5 | ||
| 495 | + m_Name: Mute | ||
| 496 | + m_TagString: Untagged | ||
| 497 | + m_Icon: {fileID: 0} | ||
| 498 | + m_NavMeshLayer: 0 | ||
| 499 | + m_StaticEditorFlags: 0 | ||
| 500 | + m_IsActive: 1 | ||
| 501 | +--- !u!224 &831899265 | ||
| 502 | +RectTransform: | ||
| 503 | + m_ObjectHideFlags: 0 | ||
| 504 | + m_CorrespondingSourceObject: {fileID: 0} | ||
| 505 | + m_PrefabInstance: {fileID: 0} | ||
| 506 | + m_PrefabAsset: {fileID: 0} | ||
| 507 | + m_GameObject: {fileID: 831899264} | ||
| 508 | + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} | ||
| 509 | + m_LocalPosition: {x: 0, y: 0, z: 0} | ||
| 510 | + m_LocalScale: {x: 1, y: 1, z: 1} | ||
| 511 | + m_ConstrainProportionsScale: 0 | ||
| 512 | + m_Children: | ||
| 513 | + - {fileID: 602403931} | ||
| 514 | + m_Father: {fileID: 1917703921} | ||
| 515 | + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | ||
| 516 | + m_AnchorMin: {x: 0.5, y: 0.5} | ||
| 517 | + m_AnchorMax: {x: 0.5, y: 0.5} | ||
| 518 | + m_AnchoredPosition: {x: 0, y: 0} | ||
| 519 | + m_SizeDelta: {x: 320, y: 60} | ||
| 520 | + m_Pivot: {x: 0.5, y: 0.5} | ||
| 521 | +--- !u!114 &831899266 | ||
| 522 | +MonoBehaviour: | ||
| 523 | + m_ObjectHideFlags: 0 | ||
| 524 | + m_CorrespondingSourceObject: {fileID: 0} | ||
| 525 | + m_PrefabInstance: {fileID: 0} | ||
| 526 | + m_PrefabAsset: {fileID: 0} | ||
| 527 | + m_GameObject: {fileID: 831899264} | ||
| 528 | + m_Enabled: 1 | ||
| 529 | + m_EditorHideFlags: 0 | ||
| 530 | + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} | ||
| 531 | + m_Name: | ||
| 532 | + m_EditorClassIdentifier: | ||
| 533 | + m_Navigation: | ||
| 534 | + m_Mode: 3 | ||
| 535 | + m_WrapAround: 0 | ||
| 536 | + m_SelectOnUp: {fileID: 0} | ||
| 537 | + m_SelectOnDown: {fileID: 0} | ||
| 538 | + m_SelectOnLeft: {fileID: 0} | ||
| 539 | + m_SelectOnRight: {fileID: 0} | ||
| 540 | + m_Transition: 1 | ||
| 541 | + m_Colors: | ||
| 542 | + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} | ||
| 543 | + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} | ||
| 544 | + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} | ||
| 545 | + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} | ||
| 546 | + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} | ||
| 547 | + m_ColorMultiplier: 1 | ||
| 548 | + m_FadeDuration: 0.1 | ||
| 549 | + m_SpriteState: | ||
| 550 | + m_HighlightedSprite: {fileID: 0} | ||
| 551 | + m_PressedSprite: {fileID: 0} | ||
| 552 | + m_SelectedSprite: {fileID: 0} | ||
| 553 | + m_DisabledSprite: {fileID: 0} | ||
| 554 | + m_AnimationTriggers: | ||
| 555 | + m_NormalTrigger: Normal | ||
| 556 | + m_HighlightedTrigger: Highlighted | ||
| 557 | + m_PressedTrigger: Pressed | ||
| 558 | + m_SelectedTrigger: Selected | ||
| 559 | + m_DisabledTrigger: Disabled | ||
| 560 | + m_Interactable: 1 | ||
| 561 | + m_TargetGraphic: {fileID: 831899267} | ||
| 562 | + m_OnClick: | ||
| 563 | + m_PersistentCalls: | ||
| 564 | + m_Calls: [] | ||
| 565 | +--- !u!114 &831899267 | ||
| 566 | +MonoBehaviour: | ||
| 567 | + m_ObjectHideFlags: 0 | ||
| 568 | + m_CorrespondingSourceObject: {fileID: 0} | ||
| 569 | + m_PrefabInstance: {fileID: 0} | ||
| 570 | + m_PrefabAsset: {fileID: 0} | ||
| 571 | + m_GameObject: {fileID: 831899264} | ||
| 572 | + m_Enabled: 1 | ||
| 573 | + m_EditorHideFlags: 0 | ||
| 574 | + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} | ||
| 575 | + m_Name: | ||
| 576 | + m_EditorClassIdentifier: | ||
| 577 | + m_Material: {fileID: 0} | ||
| 578 | + m_Color: {r: 1, g: 1, b: 1, a: 1} | ||
| 579 | + m_RaycastTarget: 1 | ||
| 580 | + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} | ||
| 581 | + m_Maskable: 1 | ||
| 582 | + m_OnCullStateChanged: | ||
| 583 | + m_PersistentCalls: | ||
| 584 | + m_Calls: [] | ||
| 585 | + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} | ||
| 586 | + m_Type: 1 | ||
| 587 | + m_PreserveAspect: 0 | ||
| 588 | + m_FillCenter: 1 | ||
| 589 | + m_FillMethod: 4 | ||
| 590 | + m_FillAmount: 1 | ||
| 591 | + m_FillClockwise: 1 | ||
| 592 | + m_FillOrigin: 0 | ||
| 593 | + m_UseSpriteMesh: 0 | ||
| 594 | + m_PixelsPerUnitMultiplier: 1 | ||
| 595 | +--- !u!222 &831899268 | ||
| 596 | +CanvasRenderer: | ||
| 597 | + m_ObjectHideFlags: 0 | ||
| 598 | + m_CorrespondingSourceObject: {fileID: 0} | ||
| 599 | + m_PrefabInstance: {fileID: 0} | ||
| 600 | + m_PrefabAsset: {fileID: 0} | ||
| 601 | + m_GameObject: {fileID: 831899264} | ||
| 602 | + m_CullTransparentMesh: 1 | ||
| 603 | +--- !u!1 &895534174 | ||
| 604 | +GameObject: | ||
| 605 | + m_ObjectHideFlags: 0 | ||
| 606 | + m_CorrespondingSourceObject: {fileID: 0} | ||
| 607 | + m_PrefabInstance: {fileID: 0} | ||
| 608 | + m_PrefabAsset: {fileID: 0} | ||
| 609 | + serializedVersion: 6 | ||
| 610 | + m_Component: | ||
| 611 | + - component: {fileID: 895534175} | ||
| 612 | + m_Layer: 5 | ||
| 613 | + m_Name: Button | ||
| 614 | + m_TagString: Untagged | ||
| 615 | + m_Icon: {fileID: 0} | ||
| 616 | + m_NavMeshLayer: 0 | ||
| 617 | + m_StaticEditorFlags: 0 | ||
| 618 | + m_IsActive: 1 | ||
| 619 | +--- !u!224 &895534175 | ||
| 620 | +RectTransform: | ||
| 621 | + m_ObjectHideFlags: 0 | ||
| 622 | + m_CorrespondingSourceObject: {fileID: 0} | ||
| 623 | + m_PrefabInstance: {fileID: 0} | ||
| 624 | + m_PrefabAsset: {fileID: 0} | ||
| 625 | + m_GameObject: {fileID: 895534174} | ||
| 626 | + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} | ||
| 627 | + m_LocalPosition: {x: 0, y: 0, z: 0} | ||
| 628 | + m_LocalScale: {x: 1, y: 1, z: 1} | ||
| 629 | + m_ConstrainProportionsScale: 0 | ||
| 630 | + m_Children: [] | ||
| 631 | + m_Father: {fileID: 1917703921} | ||
| 632 | + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | ||
| 633 | + m_AnchorMin: {x: 0, y: 0} | ||
| 634 | + m_AnchorMax: {x: 1, y: 1} | ||
| 635 | + m_AnchoredPosition: {x: 0, y: 0} | ||
| 636 | + m_SizeDelta: {x: 0, y: 0} | ||
| 637 | + m_Pivot: {x: 0.5, y: 0.5} | ||
| 391 | --- !u!1 &963194225 | 638 | --- !u!1 &963194225 |
| 392 | GameObject: | 639 | GameObject: |
| 393 | m_ObjectHideFlags: 0 | 640 | m_ObjectHideFlags: 0 |
| @@ -480,7 +727,7 @@ Transform: | @@ -480,7 +727,7 @@ Transform: | ||
| 480 | m_Children: [] | 727 | m_Children: [] |
| 481 | m_Father: {fileID: 0} | 728 | m_Father: {fileID: 0} |
| 482 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | 729 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
| 483 | ---- !u!1 &1141425609 | 730 | +--- !u!1 &1017490210 |
| 484 | GameObject: | 731 | GameObject: |
| 485 | m_ObjectHideFlags: 0 | 732 | m_ObjectHideFlags: 0 |
| 486 | m_CorrespondingSourceObject: {fileID: 0} | 733 | m_CorrespondingSourceObject: {fileID: 0} |
| @@ -488,30 +735,30 @@ GameObject: | @@ -488,30 +735,30 @@ GameObject: | ||
| 488 | m_PrefabAsset: {fileID: 0} | 735 | m_PrefabAsset: {fileID: 0} |
| 489 | serializedVersion: 6 | 736 | serializedVersion: 6 |
| 490 | m_Component: | 737 | m_Component: |
| 491 | - - component: {fileID: 1141425610} | ||
| 492 | - - component: {fileID: 1141425613} | ||
| 493 | - - component: {fileID: 1141425612} | ||
| 494 | - - component: {fileID: 1141425611} | ||
| 495 | - m_Layer: 0 | ||
| 496 | - m_Name: Button (Legacy) | 738 | + - component: {fileID: 1017490211} |
| 739 | + - component: {fileID: 1017490214} | ||
| 740 | + - component: {fileID: 1017490213} | ||
| 741 | + - component: {fileID: 1017490212} | ||
| 742 | + m_Layer: 5 | ||
| 743 | + m_Name: Play | ||
| 497 | m_TagString: Untagged | 744 | m_TagString: Untagged |
| 498 | m_Icon: {fileID: 0} | 745 | m_Icon: {fileID: 0} |
| 499 | m_NavMeshLayer: 0 | 746 | m_NavMeshLayer: 0 |
| 500 | m_StaticEditorFlags: 0 | 747 | m_StaticEditorFlags: 0 |
| 501 | m_IsActive: 1 | 748 | m_IsActive: 1 |
| 502 | ---- !u!224 &1141425610 | 749 | +--- !u!224 &1017490211 |
| 503 | RectTransform: | 750 | RectTransform: |
| 504 | m_ObjectHideFlags: 0 | 751 | m_ObjectHideFlags: 0 |
| 505 | m_CorrespondingSourceObject: {fileID: 0} | 752 | m_CorrespondingSourceObject: {fileID: 0} |
| 506 | m_PrefabInstance: {fileID: 0} | 753 | m_PrefabInstance: {fileID: 0} |
| 507 | m_PrefabAsset: {fileID: 0} | 754 | m_PrefabAsset: {fileID: 0} |
| 508 | - m_GameObject: {fileID: 1141425609} | ||
| 509 | - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} | ||
| 510 | - m_LocalPosition: {x: 0, y: 0, z: 90} | 755 | + m_GameObject: {fileID: 1017490210} |
| 756 | + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} | ||
| 757 | + m_LocalPosition: {x: 0, y: 0, z: 0} | ||
| 511 | m_LocalScale: {x: 1, y: 1, z: 1} | 758 | m_LocalScale: {x: 1, y: 1, z: 1} |
| 512 | m_ConstrainProportionsScale: 0 | 759 | m_ConstrainProportionsScale: 0 |
| 513 | m_Children: | 760 | m_Children: |
| 514 | - - {fileID: 1247993863} | 761 | + - {fileID: 658267400} |
| 515 | m_Father: {fileID: 1917703921} | 762 | m_Father: {fileID: 1917703921} |
| 516 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | 763 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
| 517 | m_AnchorMin: {x: 1, y: 1} | 764 | m_AnchorMin: {x: 1, y: 1} |
| @@ -519,13 +766,13 @@ RectTransform: | @@ -519,13 +766,13 @@ RectTransform: | ||
| 519 | m_AnchoredPosition: {x: -160, y: -30} | 766 | m_AnchoredPosition: {x: -160, y: -30} |
| 520 | m_SizeDelta: {x: 320, y: 60} | 767 | m_SizeDelta: {x: 320, y: 60} |
| 521 | m_Pivot: {x: 0.5, y: 0.5} | 768 | m_Pivot: {x: 0.5, y: 0.5} |
| 522 | ---- !u!114 &1141425611 | 769 | +--- !u!114 &1017490212 |
| 523 | MonoBehaviour: | 770 | MonoBehaviour: |
| 524 | m_ObjectHideFlags: 0 | 771 | m_ObjectHideFlags: 0 |
| 525 | m_CorrespondingSourceObject: {fileID: 0} | 772 | m_CorrespondingSourceObject: {fileID: 0} |
| 526 | m_PrefabInstance: {fileID: 0} | 773 | m_PrefabInstance: {fileID: 0} |
| 527 | m_PrefabAsset: {fileID: 0} | 774 | m_PrefabAsset: {fileID: 0} |
| 528 | - m_GameObject: {fileID: 1141425609} | 775 | + m_GameObject: {fileID: 1017490210} |
| 529 | m_Enabled: 1 | 776 | m_Enabled: 1 |
| 530 | m_EditorHideFlags: 0 | 777 | m_EditorHideFlags: 0 |
| 531 | m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} | 778 | m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} |
| @@ -559,17 +806,17 @@ MonoBehaviour: | @@ -559,17 +806,17 @@ MonoBehaviour: | ||
| 559 | m_SelectedTrigger: Selected | 806 | m_SelectedTrigger: Selected |
| 560 | m_DisabledTrigger: Disabled | 807 | m_DisabledTrigger: Disabled |
| 561 | m_Interactable: 1 | 808 | m_Interactable: 1 |
| 562 | - m_TargetGraphic: {fileID: 1141425612} | 809 | + m_TargetGraphic: {fileID: 1017490213} |
| 563 | m_OnClick: | 810 | m_OnClick: |
| 564 | m_PersistentCalls: | 811 | m_PersistentCalls: |
| 565 | m_Calls: [] | 812 | m_Calls: [] |
| 566 | ---- !u!114 &1141425612 | 813 | +--- !u!114 &1017490213 |
| 567 | MonoBehaviour: | 814 | MonoBehaviour: |
| 568 | m_ObjectHideFlags: 0 | 815 | m_ObjectHideFlags: 0 |
| 569 | m_CorrespondingSourceObject: {fileID: 0} | 816 | m_CorrespondingSourceObject: {fileID: 0} |
| 570 | m_PrefabInstance: {fileID: 0} | 817 | m_PrefabInstance: {fileID: 0} |
| 571 | m_PrefabAsset: {fileID: 0} | 818 | m_PrefabAsset: {fileID: 0} |
| 572 | - m_GameObject: {fileID: 1141425609} | 819 | + m_GameObject: {fileID: 1017490210} |
| 573 | m_Enabled: 1 | 820 | m_Enabled: 1 |
| 574 | m_EditorHideFlags: 0 | 821 | m_EditorHideFlags: 0 |
| 575 | m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} | 822 | m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} |
| @@ -593,15 +840,15 @@ MonoBehaviour: | @@ -593,15 +840,15 @@ MonoBehaviour: | ||
| 593 | m_FillOrigin: 0 | 840 | m_FillOrigin: 0 |
| 594 | m_UseSpriteMesh: 0 | 841 | m_UseSpriteMesh: 0 |
| 595 | m_PixelsPerUnitMultiplier: 1 | 842 | m_PixelsPerUnitMultiplier: 1 |
| 596 | ---- !u!222 &1141425613 | 843 | +--- !u!222 &1017490214 |
| 597 | CanvasRenderer: | 844 | CanvasRenderer: |
| 598 | m_ObjectHideFlags: 0 | 845 | m_ObjectHideFlags: 0 |
| 599 | m_CorrespondingSourceObject: {fileID: 0} | 846 | m_CorrespondingSourceObject: {fileID: 0} |
| 600 | m_PrefabInstance: {fileID: 0} | 847 | m_PrefabInstance: {fileID: 0} |
| 601 | m_PrefabAsset: {fileID: 0} | 848 | m_PrefabAsset: {fileID: 0} |
| 602 | - m_GameObject: {fileID: 1141425609} | 849 | + m_GameObject: {fileID: 1017490210} |
| 603 | m_CullTransparentMesh: 1 | 850 | m_CullTransparentMesh: 1 |
| 604 | ---- !u!1 &1247993862 | 851 | +--- !u!1 &1445674371 |
| 605 | GameObject: | 852 | GameObject: |
| 606 | m_ObjectHideFlags: 0 | 853 | m_ObjectHideFlags: 0 |
| 607 | m_CorrespondingSourceObject: {fileID: 0} | 854 | m_CorrespondingSourceObject: {fileID: 0} |
| @@ -609,76 +856,118 @@ GameObject: | @@ -609,76 +856,118 @@ GameObject: | ||
| 609 | m_PrefabAsset: {fileID: 0} | 856 | m_PrefabAsset: {fileID: 0} |
| 610 | serializedVersion: 6 | 857 | serializedVersion: 6 |
| 611 | m_Component: | 858 | m_Component: |
| 612 | - - component: {fileID: 1247993863} | ||
| 613 | - - component: {fileID: 1247993865} | ||
| 614 | - - component: {fileID: 1247993864} | ||
| 615 | - m_Layer: 0 | ||
| 616 | - m_Name: Text (Legacy) | 859 | + - component: {fileID: 1445674372} |
| 860 | + - component: {fileID: 1445674375} | ||
| 861 | + - component: {fileID: 1445674374} | ||
| 862 | + - component: {fileID: 1445674373} | ||
| 863 | + m_Layer: 5 | ||
| 864 | + m_Name: Stop | ||
| 617 | m_TagString: Untagged | 865 | m_TagString: Untagged |
| 618 | m_Icon: {fileID: 0} | 866 | m_Icon: {fileID: 0} |
| 619 | m_NavMeshLayer: 0 | 867 | m_NavMeshLayer: 0 |
| 620 | m_StaticEditorFlags: 0 | 868 | m_StaticEditorFlags: 0 |
| 621 | m_IsActive: 1 | 869 | m_IsActive: 1 |
| 622 | ---- !u!224 &1247993863 | 870 | +--- !u!224 &1445674372 |
| 623 | RectTransform: | 871 | RectTransform: |
| 624 | m_ObjectHideFlags: 0 | 872 | m_ObjectHideFlags: 0 |
| 625 | m_CorrespondingSourceObject: {fileID: 0} | 873 | m_CorrespondingSourceObject: {fileID: 0} |
| 626 | m_PrefabInstance: {fileID: 0} | 874 | m_PrefabInstance: {fileID: 0} |
| 627 | m_PrefabAsset: {fileID: 0} | 875 | m_PrefabAsset: {fileID: 0} |
| 628 | - m_GameObject: {fileID: 1247993862} | ||
| 629 | - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} | 876 | + m_GameObject: {fileID: 1445674371} |
| 877 | + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} | ||
| 630 | m_LocalPosition: {x: 0, y: 0, z: 0} | 878 | m_LocalPosition: {x: 0, y: 0, z: 0} |
| 631 | m_LocalScale: {x: 1, y: 1, z: 1} | 879 | m_LocalScale: {x: 1, y: 1, z: 1} |
| 632 | m_ConstrainProportionsScale: 0 | 880 | m_ConstrainProportionsScale: 0 |
| 633 | - m_Children: [] | ||
| 634 | - m_Father: {fileID: 1141425610} | 881 | + m_Children: |
| 882 | + - {fileID: 2146464113} | ||
| 883 | + m_Father: {fileID: 1917703921} | ||
| 635 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | 884 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
| 636 | - m_AnchorMin: {x: 0, y: 0} | ||
| 637 | - m_AnchorMax: {x: 1, y: 1} | ||
| 638 | - m_AnchoredPosition: {x: 0, y: 0} | ||
| 639 | - m_SizeDelta: {x: 0, y: 0} | 885 | + m_AnchorMin: {x: 1, y: 0} |
| 886 | + m_AnchorMax: {x: 1, y: 0} | ||
| 887 | + m_AnchoredPosition: {x: -160, y: 30} | ||
| 888 | + m_SizeDelta: {x: 320, y: 60} | ||
| 640 | m_Pivot: {x: 0.5, y: 0.5} | 889 | m_Pivot: {x: 0.5, y: 0.5} |
| 641 | ---- !u!114 &1247993864 | 890 | +--- !u!114 &1445674373 |
| 642 | MonoBehaviour: | 891 | MonoBehaviour: |
| 643 | m_ObjectHideFlags: 0 | 892 | m_ObjectHideFlags: 0 |
| 644 | m_CorrespondingSourceObject: {fileID: 0} | 893 | m_CorrespondingSourceObject: {fileID: 0} |
| 645 | m_PrefabInstance: {fileID: 0} | 894 | m_PrefabInstance: {fileID: 0} |
| 646 | m_PrefabAsset: {fileID: 0} | 895 | m_PrefabAsset: {fileID: 0} |
| 647 | - m_GameObject: {fileID: 1247993862} | 896 | + m_GameObject: {fileID: 1445674371} |
| 648 | m_Enabled: 1 | 897 | m_Enabled: 1 |
| 649 | m_EditorHideFlags: 0 | 898 | m_EditorHideFlags: 0 |
| 650 | - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} | 899 | + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} |
| 900 | + m_Name: | ||
| 901 | + m_EditorClassIdentifier: | ||
| 902 | + m_Navigation: | ||
| 903 | + m_Mode: 3 | ||
| 904 | + m_WrapAround: 0 | ||
| 905 | + m_SelectOnUp: {fileID: 0} | ||
| 906 | + m_SelectOnDown: {fileID: 0} | ||
| 907 | + m_SelectOnLeft: {fileID: 0} | ||
| 908 | + m_SelectOnRight: {fileID: 0} | ||
| 909 | + m_Transition: 1 | ||
| 910 | + m_Colors: | ||
| 911 | + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} | ||
| 912 | + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} | ||
| 913 | + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} | ||
| 914 | + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} | ||
| 915 | + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} | ||
| 916 | + m_ColorMultiplier: 1 | ||
| 917 | + m_FadeDuration: 0.1 | ||
| 918 | + m_SpriteState: | ||
| 919 | + m_HighlightedSprite: {fileID: 0} | ||
| 920 | + m_PressedSprite: {fileID: 0} | ||
| 921 | + m_SelectedSprite: {fileID: 0} | ||
| 922 | + m_DisabledSprite: {fileID: 0} | ||
| 923 | + m_AnimationTriggers: | ||
| 924 | + m_NormalTrigger: Normal | ||
| 925 | + m_HighlightedTrigger: Highlighted | ||
| 926 | + m_PressedTrigger: Pressed | ||
| 927 | + m_SelectedTrigger: Selected | ||
| 928 | + m_DisabledTrigger: Disabled | ||
| 929 | + m_Interactable: 1 | ||
| 930 | + m_TargetGraphic: {fileID: 1445674374} | ||
| 931 | + m_OnClick: | ||
| 932 | + m_PersistentCalls: | ||
| 933 | + m_Calls: [] | ||
| 934 | +--- !u!114 &1445674374 | ||
| 935 | +MonoBehaviour: | ||
| 936 | + m_ObjectHideFlags: 0 | ||
| 937 | + m_CorrespondingSourceObject: {fileID: 0} | ||
| 938 | + m_PrefabInstance: {fileID: 0} | ||
| 939 | + m_PrefabAsset: {fileID: 0} | ||
| 940 | + m_GameObject: {fileID: 1445674371} | ||
| 941 | + m_Enabled: 1 | ||
| 942 | + m_EditorHideFlags: 0 | ||
| 943 | + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} | ||
| 651 | m_Name: | 944 | m_Name: |
| 652 | m_EditorClassIdentifier: | 945 | m_EditorClassIdentifier: |
| 653 | m_Material: {fileID: 0} | 946 | m_Material: {fileID: 0} |
| 654 | - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} | 947 | + m_Color: {r: 1, g: 1, b: 1, a: 1} |
| 655 | m_RaycastTarget: 1 | 948 | m_RaycastTarget: 1 |
| 656 | m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} | 949 | m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} |
| 657 | m_Maskable: 1 | 950 | m_Maskable: 1 |
| 658 | m_OnCullStateChanged: | 951 | m_OnCullStateChanged: |
| 659 | m_PersistentCalls: | 952 | m_PersistentCalls: |
| 660 | m_Calls: [] | 953 | m_Calls: [] |
| 661 | - m_FontData: | ||
| 662 | - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} | ||
| 663 | - m_FontSize: 14 | ||
| 664 | - m_FontStyle: 0 | ||
| 665 | - m_BestFit: 0 | ||
| 666 | - m_MinSize: 10 | ||
| 667 | - m_MaxSize: 40 | ||
| 668 | - m_Alignment: 4 | ||
| 669 | - m_AlignByGeometry: 0 | ||
| 670 | - m_RichText: 1 | ||
| 671 | - m_HorizontalOverflow: 0 | ||
| 672 | - m_VerticalOverflow: 0 | ||
| 673 | - m_LineSpacing: 1 | ||
| 674 | - m_Text: Button | ||
| 675 | ---- !u!222 &1247993865 | 954 | + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} |
| 955 | + m_Type: 1 | ||
| 956 | + m_PreserveAspect: 0 | ||
| 957 | + m_FillCenter: 1 | ||
| 958 | + m_FillMethod: 4 | ||
| 959 | + m_FillAmount: 1 | ||
| 960 | + m_FillClockwise: 1 | ||
| 961 | + m_FillOrigin: 0 | ||
| 962 | + m_UseSpriteMesh: 0 | ||
| 963 | + m_PixelsPerUnitMultiplier: 1 | ||
| 964 | +--- !u!222 &1445674375 | ||
| 676 | CanvasRenderer: | 965 | CanvasRenderer: |
| 677 | m_ObjectHideFlags: 0 | 966 | m_ObjectHideFlags: 0 |
| 678 | m_CorrespondingSourceObject: {fileID: 0} | 967 | m_CorrespondingSourceObject: {fileID: 0} |
| 679 | m_PrefabInstance: {fileID: 0} | 968 | m_PrefabInstance: {fileID: 0} |
| 680 | m_PrefabAsset: {fileID: 0} | 969 | m_PrefabAsset: {fileID: 0} |
| 681 | - m_GameObject: {fileID: 1247993862} | 970 | + m_GameObject: {fileID: 1445674371} |
| 682 | m_CullTransparentMesh: 1 | 971 | m_CullTransparentMesh: 1 |
| 683 | --- !u!1 &1917703917 | 972 | --- !u!1 &1917703917 |
| 684 | GameObject: | 973 | GameObject: |
| @@ -694,7 +983,7 @@ GameObject: | @@ -694,7 +983,7 @@ GameObject: | ||
| 694 | - component: {fileID: 1917703918} | 983 | - component: {fileID: 1917703918} |
| 695 | - component: {fileID: 1917703922} | 984 | - component: {fileID: 1917703922} |
| 696 | m_Layer: 5 | 985 | m_Layer: 5 |
| 697 | - m_Name: UIRoot | 986 | + m_Name: Main |
| 698 | m_TagString: Untagged | 987 | m_TagString: Untagged |
| 699 | m_Icon: {fileID: 0} | 988 | m_Icon: {fileID: 0} |
| 700 | m_NavMeshLayer: 0 | 989 | m_NavMeshLayer: 0 |
| @@ -775,8 +1064,11 @@ RectTransform: | @@ -775,8 +1064,11 @@ RectTransform: | ||
| 775 | m_LocalScale: {x: 0, y: 0, z: 0} | 1064 | m_LocalScale: {x: 0, y: 0, z: 0} |
| 776 | m_ConstrainProportionsScale: 0 | 1065 | m_ConstrainProportionsScale: 0 |
| 777 | m_Children: | 1066 | m_Children: |
| 778 | - - {fileID: 538774234} | ||
| 779 | - - {fileID: 1141425610} | 1067 | + - {fileID: 895534175} |
| 1068 | + - {fileID: 809232570} | ||
| 1069 | + - {fileID: 1017490211} | ||
| 1070 | + - {fileID: 1445674372} | ||
| 1071 | + - {fileID: 831899265} | ||
| 780 | m_Father: {fileID: 0} | 1072 | m_Father: {fileID: 0} |
| 781 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | 1073 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
| 782 | m_AnchorMin: {x: 0, y: 0} | 1074 | m_AnchorMin: {x: 0, y: 0} |
| @@ -796,8 +1088,90 @@ MonoBehaviour: | @@ -796,8 +1088,90 @@ MonoBehaviour: | ||
| 796 | m_Script: {fileID: 11500000, guid: fd97786330c93d24f99488f7c6644c8e, type: 3} | 1088 | m_Script: {fileID: 11500000, guid: fd97786330c93d24f99488f7c6644c8e, type: 3} |
| 797 | m_Name: | 1089 | m_Name: |
| 798 | m_EditorClassIdentifier: | 1090 | m_EditorClassIdentifier: |
| 799 | - btnTest: {fileID: 1141425611} | ||
| 800 | - ui3: {fileID: 6860533469271155993, guid: 04f5d385ba239ae409808c9e9b4fea59, type: 3} | 1091 | + btnPlay: {fileID: 1017490212} |
| 1092 | + btnStop: {fileID: 1445674373} | ||
| 1093 | + btnMute: {fileID: 831899266} | ||
| 1094 | +--- !u!1 &2146464112 | ||
| 1095 | +GameObject: | ||
| 1096 | + m_ObjectHideFlags: 0 | ||
| 1097 | + m_CorrespondingSourceObject: {fileID: 0} | ||
| 1098 | + m_PrefabInstance: {fileID: 0} | ||
| 1099 | + m_PrefabAsset: {fileID: 0} | ||
| 1100 | + serializedVersion: 6 | ||
| 1101 | + m_Component: | ||
| 1102 | + - component: {fileID: 2146464113} | ||
| 1103 | + - component: {fileID: 2146464115} | ||
| 1104 | + - component: {fileID: 2146464114} | ||
| 1105 | + m_Layer: 5 | ||
| 1106 | + m_Name: Text (Legacy) | ||
| 1107 | + m_TagString: Untagged | ||
| 1108 | + m_Icon: {fileID: 0} | ||
| 1109 | + m_NavMeshLayer: 0 | ||
| 1110 | + m_StaticEditorFlags: 0 | ||
| 1111 | + m_IsActive: 1 | ||
| 1112 | +--- !u!224 &2146464113 | ||
| 1113 | +RectTransform: | ||
| 1114 | + m_ObjectHideFlags: 0 | ||
| 1115 | + m_CorrespondingSourceObject: {fileID: 0} | ||
| 1116 | + m_PrefabInstance: {fileID: 0} | ||
| 1117 | + m_PrefabAsset: {fileID: 0} | ||
| 1118 | + m_GameObject: {fileID: 2146464112} | ||
| 1119 | + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} | ||
| 1120 | + m_LocalPosition: {x: 0, y: 0, z: 0} | ||
| 1121 | + m_LocalScale: {x: 1, y: 1, z: 1} | ||
| 1122 | + m_ConstrainProportionsScale: 0 | ||
| 1123 | + m_Children: [] | ||
| 1124 | + m_Father: {fileID: 1445674372} | ||
| 1125 | + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | ||
| 1126 | + m_AnchorMin: {x: 0, y: 0} | ||
| 1127 | + m_AnchorMax: {x: 1, y: 1} | ||
| 1128 | + m_AnchoredPosition: {x: 0, y: 0} | ||
| 1129 | + m_SizeDelta: {x: 0, y: 0} | ||
| 1130 | + m_Pivot: {x: 0.5, y: 0.5} | ||
| 1131 | +--- !u!114 &2146464114 | ||
| 1132 | +MonoBehaviour: | ||
| 1133 | + m_ObjectHideFlags: 0 | ||
| 1134 | + m_CorrespondingSourceObject: {fileID: 0} | ||
| 1135 | + m_PrefabInstance: {fileID: 0} | ||
| 1136 | + m_PrefabAsset: {fileID: 0} | ||
| 1137 | + m_GameObject: {fileID: 2146464112} | ||
| 1138 | + m_Enabled: 1 | ||
| 1139 | + m_EditorHideFlags: 0 | ||
| 1140 | + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} | ||
| 1141 | + m_Name: | ||
| 1142 | + m_EditorClassIdentifier: | ||
| 1143 | + m_Material: {fileID: 0} | ||
| 1144 | + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} | ||
| 1145 | + m_RaycastTarget: 1 | ||
| 1146 | + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} | ||
| 1147 | + m_Maskable: 1 | ||
| 1148 | + m_OnCullStateChanged: | ||
| 1149 | + m_PersistentCalls: | ||
| 1150 | + m_Calls: [] | ||
| 1151 | + m_FontData: | ||
| 1152 | + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} | ||
| 1153 | + m_FontSize: 38 | ||
| 1154 | + m_FontStyle: 0 | ||
| 1155 | + m_BestFit: 0 | ||
| 1156 | + m_MinSize: 3 | ||
| 1157 | + m_MaxSize: 40 | ||
| 1158 | + m_Alignment: 4 | ||
| 1159 | + m_AlignByGeometry: 0 | ||
| 1160 | + m_RichText: 1 | ||
| 1161 | + m_HorizontalOverflow: 0 | ||
| 1162 | + m_VerticalOverflow: 0 | ||
| 1163 | + m_LineSpacing: 1 | ||
| 1164 | + m_Text: 'Stop | ||
| 1165 | + | ||
| 1166 | +' | ||
| 1167 | +--- !u!222 &2146464115 | ||
| 1168 | +CanvasRenderer: | ||
| 1169 | + m_ObjectHideFlags: 0 | ||
| 1170 | + m_CorrespondingSourceObject: {fileID: 0} | ||
| 1171 | + m_PrefabInstance: {fileID: 0} | ||
| 1172 | + m_PrefabAsset: {fileID: 0} | ||
| 1173 | + m_GameObject: {fileID: 2146464112} | ||
| 1174 | + m_CullTransparentMesh: 1 | ||
| 801 | --- !u!1660057539 &9223372036854775807 | 1175 | --- !u!1660057539 &9223372036854775807 |
| 802 | SceneRoots: | 1176 | SceneRoots: |
| 803 | m_ObjectHideFlags: 0 | 1177 | m_ObjectHideFlags: 0 |
| 1 | using System.Collections; | 1 | using System.Collections; |
| 2 | using System.Collections.Generic; | 2 | using System.Collections.Generic; |
| 3 | using UnityEngine; | 3 | using UnityEngine; |
| 4 | +using UnityEngine.Serialization; | ||
| 4 | using UnityEngine.UI; | 5 | using UnityEngine.UI; |
| 5 | 6 | ||
| 6 | public class Main : MonoBehaviour | 7 | public class Main : MonoBehaviour |
| 7 | { | 8 | { |
| 8 | - public Button btnTest; | 9 | + public Button btnPlay; |
| 10 | + public Button btnStop; | ||
| 11 | + public Button btnMute; | ||
| 9 | 12 | ||
| 10 | - public GameObject ui3; | ||
| 11 | - | ||
| 12 | - // Start is called before the first frame update | ||
| 13 | void Start() | 13 | void Start() |
| 14 | { | 14 | { |
| 15 | - btnTest.onClick.AddListener(TestFuntion); | 15 | + btnPlay.onClick.AddListener(AudioPlay); |
| 16 | + btnStop.onClick.AddListener(AudioStop); | ||
| 17 | + btnMute.onClick.AddListener(AudioMute); | ||
| 16 | } | 18 | } |
| 17 | 19 | ||
| 18 | - // Update is called once per frame | ||
| 19 | - void Update() | 20 | + private void AudioMute() |
| 20 | { | 21 | { |
| 21 | - if (Input.GetKeyDown(KeyCode.D)) | ||
| 22 | - { | ||
| 23 | - UIManager.Instance.ShowUI<Test1>(); | ||
| 24 | - } | 22 | + AudioManager.Instance.Mute(); |
| 23 | + } | ||
| 25 | 24 | ||
| 26 | - if (Input.GetKeyDown(KeyCode.S)) | ||
| 27 | - { | ||
| 28 | - UIManager.Instance.HideUI<Test1>(); | ||
| 29 | - } | 25 | + private void AudioPlay() |
| 26 | + { | ||
| 27 | + AudioManager.Instance.PlayBGM(ResourcesManager.Instance.Load<AudioClip>("Video/video1")); | ||
| 30 | 28 | ||
| 31 | - if (Input.GetKeyDown(KeyCode.Space)) | 29 | + if (!AudioManager.Instance.IsPlayComplete()) |
| 32 | { | 30 | { |
| 33 | - Instantiate(ui3); | 31 | + AudioManager.Instance.ResumeEffect(); |
| 34 | } | 32 | } |
| 35 | - | ||
| 36 | - if (Input.GetKeyDown(KeyCode.A)) | 33 | + else |
| 37 | { | 34 | { |
| 38 | - UIManager.Instance.ShowUI<Test3>(); | 35 | + AudioManager.Instance.PlayEffect(ResourcesManager.Instance.Load<AudioClip>("Video/video0"), |
| 36 | + CompleteCallBack); | ||
| 39 | } | 37 | } |
| 38 | + } | ||
| 40 | 39 | ||
| 41 | - if (Input.GetKeyDown(KeyCode.Q)) | ||
| 42 | - { | ||
| 43 | - UIManager.Instance.HideUI<Test3>(); | ||
| 44 | - } | 40 | + private void CompleteCallBack() |
| 41 | + { | ||
| 42 | + Debug.Log("声音播放完成"); | ||
| 45 | } | 43 | } |
| 46 | 44 | ||
| 47 | - public void TestFuntion() | 45 | + private void AudioStop() |
| 48 | { | 46 | { |
| 49 | - UIManager.Instance.GetUi<Test1>().ShowLog(); | 47 | + AudioManager.Instance.PauseEffect(); |
| 50 | } | 48 | } |
| 51 | } | 49 | } |
Assets/Scripts/Manager/AudioManager.cs
0 → 100644
| 1 | +using System; | ||
| 2 | +using UnityEngine; | ||
| 3 | +using System.Collections; | ||
| 4 | +using Unity.VisualScripting; | ||
| 5 | +using UnityEngine.Events; | ||
| 6 | + | ||
| 7 | +public class AudioManager : Singleton<AudioManager> | ||
| 8 | +{ | ||
| 9 | + /// <summary> | ||
| 10 | + /// BGM音效组件 | ||
| 11 | + /// </summary> | ||
| 12 | + private AudioSource _bgmAudioSource; | ||
| 13 | + | ||
| 14 | + /// <summary> | ||
| 15 | + /// 音效播放组件 | ||
| 16 | + /// </summary> | ||
| 17 | + private AudioSource _effectAudioSource; | ||
| 18 | + | ||
| 19 | + /// <summary> | ||
| 20 | + /// 完成回调 | ||
| 21 | + /// </summary> | ||
| 22 | + private Action _onComplete; | ||
| 23 | + | ||
| 24 | + /// <summary> | ||
| 25 | + /// 音频的时长 | ||
| 26 | + /// </summary> | ||
| 27 | + private float _clipLength = 0f; | ||
| 28 | + | ||
| 29 | + /// <summary> | ||
| 30 | + /// 当前播放音频的时长 | ||
| 31 | + /// </summary> | ||
| 32 | + private float _curClipLength = 0f; | ||
| 33 | + | ||
| 34 | + /// <summary> | ||
| 35 | + /// 是否正在播放 | ||
| 36 | + /// </summary> | ||
| 37 | + /// <returns></returns> | ||
| 38 | + public bool IsPlaying() | ||
| 39 | + { | ||
| 40 | + return _effectAudioSource.isPlaying; | ||
| 41 | + } | ||
| 42 | + | ||
| 43 | + private bool _isPlayComplete = true; | ||
| 44 | + | ||
| 45 | + public bool IsPlayComplete() | ||
| 46 | + { | ||
| 47 | + return _isPlayComplete; | ||
| 48 | + } | ||
| 49 | + | ||
| 50 | + protected override void Awake() | ||
| 51 | + { | ||
| 52 | + //初始化时 挂载AudioSource组件 | ||
| 53 | + if (_bgmAudioSource == null) | ||
| 54 | + { | ||
| 55 | + _bgmAudioSource = gameObject.AddComponent<AudioSource>(); | ||
| 56 | + } | ||
| 57 | + | ||
| 58 | + | ||
| 59 | + if (_effectAudioSource == null) | ||
| 60 | + { | ||
| 61 | + _effectAudioSource = gameObject.AddComponent<AudioSource>(); | ||
| 62 | + } | ||
| 63 | + } | ||
| 64 | + | ||
| 65 | + protected void Update() | ||
| 66 | + { | ||
| 67 | + if (_effectAudioSource != null && _effectAudioSource.isPlaying) | ||
| 68 | + { | ||
| 69 | + // 手动计时 | ||
| 70 | + _curClipLength += Time.deltaTime; | ||
| 71 | + if (_curClipLength >= _clipLength) | ||
| 72 | + { | ||
| 73 | + _curClipLength = 0; | ||
| 74 | + StopEffect(); | ||
| 75 | + _isPlayComplete = true; | ||
| 76 | + _onComplete?.Invoke(); | ||
| 77 | + } | ||
| 78 | + } | ||
| 79 | + } | ||
| 80 | + | ||
| 81 | + /// <summary> | ||
| 82 | + /// 播放Bgm | ||
| 83 | + /// </summary> | ||
| 84 | + /// <param name="clip"></param> | ||
| 85 | + public void PlayBGM(AudioClip clip) | ||
| 86 | + { | ||
| 87 | + _bgmAudioSource.clip = clip; | ||
| 88 | + _bgmAudioSource.loop = true; | ||
| 89 | + _bgmAudioSource.Play(); | ||
| 90 | + } | ||
| 91 | + | ||
| 92 | + /// <summary> | ||
| 93 | + /// 暂停Bgm | ||
| 94 | + /// </summary> | ||
| 95 | + public void PauseBgm() | ||
| 96 | + { | ||
| 97 | + _bgmAudioSource.Pause(); | ||
| 98 | + } | ||
| 99 | + | ||
| 100 | + /// <summary> | ||
| 101 | + /// 恢复Bgm | ||
| 102 | + /// </summary> | ||
| 103 | + public void ResumeBgm() | ||
| 104 | + { | ||
| 105 | + _bgmAudioSource.UnPause(); | ||
| 106 | + } | ||
| 107 | + | ||
| 108 | + /// <summary> | ||
| 109 | + /// 播放声音 | ||
| 110 | + /// </summary> | ||
| 111 | + /// <param name="clip">音频文件</param> | ||
| 112 | + /// <param name="callBack">回调参数</param> | ||
| 113 | + /// <param name="isLoop">是否循环播放</param> | ||
| 114 | + public void PlayEffect(AudioClip clip, Action callBack = null, bool isLoop = false) | ||
| 115 | + { | ||
| 116 | + if (clip == null) | ||
| 117 | + { | ||
| 118 | + Debug.LogError("音频报错: "); | ||
| 119 | + return; | ||
| 120 | + } | ||
| 121 | + | ||
| 122 | + _curClipLength = 0; | ||
| 123 | + _effectAudioSource.Stop(); | ||
| 124 | + _isPlayComplete = false; | ||
| 125 | + _onComplete = callBack; | ||
| 126 | + | ||
| 127 | + _effectAudioSource.clip = clip; | ||
| 128 | + _effectAudioSource.loop = isLoop; | ||
| 129 | + _clipLength = clip.length; | ||
| 130 | + _effectAudioSource.Play(); | ||
| 131 | + } | ||
| 132 | + | ||
| 133 | + /// <summary> | ||
| 134 | + /// 停止播放 | ||
| 135 | + /// </summary> | ||
| 136 | + public void StopEffect() | ||
| 137 | + { | ||
| 138 | + _effectAudioSource.Stop(); | ||
| 139 | + } | ||
| 140 | + | ||
| 141 | + /// <summary> | ||
| 142 | + /// 暂停播放 | ||
| 143 | + /// </summary> | ||
| 144 | + public void PauseEffect() | ||
| 145 | + { | ||
| 146 | + _effectAudioSource.Pause(); | ||
| 147 | + } | ||
| 148 | + | ||
| 149 | + /// <summary> | ||
| 150 | + /// 恢复播放 | ||
| 151 | + /// </summary> | ||
| 152 | + public void ResumeEffect() | ||
| 153 | + { | ||
| 154 | + _effectAudioSource.UnPause(); | ||
| 155 | + } | ||
| 156 | + | ||
| 157 | + /// <summary> | ||
| 158 | + /// 静音 | ||
| 159 | + /// </summary> | ||
| 160 | + public void Mute() | ||
| 161 | + { | ||
| 162 | + _effectAudioSource.mute = !_effectAudioSource.mute; | ||
| 163 | + _bgmAudioSource.mute = !_bgmAudioSource.mute; | ||
| 164 | + } | ||
| 165 | +} |
Assets/Scripts/Manager/AudioManager.cs.meta
0 → 100644
Assets/Scripts/Manager/ResourcesManager.cs
0 → 100644
| 1 | +using System.Collections; | ||
| 2 | +using System.Collections.Generic; | ||
| 3 | +using System; | ||
| 4 | +using UnityEngine; | ||
| 5 | +using UnityEngine.Events; | ||
| 6 | + | ||
| 7 | +public class ResourcesManager : Singleton<ResourcesManager> | ||
| 8 | +{ | ||
| 9 | + // 资源缓存字典 | ||
| 10 | + private Dictionary<string, UnityEngine.Object> resourceCache = new Dictionary<string, UnityEngine.Object>(); | ||
| 11 | + | ||
| 12 | + | ||
| 13 | + /// <summary> | ||
| 14 | + /// 同步加载资源 | ||
| 15 | + /// </summary> | ||
| 16 | + /// <typeparam name="T">资源类型</typeparam> | ||
| 17 | + /// <param name="path">资源路径</param> | ||
| 18 | + /// <param name="cache">是否缓存</param> | ||
| 19 | + /// <returns>加载的资源</returns> | ||
| 20 | + public T Load<T>(string path, bool cache = false) where T : UnityEngine.Object | ||
| 21 | + { | ||
| 22 | + if (string.IsNullOrEmpty(path)) | ||
| 23 | + { | ||
| 24 | + Debug.LogError("资源路径不能为空"); | ||
| 25 | + return null; | ||
| 26 | + } | ||
| 27 | + | ||
| 28 | + // 检查缓存 | ||
| 29 | + if (resourceCache.TryGetValue(path, out UnityEngine.Object cachedResource)) | ||
| 30 | + { | ||
| 31 | + return cachedResource as T; | ||
| 32 | + } | ||
| 33 | + | ||
| 34 | + // 从Resources加载 | ||
| 35 | + T resource = Resources.Load<T>(path); | ||
| 36 | + if (resource == null) | ||
| 37 | + { | ||
| 38 | + Debug.LogError($"无法加载资源: {path}"); | ||
| 39 | + return null; | ||
| 40 | + } | ||
| 41 | + | ||
| 42 | + // 缓存资源 | ||
| 43 | + if (cache) | ||
| 44 | + { | ||
| 45 | + resourceCache[path] = resource; | ||
| 46 | + } | ||
| 47 | + | ||
| 48 | + return resource; | ||
| 49 | + } | ||
| 50 | + | ||
| 51 | + /// <summary> | ||
| 52 | + /// 加载一个二级UI | ||
| 53 | + /// </summary> | ||
| 54 | + /// <typeparam name="T"></typeparam> | ||
| 55 | + public void ShowSecondUI<T>(string path) where T : UIBase | ||
| 56 | + { | ||
| 57 | + var uiname = typeof(T).Name; | ||
| 58 | + if (UIManager.Instance.GetUi<T>() == null) | ||
| 59 | + { | ||
| 60 | + var obj = Load<GameObject>(path); | ||
| 61 | + Instantiate(obj); | ||
| 62 | + UIManager.Instance.ShowUI<T>(); | ||
| 63 | + } | ||
| 64 | + else | ||
| 65 | + { | ||
| 66 | + Debug.LogError("场景中已经存在相同的UI: " + uiname); | ||
| 67 | + } | ||
| 68 | + } | ||
| 69 | +} |
| @@ -112,7 +112,6 @@ public class UIBase : MonoBehaviour, IUIBase | @@ -112,7 +112,6 @@ public class UIBase : MonoBehaviour, IUIBase | ||
| 112 | } | 112 | } |
| 113 | 113 | ||
| 114 | isAnimation = true; | 114 | isAnimation = true; |
| 115 | - gameObject.transform.localScale = Vector3.one; | ||
| 116 | switch (animationType) | 115 | switch (animationType) |
| 117 | { | 116 | { |
| 118 | case EUiAnimationType.None: | 117 | case EUiAnimationType.None: |
| @@ -123,6 +122,7 @@ public class UIBase : MonoBehaviour, IUIBase | @@ -123,6 +122,7 @@ public class UIBase : MonoBehaviour, IUIBase | ||
| 123 | UIAnimation.ZoomIn(gameObject, OpenComplete); | 122 | UIAnimation.ZoomIn(gameObject, OpenComplete); |
| 124 | break; | 123 | break; |
| 125 | case EUiAnimationType.Fade: | 124 | case EUiAnimationType.Fade: |
| 125 | + gameObject.transform.localScale = Vector3.one; | ||
| 126 | UIAnimation.FadeIn(gameObject, OpenComplete); | 126 | UIAnimation.FadeIn(gameObject, OpenComplete); |
| 127 | break; | 127 | break; |
| 128 | } | 128 | } |
| @@ -15,7 +15,7 @@ public class UIManager : Singleton<UIManager> | @@ -15,7 +15,7 @@ public class UIManager : Singleton<UIManager> | ||
| 15 | /// </summary> | 15 | /// </summary> |
| 16 | public Transform uiRoot | 16 | public Transform uiRoot |
| 17 | { | 17 | { |
| 18 | - get { return GameObject.Find("UIRoot").transform; } | 18 | + get { return GameObject.Find("Top").transform; } |
| 19 | } | 19 | } |
| 20 | 20 | ||
| 21 | #region 管理UI | 21 | #region 管理UI |
Assets/resources/Video.meta
0 → 100644
Assets/resources/Video/video0.MP3
0 → 100644
No preview for this file type
Assets/resources/Video/video0.MP3.meta
0 → 100644
| 1 | +fileFormatVersion: 2 | ||
| 2 | +guid: 94ec15b2d73eb254b8528d94eb86c8d6 | ||
| 3 | +AudioImporter: | ||
| 4 | + externalObjects: {} | ||
| 5 | + serializedVersion: 7 | ||
| 6 | + defaultSettings: | ||
| 7 | + serializedVersion: 2 | ||
| 8 | + loadType: 0 | ||
| 9 | + sampleRateSetting: 0 | ||
| 10 | + sampleRateOverride: 44100 | ||
| 11 | + compressionFormat: 1 | ||
| 12 | + quality: 1 | ||
| 13 | + conversionMode: 0 | ||
| 14 | + preloadAudioData: 0 | ||
| 15 | + platformSettingOverrides: {} | ||
| 16 | + forceToMono: 0 | ||
| 17 | + normalize: 1 | ||
| 18 | + loadInBackground: 0 | ||
| 19 | + ambisonic: 0 | ||
| 20 | + 3D: 1 | ||
| 21 | + userData: | ||
| 22 | + assetBundleName: | ||
| 23 | + assetBundleVariant: |
Assets/resources/Video/video1.MP3
0 → 100644
No preview for this file type
Assets/resources/Video/video1.MP3.meta
0 → 100644
| 1 | +fileFormatVersion: 2 | ||
| 2 | +guid: 51ae471ad2c96de4bb106ee83a74d037 | ||
| 3 | +AudioImporter: | ||
| 4 | + externalObjects: {} | ||
| 5 | + serializedVersion: 7 | ||
| 6 | + defaultSettings: | ||
| 7 | + serializedVersion: 2 | ||
| 8 | + loadType: 0 | ||
| 9 | + sampleRateSetting: 0 | ||
| 10 | + sampleRateOverride: 44100 | ||
| 11 | + compressionFormat: 1 | ||
| 12 | + quality: 1 | ||
| 13 | + conversionMode: 0 | ||
| 14 | + preloadAudioData: 0 | ||
| 15 | + platformSettingOverrides: {} | ||
| 16 | + forceToMono: 0 | ||
| 17 | + normalize: 1 | ||
| 18 | + loadInBackground: 0 | ||
| 19 | + ambisonic: 0 | ||
| 20 | + 3D: 1 | ||
| 21 | + userData: | ||
| 22 | + assetBundleName: | ||
| 23 | + assetBundleVariant: |
| @@ -284,7 +284,99 @@ PlayerSettings: | @@ -284,7 +284,99 @@ PlayerSettings: | ||
| 284 | AndroidValidateAppBundleSize: 1 | 284 | AndroidValidateAppBundleSize: 1 |
| 285 | AndroidAppBundleSizeToValidate: 150 | 285 | AndroidAppBundleSizeToValidate: 150 |
| 286 | m_BuildTargetIcons: [] | 286 | m_BuildTargetIcons: [] |
| 287 | - m_BuildTargetPlatformIcons: [] | 287 | + m_BuildTargetPlatformIcons: |
| 288 | + - m_BuildTarget: Android | ||
| 289 | + m_Icons: | ||
| 290 | + - m_Textures: [] | ||
| 291 | + m_Width: 432 | ||
| 292 | + m_Height: 432 | ||
| 293 | + m_Kind: 2 | ||
| 294 | + m_SubKind: | ||
| 295 | + - m_Textures: [] | ||
| 296 | + m_Width: 324 | ||
| 297 | + m_Height: 324 | ||
| 298 | + m_Kind: 2 | ||
| 299 | + m_SubKind: | ||
| 300 | + - m_Textures: [] | ||
| 301 | + m_Width: 216 | ||
| 302 | + m_Height: 216 | ||
| 303 | + m_Kind: 2 | ||
| 304 | + m_SubKind: | ||
| 305 | + - m_Textures: [] | ||
| 306 | + m_Width: 162 | ||
| 307 | + m_Height: 162 | ||
| 308 | + m_Kind: 2 | ||
| 309 | + m_SubKind: | ||
| 310 | + - m_Textures: [] | ||
| 311 | + m_Width: 108 | ||
| 312 | + m_Height: 108 | ||
| 313 | + m_Kind: 2 | ||
| 314 | + m_SubKind: | ||
| 315 | + - m_Textures: [] | ||
| 316 | + m_Width: 81 | ||
| 317 | + m_Height: 81 | ||
| 318 | + m_Kind: 2 | ||
| 319 | + m_SubKind: | ||
| 320 | + - m_Textures: [] | ||
| 321 | + m_Width: 192 | ||
| 322 | + m_Height: 192 | ||
| 323 | + m_Kind: 1 | ||
| 324 | + m_SubKind: | ||
| 325 | + - m_Textures: [] | ||
| 326 | + m_Width: 144 | ||
| 327 | + m_Height: 144 | ||
| 328 | + m_Kind: 1 | ||
| 329 | + m_SubKind: | ||
| 330 | + - m_Textures: [] | ||
| 331 | + m_Width: 96 | ||
| 332 | + m_Height: 96 | ||
| 333 | + m_Kind: 1 | ||
| 334 | + m_SubKind: | ||
| 335 | + - m_Textures: [] | ||
| 336 | + m_Width: 72 | ||
| 337 | + m_Height: 72 | ||
| 338 | + m_Kind: 1 | ||
| 339 | + m_SubKind: | ||
| 340 | + - m_Textures: [] | ||
| 341 | + m_Width: 48 | ||
| 342 | + m_Height: 48 | ||
| 343 | + m_Kind: 1 | ||
| 344 | + m_SubKind: | ||
| 345 | + - m_Textures: [] | ||
| 346 | + m_Width: 36 | ||
| 347 | + m_Height: 36 | ||
| 348 | + m_Kind: 1 | ||
| 349 | + m_SubKind: | ||
| 350 | + - m_Textures: [] | ||
| 351 | + m_Width: 192 | ||
| 352 | + m_Height: 192 | ||
| 353 | + m_Kind: 0 | ||
| 354 | + m_SubKind: | ||
| 355 | + - m_Textures: [] | ||
| 356 | + m_Width: 144 | ||
| 357 | + m_Height: 144 | ||
| 358 | + m_Kind: 0 | ||
| 359 | + m_SubKind: | ||
| 360 | + - m_Textures: [] | ||
| 361 | + m_Width: 96 | ||
| 362 | + m_Height: 96 | ||
| 363 | + m_Kind: 0 | ||
| 364 | + m_SubKind: | ||
| 365 | + - m_Textures: [] | ||
| 366 | + m_Width: 72 | ||
| 367 | + m_Height: 72 | ||
| 368 | + m_Kind: 0 | ||
| 369 | + m_SubKind: | ||
| 370 | + - m_Textures: [] | ||
| 371 | + m_Width: 48 | ||
| 372 | + m_Height: 48 | ||
| 373 | + m_Kind: 0 | ||
| 374 | + m_SubKind: | ||
| 375 | + - m_Textures: [] | ||
| 376 | + m_Width: 36 | ||
| 377 | + m_Height: 36 | ||
| 378 | + m_Kind: 0 | ||
| 379 | + m_SubKind: | ||
| 288 | m_BuildTargetBatching: | 380 | m_BuildTargetBatching: |
| 289 | - m_BuildTarget: Standalone | 381 | - m_BuildTarget: Standalone |
| 290 | m_StaticBatching: 1 | 382 | m_StaticBatching: 1 |
U3DFrameWork.sln
0 → 100644
| 1 | + | ||
| 2 | +Microsoft Visual Studio Solution File, Format Version 11.00 | ||
| 3 | +# Visual Studio 2010 | ||
| 4 | +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-firstpass", "Assembly-CSharp-firstpass.csproj", "{0fb0da77-85a4-96d4-1dc2-8ddaab877745}" | ||
| 5 | +EndProject | ||
| 6 | +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{9864750c-93e8-aa72-e152-534ad74cab45}" | ||
| 7 | +EndProject | ||
| 8 | +Global | ||
| 9 | + GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||
| 10 | + Debug|Any CPU = Debug|Any CPU | ||
| 11 | + EndGlobalSection | ||
| 12 | + GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||
| 13 | + {0fb0da77-85a4-96d4-1dc2-8ddaab877745}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 14 | + {0fb0da77-85a4-96d4-1dc2-8ddaab877745}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 15 | + {9864750c-93e8-aa72-e152-534ad74cab45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 16 | + {9864750c-93e8-aa72-e152-534ad74cab45}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 17 | + EndGlobalSection | ||
| 18 | + GlobalSection(SolutionProperties) = preSolution | ||
| 19 | + HideSolutionNode = FALSE | ||
| 20 | + EndGlobalSection | ||
| 21 | +EndGlobal |
U3DFrameWork.sln.DotSettings.user
0 → 100644
| 1 | +<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation"> | ||
| 2 | + <s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AObject_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Ff68865d630f84dbe83e4490ea2afd98a176800_003F36_003F499d8774_003FObject_002Ecs/@EntryIndexedValue">ForceIncluded</s:String></wpf:ResourceDictionary> |
No preview for this file type
No preview for this file type
-
Please register or login to post a comment