From deb2c01d01d868de93932e6c1610324b83312f97 Mon Sep 17 00:00:00 2001 From: SepComet <202308010230@stu.csust.edu.cn> Date: Wed, 11 Feb 2026 14:58:05 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E5=AE=8C=E5=96=84=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E7=9A=84=E5=85=B7=E4=BD=93=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=8C=E5=85=A8=E5=B1=80=E6=80=A7=E7=9A=84=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E9=A1=B9=E5=B7=B2=E7=BB=8F=E5=8F=AF=E4=BB=A5=E5=8F=91=E6=8C=A5?= =?UTF-8?q?=E4=BD=9C=E7=94=A8=E4=BA=86=20-=20=E8=B0=83=E6=95=B4=E9=83=A8?= =?UTF-8?q?=E5=88=86=E9=A1=B9=E7=9B=AE=E7=BB=93=E6=9E=84=E5=92=8CAB?= =?UTF-8?q?=E5=8C=85=E8=AE=BE=E7=BD=AE=EF=BC=8C=E6=89=93=E5=8C=85=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E8=AE=BE=E7=BD=AE=E9=9D=A2=E6=9D=BF=E7=9A=84=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Inspector/BaseComponentInspector.cs | 2 +- .../LocalizationComponentInspector.cs | 152 +++++++-------- Assets/GameMain/Configs/DefaultConfig.bytes | 4 - .../GameMain/Configs/DefaultConfig.bytes.meta | 6 - Assets/GameMain/Configs/DefaultConfig.txt | Bin 248 -> 0 bytes .../GameMain/Configs/DefaultConfig.txt.meta | 8 - Assets/GameMain/Configs/ResourceBuilder.xml | 4 +- .../GameMain/Configs/ResourceCollection.xml | 120 ++---------- Assets/GameMain/DataTables/Music.txt | 7 - Assets/GameMain/DataTables/Music.txt.meta | 8 - Assets/GameMain/DataTables/Sound.txt | 9 - Assets/GameMain/DataTables/Sound.txt.meta | 8 - Assets/GameMain/DataTables/UIForm.txt | 2 +- Assets/GameMain/DataTables/UISound.txt | 6 - Assets/GameMain/DataTables/UISound.txt.meta | 8 - .../DataTable/{DRMusic.cs => DRBGM.cs} | 17 +- .../{DRMusic.cs.meta => DRBGM.cs.meta} | 0 .../DataTable/{DRUISound.cs => DRSE.cs} | 7 +- .../{DRUISound.cs.meta => DRSE.cs.meta} | 0 Assets/GameMain/Scripts/DataTable/DRSound.cs | 127 ------------ .../Scripts/DataTable/DRSound.cs.meta | 12 -- Assets/GameMain/Scripts/Debugger.meta | 9 - .../Debugger/ChangeLanguageDebuggerWindow.cs | 86 -------- .../ChangeLanguageDebuggerWindow.cs.meta | 12 -- .../Definition/Constant/Constant.Setting.cs | 21 +- .../Definition/DataStruct/GameSetting.cs | 4 +- .../Scripts/Definition/Enum/SettingEnums.cs | 14 +- .../Scripts/Event/SettingSaveEventArgs.cs | 4 +- .../Procedure/BuiltIn/ProcedureChangeScene.cs | 15 +- .../Procedure/BuiltIn/ProcedureLaunch.cs | 103 +--------- .../Procedure/BuiltIn/ProcedurePreload.cs | 103 ++++++++-- .../Scripts/Procedure/ProcedureMenu.cs | 157 +++++++++++++++ .../GameMain/Scripts/Sound/SoundExtension.cs | 93 ++------- .../UI/Controller/SettingFormController.cs | 1 + Assets/GameMain/Scripts/UI/UGuiForm.cs | 21 +- .../GameMain/Scripts/UI/View/SettingForm.cs | 17 +- Assets/GameMain/UI/UIForms/SettingForm.prefab | 2 +- Assets/Launcher.unity | 52 ++--- Assets/Settings/URP-Balanced-Renderer.asset | 76 -------- .../Settings/URP-Balanced-Renderer.asset.meta | 8 - Assets/Settings/URP-Balanced.asset | 114 ----------- Assets/Settings/URP-Balanced.asset.meta | 8 - .../Settings/URP-HighFidelity-Renderer.asset | 104 ---------- .../URP-HighFidelity-Renderer.asset.meta | 8 - Assets/Settings/URP-HighFidelity.asset | 114 ----------- Assets/Settings/URP-HighFidelity.asset.meta | 8 - Assets/Settings/URP-Performant-Renderer.asset | 52 ----- .../URP-Performant-Renderer.asset.meta | 8 - Assets/Settings/URP-Performant.asset | 114 ----------- Assets/Settings/URP-Performant.asset.meta | 8 - .../BurstAotSettings_StandaloneWindows.json | 8 +- ProjectSettings/CommonBurstAotSettings.json | 2 +- ProjectSettings/EditorBuildSettings.asset | 3 + ProjectSettings/ProjectSettings.asset | 6 +- ProjectSettings/QualitySettings.asset | 184 +++++++----------- 数据表/Music.txt | 7 - 数据表/Music.xlsx | Bin 9804 -> 0 bytes 数据表/Scene.xlsx | Bin 9869 -> 9874 bytes 数据表/Sound.xlsx | Bin 10340 -> 0 bytes 数据表/UIForm.txt | 2 +- 数据表/UIForm.xlsx | Bin 10331 -> 10336 bytes 数据表/UISound.txt | 6 - 数据表/UISound.xlsx | Bin 10516 -> 0 bytes 数据表/convert.py | 11 +- 64 files changed, 536 insertions(+), 1536 deletions(-) delete mode 100644 Assets/GameMain/Configs/DefaultConfig.bytes delete mode 100644 Assets/GameMain/Configs/DefaultConfig.bytes.meta delete mode 100644 Assets/GameMain/Configs/DefaultConfig.txt delete mode 100644 Assets/GameMain/Configs/DefaultConfig.txt.meta delete mode 100644 Assets/GameMain/DataTables/Music.txt delete mode 100644 Assets/GameMain/DataTables/Music.txt.meta delete mode 100644 Assets/GameMain/DataTables/Sound.txt delete mode 100644 Assets/GameMain/DataTables/Sound.txt.meta delete mode 100644 Assets/GameMain/DataTables/UISound.txt delete mode 100644 Assets/GameMain/DataTables/UISound.txt.meta rename Assets/GameMain/Scripts/DataTable/{DRMusic.cs => DRBGM.cs} (76%) rename Assets/GameMain/Scripts/DataTable/{DRMusic.cs.meta => DRBGM.cs.meta} (100%) rename Assets/GameMain/Scripts/DataTable/{DRUISound.cs => DRSE.cs} (94%) rename Assets/GameMain/Scripts/DataTable/{DRUISound.cs.meta => DRSE.cs.meta} (100%) delete mode 100644 Assets/GameMain/Scripts/DataTable/DRSound.cs delete mode 100644 Assets/GameMain/Scripts/DataTable/DRSound.cs.meta delete mode 100644 Assets/GameMain/Scripts/Debugger.meta delete mode 100644 Assets/GameMain/Scripts/Debugger/ChangeLanguageDebuggerWindow.cs delete mode 100644 Assets/GameMain/Scripts/Debugger/ChangeLanguageDebuggerWindow.cs.meta delete mode 100644 Assets/Settings/URP-Balanced-Renderer.asset delete mode 100644 Assets/Settings/URP-Balanced-Renderer.asset.meta delete mode 100644 Assets/Settings/URP-Balanced.asset delete mode 100644 Assets/Settings/URP-Balanced.asset.meta delete mode 100644 Assets/Settings/URP-HighFidelity-Renderer.asset delete mode 100644 Assets/Settings/URP-HighFidelity-Renderer.asset.meta delete mode 100644 Assets/Settings/URP-HighFidelity.asset delete mode 100644 Assets/Settings/URP-HighFidelity.asset.meta delete mode 100644 Assets/Settings/URP-Performant-Renderer.asset delete mode 100644 Assets/Settings/URP-Performant-Renderer.asset.meta delete mode 100644 Assets/Settings/URP-Performant.asset delete mode 100644 Assets/Settings/URP-Performant.asset.meta delete mode 100644 数据表/Music.txt delete mode 100644 数据表/Music.xlsx delete mode 100644 数据表/Sound.xlsx delete mode 100644 数据表/UISound.txt delete mode 100644 数据表/UISound.xlsx diff --git a/Assets/GameFramework/Scripts/Editor/Inspector/BaseComponentInspector.cs b/Assets/GameFramework/Scripts/Editor/Inspector/BaseComponentInspector.cs index 65d3792..328d8be 100644 --- a/Assets/GameFramework/Scripts/Editor/Inspector/BaseComponentInspector.cs +++ b/Assets/GameFramework/Scripts/Editor/Inspector/BaseComponentInspector.cs @@ -104,7 +104,7 @@ namespace UnityGameFramework.Editor } EditorGUI.EndDisabledGroup(); - int frameRate = EditorGUILayout.IntSlider("Frame Rate", m_FrameRate.intValue, 1, 120); + int frameRate = EditorGUILayout.IntSlider("Frame Rate", m_FrameRate.intValue, 1, 240); if (frameRate != m_FrameRate.intValue) { if (EditorApplication.isPlaying) diff --git a/Assets/GameFramework/Scripts/Editor/Inspector/LocalizationComponentInspector.cs b/Assets/GameFramework/Scripts/Editor/Inspector/LocalizationComponentInspector.cs index 3bacb67..9892596 100644 --- a/Assets/GameFramework/Scripts/Editor/Inspector/LocalizationComponentInspector.cs +++ b/Assets/GameFramework/Scripts/Editor/Inspector/LocalizationComponentInspector.cs @@ -1,76 +1,76 @@ -//------------------------------------------------------------ -// Game Framework -// Copyright © 2013-2021 Jiang Yin. All rights reserved. -// Homepage: https://gameframework.cn/ -// Feedback: mailto:ellan@gameframework.cn -//------------------------------------------------------------ - -using UnityEditor; -using UnityGameFramework.Runtime; - -namespace UnityGameFramework.Editor -{ - [CustomEditor(typeof(LocalizationComponent))] - internal sealed class LocalizationComponentInspector : GameFrameworkInspector - { - private SerializedProperty m_EnableLoadDictionaryUpdateEvent = null; - private SerializedProperty m_EnableLoadDictionaryDependencyAssetEvent = null; - private SerializedProperty m_CachedBytesSize = null; - - private HelperInfo m_LocalizationHelperInfo = new HelperInfo("Localization"); - - public override void OnInspectorGUI() - { - base.OnInspectorGUI(); - - serializedObject.Update(); - - LocalizationComponent t = (LocalizationComponent)target; - - EditorGUI.BeginDisabledGroup(EditorApplication.isPlayingOrWillChangePlaymode); - { - EditorGUILayout.PropertyField(m_EnableLoadDictionaryUpdateEvent); - EditorGUILayout.PropertyField(m_EnableLoadDictionaryDependencyAssetEvent); - m_LocalizationHelperInfo.Draw(); - EditorGUILayout.PropertyField(m_CachedBytesSize); - } - EditorGUI.EndDisabledGroup(); - - if (EditorApplication.isPlaying && IsPrefabInHierarchy(t.gameObject)) - { - EditorGUILayout.LabelField("Language", t.Language.ToString()); - EditorGUILayout.LabelField("System Language", t.SystemLanguage.ToString()); - EditorGUILayout.LabelField("Dictionary Count", t.DictionaryCount.ToString()); - EditorGUILayout.LabelField("Cached Bytes Size", t.CachedBytesSize.ToString()); - } - - serializedObject.ApplyModifiedProperties(); - - Repaint(); - } - - protected override void OnCompileComplete() - { - base.OnCompileComplete(); - - RefreshTypeNames(); - } - - private void OnEnable() - { - m_EnableLoadDictionaryUpdateEvent = serializedObject.FindProperty("m_EnableLoadDictionaryUpdateEvent"); - m_EnableLoadDictionaryDependencyAssetEvent = serializedObject.FindProperty("m_EnableLoadDictionaryDependencyAssetEvent"); - m_CachedBytesSize = serializedObject.FindProperty("m_CachedBytesSize"); - - m_LocalizationHelperInfo.Init(serializedObject); - - RefreshTypeNames(); - } - - private void RefreshTypeNames() - { - m_LocalizationHelperInfo.Refresh(); - serializedObject.ApplyModifiedProperties(); - } - } -} +// //------------------------------------------------------------ +// // Game Framework +// // Copyright © 2013-2021 Jiang Yin. All rights reserved. +// // Homepage: https://gameframework.cn/ +// // Feedback: mailto:ellan@gameframework.cn +// //------------------------------------------------------------ +// +// using UnityEditor; +// using UnityGameFramework.Runtime; +// +// namespace UnityGameFramework.Editor +// { +// [CustomEditor(typeof(LocalizationComponent))] +// internal sealed class LocalizationComponentInspector : GameFrameworkInspector +// { +// private SerializedProperty m_EnableLoadDictionaryUpdateEvent = null; +// private SerializedProperty m_EnableLoadDictionaryDependencyAssetEvent = null; +// private SerializedProperty m_CachedBytesSize = null; +// +// private HelperInfo m_LocalizationHelperInfo = new HelperInfo("Localization"); +// +// public override void OnInspectorGUI() +// { +// base.OnInspectorGUI(); +// +// serializedObject.Update(); +// +// LocalizationComponent t = (LocalizationComponent)target; +// +// EditorGUI.BeginDisabledGroup(EditorApplication.isPlayingOrWillChangePlaymode); +// { +// EditorGUILayout.PropertyField(m_EnableLoadDictionaryUpdateEvent); +// EditorGUILayout.PropertyField(m_EnableLoadDictionaryDependencyAssetEvent); +// m_LocalizationHelperInfo.Draw(); +// EditorGUILayout.PropertyField(m_CachedBytesSize); +// } +// EditorGUI.EndDisabledGroup(); +// +// if (EditorApplication.isPlaying && IsPrefabInHierarchy(t.gameObject)) +// { +// EditorGUILayout.LabelField("Language", t.Language.ToString()); +// EditorGUILayout.LabelField("System Language", t.SystemLanguage.ToString()); +// EditorGUILayout.LabelField("Dictionary Count", t.DictionaryCount.ToString()); +// EditorGUILayout.LabelField("Cached Bytes Size", t.CachedBytesSize.ToString()); +// } +// +// serializedObject.ApplyModifiedProperties(); +// +// Repaint(); +// } +// +// protected override void OnCompileComplete() +// { +// base.OnCompileComplete(); +// +// RefreshTypeNames(); +// } +// +// private void OnEnable() +// { +// m_EnableLoadDictionaryUpdateEvent = serializedObject.FindProperty("m_EnableLoadDictionaryUpdateEvent"); +// m_EnableLoadDictionaryDependencyAssetEvent = serializedObject.FindProperty("m_EnableLoadDictionaryDependencyAssetEvent"); +// m_CachedBytesSize = serializedObject.FindProperty("m_CachedBytesSize"); +// +// m_LocalizationHelperInfo.Init(serializedObject); +// +// RefreshTypeNames(); +// } +// +// private void RefreshTypeNames() +// { +// m_LocalizationHelperInfo.Refresh(); +// serializedObject.ApplyModifiedProperties(); +// } +// } +// } diff --git a/Assets/GameMain/Configs/DefaultConfig.bytes b/Assets/GameMain/Configs/DefaultConfig.bytes deleted file mode 100644 index 0cb29fa..0000000 --- a/Assets/GameMain/Configs/DefaultConfig.bytes +++ /dev/null @@ -1,4 +0,0 @@ -Game.Id -Star Force -Scene.Menu1 -Scene.Main2 \ No newline at end of file diff --git a/Assets/GameMain/Configs/DefaultConfig.bytes.meta b/Assets/GameMain/Configs/DefaultConfig.bytes.meta deleted file mode 100644 index 5624dbb..0000000 --- a/Assets/GameMain/Configs/DefaultConfig.bytes.meta +++ /dev/null @@ -1,6 +0,0 @@ -fileFormatVersion: 2 -guid: 7fd11dc5d29076d469d414dec2818f11 -TextScriptImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameMain/Configs/DefaultConfig.txt b/Assets/GameMain/Configs/DefaultConfig.txt deleted file mode 100644 index b985132208cae8514460db21cd9ee2e20023e5e8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 248 zcmezWPnm&};l{ir-M$m^>N$aIUIs1(kQj(xIfIiStXe3DJ@Q2kM8qZlB+tp<&XCBE z%aF>T$Kc730_1Zt1T&NX#flgd7~B~0fpjuZ7NRy7%+3R=_63r845eTlhFIkj88U$? qKqeYtkq6mQ1T>=<2t&Yh30SQ$7PT-p7BJ)hT~^892v%tVRtW&HZYmW3 diff --git a/Assets/GameMain/Configs/DefaultConfig.txt.meta b/Assets/GameMain/Configs/DefaultConfig.txt.meta deleted file mode 100644 index 2fa1d84..0000000 --- a/Assets/GameMain/Configs/DefaultConfig.txt.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 44c8db52241385c45bbb14a1718f17bf -timeCreated: 1528026123 -licenseType: Pro -TextScriptImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameMain/Configs/ResourceBuilder.xml b/Assets/GameMain/Configs/ResourceBuilder.xml index 8e0b951..ef44c2c 100644 --- a/Assets/GameMain/Configs/ResourceBuilder.xml +++ b/Assets/GameMain/Configs/ResourceBuilder.xml @@ -2,14 +2,14 @@ - 0 + 1 1 1 UnityGameFramework.Runtime.DefaultCompressionHelper True False StarForce.Editor.StarForceBuildEventHandler - + D:/Learn/GameLearn/UnityProjects/Biography of Li Jian/AssetBundles True True True diff --git a/Assets/GameMain/Configs/ResourceCollection.xml b/Assets/GameMain/Configs/ResourceCollection.xml index b5987c3..6f7b7fd 100644 --- a/Assets/GameMain/Configs/ResourceCollection.xml +++ b/Assets/GameMain/Configs/ResourceCollection.xml @@ -2,23 +2,16 @@ - - - - - - - - + - + @@ -26,133 +19,58 @@ + - - - - - - - - - - + - - - - - - - - - - - - - - + + - - - - - - - - + - - - + + - - + + + - - - - - - - + - - - + - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - + - - + - - - - - - - - \ No newline at end of file diff --git a/Assets/GameMain/DataTables/Music.txt b/Assets/GameMain/DataTables/Music.txt deleted file mode 100644 index c94009f..0000000 --- a/Assets/GameMain/DataTables/Music.txt +++ /dev/null @@ -1,7 +0,0 @@ -# 音乐配置表 -# Id AssetName -# int string -# 音乐编号 策划备注 资源名称 - 1 菜单音乐 music_menu - 2 战斗音乐 music_background - 3 关于音乐 music_about diff --git a/Assets/GameMain/DataTables/Music.txt.meta b/Assets/GameMain/DataTables/Music.txt.meta deleted file mode 100644 index a4ca722..0000000 --- a/Assets/GameMain/DataTables/Music.txt.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 315e8ed2db27c254cb3366ff0793cd90 -timeCreated: 1528026124 -licenseType: Pro -TextScriptImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameMain/DataTables/Sound.txt b/Assets/GameMain/DataTables/Sound.txt deleted file mode 100644 index 0d22e6d..0000000 --- a/Assets/GameMain/DataTables/Sound.txt +++ /dev/null @@ -1,9 +0,0 @@ -# 声音配置表 -# Id AssetName Priority Loop Volume SpatialBlend MaxDistance -# int string int bool float float float -# 声音编号 策划备注 资源名称 优先级（默认0，128最高，-128最低） 是否循环 音量（0~1） 声音空间混合量（0为2D，1为3D，中间值混合效果） 声音最大距离 - 10000 玩家子弹 weapon_player 0 False 1 0 100 - 10001 敌人子弹 weapon_enemy 0 False 1 0 100 - 20000 玩家爆炸 explosion_player 0 False 1 0 100 - 20001 敌人爆炸 explosion_enemy 0 False 1 0 100 - 20002 小行星爆炸 explosion_asteroid 0 False 1 0 100 diff --git a/Assets/GameMain/DataTables/Sound.txt.meta b/Assets/GameMain/DataTables/Sound.txt.meta deleted file mode 100644 index 92830da..0000000 --- a/Assets/GameMain/DataTables/Sound.txt.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 372a8b1e52bedc64b9207b12d167afaa -timeCreated: 1528026124 -licenseType: Pro -TextScriptImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameMain/DataTables/UIForm.txt b/Assets/GameMain/DataTables/UIForm.txt index eccc80b..c97b02d 100644 --- a/Assets/GameMain/DataTables/UIForm.txt +++ b/Assets/GameMain/DataTables/UIForm.txt @@ -2,7 +2,7 @@ # Id AssetName UIGroupName AllowMultiInstance PauseCoveredUIForm # int string string bool bool # 界面编号 策划备注 资源名称 界面组名称 是否允许多个界面实例 是否暂停被其覆盖的界面 - 1 弹出框 DialogForm Default True True + 1 弹出框 DialogForm Dialog True True 100 主菜单 MenuForm Default False True 101 设置 SettingForm Default False True 102 关于 AboutForm Default False True diff --git a/Assets/GameMain/DataTables/UISound.txt b/Assets/GameMain/DataTables/UISound.txt deleted file mode 100644 index 87e1cd2..0000000 --- a/Assets/GameMain/DataTables/UISound.txt +++ /dev/null @@ -1,6 +0,0 @@ -# 声音配置表 -# Id AssetName Priority Volume -# int string int float -# 声音编号 策划备注 资源名称 优先级（默认0，128最高，-128最低） 音量（0~1） - 10000 选择音效 select 0 1 - 10001 点击音效 click 0 1 diff --git a/Assets/GameMain/DataTables/UISound.txt.meta b/Assets/GameMain/DataTables/UISound.txt.meta deleted file mode 100644 index b4f1b22..0000000 --- a/Assets/GameMain/DataTables/UISound.txt.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f2f97a713beae744181ba934f9c4113a -timeCreated: 1528026124 -licenseType: Pro -TextScriptImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameMain/Scripts/DataTable/DRMusic.cs b/Assets/GameMain/Scripts/DataTable/DRBGM.cs similarity index 76% rename from Assets/GameMain/Scripts/DataTable/DRMusic.cs rename to Assets/GameMain/Scripts/DataTable/DRBGM.cs index 83b2a31..efd97ec 100644 --- a/Assets/GameMain/Scripts/DataTable/DRMusic.cs +++ b/Assets/GameMain/Scripts/DataTable/DRBGM.cs @@ -1,17 +1,4 @@ -//------------------------------------------------------------ -// Game Framework -// Copyright © 2013-2021 Jiang Yin. All rights reserved. -// Homepage: https://gameframework.cn/ -// Feedback: mailto:ellan@gameframework.cn -//------------------------------------------------------------ -// 此文件由工具自动生成，请勿直接修改。 -// 生成时间：2021-06-16 21:54:35.591 -//------------------------------------------------------------ - -using GameFramework; -using System; -using System.Collections.Generic; -using System.IO; +using System.IO; using System.Text; using UnityEngine; using UnityGameFramework.Runtime; @@ -21,7 +8,7 @@ namespace DataTable /// /// 音乐配置表。 /// - public class DRMusic : DataRowBase + public class DRBGM : DataRowBase { private int m_Id = 0; diff --git a/Assets/GameMain/Scripts/DataTable/DRMusic.cs.meta b/Assets/GameMain/Scripts/DataTable/DRBGM.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/DataTable/DRMusic.cs.meta rename to Assets/GameMain/Scripts/DataTable/DRBGM.cs.meta diff --git a/Assets/GameMain/Scripts/DataTable/DRUISound.cs b/Assets/GameMain/Scripts/DataTable/DRSE.cs similarity index 94% rename from Assets/GameMain/Scripts/DataTable/DRUISound.cs rename to Assets/GameMain/Scripts/DataTable/DRSE.cs index db77bc7..82de2b7 100644 --- a/Assets/GameMain/Scripts/DataTable/DRUISound.cs +++ b/Assets/GameMain/Scripts/DataTable/DRSE.cs @@ -1,7 +1,4 @@ -using GameFramework; -using System; -using System.Collections.Generic; -using System.IO; +using System.IO; using System.Text; using UnityEngine; using UnityGameFramework.Runtime; @@ -11,7 +8,7 @@ namespace DataTable /// /// 声音配置表。 /// - public class DRUISound : DataRowBase + public class DRSE : DataRowBase { private int m_Id = 0; diff --git a/Assets/GameMain/Scripts/DataTable/DRUISound.cs.meta b/Assets/GameMain/Scripts/DataTable/DRSE.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/DataTable/DRUISound.cs.meta rename to Assets/GameMain/Scripts/DataTable/DRSE.cs.meta diff --git a/Assets/GameMain/Scripts/DataTable/DRSound.cs b/Assets/GameMain/Scripts/DataTable/DRSound.cs deleted file mode 100644 index fe12887..0000000 --- a/Assets/GameMain/Scripts/DataTable/DRSound.cs +++ /dev/null @@ -1,127 +0,0 @@ -using System.IO; -using System.Text; -using UnityGameFramework.Runtime; - -namespace DataTable -{ - /// - /// 声音配置表。 - /// - public class DRSound : DataRowBase - { - private int m_Id = 0; - - /// - /// 获取声音编号。 - /// - public override int Id - { - get - { - return m_Id; - } - } - - /// - /// 获取资源名称。 - /// - public string AssetName - { - get; - private set; - } - - /// - /// 获取优先级（默认0，128最高，-128最低）。 - /// - public int Priority - { - get; - private set; - } - - /// - /// 获取是否循环。 - /// - public bool Loop - { - get; - private set; - } - - /// - /// 获取音量（0~1）。 - /// - public float Volume - { - get; - private set; - } - - /// - /// 获取声音空间混合量（0为2D，1为3D，中间值混合效果）。 - /// - public float SpatialBlend - { - get; - private set; - } - - /// - /// 获取声音最大距离。 - /// - public float MaxDistance - { - get; - private set; - } - - public override bool ParseDataRow(string dataRowString, object userData) - { - string[] columnStrings = dataRowString.Split(DataTableExtension.DataSplitSeparators); - for (int i = 0; i < columnStrings.Length; i++) - { - columnStrings[i] = columnStrings[i].Trim(DataTableExtension.DataTrimSeparators); - } - - int index = 0; - index++; - m_Id = int.Parse(columnStrings[index++]); - index++; - AssetName = columnStrings[index++]; - Priority = int.Parse(columnStrings[index++]); - Loop = bool.Parse(columnStrings[index++]); - Volume = float.Parse(columnStrings[index++]); - SpatialBlend = float.Parse(columnStrings[index++]); - MaxDistance = float.Parse(columnStrings[index++]); - - GeneratePropertyArray(); - return true; - } - - public override bool ParseDataRow(byte[] dataRowBytes, int startIndex, int length, object userData) - { - using (MemoryStream memoryStream = new MemoryStream(dataRowBytes, startIndex, length, false)) - { - using (BinaryReader binaryReader = new BinaryReader(memoryStream, Encoding.UTF8)) - { - m_Id = binaryReader.Read7BitEncodedInt32(); - AssetName = binaryReader.ReadString(); - Priority = binaryReader.Read7BitEncodedInt32(); - Loop = binaryReader.ReadBoolean(); - Volume = binaryReader.ReadSingle(); - SpatialBlend = binaryReader.ReadSingle(); - MaxDistance = binaryReader.ReadSingle(); - } - } - - GeneratePropertyArray(); - return true; - } - - private void GeneratePropertyArray() - { - - } - } -} diff --git a/Assets/GameMain/Scripts/DataTable/DRSound.cs.meta b/Assets/GameMain/Scripts/DataTable/DRSound.cs.meta deleted file mode 100644 index daead29..0000000 --- a/Assets/GameMain/Scripts/DataTable/DRSound.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: fc0abcc42a26c844d91d422da22eb94d -timeCreated: 1528026147 -licenseType: Pro -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameMain/Scripts/Debugger.meta b/Assets/GameMain/Scripts/Debugger.meta deleted file mode 100644 index 87d4c25..0000000 --- a/Assets/GameMain/Scripts/Debugger.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 5479812568543994bbbcdbee6c42fce1 -folderAsset: yes -timeCreated: 1528026148 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameMain/Scripts/Debugger/ChangeLanguageDebuggerWindow.cs b/Assets/GameMain/Scripts/Debugger/ChangeLanguageDebuggerWindow.cs deleted file mode 100644 index b1632bb..0000000 --- a/Assets/GameMain/Scripts/Debugger/ChangeLanguageDebuggerWindow.cs +++ /dev/null @@ -1,86 +0,0 @@ -//------------------------------------------------------------ -// Game Framework -// Copyright © 2013-2021 Jiang Yin. All rights reserved. -// Homepage: https://gameframework.cn/ -// Feedback: mailto:ellan@gameframework.cn -//------------------------------------------------------------ - -using Definition; -using GameFramework.Debugger; -using GameFramework.Localization; -using UnityEngine; -using UnityGameFramework.Runtime; - -namespace StarForce -{ - public class ChangeLanguageDebuggerWindow : IDebuggerWindow - { - private Vector2 m_ScrollPosition = Vector2.zero; - private bool m_NeedRestart = false; - - public void Initialize(params object[] args) - { - } - - public void Shutdown() - { - } - - public void OnEnter() - { - } - - public void OnLeave() - { - } - - public void OnUpdate(float elapseSeconds, float realElapseSeconds) - { - if (m_NeedRestart) - { - m_NeedRestart = false; - UnityGameFramework.Runtime.GameEntry.Shutdown(ShutdownType.Restart); - } - } - - public void OnDraw() - { - m_ScrollPosition = GUILayout.BeginScrollView(m_ScrollPosition); - { - DrawSectionChangeLanguage(); - } - GUILayout.EndScrollView(); - } - - private void DrawSectionChangeLanguage() - { - GUILayout.Label("Change Language"); - GUILayout.BeginHorizontal("box"); - { - if (GUILayout.Button("Chinese Simplified", GUILayout.Height(30))) - { - GameEntry.Localization.Language = Language.ChineseSimplified; - SaveLanguage(); - } - if (GUILayout.Button("Chinese Traditional", GUILayout.Height(30))) - { - GameEntry.Localization.Language = Language.ChineseTraditional; - SaveLanguage(); - } - if (GUILayout.Button("English", GUILayout.Height(30))) - { - GameEntry.Localization.Language = Language.English; - SaveLanguage(); - } - } - GUILayout.EndHorizontal(); - } - - private void SaveLanguage() - { - GameEntry.Setting.SetString(Constant.Setting.Language, GameEntry.Localization.Language.ToString()); - GameEntry.Setting.Save(); - m_NeedRestart = true; - } - } -} diff --git a/Assets/GameMain/Scripts/Debugger/ChangeLanguageDebuggerWindow.cs.meta b/Assets/GameMain/Scripts/Debugger/ChangeLanguageDebuggerWindow.cs.meta deleted file mode 100644 index 5c0c046..0000000 --- a/Assets/GameMain/Scripts/Debugger/ChangeLanguageDebuggerWindow.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 278a7992e66d1ea4081597614f912f3d -timeCreated: 1528026148 -licenseType: Pro -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameMain/Scripts/Definition/Constant/Constant.Setting.cs b/Assets/GameMain/Scripts/Definition/Constant/Constant.Setting.cs index 1595633..60034d7 100644 --- a/Assets/GameMain/Scripts/Definition/Constant/Constant.Setting.cs +++ b/Assets/GameMain/Scripts/Definition/Constant/Constant.Setting.cs @@ -11,15 +11,18 @@ namespace Definition { public static class Setting { - public const string Language = "Setting.Language"; - public const string SoundGroupMuted = "Setting.{0}Muted"; - public const string SoundGroupVolume = "Setting.{0}Volume"; - public const string MusicMuted = "Setting.MusicMuted"; - public const string MusicVolume = "Setting.MusicVolume"; - public const string SoundMuted = "Setting.SoundMuted"; - public const string SoundVolume = "Setting.SoundVolume"; - public const string UISoundMuted = "Setting.UISoundMuted"; - public const string UISoundVolume = "Setting.UISoundVolume"; + public const string BGMVolume = "Setting.BGMVolume"; + public const string SEVolume = "Setting.SEVolume"; + + public const string AllowShake = "Setting.AllowShake"; + public const string AllowBlink = "Setting.AllowBlink"; + public const string DialogWindowAlpha = "Setting.DialogWindowAlpha"; + public const string DialogPlayingSpeed = "Setting.PlayingSpeed"; + + public const string ScreenSolution = "Setting.ScreenSolution"; + public const string ScreenWindow = "Setting.ScreenWindow"; + public const string VSync = "Setting.VSync"; + public const string AntiAliasing = "Setting.AntiAliasing"; } } } diff --git a/Assets/GameMain/Scripts/Definition/DataStruct/GameSetting.cs b/Assets/GameMain/Scripts/Definition/DataStruct/GameSetting.cs index 3f80782..76a4787 100644 --- a/Assets/GameMain/Scripts/Definition/DataStruct/GameSetting.cs +++ b/Assets/GameMain/Scripts/Definition/DataStruct/GameSetting.cs @@ -38,7 +38,7 @@ namespace Definition.DataStruct /// /// 对话播放速度 /// - public DialogPlayingSpeed PlayingSpeed { get; set; } + public DialogPlayingSpeed DialogPlayingSpeed { get; set; } #endregion @@ -47,7 +47,7 @@ namespace Definition.DataStruct /// /// 屏幕分辨率 /// - public ScreenSolutionType ScreenSolution { get; set; } + public ScreenResolutionType ScreenResolution { get; set; } /// /// 屏幕窗口模式 diff --git a/Assets/GameMain/Scripts/Definition/Enum/SettingEnums.cs b/Assets/GameMain/Scripts/Definition/Enum/SettingEnums.cs index 2884c13..0dd6218 100644 --- a/Assets/GameMain/Scripts/Definition/Enum/SettingEnums.cs +++ b/Assets/GameMain/Scripts/Definition/Enum/SettingEnums.cs @@ -15,14 +15,20 @@ namespace Definition.Enum High } - public enum ScreenSolutionType : byte + public enum ScreenResolutionType : byte { + _1280x720, + _1366x768, + _1600x900, + _1920x1080, + _2560x1440, + _2560x1600 } public enum ScreenWindowType : byte { - NoneBoard, - Window, - FullScreen + Borderless, + FullScreen, + Windowed, } } \ No newline at end of file diff --git a/Assets/GameMain/Scripts/Event/SettingSaveEventArgs.cs b/Assets/GameMain/Scripts/Event/SettingSaveEventArgs.cs index 8c89698..ecbef05 100644 --- a/Assets/GameMain/Scripts/Event/SettingSaveEventArgs.cs +++ b/Assets/GameMain/Scripts/Event/SettingSaveEventArgs.cs @@ -11,7 +11,7 @@ namespace Event public override int Id => EventId; - public GameSetting? GameSettings; + public GameSetting GameSettings; public SettingSaveEventArgs() { @@ -26,7 +26,7 @@ namespace Event public override void Clear() { - GameSettings = null; + GameSettings = new GameSetting(); } } } \ No newline at end of file diff --git a/Assets/GameMain/Scripts/Procedure/BuiltIn/ProcedureChangeScene.cs b/Assets/GameMain/Scripts/Procedure/BuiltIn/ProcedureChangeScene.cs index d36d85d..241d939 100644 --- a/Assets/GameMain/Scripts/Procedure/BuiltIn/ProcedureChangeScene.cs +++ b/Assets/GameMain/Scripts/Procedure/BuiltIn/ProcedureChangeScene.cs @@ -4,7 +4,7 @@ using Definition; using Definition.Enum; using GameFramework.DataTable; using GameFramework.Event; -using StarForce; +using Sound; using UnityGameFramework.Runtime; using ProcedureOwner = GameFramework.Fsm.IFsm; @@ -57,7 +57,8 @@ namespace Procedure return; } - GameEntry.Scene.LoadScene(AssetUtility.GetSceneAsset(drScene.AssetName), Constant.AssetPriority.SceneAsset, this); + GameEntry.Scene.LoadScene(AssetUtility.GetSceneAsset(drScene.AssetName), Constant.AssetPriority.SceneAsset, + this); _backgroundMusicId = drScene.BackgroundMusicId; } @@ -83,6 +84,9 @@ namespace Procedure SceneId sceneId = (SceneId)_nextSceneId; switch (sceneId) { + case SceneId.Menu: + ChangeState(procedureOwner); + break; case SceneId.GameplayA: ChangeState(procedureOwner); break; @@ -105,7 +109,7 @@ namespace Procedure if (_backgroundMusicId > 0) { - GameEntry.Sound.PlayMusic(_backgroundMusicId); + GameEntry.Sound.PlayBGM(_backgroundMusicId); } _isChangeSceneComplete = true; @@ -141,7 +145,8 @@ namespace Procedure return; } - Log.Info("Load scene '{0}' dependency asset '{1}', count '{2}/{3}'.", ne.SceneAssetName, ne.DependencyAssetName, ne.LoadedCount.ToString(), ne.TotalCount.ToString()); + Log.Info("Load scene '{0}' dependency asset '{1}', count '{2}/{3}'.", ne.SceneAssetName, + ne.DependencyAssetName, ne.LoadedCount.ToString(), ne.TotalCount.ToString()); } } -} +} \ No newline at end of file diff --git a/Assets/GameMain/Scripts/Procedure/BuiltIn/ProcedureLaunch.cs b/Assets/GameMain/Scripts/Procedure/BuiltIn/ProcedureLaunch.cs index f86746a..bf16cd8 100644 --- a/Assets/GameMain/Scripts/Procedure/BuiltIn/ProcedureLaunch.cs +++ b/Assets/GameMain/Scripts/Procedure/BuiltIn/ProcedureLaunch.cs @@ -1,7 +1,5 @@ -using GameFramework.Localization; -using System; -using Definition; -using StarForce; +using Definition; +using Sound; using UnityGameFramework.Runtime; using ProcedureOwner = GameFramework.Fsm.IFsm; @@ -17,19 +15,10 @@ namespace Procedure // 构建信息：发布版本时，把一些数据以 Json 的格式写入 Assets/GameMain/Configs/BuildInfo.txt，供游戏逻辑读取 GameEntry.BuiltinData.InitBuildInfo(); - - // 语言配置：设置当前使用的语言，如果不设置，则默认使用操作系统语言 - InitLanguageSettings(); - - // 变体配置：根据使用的语言，通知底层加载对应的资源变体 - InitCurrentVariant(); - - // 声音配置：根据用户配置数据，设置即将使用的声音选项 - InitSoundSettings(); - + // 默认字典：加载默认字典文件 Assets/GameMain/Configs/DefaultDictionary.xml // 此字典文件记录了资源更新前使用的各种语言的字符串，会随 App 一起发布，故不可更新 - GameEntry.BuiltinData.InitDefaultDictionary(); + // GameEntry.BuiltinData.InitDefaultDictionary(); } protected override void OnUpdate(ProcedureOwner procedureOwner, float elapseSeconds, float realElapseSeconds) @@ -39,89 +28,5 @@ namespace Procedure // 运行一帧即切换到 Splash 展示流程 ChangeState(procedureOwner); } - - private void InitLanguageSettings() - { - if (GameEntry.Base.EditorResourceMode && GameEntry.Base.EditorLanguage != Language.Unspecified) - { - // 编辑器资源模式直接使用 Inspector 上设置的语言 - return; - } - - Language language = GameEntry.Localization.Language; - if (GameEntry.Setting.HasSetting(Constant.Setting.Language)) - { - try - { - string languageString = GameEntry.Setting.GetString(Constant.Setting.Language); - language = (Language)Enum.Parse(typeof(Language), languageString); - } - catch - { - } - } - - if (language != Language.English - && language != Language.ChineseSimplified - && language != Language.ChineseTraditional - && language != Language.Korean) - { - // 若是暂不支持的语言，则使用英语 - language = Language.English; - - GameEntry.Setting.SetString(Constant.Setting.Language, language.ToString()); - GameEntry.Setting.Save(); - } - - GameEntry.Localization.Language = language; - Log.Info("Init language settings complete, current language is '{0}'.", language.ToString()); - } - - private void InitCurrentVariant() - { - if (GameEntry.Base.EditorResourceMode) - { - // 编辑器资源模式不使用 AssetBundle，也就没有变体了 - return; - } - - string currentVariant = null; - switch (GameEntry.Localization.Language) - { - case Language.English: - currentVariant = "en-us"; - break; - - case Language.ChineseSimplified: - currentVariant = "zh-cn"; - break; - - case Language.ChineseTraditional: - currentVariant = "zh-tw"; - break; - - case Language.Korean: - currentVariant = "ko-kr"; - break; - - default: - currentVariant = "zh-cn"; - break; - } - - GameEntry.Resource.SetCurrentVariant(currentVariant); - Log.Info("Init current variant complete."); - } - - private void InitSoundSettings() - { - GameEntry.Sound.Mute("Music", GameEntry.Setting.GetBool(Constant.Setting.MusicMuted, false)); - GameEntry.Sound.SetVolume("Music", GameEntry.Setting.GetFloat(Constant.Setting.MusicVolume, 0.3f)); - GameEntry.Sound.Mute("Sound", GameEntry.Setting.GetBool(Constant.Setting.SoundMuted, false)); - GameEntry.Sound.SetVolume("Sound", GameEntry.Setting.GetFloat(Constant.Setting.SoundVolume, 1f)); - GameEntry.Sound.Mute("UISound", GameEntry.Setting.GetBool(Constant.Setting.UISoundMuted, false)); - GameEntry.Sound.SetVolume("UISound", GameEntry.Setting.GetFloat(Constant.Setting.UISoundVolume, 1f)); - Log.Info("Init sound settings complete."); - } } } diff --git a/Assets/GameMain/Scripts/Procedure/BuiltIn/ProcedurePreload.cs b/Assets/GameMain/Scripts/Procedure/BuiltIn/ProcedurePreload.cs index dc16b94..0a96a28 100644 --- a/Assets/GameMain/Scripts/Procedure/BuiltIn/ProcedurePreload.cs +++ b/Assets/GameMain/Scripts/Procedure/BuiltIn/ProcedurePreload.cs @@ -1,14 +1,19 @@ -using GameFramework; +using System; +using GameFramework; using GameFramework.Event; using GameFramework.Resource; using System.Collections.Generic; +using System.Linq; using CustomUtility; using DataTable; using Definition; using Definition.Enum; +using Setting; +using Sound; using TMPro; using UI; using UnityEngine; +using UnityEngine.Rendering; using UnityGameFramework.Runtime; using ProcedureOwner = GameFramework.Fsm.IFsm; @@ -19,11 +24,10 @@ namespace Procedure public static readonly string[] DataTableNames = new string[] { "Entity", - "Music", + "BGM", "Scene", - "Sound", "UIForm", - "UISound", + "SE", "Dialog", "DialogLine" }; @@ -72,15 +76,12 @@ namespace Procedure } } - procedureOwner.SetData("NextSceneId", (int)SceneId.Main); + procedureOwner.SetData("NextSceneId", (int)SceneId.Menu); ChangeState(procedureOwner); } private void PreloadResources() { - // Preload configs - LoadConfig("DefaultConfig"); - // Preload data tables foreach (string dataTableName in DataTableNames) { @@ -88,18 +89,13 @@ namespace Procedure } // Preload dictionaries - LoadDictionary("Default"); + // LoadDictionary("Default"); // Preload fonts LoadFont("MainFont"); LoadTMPFont("MainTMPFont"); - } - private void LoadConfig(string configName) - { - string configAssetName = AssetUtility.GetConfigAsset(configName, false); - _loadedFlag.Add(configAssetName, false); - GameEntry.Config.ReadData(configAssetName, this); + LoadSetting(); } private void LoadDataTable(string dataTableName) @@ -152,6 +148,81 @@ namespace Procedure })); } + private void LoadSetting() + { + var setting = GameEntry.Setting.GetGameSetting(); + + GameEntry.Sound.SetVolume("BGM", setting.BGMVolume); + GameEntry.Sound.SetVolume("SE", setting.SEVolume); + + ScreenResolutionType resolution = setting.ScreenResolution; + int width = 0, height = 0; + switch (resolution) + { + case ScreenResolutionType._1280x720: + width = 1280; + height = 720; + break; + case ScreenResolutionType._1366x768: + width = 1366; + height = 768; + break; + case ScreenResolutionType._1600x900: + width = 1600; + height = 900; + break; + case ScreenResolutionType._1920x1080: + width = 1920; + height = 1080; + break; + case ScreenResolutionType._2560x1440: + width = 2560; + height = 1440; + break; + case ScreenResolutionType._2560x1600: + width = 2560; + height = 1600; + break; + default: + throw new ArgumentOutOfRangeException(); + } + + ScreenWindowType resolutionWindow = setting.ScreenWindow; + switch (resolutionWindow) + { + case ScreenWindowType.FullScreen: + Screen.SetResolution(width, height, FullScreenMode.ExclusiveFullScreen); + break; + case ScreenWindowType.Borderless: + Screen.SetResolution(width, height, FullScreenMode.FullScreenWindow); + break; + case ScreenWindowType.Windowed: + Screen.SetResolution(width, height, FullScreenMode.Windowed); + break; + default: + throw new ArgumentOutOfRangeException(); + } + + Application.targetFrameRate = -1; + QualitySettings.vSyncCount = setting.VSync ? 1 : 0; + if (setting.AntiAliasing) + { + foreach (var asset in GraphicsSettings.allConfiguredRenderPipelines) + { + if (asset.name == "URP-AntiAliasing") GraphicsSettings.renderPipelineAsset = asset; + } + } + else + { + foreach (var asset in GraphicsSettings.allConfiguredRenderPipelines) + { + if (asset.name == "URP-Normal") GraphicsSettings.renderPipelineAsset = asset; + } + } + } + + #region Event Hanlders + private void OnLoadConfigSuccess(object sender, GameEventArgs e) { LoadConfigSuccessEventArgs ne = (LoadConfigSuccessEventArgs)e; @@ -223,5 +294,7 @@ namespace Procedure Log.Error("Can not load dictionary '{0}' from '{1}' with error message '{2}'.", ne.DictionaryAssetName, ne.DictionaryAssetName, ne.ErrorMessage); } + + #endregion } } \ No newline at end of file diff --git a/Assets/GameMain/Scripts/Procedure/ProcedureMenu.cs b/Assets/GameMain/Scripts/Procedure/ProcedureMenu.cs index ee07e30..2ddc29c 100644 --- a/Assets/GameMain/Scripts/Procedure/ProcedureMenu.cs +++ b/Assets/GameMain/Scripts/Procedure/ProcedureMenu.cs @@ -1,6 +1,15 @@ +using System; +using Definition.DataStruct; +using Definition.Enum; +using Event; +using GameFramework.Event; using GameFramework.Fsm; using GameFramework.Procedure; +using Setting; +using Sound; using UI; +using UnityEngine; +using UnityEngine.Rendering; namespace Procedure @@ -11,18 +20,64 @@ namespace Procedure private MenuFormController _menuFormController; + private SettingFormController _settingFormController; + + private const string SettingPrefix = "Setting."; + + private void StartGame() + { + } + + private void LoadGame() + { + } + + private void OpenSettingForm() + { + if (_settingFormController == null) + { + _settingFormController = new SettingFormController(); + } + + var settingContext = new SettingFormContext + { + Setting = GameEntry.Setting.GetGameSetting() + }; + _settingFormController.OpenUI(settingContext); + } + + private void ExitGame() + { + Application.Quit(); + } + #region FSM protected override void OnEnter(IFsm procedureOwner) { base.OnEnter(procedureOwner); + var e = GameEntry.Event; + e.Subscribe(MenuStartEventArgs.EventId, MenuStart); + e.Subscribe(MenuContinueEventArgs.EventId, MenuContinue); + e.Subscribe(MenuSettingEventArgs.EventId, MenuSetting); + e.Subscribe(MenuExitEventArgs.EventId, MenuExit); + e.Subscribe(SettingSaveEventArgs.EventId, SettingSave); + + _menuFormController = new MenuFormController(); _menuFormController.OpenUI(new MenuFormContext()); } protected override void OnLeave(IFsm procedureOwner, bool isShutdown) { + var e = GameEntry.Event; + e.Unsubscribe(MenuStartEventArgs.EventId, MenuStart); + e.Unsubscribe(MenuContinueEventArgs.EventId, MenuContinue); + e.Unsubscribe(MenuSettingEventArgs.EventId, MenuSetting); + e.Unsubscribe(MenuExitEventArgs.EventId, MenuExit); + e.Unsubscribe(SettingSaveEventArgs.EventId, SettingSave); + base.OnLeave(procedureOwner, isShutdown); } @@ -33,5 +88,107 @@ namespace Procedure } #endregion + + #region Event Handlers + + private void MenuStart(object sender, GameEventArgs e) + { + if (!(e is MenuStartEventArgs)) return; + } + + private void MenuContinue(object sender, GameEventArgs e) + { + if (!(e is MenuContinueEventArgs)) return; + } + + private void MenuSetting(object sender, GameEventArgs e) + { + if (!(e is MenuSettingEventArgs)) return; + OpenSettingForm(); + } + + private void MenuExit(object sender, GameEventArgs e) + { + if (!(e is MenuExitEventArgs)) return; + ExitGame(); + } + + private void SettingSave(object sender, GameEventArgs e) + { + if (!(e is SettingSaveEventArgs args)) return; + + GameEntry.Sound.SetVolume("BGM", args.GameSettings.BGMVolume); + GameEntry.Sound.SetVolume("SE", args.GameSettings.SEVolume); + + ScreenResolutionType resolution = args.GameSettings.ScreenResolution; + int width = 0, height = 0; + switch (resolution) + { + case ScreenResolutionType._1280x720: + width = 1280; + height = 720; + break; + case ScreenResolutionType._1366x768: + width = 1366; + height = 768; + break; + case ScreenResolutionType._1600x900: + width = 1600; + height = 900; + break; + case ScreenResolutionType._1920x1080: + width = 1920; + height = 1080; + break; + case ScreenResolutionType._2560x1440: + width = 2560; + height = 1440; + break; + case ScreenResolutionType._2560x1600: + width = 2560; + height = 1600; + break; + default: + throw new ArgumentOutOfRangeException(); + } + + ScreenWindowType resolutionWindow = args.GameSettings.ScreenWindow; + switch (resolutionWindow) + { + case ScreenWindowType.FullScreen: + Screen.SetResolution(width, height, FullScreenMode.ExclusiveFullScreen); + break; + case ScreenWindowType.Borderless: + Screen.SetResolution(width, height, FullScreenMode.FullScreenWindow); + break; + case ScreenWindowType.Windowed: + Screen.SetResolution(width, height, FullScreenMode.Windowed); + break; + default: + throw new ArgumentOutOfRangeException(); + } + + if (args.GameSettings.AntiAliasing) + { + foreach (var asset in GraphicsSettings.allConfiguredRenderPipelines) + { + if (asset.name == "URP-AntiAliasing") GraphicsSettings.renderPipelineAsset = asset; + } + } + else + { + foreach (var asset in GraphicsSettings.allConfiguredRenderPipelines) + { + if (asset.name == "URP-Normal") GraphicsSettings.renderPipelineAsset = asset; + } + } + + Application.targetFrameRate = -1; + QualitySettings.vSyncCount = args.GameSettings.VSync ? 1 : 0; + + GameEntry.Setting.SaveSetting(args.GameSettings); + } + + #endregion } } \ No newline at end of file diff --git a/Assets/GameMain/Scripts/Sound/SoundExtension.cs b/Assets/GameMain/Scripts/Sound/SoundExtension.cs index d8fce21..1060b1b 100644 --- a/Assets/GameMain/Scripts/Sound/SoundExtension.cs +++ b/Assets/GameMain/Scripts/Sound/SoundExtension.cs @@ -1,33 +1,25 @@ -//------------------------------------------------------------ -// Game Framework -// Copyright © 2013-2021 Jiang Yin. All rights reserved. -// Homepage: https://gameframework.cn/ -// Feedback: mailto:ellan@gameframework.cn -//------------------------------------------------------------ - -using CustomUtility; +using CustomUtility; using DataTable; using Definition; using Entity; -using GameFramework; using GameFramework.DataTable; using GameFramework.Sound; using UnityGameFramework.Runtime; -namespace StarForce +namespace Sound { public static class SoundExtension { private const float FadeVolumeDuration = 1f; private static int? s_MusicSerialId = null; - public static int? PlayMusic(this SoundComponent soundComponent, int musicId, object userData = null) + public static int? PlayBGM(this SoundComponent soundComponent, int musicId, object userData = null) { soundComponent.StopMusic(); - IDataTable dtMusic = GameEntry.DataTable.GetDataTable(); - DRMusic drMusic = dtMusic.GetDataRow(musicId); - if (drMusic == null) + IDataTable dtMusic = GameEntry.DataTable.GetDataTable(); + DRBGM drBgm = dtMusic.GetDataRow(musicId); + if (drBgm == null) { Log.Warning("Can not load music '{0}' from data table.", musicId.ToString()); return null; @@ -39,7 +31,8 @@ namespace StarForce playSoundParams.VolumeInSoundGroup = 1f; playSoundParams.FadeInSeconds = FadeVolumeDuration; playSoundParams.SpatialBlend = 0f; - s_MusicSerialId = soundComponent.PlaySound(AssetUtility.GetMusicAsset(drMusic.AssetName), "Music", Constant.AssetPriority.MusicAsset, playSoundParams, null, userData); + s_MusicSerialId = soundComponent.PlaySound(AssetUtility.GetMusicAsset(drBgm.AssetName), "BGM", + Constant.AssetPriority.MusicAsset, playSoundParams, null, userData); return s_MusicSerialId; } @@ -54,28 +47,10 @@ namespace StarForce s_MusicSerialId = null; } - public static int? PlaySound(this SoundComponent soundComponent, int soundId, EntityBase bindingEntity = null, object userData = null) + public static int? PlaySE(this SoundComponent soundComponent, int uiSoundId, object userData = null) { - IDataTable dtSound = GameEntry.DataTable.GetDataTable(); - DRSound drSound = dtSound.GetDataRow(soundId); - if (drSound == null) - { - Log.Warning("Can not load sound '{0}' from data table.", soundId.ToString()); - return null; - } - - PlaySoundParams playSoundParams = PlaySoundParams.Create(); - playSoundParams.Priority = drSound.Priority; - playSoundParams.Loop = drSound.Loop; - playSoundParams.VolumeInSoundGroup = drSound.Volume; - playSoundParams.SpatialBlend = drSound.SpatialBlend; - return soundComponent.PlaySound(AssetUtility.GetSoundAsset(drSound.AssetName), "Sound", Constant.AssetPriority.SoundAsset, playSoundParams, bindingEntity != null ? bindingEntity.Entity : null, userData); - } - - public static int? PlayUISound(this SoundComponent soundComponent, int uiSoundId, object userData = null) - { - IDataTable dtUISound = GameEntry.DataTable.GetDataTable(); - DRUISound drUISound = dtUISound.GetDataRow(uiSoundId); + IDataTable dtUISound = GameEntry.DataTable.GetDataTable(); + DRSE drUISound = dtUISound.GetDataRow(uiSoundId); if (drUISound == null) { Log.Warning("Can not load UI sound '{0}' from data table.", uiSoundId.ToString()); @@ -87,46 +62,8 @@ namespace StarForce playSoundParams.Loop = false; playSoundParams.VolumeInSoundGroup = drUISound.Volume; playSoundParams.SpatialBlend = 0f; - return soundComponent.PlaySound(AssetUtility.GetUISoundAsset(drUISound.AssetName), "UISound", Constant.AssetPriority.UISoundAsset, playSoundParams, userData); - } - - public static bool IsMuted(this SoundComponent soundComponent, string soundGroupName) - { - if (string.IsNullOrEmpty(soundGroupName)) - { - Log.Warning("Sound group is invalid."); - return true; - } - - ISoundGroup soundGroup = soundComponent.GetSoundGroup(soundGroupName); - if (soundGroup == null) - { - Log.Warning("Sound group '{0}' is invalid.", soundGroupName); - return true; - } - - return soundGroup.Mute; - } - - public static void Mute(this SoundComponent soundComponent, string soundGroupName, bool mute) - { - if (string.IsNullOrEmpty(soundGroupName)) - { - Log.Warning("Sound group is invalid."); - return; - } - - ISoundGroup soundGroup = soundComponent.GetSoundGroup(soundGroupName); - if (soundGroup == null) - { - Log.Warning("Sound group '{0}' is invalid.", soundGroupName); - return; - } - - soundGroup.Mute = mute; - - GameEntry.Setting.SetBool(Utility.Text.Format(Constant.Setting.SoundGroupMuted, soundGroupName), mute); - GameEntry.Setting.Save(); + return soundComponent.PlaySound(AssetUtility.GetUISoundAsset(drUISound.AssetName), "SE", + Constant.AssetPriority.UISoundAsset, playSoundParams, userData); } public static float GetVolume(this SoundComponent soundComponent, string soundGroupName) @@ -164,8 +101,8 @@ namespace StarForce soundGroup.Volume = volume; - GameEntry.Setting.SetFloat(Utility.Text.Format(Constant.Setting.SoundGroupVolume, soundGroupName), volume); + GameEntry.Setting.SetFloat($"Setting.{soundGroup}Volume", volume); GameEntry.Setting.Save(); } } -} +} \ No newline at end of file diff --git a/Assets/GameMain/Scripts/UI/Controller/SettingFormController.cs b/Assets/GameMain/Scripts/UI/Controller/SettingFormController.cs index 080d92f..51045aa 100644 --- a/Assets/GameMain/Scripts/UI/Controller/SettingFormController.cs +++ b/Assets/GameMain/Scripts/UI/Controller/SettingFormController.cs @@ -25,6 +25,7 @@ namespace UI return null; } + context.Controller = this; _context = context; if (_settingForm != null) diff --git a/Assets/GameMain/Scripts/UI/UGuiForm.cs b/Assets/GameMain/Scripts/UI/UGuiForm.cs index 3254d11..c66f18f 100644 --- a/Assets/GameMain/Scripts/UI/UGuiForm.cs +++ b/Assets/GameMain/Scripts/UI/UGuiForm.cs @@ -1,13 +1,6 @@ -//------------------------------------------------------------ -// Game Framework -// Copyright © 2013-2021 Jiang Yin. All rights reserved. -// Homepage: https://gameframework.cn/ -// Feedback: mailto:ellan@gameframework.cn -//------------------------------------------------------------ - -using System.Collections; +using System.Collections; using System.Collections.Generic; -using StarForce; +using Sound; using TMPro; using UnityEngine; using UnityEngine.UI; @@ -51,7 +44,7 @@ namespace UI public void PlayUISound(int uiSoundId) { - GameEntry.Sound.PlayUISound(uiSoundId); + GameEntry.Sound.PlaySE(uiSoundId); } public static void SetMainFont(Font mainFont) @@ -108,10 +101,6 @@ namespace UI foreach (var text in tmp_texts) { text.font = _mainTMPFont; - if (!string.IsNullOrEmpty(text.text)) - { - text.text = GameEntry.Localization.GetString(text.text); - } } } @@ -125,10 +114,6 @@ namespace UI foreach (var text in texts) { text.font = _mainFont; - if (!string.IsNullOrEmpty(text.text)) - { - text.text = GameEntry.Localization.GetString(text.text); - } } } } diff --git a/Assets/GameMain/Scripts/UI/View/SettingForm.cs b/Assets/GameMain/Scripts/UI/View/SettingForm.cs index a39646c..9f5f607 100644 --- a/Assets/GameMain/Scripts/UI/View/SettingForm.cs +++ b/Assets/GameMain/Scripts/UI/View/SettingForm.cs @@ -46,15 +46,15 @@ namespace UI var setting = context.Setting; - _bgmVolumeSlider.value = setting.BGMVolume; - _seVolumeSlider.value = setting.SEVolume; + _bgmVolumeSlider.value = setting.BGMVolume * 4; + _seVolumeSlider.value = setting.SEVolume * 4; _allowBlinkGroup.SetValue(setting.AllowBlink); _allowShakeGroup.SetValue(setting.AllowShake); _dialogWindowAlpha.SetValue((int)setting.DialogWindowAlpha); - _playingSpeed.SetValue((int)setting.PlayingSpeed); + _playingSpeed.SetValue((int)setting.DialogPlayingSpeed); - _screenSolution.SetValue((int)setting.ScreenSolution); + _screenSolution.SetValue((int)setting.ScreenResolution); _screenWindow.SetValue((int)setting.ScreenWindow); _vSyncGroup.SetValue(setting.VSync); _antiAliasingGroup.SetValue(setting.AntiAliasing); @@ -77,15 +77,15 @@ namespace UI { var setting = new GameSetting { - BGMVolume = _bgmVolumeSlider.value, - SEVolume = _seVolumeSlider.value, + BGMVolume = _bgmVolumeSlider.value / 4, + SEVolume = _seVolumeSlider.value / 4, AllowShake = _allowShakeGroup.GetBoolValue(), AllowBlink = _allowBlinkGroup.GetBoolValue(), DialogWindowAlpha = (DialogWindowAlpha)_dialogWindowAlpha.GetIntValue(), - PlayingSpeed = (DialogPlayingSpeed)_playingSpeed.GetIntValue(), + DialogPlayingSpeed = (DialogPlayingSpeed)_playingSpeed.GetIntValue(), - ScreenSolution = (ScreenSolutionType)_screenSolution.GetIntValue(), + ScreenResolution = (ScreenResolutionType)_screenSolution.GetIntValue(), ScreenWindow = (ScreenWindowType)_screenWindow.GetIntValue(), VSync = _vSyncGroup.GetBoolValue(), AntiAliasing = _antiAliasingGroup.GetBoolValue() @@ -129,6 +129,7 @@ namespace UI { var setting = CollectSetting(); GameEntry.Event.Fire(this, SettingSaveEventArgs.Create(setting)); + _controller.CloseUI(); } } } \ No newline at end of file diff --git a/Assets/GameMain/UI/UIForms/SettingForm.prefab b/Assets/GameMain/UI/UIForms/SettingForm.prefab index 5000525..40ff7c5 100644 --- a/Assets/GameMain/UI/UIForms/SettingForm.prefab +++ b/Assets/GameMain/UI/UIForms/SettingForm.prefab @@ -4564,7 +4564,7 @@ GameObject: - component: {fileID: 5634799414351515039} - component: {fileID: 8849553200166011154} m_Layer: 5 - m_Name: ScreenSolution + m_Name: ScreenResolution m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Launcher.unity b/Assets/Launcher.unity index c03dc56..df50412 100644 --- a/Assets/Launcher.unity +++ b/Assets/Launcher.unity @@ -288,7 +288,7 @@ MonoBehaviour: m_RequiresOpaqueTextureOption: 2 m_CameraType: 0 m_Cameras: [] - m_RendererIndex: -1 + m_RendererIndex: 0 m_VolumeLayerMask: serializedVersion: 2 m_Bits: 1 @@ -438,57 +438,61 @@ PrefabInstance: value: objectReference: {fileID: 11400000, guid: a4c1cc1e6676f0e48a527bad48941f98, type: 2} + - target: {fileID: 11402440, guid: adb3eb1c35fcff14f89fba7b05c9d71c, type: 3} + propertyPath: m_ActiveWindow + value: 0 + objectReference: {fileID: 0} - target: {fileID: 11405216, guid: adb3eb1c35fcff14f89fba7b05c9d71c, type: 3} propertyPath: m_EntranceProcedureTypeName value: Procedure.ProcedureLaunch objectReference: {fileID: 0} - target: {fileID: 11405216, guid: adb3eb1c35fcff14f89fba7b05c9d71c, type: 3} propertyPath: m_AvailableProcedureTypeNames.Array.size - value: 11 + value: 12 objectReference: {fileID: 0} - target: {fileID: 11405216, guid: adb3eb1c35fcff14f89fba7b05c9d71c, type: 3} propertyPath: m_AvailableProcedureTypeNames.Array.data[0] - value: Procedure.ProcedureCheckResources + value: Procedure.ProcedureChangeScene objectReference: {fileID: 0} - target: {fileID: 11405216, guid: adb3eb1c35fcff14f89fba7b05c9d71c, type: 3} propertyPath: m_AvailableProcedureTypeNames.Array.data[1] - value: Procedure.ProcedureCheckVersion + value: Procedure.ProcedureCheckResources objectReference: {fileID: 0} - target: {fileID: 11405216, guid: adb3eb1c35fcff14f89fba7b05c9d71c, type: 3} propertyPath: m_AvailableProcedureTypeNames.Array.data[2] - value: Procedure.ProcedureCombine + value: Procedure.ProcedureCheckVersion objectReference: {fileID: 0} - target: {fileID: 11405216, guid: adb3eb1c35fcff14f89fba7b05c9d71c, type: 3} propertyPath: m_AvailableProcedureTypeNames.Array.data[3] - value: Procedure.ProcedureInitResources + value: Procedure.ProcedureCombine objectReference: {fileID: 0} - target: {fileID: 11405216, guid: adb3eb1c35fcff14f89fba7b05c9d71c, type: 3} propertyPath: m_AvailableProcedureTypeNames.Array.data[4] - value: Procedure.ProcedureLaunch + value: Procedure.ProcedureInitResources objectReference: {fileID: 0} - target: {fileID: 11405216, guid: adb3eb1c35fcff14f89fba7b05c9d71c, type: 3} propertyPath: m_AvailableProcedureTypeNames.Array.data[5] - value: Procedure.ProcedureMenu + value: Procedure.ProcedureLaunch objectReference: {fileID: 0} - target: {fileID: 11405216, guid: adb3eb1c35fcff14f89fba7b05c9d71c, type: 3} propertyPath: m_AvailableProcedureTypeNames.Array.data[6] - value: Procedure.ProcedurePreload + value: Procedure.ProcedureMenu objectReference: {fileID: 0} - target: {fileID: 11405216, guid: adb3eb1c35fcff14f89fba7b05c9d71c, type: 3} propertyPath: m_AvailableProcedureTypeNames.Array.data[7] - value: Procedure.ProcedureSplash + value: Procedure.ProcedurePreload objectReference: {fileID: 0} - target: {fileID: 11405216, guid: adb3eb1c35fcff14f89fba7b05c9d71c, type: 3} propertyPath: m_AvailableProcedureTypeNames.Array.data[8] - value: Procedure.ProcedureUpdateResources + value: Procedure.ProcedureSplash objectReference: {fileID: 0} - target: {fileID: 11405216, guid: adb3eb1c35fcff14f89fba7b05c9d71c, type: 3} propertyPath: m_AvailableProcedureTypeNames.Array.data[9] - value: Procedure.ProcedureUpdateVersion + value: Procedure.ProcedureUpdateResources objectReference: {fileID: 0} - target: {fileID: 11405216, guid: adb3eb1c35fcff14f89fba7b05c9d71c, type: 3} propertyPath: m_AvailableProcedureTypeNames.Array.data[10] - value: Procedure.ProcedureVerifyResources + value: Procedure.ProcedureUpdateVersion objectReference: {fileID: 0} - target: {fileID: 11405216, guid: adb3eb1c35fcff14f89fba7b05c9d71c, type: 3} propertyPath: m_AvailableProcedureTypeNames.Array.data[11] @@ -509,15 +513,15 @@ PrefabInstance: type: 2} - target: {fileID: 11413340, guid: adb3eb1c35fcff14f89fba7b05c9d71c, type: 3} propertyPath: m_SoundGroups.Array.size - value: 3 + value: 2 objectReference: {fileID: 0} - target: {fileID: 11413340, guid: adb3eb1c35fcff14f89fba7b05c9d71c, type: 3} propertyPath: m_SoundGroups.Array.data[0].m_Name - value: Music + value: BGM objectReference: {fileID: 0} - target: {fileID: 11413340, guid: adb3eb1c35fcff14f89fba7b05c9d71c, type: 3} propertyPath: m_SoundGroups.Array.data[1].m_Name - value: Sound + value: SE objectReference: {fileID: 0} - target: {fileID: 11413340, guid: adb3eb1c35fcff14f89fba7b05c9d71c, type: 3} propertyPath: m_SoundGroups.Array.data[2].m_Name @@ -589,7 +593,7 @@ PrefabInstance: objectReference: {fileID: 934951765} - target: {fileID: 11454530, guid: adb3eb1c35fcff14f89fba7b05c9d71c, type: 3} propertyPath: m_UIGroups.Array.size - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 11454530, guid: adb3eb1c35fcff14f89fba7b05c9d71c, type: 3} propertyPath: m_UIGroupHelperTypeName @@ -601,7 +605,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 11454530, guid: adb3eb1c35fcff14f89fba7b05c9d71c, type: 3} propertyPath: m_UIGroups.Array.data[1].m_Name - value: Player + value: Dialog objectReference: {fileID: 0} - target: {fileID: 11454530, guid: adb3eb1c35fcff14f89fba7b05c9d71c, type: 3} propertyPath: m_UIGroups.Array.data[0].m_Depth @@ -609,6 +613,10 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 11454530, guid: adb3eb1c35fcff14f89fba7b05c9d71c, type: 3} propertyPath: m_UIGroups.Array.data[1].m_Depth + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 11461470, guid: adb3eb1c35fcff14f89fba7b05c9d71c, type: 3} + propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} - target: {fileID: 11461470, guid: adb3eb1c35fcff14f89fba7b05c9d71c, type: 3} @@ -769,11 +777,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 11497722, guid: adb3eb1c35fcff14f89fba7b05c9d71c, type: 3} propertyPath: m_ResourceMode - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 11499388, guid: adb3eb1c35fcff14f89fba7b05c9d71c, type: 3} propertyPath: m_FrameRate - value: 60 + value: 240 objectReference: {fileID: 0} - target: {fileID: 11499388, guid: adb3eb1c35fcff14f89fba7b05c9d71c, type: 3} propertyPath: m_EditorLanguage @@ -785,7 +793,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 11499388, guid: adb3eb1c35fcff14f89fba7b05c9d71c, type: 3} propertyPath: m_EditorResourceMode - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 11499388, guid: adb3eb1c35fcff14f89fba7b05c9d71c, type: 3} propertyPath: m_JsonHelperTypeName @@ -1054,7 +1062,7 @@ Canvas: m_RenderMode: 0 m_Camera: {fileID: 0} m_PlaneDistance: 100 - m_PixelPerfect: 0 + m_PixelPerfect: 1 m_ReceivesEvents: 1 m_OverrideSorting: 0 m_OverridePixelPerfect: 0 diff --git a/Assets/Settings/URP-Balanced-Renderer.asset b/Assets/Settings/URP-Balanced-Renderer.asset deleted file mode 100644 index 20bd4d4..0000000 --- a/Assets/Settings/URP-Balanced-Renderer.asset +++ /dev/null @@ -1,76 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &-1878332245247344467 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f62c9c65cf3354c93be831c8bc075510, type: 3} - m_Name: SSAO - m_EditorClassIdentifier: - m_Active: 1 - m_Shader: {fileID: 0} - m_Settings: - Downsample: 1 - AfterOpaque: 0 - Source: 0 - NormalSamples: 0 - Intensity: 0.5 - DirectLightingStrength: 0.25 - Radius: 0.25 - SampleCount: 4 ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: de640fe3d0db1804a85f9fc8f5cadab6, type: 3} - m_Name: URP-Balanced-Renderer - m_EditorClassIdentifier: - debugShaders: - debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, - type: 3} - m_RendererFeatures: - - {fileID: -1878332245247344467} - m_RendererFeatureMap: adc0de57c6d2eee5 - m_UseNativeRenderPass: 0 - postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} - shaders: - blitPS: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3} - copyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3} - screenSpaceShadowPS: {fileID: 0} - samplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3} - stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} - fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} - materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} - coreBlitPS: {fileID: 0} - coreBlitColorAndDepthPS: {fileID: 0} - cameraMotionVector: {fileID: 0} - objectMotionVector: {fileID: 0} - m_OpaqueLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_TransparentLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_DefaultStencilState: - overrideStencilState: 0 - stencilReference: 0 - stencilCompareFunction: 8 - passOperation: 2 - failOperation: 0 - zFailOperation: 0 - m_ShadowTransparentReceive: 1 - m_RenderingMode: 0 - m_DepthPrimingMode: 0 - m_AccurateGbufferNormals: 0 - m_ClusteredRendering: 0 - m_TileSize: 32 diff --git a/Assets/Settings/URP-Balanced-Renderer.asset.meta b/Assets/Settings/URP-Balanced-Renderer.asset.meta deleted file mode 100644 index 8fa7f17..0000000 --- a/Assets/Settings/URP-Balanced-Renderer.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e634585d5c4544dd297acaee93dc2beb -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Settings/URP-Balanced.asset b/Assets/Settings/URP-Balanced.asset deleted file mode 100644 index 65bbfc8..0000000 --- a/Assets/Settings/URP-Balanced.asset +++ /dev/null @@ -1,114 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3} - m_Name: URP-Balanced - m_EditorClassIdentifier: - k_AssetVersion: 11 - k_AssetPreviousVersion: 11 - m_RendererType: 1 - m_RendererData: {fileID: 0} - m_RendererDataList: - - {fileID: 11400000, guid: e634585d5c4544dd297acaee93dc2beb, type: 2} - m_DefaultRendererIndex: 0 - m_RequireDepthTexture: 0 - m_RequireOpaqueTexture: 0 - m_OpaqueDownsampling: 1 - m_SupportsTerrainHoles: 1 - m_SupportsHDR: 1 - m_HDRColorBufferPrecision: 0 - m_MSAA: 1 - m_RenderScale: 1 - m_UpscalingFilter: 0 - m_FsrOverrideSharpness: 0 - m_FsrSharpness: 0.92 - m_EnableLODCrossFade: 1 - m_LODCrossFadeDitheringType: 1 - m_ShEvalMode: 0 - m_MainLightRenderingMode: 1 - m_MainLightShadowsSupported: 1 - m_MainLightShadowmapResolution: 1024 - m_AdditionalLightsRenderingMode: 1 - m_AdditionalLightsPerObjectLimit: 2 - m_AdditionalLightShadowsSupported: 0 - m_AdditionalLightsShadowmapResolution: 512 - m_AdditionalLightsShadowResolutionTierLow: 128 - m_AdditionalLightsShadowResolutionTierMedium: 256 - m_AdditionalLightsShadowResolutionTierHigh: 512 - m_ReflectionProbeBlending: 0 - m_ReflectionProbeBoxProjection: 0 - m_ShadowDistance: 50 - m_ShadowCascadeCount: 1 - m_Cascade2Split: 0.25 - m_Cascade3Split: {x: 0.1, y: 0.3} - m_Cascade4Split: {x: 0.067, y: 0.2, z: 0.467} - m_CascadeBorder: 0.1 - m_ShadowDepthBias: 1 - m_ShadowNormalBias: 1 - m_AnyShadowsSupported: 1 - m_SoftShadowsSupported: 1 - m_ConservativeEnclosingSphere: 0 - m_NumIterationsEnclosingSphere: 64 - m_SoftShadowQuality: 2 - m_AdditionalLightsCookieResolution: 512 - m_AdditionalLightsCookieFormat: 1 - m_UseSRPBatcher: 1 - m_SupportsDynamicBatching: 0 - m_MixedLightingSupported: 1 - m_SupportsLightCookies: 1 - m_SupportsLightLayers: 0 - m_DebugLevel: 0 - m_StoreActionsOptimization: 0 - m_EnableRenderGraph: 0 - m_UseAdaptivePerformance: 1 - m_ColorGradingMode: 0 - m_ColorGradingLutSize: 32 - m_UseFastSRGBLinearConversion: 0 - m_SupportDataDrivenLensFlare: 1 - m_ShadowType: 1 - m_LocalShadowsSupported: 0 - m_LocalShadowsAtlasResolution: 256 - m_MaxPixelLights: 0 - m_ShadowAtlasResolution: 256 - m_VolumeFrameworkUpdateMode: 0 - m_Textures: - blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3} - bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3} - m_PrefilteringModeMainLightShadows: 1 - m_PrefilteringModeAdditionalLight: 4 - m_PrefilteringModeAdditionalLightShadows: 1 - m_PrefilterXRKeywords: 0 - m_PrefilteringModeForwardPlus: 1 - m_PrefilteringModeDeferredRendering: 1 - m_PrefilteringModeScreenSpaceOcclusion: 1 - m_PrefilterDebugKeywords: 0 - m_PrefilterWriteRenderingLayers: 0 - m_PrefilterHDROutput: 0 - m_PrefilterSSAODepthNormals: 0 - m_PrefilterSSAOSourceDepthLow: 0 - m_PrefilterSSAOSourceDepthMedium: 0 - m_PrefilterSSAOSourceDepthHigh: 0 - m_PrefilterSSAOInterleaved: 0 - m_PrefilterSSAOBlueNoise: 0 - m_PrefilterSSAOSampleCountLow: 0 - m_PrefilterSSAOSampleCountMedium: 0 - m_PrefilterSSAOSampleCountHigh: 0 - m_PrefilterDBufferMRT1: 0 - m_PrefilterDBufferMRT2: 0 - m_PrefilterDBufferMRT3: 0 - m_PrefilterSoftShadowsQualityLow: 0 - m_PrefilterSoftShadowsQualityMedium: 0 - m_PrefilterSoftShadowsQualityHigh: 0 - m_PrefilterSoftShadows: 0 - m_PrefilterScreenCoord: 0 - m_PrefilterNativeRenderPass: 0 - m_ShaderVariantLogLevel: 0 - m_ShadowCascades: 0 diff --git a/Assets/Settings/URP-Balanced.asset.meta b/Assets/Settings/URP-Balanced.asset.meta deleted file mode 100644 index f524db0..0000000 --- a/Assets/Settings/URP-Balanced.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e1260c1148f6143b28bae5ace5e9c5d1 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Settings/URP-HighFidelity-Renderer.asset b/Assets/Settings/URP-HighFidelity-Renderer.asset deleted file mode 100644 index 4f662f3..0000000 --- a/Assets/Settings/URP-HighFidelity-Renderer.asset +++ /dev/null @@ -1,104 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &-1878332245247344467 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f62c9c65cf3354c93be831c8bc075510, type: 3} - m_Name: SSAO - m_EditorClassIdentifier: - m_Active: 1 - m_Settings: - AOMethod: 1 - Downsample: 0 - AfterOpaque: 0 - Source: 1 - NormalSamples: 1 - Intensity: 0.5 - DirectLightingStrength: 0.25 - Radius: 0.25 - Samples: 0 - BlurQuality: 0 - Falloff: 100 - SampleCount: -1 - m_BlueNoise256Textures: - - {fileID: 2800000, guid: 36f118343fc974119bee3d09e2111500, type: 3} - - {fileID: 2800000, guid: 4b7b083e6b6734e8bb2838b0b50a0bc8, type: 3} - - {fileID: 2800000, guid: c06cc21c692f94f5fb5206247191eeee, type: 3} - - {fileID: 2800000, guid: cb76dd40fa7654f9587f6a344f125c9a, type: 3} - - {fileID: 2800000, guid: e32226222ff144b24bf3a5a451de54bc, type: 3} - - {fileID: 2800000, guid: 3302065f671a8450b82c9ddf07426f3a, type: 3} - - {fileID: 2800000, guid: 56a77a3e8d64f47b6afe9e3c95cb57d5, type: 3} - m_Shader: {fileID: 4800000, guid: 0849e84e3d62649e8882e9d6f056a017, type: 3} ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: de640fe3d0db1804a85f9fc8f5cadab6, type: 3} - m_Name: URP-HighFidelity-Renderer - m_EditorClassIdentifier: - debugShaders: - debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, - type: 3} - hdrDebugViewPS: {fileID: 4800000, guid: 573620ae32aec764abd4d728906d2587, type: 3} - m_RendererFeatures: - - {fileID: -1878332245247344467} - m_RendererFeatureMap: adc0de57c6d2eee5 - m_UseNativeRenderPass: 0 - postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} - xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} - shaders: - blitPS: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3} - copyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3} - screenSpaceShadowPS: {fileID: 0} - samplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3} - stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} - fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} - fallbackLoadingPS: {fileID: 4800000, guid: 7f888aff2ac86494babad1c2c5daeee2, type: 3} - materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} - coreBlitPS: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3} - coreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b, - type: 3} - blitHDROverlay: {fileID: 4800000, guid: a89bee29cffa951418fc1e2da94d1959, type: 3} - cameraMotionVector: {fileID: 4800000, guid: c56b7e0d4c7cb484e959caeeedae9bbf, - type: 3} - objectMotionVector: {fileID: 4800000, guid: 7b3ede40266cd49a395def176e1bc486, - type: 3} - dataDrivenLensFlare: {fileID: 4800000, guid: 6cda457ac28612740adb23da5d39ea92, - type: 3} - terrainDetailLitPS: {fileID: 4800000, guid: f6783ab646d374f94b199774402a5144, - type: 3} - terrainDetailGrassPS: {fileID: 4800000, guid: e507fdfead5ca47e8b9a768b51c291a1, - type: 3} - terrainDetailGrassBillboardPS: {fileID: 4800000, guid: 29868e73b638e48ca99a19ea58c48d90, - type: 3} - m_AssetVersion: 2 - m_OpaqueLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_TransparentLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_DefaultStencilState: - overrideStencilState: 0 - stencilReference: 0 - stencilCompareFunction: 8 - passOperation: 2 - failOperation: 0 - zFailOperation: 0 - m_ShadowTransparentReceive: 1 - m_RenderingMode: 0 - m_DepthPrimingMode: 0 - m_CopyDepthMode: 0 - m_AccurateGbufferNormals: 0 - m_IntermediateTextureMode: 1 diff --git a/Assets/Settings/URP-HighFidelity-Renderer.asset.meta b/Assets/Settings/URP-HighFidelity-Renderer.asset.meta deleted file mode 100644 index bcdff02..0000000 --- a/Assets/Settings/URP-HighFidelity-Renderer.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c40be3174f62c4acf8c1216858c64956 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Settings/URP-HighFidelity.asset b/Assets/Settings/URP-HighFidelity.asset deleted file mode 100644 index d526597..0000000 --- a/Assets/Settings/URP-HighFidelity.asset +++ /dev/null @@ -1,114 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3} - m_Name: URP-HighFidelity - m_EditorClassIdentifier: - k_AssetVersion: 11 - k_AssetPreviousVersion: 11 - m_RendererType: 1 - m_RendererData: {fileID: 0} - m_RendererDataList: - - {fileID: 11400000, guid: c40be3174f62c4acf8c1216858c64956, type: 2} - m_DefaultRendererIndex: 0 - m_RequireDepthTexture: 0 - m_RequireOpaqueTexture: 0 - m_OpaqueDownsampling: 1 - m_SupportsTerrainHoles: 1 - m_SupportsHDR: 1 - m_HDRColorBufferPrecision: 0 - m_MSAA: 4 - m_RenderScale: 1 - m_UpscalingFilter: 0 - m_FsrOverrideSharpness: 0 - m_FsrSharpness: 0.92 - m_EnableLODCrossFade: 1 - m_LODCrossFadeDitheringType: 1 - m_ShEvalMode: 0 - m_MainLightRenderingMode: 1 - m_MainLightShadowsSupported: 1 - m_MainLightShadowmapResolution: 4096 - m_AdditionalLightsRenderingMode: 1 - m_AdditionalLightsPerObjectLimit: 8 - m_AdditionalLightShadowsSupported: 1 - m_AdditionalLightsShadowmapResolution: 4096 - m_AdditionalLightsShadowResolutionTierLow: 128 - m_AdditionalLightsShadowResolutionTierMedium: 256 - m_AdditionalLightsShadowResolutionTierHigh: 512 - m_ReflectionProbeBlending: 1 - m_ReflectionProbeBoxProjection: 1 - m_ShadowDistance: 150 - m_ShadowCascadeCount: 4 - m_Cascade2Split: 0.25 - m_Cascade3Split: {x: 0.1, y: 0.3} - m_Cascade4Split: {x: 0.067, y: 0.2, z: 0.467} - m_CascadeBorder: 0.1 - m_ShadowDepthBias: 1 - m_ShadowNormalBias: 1 - m_AnyShadowsSupported: 1 - m_SoftShadowsSupported: 1 - m_ConservativeEnclosingSphere: 0 - m_NumIterationsEnclosingSphere: 64 - m_SoftShadowQuality: 2 - m_AdditionalLightsCookieResolution: 4096 - m_AdditionalLightsCookieFormat: 4 - m_UseSRPBatcher: 1 - m_SupportsDynamicBatching: 0 - m_MixedLightingSupported: 1 - m_SupportsLightCookies: 1 - m_SupportsLightLayers: 0 - m_DebugLevel: 0 - m_StoreActionsOptimization: 0 - m_EnableRenderGraph: 0 - m_UseAdaptivePerformance: 1 - m_ColorGradingMode: 0 - m_ColorGradingLutSize: 32 - m_UseFastSRGBLinearConversion: 0 - m_SupportDataDrivenLensFlare: 1 - m_ShadowType: 1 - m_LocalShadowsSupported: 0 - m_LocalShadowsAtlasResolution: 256 - m_MaxPixelLights: 0 - m_ShadowAtlasResolution: 256 - m_VolumeFrameworkUpdateMode: 0 - m_Textures: - blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3} - bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3} - m_PrefilteringModeMainLightShadows: 1 - m_PrefilteringModeAdditionalLight: 4 - m_PrefilteringModeAdditionalLightShadows: 1 - m_PrefilterXRKeywords: 0 - m_PrefilteringModeForwardPlus: 1 - m_PrefilteringModeDeferredRendering: 1 - m_PrefilteringModeScreenSpaceOcclusion: 1 - m_PrefilterDebugKeywords: 0 - m_PrefilterWriteRenderingLayers: 0 - m_PrefilterHDROutput: 0 - m_PrefilterSSAODepthNormals: 0 - m_PrefilterSSAOSourceDepthLow: 0 - m_PrefilterSSAOSourceDepthMedium: 0 - m_PrefilterSSAOSourceDepthHigh: 0 - m_PrefilterSSAOInterleaved: 0 - m_PrefilterSSAOBlueNoise: 0 - m_PrefilterSSAOSampleCountLow: 0 - m_PrefilterSSAOSampleCountMedium: 0 - m_PrefilterSSAOSampleCountHigh: 0 - m_PrefilterDBufferMRT1: 0 - m_PrefilterDBufferMRT2: 0 - m_PrefilterDBufferMRT3: 0 - m_PrefilterSoftShadowsQualityLow: 0 - m_PrefilterSoftShadowsQualityMedium: 0 - m_PrefilterSoftShadowsQualityHigh: 0 - m_PrefilterSoftShadows: 0 - m_PrefilterScreenCoord: 0 - m_PrefilterNativeRenderPass: 0 - m_ShaderVariantLogLevel: 0 - m_ShadowCascades: 1 diff --git a/Assets/Settings/URP-HighFidelity.asset.meta b/Assets/Settings/URP-HighFidelity.asset.meta deleted file mode 100644 index 7416e17..0000000 --- a/Assets/Settings/URP-HighFidelity.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7b7fd9122c28c4d15b667c7040e3b3fd -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Settings/URP-Performant-Renderer.asset b/Assets/Settings/URP-Performant-Renderer.asset deleted file mode 100644 index 56c53f0..0000000 --- a/Assets/Settings/URP-Performant-Renderer.asset +++ /dev/null @@ -1,52 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: de640fe3d0db1804a85f9fc8f5cadab6, type: 3} - m_Name: URP-Performant-Renderer - m_EditorClassIdentifier: - debugShaders: - debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, - type: 3} - m_RendererFeatures: [] - m_RendererFeatureMap: - m_UseNativeRenderPass: 0 - postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} - shaders: - blitPS: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3} - copyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3} - screenSpaceShadowPS: {fileID: 0} - samplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3} - stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} - fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} - materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} - coreBlitPS: {fileID: 0} - coreBlitColorAndDepthPS: {fileID: 0} - cameraMotionVector: {fileID: 0} - objectMotionVector: {fileID: 0} - m_OpaqueLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_TransparentLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_DefaultStencilState: - overrideStencilState: 0 - stencilReference: 0 - stencilCompareFunction: 8 - passOperation: 2 - failOperation: 0 - zFailOperation: 0 - m_ShadowTransparentReceive: 1 - m_RenderingMode: 0 - m_DepthPrimingMode: 0 - m_AccurateGbufferNormals: 0 - m_ClusteredRendering: 0 - m_TileSize: 32 diff --git a/Assets/Settings/URP-Performant-Renderer.asset.meta b/Assets/Settings/URP-Performant-Renderer.asset.meta deleted file mode 100644 index 912ff60..0000000 --- a/Assets/Settings/URP-Performant-Renderer.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 707360a9c581a4bd7aa53bfeb1429f71 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Settings/URP-Performant.asset b/Assets/Settings/URP-Performant.asset deleted file mode 100644 index 8650b69..0000000 --- a/Assets/Settings/URP-Performant.asset +++ /dev/null @@ -1,114 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3} - m_Name: URP-Performant - m_EditorClassIdentifier: - k_AssetVersion: 11 - k_AssetPreviousVersion: 11 - m_RendererType: 1 - m_RendererData: {fileID: 0} - m_RendererDataList: - - {fileID: 11400000, guid: 707360a9c581a4bd7aa53bfeb1429f71, type: 2} - m_DefaultRendererIndex: 0 - m_RequireDepthTexture: 0 - m_RequireOpaqueTexture: 0 - m_OpaqueDownsampling: 1 - m_SupportsTerrainHoles: 1 - m_SupportsHDR: 0 - m_HDRColorBufferPrecision: 0 - m_MSAA: 1 - m_RenderScale: 1 - m_UpscalingFilter: 0 - m_FsrOverrideSharpness: 0 - m_FsrSharpness: 0.92 - m_EnableLODCrossFade: 1 - m_LODCrossFadeDitheringType: 1 - m_ShEvalMode: 0 - m_MainLightRenderingMode: 1 - m_MainLightShadowsSupported: 0 - m_MainLightShadowmapResolution: 1024 - m_AdditionalLightsRenderingMode: 0 - m_AdditionalLightsPerObjectLimit: 4 - m_AdditionalLightShadowsSupported: 0 - m_AdditionalLightsShadowmapResolution: 512 - m_AdditionalLightsShadowResolutionTierLow: 128 - m_AdditionalLightsShadowResolutionTierMedium: 256 - m_AdditionalLightsShadowResolutionTierHigh: 512 - m_ReflectionProbeBlending: 0 - m_ReflectionProbeBoxProjection: 0 - m_ShadowDistance: 50 - m_ShadowCascadeCount: 1 - m_Cascade2Split: 0.25 - m_Cascade3Split: {x: 0.1, y: 0.3} - m_Cascade4Split: {x: 0.067, y: 0.2, z: 0.467} - m_CascadeBorder: 0.1 - m_ShadowDepthBias: 1 - m_ShadowNormalBias: 1 - m_AnyShadowsSupported: 1 - m_SoftShadowsSupported: 0 - m_ConservativeEnclosingSphere: 0 - m_NumIterationsEnclosingSphere: 64 - m_SoftShadowQuality: 2 - m_AdditionalLightsCookieResolution: 2048 - m_AdditionalLightsCookieFormat: 3 - m_UseSRPBatcher: 1 - m_SupportsDynamicBatching: 0 - m_MixedLightingSupported: 1 - m_SupportsLightCookies: 1 - m_SupportsLightLayers: 0 - m_DebugLevel: 0 - m_StoreActionsOptimization: 0 - m_EnableRenderGraph: 0 - m_UseAdaptivePerformance: 1 - m_ColorGradingMode: 0 - m_ColorGradingLutSize: 16 - m_UseFastSRGBLinearConversion: 0 - m_SupportDataDrivenLensFlare: 1 - m_ShadowType: 1 - m_LocalShadowsSupported: 0 - m_LocalShadowsAtlasResolution: 256 - m_MaxPixelLights: 0 - m_ShadowAtlasResolution: 256 - m_VolumeFrameworkUpdateMode: 0 - m_Textures: - blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3} - bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3} - m_PrefilteringModeMainLightShadows: 1 - m_PrefilteringModeAdditionalLight: 4 - m_PrefilteringModeAdditionalLightShadows: 1 - m_PrefilterXRKeywords: 0 - m_PrefilteringModeForwardPlus: 1 - m_PrefilteringModeDeferredRendering: 1 - m_PrefilteringModeScreenSpaceOcclusion: 1 - m_PrefilterDebugKeywords: 0 - m_PrefilterWriteRenderingLayers: 0 - m_PrefilterHDROutput: 0 - m_PrefilterSSAODepthNormals: 0 - m_PrefilterSSAOSourceDepthLow: 0 - m_PrefilterSSAOSourceDepthMedium: 0 - m_PrefilterSSAOSourceDepthHigh: 0 - m_PrefilterSSAOInterleaved: 0 - m_PrefilterSSAOBlueNoise: 0 - m_PrefilterSSAOSampleCountLow: 0 - m_PrefilterSSAOSampleCountMedium: 0 - m_PrefilterSSAOSampleCountHigh: 0 - m_PrefilterDBufferMRT1: 0 - m_PrefilterDBufferMRT2: 0 - m_PrefilterDBufferMRT3: 0 - m_PrefilterSoftShadowsQualityLow: 0 - m_PrefilterSoftShadowsQualityMedium: 0 - m_PrefilterSoftShadowsQualityHigh: 0 - m_PrefilterSoftShadows: 0 - m_PrefilterScreenCoord: 0 - m_PrefilterNativeRenderPass: 0 - m_ShaderVariantLogLevel: 0 - m_ShadowCascades: 0 diff --git a/Assets/Settings/URP-Performant.asset.meta b/Assets/Settings/URP-Performant.asset.meta deleted file mode 100644 index 264c9c5..0000000 --- a/Assets/Settings/URP-Performant.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d0e2fc18fe036412f8223b3b3d9ad574 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/ProjectSettings/BurstAotSettings_StandaloneWindows.json b/ProjectSettings/BurstAotSettings_StandaloneWindows.json index 2144f6d..34712b4 100644 --- a/ProjectSettings/BurstAotSettings_StandaloneWindows.json +++ b/ProjectSettings/BurstAotSettings_StandaloneWindows.json @@ -1,16 +1,18 @@ { "MonoBehaviour": { - "Version": 3, + "Version": 5, "EnableBurstCompilation": true, "EnableOptimisations": true, "EnableSafetyChecks": false, "EnableDebugInAllBuilds": false, - "UsePlatformSDKLinker": false, + "DebugDataKind": 0, + "EnableArmv9SecurityFeatures": false, "CpuMinTargetX32": 0, "CpuMaxTargetX32": 0, "CpuMinTargetX64": 0, "CpuMaxTargetX64": 0, "CpuTargetsX32": 6, - "CpuTargetsX64": 72 + "CpuTargetsX64": 72, + "OptimizeFor": 0 } } diff --git a/ProjectSettings/CommonBurstAotSettings.json b/ProjectSettings/CommonBurstAotSettings.json index 3dffdba..a6a6297 100644 --- a/ProjectSettings/CommonBurstAotSettings.json +++ b/ProjectSettings/CommonBurstAotSettings.json @@ -1,6 +1,6 @@ { "MonoBehaviour": { - "Version": 3, + "Version": 5, "DisabledWarnings": "" } } diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 594ebe3..c9e6d78 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -11,4 +11,7 @@ EditorBuildSettings: - enabled: 1 path: Assets/GameMain/Scenes/GameplayA.unity guid: 639c98846a76d624cbac99ade4a1e1a3 + - enabled: 1 + path: Assets/GameMain/Scenes/Menu.unity + guid: 5ae1171af6ab9b646b7a915598c657f1 m_configObjects: {} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 403c004..191853f 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -12,8 +12,8 @@ PlayerSettings: targetDevice: 2 useOnDemandResources: 0 accelerometerFrequency: 60 - companyName: DefaultCompany - productName: StarForce1 + companyName: Comet + productName: Biography of Li Jian defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} @@ -104,7 +104,7 @@ PlayerSettings: xboxEnableKinectAutoTracking: 0 xboxEnableFitness: 0 visibleInBackground: 1 - allowFullscreenSwitch: 1 + allowFullscreenSwitch: 0 fullscreenMode: 1 xboxSpeechDB: 0 xboxEnableHeadOrientation: 0 diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index af75b7f..e61f588 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -4,110 +4,10 @@ QualitySettings: m_ObjectHideFlags: 0 serializedVersion: 5 - m_CurrentQuality: 2 + m_CurrentQuality: 1 m_QualitySettings: - serializedVersion: 3 - name: Performant - pixelLightCount: 0 - shadows: 0 - shadowResolution: 0 - shadowProjection: 1 - shadowCascades: 1 - shadowDistance: 20 - shadowNearPlaneOffset: 3 - shadowCascade2Split: 0.33333334 - shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} - shadowmaskMode: 0 - skinWeights: 2 - globalTextureMipmapLimit: 0 - textureMipmapLimitSettings: [] - anisotropicTextures: 0 - antiAliasing: 0 - softParticles: 0 - softVegetation: 0 - realtimeReflectionProbes: 0 - billboardsFaceCameraPosition: 0 - useLegacyDetailDistribution: 1 - vSyncCount: 0 - realtimeGICPUUsage: 25 - lodBias: 0.4 - maximumLODLevel: 0 - enableLODCrossFade: 1 - streamingMipmapsActive: 0 - streamingMipmapsAddAllCameras: 1 - streamingMipmapsMemoryBudget: 512 - streamingMipmapsRenderersPerFrame: 512 - streamingMipmapsMaxLevelReduction: 2 - streamingMipmapsMaxFileIORequests: 1024 - particleRaycastBudget: 4 - asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 16 - asyncUploadPersistentBuffer: 1 - resolutionScalingFixedDPIFactor: 1 - customRenderPipeline: {fileID: 11400000, guid: d0e2fc18fe036412f8223b3b3d9ad574, - type: 2} - terrainQualityOverrides: 0 - terrainPixelError: 1 - terrainDetailDensityScale: 1 - terrainBasemapDistance: 1000 - terrainDetailDistance: 80 - terrainTreeDistance: 5000 - terrainBillboardStart: 50 - terrainFadeLength: 5 - terrainMaxTrees: 50 - excludedTargetPlatforms: [] - - serializedVersion: 3 - name: Balanced - pixelLightCount: 1 - shadows: 1 - shadowResolution: 0 - shadowProjection: 1 - shadowCascades: 1 - shadowDistance: 20 - shadowNearPlaneOffset: 3 - shadowCascade2Split: 0.33333334 - shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} - shadowmaskMode: 0 - skinWeights: 4 - globalTextureMipmapLimit: 0 - textureMipmapLimitSettings: [] - anisotropicTextures: 1 - antiAliasing: 0 - softParticles: 0 - softVegetation: 0 - realtimeReflectionProbes: 0 - billboardsFaceCameraPosition: 0 - useLegacyDetailDistribution: 1 - vSyncCount: 1 - realtimeGICPUUsage: 25 - lodBias: 1 - maximumLODLevel: 0 - enableLODCrossFade: 1 - streamingMipmapsActive: 0 - streamingMipmapsAddAllCameras: 1 - streamingMipmapsMemoryBudget: 512 - streamingMipmapsRenderersPerFrame: 512 - streamingMipmapsMaxLevelReduction: 2 - streamingMipmapsMaxFileIORequests: 1024 - particleRaycastBudget: 64 - asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 16 - asyncUploadPersistentBuffer: 1 - resolutionScalingFixedDPIFactor: 1 - customRenderPipeline: {fileID: 11400000, guid: e1260c1148f6143b28bae5ace5e9c5d1, - type: 2} - terrainQualityOverrides: 0 - terrainPixelError: 1 - terrainDetailDensityScale: 1 - terrainBasemapDistance: 1000 - terrainDetailDistance: 80 - terrainTreeDistance: 5000 - terrainBillboardStart: 50 - terrainFadeLength: 5 - terrainMaxTrees: 50 - excludedTargetPlatforms: [] - - serializedVersion: 3 - name: High Fidelity + name: AntiAliasing pixelLightCount: 2 shadows: 2 shadowResolution: 1 @@ -156,21 +56,71 @@ QualitySettings: terrainFadeLength: 5 terrainMaxTrees: 50 excludedTargetPlatforms: [] + - serializedVersion: 3 + name: Normal + pixelLightCount: 1 + shadows: 1 + shadowResolution: 0 + shadowProjection: 1 + shadowCascades: 1 + shadowDistance: 20 + shadowNearPlaneOffset: 3 + shadowCascade2Split: 0.33333334 + shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} + shadowmaskMode: 1 + skinWeights: 255 + globalTextureMipmapLimit: 0 + textureMipmapLimitSettings: [] + anisotropicTextures: 2 + antiAliasing: 0 + softParticles: 0 + softVegetation: 0 + realtimeReflectionProbes: 1 + billboardsFaceCameraPosition: 1 + useLegacyDetailDistribution: 1 + vSyncCount: 1 + realtimeGICPUUsage: 25 + lodBias: 2 + maximumLODLevel: 0 + enableLODCrossFade: 1 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 + particleRaycastBudget: 2048 + asyncUploadTimeSlice: 2 + asyncUploadBufferSize: 16 + asyncUploadPersistentBuffer: 1 + resolutionScalingFixedDPIFactor: 1 + customRenderPipeline: {fileID: 11400000, guid: e1260c1148f6143b28bae5ace5e9c5d1, + type: 2} + terrainQualityOverrides: 0 + terrainPixelError: 1 + terrainDetailDensityScale: 1 + terrainBasemapDistance: 1000 + terrainDetailDistance: 80 + terrainTreeDistance: 5000 + terrainBillboardStart: 50 + terrainFadeLength: 5 + terrainMaxTrees: 50 + excludedTargetPlatforms: [] m_TextureMipmapLimitGroupNames: [] m_PerPlatformDefaultQuality: - Android: 1 - CloudRendering: 2 - GameCoreScarlett: 2 - GameCoreXboxOne: 2 - Lumin: 2 - Nintendo Switch: 2 - PS4: 2 - PS5: 2 + Android: 0 + CloudRendering: 1 + GameCoreScarlett: 1 + GameCoreXboxOne: 1 + Lumin: 1 + Nintendo Switch: 1 + PS4: 1 + PS5: 1 Server: 0 - Stadia: 2 - Standalone: 2 - WebGL: 1 - Windows Store Apps: 2 - XboxOne: 2 - iPhone: 1 - tvOS: 1 + Stadia: 1 + Standalone: 1 + WebGL: 0 + Windows Store Apps: 1 + XboxOne: 1 + iPhone: 0 + tvOS: 0 diff --git a/数据表/Music.txt b/数据表/Music.txt deleted file mode 100644 index c94009f..0000000 --- a/数据表/Music.txt +++ /dev/null @@ -1,7 +0,0 @@ -# 音乐配置表 -# Id AssetName -# int string -# 音乐编号 策划备注 资源名称 - 1 菜单音乐 music_menu - 2 战斗音乐 music_background - 3 关于音乐 music_about diff --git a/数据表/Music.xlsx b/数据表/Music.xlsx deleted file mode 100644 index c10de827b2525b0b76a130344d6cf0c023c43d17..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9804 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 diff --git a/数据表/Scene.xlsx b/数据表/Scene.xlsx index 211b7984289b8dc59a87a332c8b3bc8d316c8fd2..428b1de0472c79c9a1f15d81c8d55baa40c8b687 100644 GIT binary patch delta 1184 zcmV;R1Yi4&O_EKplK}*ZMdzK9mjNvTtAdlp0YiT|3an#Fu(DE+p&eK>%}-BKt|_k! z+?Yy(aRu1Gla!@gXK3S`rWjkk0m*FS9mmmuL*$V%VJR*5G5YoM>1K{RA#s`FoRuU-Z$zN`)yEIZn(-HLAVhk=P>L8Gq^uS} zAd&+qu<%($N*Ku)FMqIvSH2HK#R*RJq#_SSVK@y6OiN@K7W^6xmSr>{8`JbM!Fevq6blB8f2pqp?zwupH9DuUAmD2as3bS5x5sQVRK& z!)A!i)6K-uc_Q3vGg0YipkAVTa4w@i6{^rV;oeO3=TYank_ZxNBDhfzkrAs=CR_cB>_4wFg@gmVZ}NSREMAVgiOqRPaGX^%!(d zK=iZ=s~;@XaRjUA&4$Yua?;g_w2^fUCN!J#xDO+~G=3(~b6>qxtB;bs8R z+E5p`wGbt(&CruJ8kp2!gdCeEW92OPclW&;sX(_y%WYC7t zpTT-^bHJMy$trEc9h2~J(~k%EgF)ax34H)(j1fuu0_VILd(uJm0c!rito{L$K^_{D zU?c>yAP9OI0o{|EB0vE~liVUR0cw*FBa;M*MdzK9rz6J!l9O*FHUhaHlh7X=lfxt` y0augmBtZevlQ1PZ0SA+7B{l&rlcFU+0l<^vC0+%vtdwsJlSU>%26Z9;0002CUMZ~r delta 1172 zcmV;F1Z(?}O^r>klK}*!nDrZzmjNvTMOBl=0YiTT1=cYoSXn8^&<-q`=BFnq*OXTV zZcL@YxB_h8Ny<{LGqiC|Q;aR&fMhoE4&}vFWh8U{Y1UXX{>0XR6GFyVf@6X?h8tk0 zdm`E+1@Dpi*_16na113#P|o5wit&%vfsyvlhE^FkW#M+(@3fCQWDDMjy?bkm-dNXl zRF8k!7(RcD@8{QxcGa*@&8;|~JQbXB1I$$>Ux0QXAHk$}P;D+)GVA94*sB7>#V-GP zfBpP;OYv{TDVHi=W)klnxU*d`Zaiclny%p9LNV;?&#AK%Kt zI}$D^t6~)SA@WF-vW!-{82$SBd^bm)khscl!737?cOuZ^>f?uH!}zP%6Cyoes6>qR zQr3$g5b2(jSoo|a6=ZV8OMfikmG1&kbAmHHs4Rj}7*2x{(+U}e1;2%Z6~_)RVRv^uF6Oi(lnh<{ukgk)ucB}S{I zUV#@Ltd<#tSyW5!agxXADOzl12;v&?o03Kho;``TKS)7RNiwhs@{|R(jJ+!07YK!l zTLTm$P9;5(H7SZ1B@y^a{MAL&Gn5Fr8pG$d-m|vN3->aT<3l0WtoTDSxsTD@pN$6B zJ!&D}S@W6D-ClyWF@N&dK^C+kU&)aakc!dNjsatg#!5-b3MdP|UP;v+KwgR8OoRU` zDdc+rn;|+4Hv>nffpBlkK&7LDdZ}K6QycbB=t9?odpFddM}zA|A}FYd;NB8V{UHyC zyGhaHL0dRK(REKT>6}?`-MU1)vT4drP?rp@zMT|RyB@!0;f=Cs; zF49Fzx&lU|iAKAgq@B4ixd7>H zs2kk05GAdzU`d-@l%}GswDY=cZXm69mZ{r9>>Y0EnlFMmENZ+X-!R|NN_YjyVHrYy z2J^|y0dHO;tF;lgOv1-aKknfV27v=5^Z}eRCfgS{=L}8mSqIezsQU-A`Uj96vn2?6 z8Ufgopdvs4L6hMkGXZ6j6(f@brI_^_ldL1h0gaP%BsKxGldB|00aBCmBtZeqlQkte m0Roe7B{l&mlcyy>0lSmvC0+$+@!Hx5lS?K+25=$(0001>vm++} diff --git a/数据表/Sound.xlsx b/数据表/Sound.xlsx deleted file mode 100644 index f5bf6e4c0df1c5dd54bdb06529a76358c34f3e74..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10340 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 diff --git a/数据表/UIForm.txt b/数据表/UIForm.txt index eccc80b..c97b02d 100644 --- a/数据表/UIForm.txt +++ b/数据表/UIForm.txt @@ -2,7 +2,7 @@ # Id AssetName UIGroupName AllowMultiInstance PauseCoveredUIForm # int string string bool bool # 界面编号 策划备注 资源名称 界面组名称 是否允许多个界面实例 是否暂停被其覆盖的界面 - 1 弹出框 DialogForm Default True True + 1 弹出框 DialogForm Dialog True True 100 主菜单 MenuForm Default False True 101 设置 SettingForm Default False True 102 关于 AboutForm Default False True diff --git a/数据表/UIForm.xlsx b/数据表/UIForm.xlsx index ba5c5196d0c46c7d2dd661d56d738826ff61d1d6..1d559d7282494421a99d8dc7ebb22978704ed5c5 100644 GIT binary patch delta 2133 zcmV-b2&(tnP~cFolK};EZNTkJlb8W3e@;b(qQsQ|b)phdi$H9~zP1suW7&qZI}@+O zz{{}k7C1>8T7ksq`~UmyzmxOHMpe-ZSXb7%Kr|sJ0xfD;>Q#Ym7t{D0Mb2|Ac~xsD z&=wq;u+x)Vm`v0bZftG9`Vw3eNZMt>6lm?e$uM?e4T`%YICKz~wN>1Qr(I#gf5j7D z0Zs`SV+Ec|?m2FOu^EVHhm>MKnrB;e04Xq3pg?M1LpxR!r z;?B>)v6m&ti!J+lfBpP;%kgg|KH$3aJriUU@??Gby>d6Yyjn~VOG!G835`>-AZbR& z86gkt;G_OFUtdtW@&6Ljn9`PbMvsYm0PAue{|WZ91Ov|j1yUQbP$!ev1SNlKkE1pe zhQC+pe?WX+Zj+fzMoCsXT+&Ldv}$+T&jg$V4PXjRnECg6YzKVZG>R06{rLF2_In6k ze|~Rj=Ysm7!tKTly})%)Ti~*4j~n;kK4s%e=-d+PEKRa6fN<{bfDk{%trR zL>!3F4jcDGNcZCVLvcb)K6rn)LoM_iaNpzve)dOy=z5fwY*17CQ4l=&Oj^2OR4PMb+vyc`j zT>6N_=YilR$w}^R*K7yA_WpKVRzy7QHtv`3Wfw*+bTH(f3XOww?~r`|H>y!V zPzhdf9qNHS#%~n-9hw3foB=dsUXbd7VpP`~Hw&M@NB^-|=sir~&vVH4(|j58&DY*3 z(IG$AB*yi>RY^`8_t}42M$+fOoshrq_#3K@Cjz-GTnC>?UA5>BbU`(Y-neYm0@pAF zd^=4=4evTl{?5hxEc`$|YH)r?lb#1g*MV>y`M@yr7LVfdNbBZ0&?(sRUj?XvAb*wt zT&F;+BH2*5UWY~tZxu+NJ9B_sSs=JhIjlTM%i>-!u*rWc5M1Ys?#y9%9SYZJ z=#v*diw~^ytp)Y@&N5R`pKsSa9vyfFz!nc(PM=WW%MuJ)(8e#cmGyyJ257x(gSCGF zCl*)Y)g;21@FDg*0Zq)DfVSSAz$Bu10+wWA5)Ueon#4jSGLv{ziJeJ2&4eNpENT%- zTWusSX5o)fAEr_rcUknSP86&kI znlmyBqFG~SL4-Gy1)=qCSp1c?(gmT_qlt*8K4-44P`HZgv>=)3l_Oe~0I%G82r6J;`D*J%M%EQlx@wpytL z5jip>lM%a4lMpc!ohz$O+A4HvI}uO4l1{xoEr?#97DVL8b;^ic=Pg3f8N%VjvZ1V5 zDAl$rp1Xe~soFy%u`ya1r#40xt1x!8HxX5?_08oqoL)@WV>i&O7th^7?t}KENNkKI zCABb-#$*cf6S-5iG#wpL<Mvs~dkBKue~X*_pJaZY9sf97+PN@hj+KSNA z6VFy4V)40Le(vF~s9kRnLzx{0G4ub+@y}1kP~m_5|l> z1h27y2k-%7GW~!f3h&EUBRyu#2led_kRG!+2|xya-XlvQ?*RY+P6Pk|6aWAKcx*3o zXkl_?WK(oMn8E_iKheU#sB(=Zst?~!QQoRrI)-*=Au9a}M$Hv(UKfkNsL zY=T>p_zxU^W$XGigHonRFQz7FFxFhsby{nn0MZ50L|Bq_5(bdT&#7Z{4?jfYA!u% z731XnkatdayeS4_e%zmqzh#HugOAgTw`y26o%CPx&3$q7oyWh$$yWNIm-btkO*QcI zQ@%ZaNe;JE@W7Lgt6tP#M%4M~_)P5X^LAGS6@;V07_<)MRjT7+a3P$EcK0Fn}gS>6V<`=d?7$d$0XUQ1B$EYn zZNTkJlXfLk0ssS(Ap;eY!zUb*{Ur_obCV1vFacnbJtj5+har=mAsj1EO928D02BZK z00;nwPU1k`BTFLh0RR9_1ONaO000000000103ZMW0Bw`JCP4w9ll~?;0UeV$CpG~@ zlW-?M0gjWgCp-a^lkO)W98w#yP$vWc0PPO|02lxO000000096X0002M1e4(e8k0pR L5C%ge00000xf9at delta 2134 zcmV-c2&wnrP}@+jlK}mC1y0hIR3I_>{{O!F@8oQ>mR0Zq#+J3pQ5+Ezfa0|%)gni?vvGKa0_&I(tg02{ zXag3FisPeTELTnRStBxNbrIa)fWDaMvBK{6Y8hw|dQHj+92Gz+X5e}7^N zzzHEKmf)CRj^PFv>OB!{k%I4$`q@-1KyVBdNKnq=IEwL)*MX7t&xTg%Ic4cK+V8ZD z+h+^jiF^0jmV4uBwTf1QHipk1@@^uBd9se&e3Ca14oY3JZ9i~0v4p6kY5C25*v;P9m0S>F%pq?NE008X| z000;OlQ1Y6e~p)IkE1FWhQFWW{0HOr^`+Bkr<1mu9c#NM*-bX*^)pr4no)6u)|r35 z51^vJcp8(caPjcma6@JN`K`#E8?I?a%8eU(f$QKhA!$~gH|{@w?>{}c4rQoJQBF#{ zao;g@KW~5kZQYRim0mDr4n!#F#=S6BJ^MaQF1SF{e2?B!L!5A@h_a?gy9st;yT;|M?zjX_y-gPJh%XONR+Vbh9jKk8#fMD;G>_S7yb-g z__}=B`7oEYC{( z4c~AMtvBw1_nMF#x`1D&$hhHMr$BE~%tzrVd(Xl7VcT3boV5+%-pGbw=*=J1^~l#v z+t5kG@V5fSfgpd80o=PlV#(dn6hw-qaBrK==H4n8TzBRGxr#t=?{Zjq11t)K9>zp$67w;!H;KnF zaWIKRPmF|uMJ+;k>9kOjSoR%Ap(gP(e9kOj2sKwl z7DU-f4u%EMj1gN9%^7 zBDNr!G4?~`XiMcVMT}I!u4PflOM8`pKA&CfK&NKAor%n}D6xrzy3QdYb!tHleILQnh_%e`jN~1sGcxL+psLtDQu~a;;x3FJbp#BDUQ?o3*H~ z9>~>qBn$JP?Iy8>G39ot@V-8fJB5tp^6wDS#&8}P`dD*d)K@FH4{Di6Bik5l-NzQj zl-s4EJb+Jxu-sf=Ql?23Qxh~8Yd+9*T5F&H(go5)SUT$@3?P%o zu&&c)h@eXw2(iG|ZxQ8-%g|?s zOh~$KFAt6`qjvIlkREs_GEpt6DZ?a^4ere{$ZBp4fROj<@4cZv6CDE1q;j zr=5KMnd7dKOU_!wcKm)QIwvC9Ob26e+@FrWWtR|xkJF1cYO}05?!OkB`{~hl5&ce2 zwvrFMq~FRg6%gmAVtaoQA8x6}swW>;y(qy|v<~GCRA4$jOZWCgyQ>-%gn3b)bZ{Xb zi(35zF($WB1c+!fo$RVW*&&=2mCH!ePf@b_H6C@Vwu-Hg!0|9D0xOU{6T{PVc#y|t z-u!5m31cLf$7b#_+4xTb?l?Z0+u+JAqILQ6t$$EU0|XQR006U=5!Vs{rju?YKmiYv zuOu@8Gn3;alLhU&zq3)3dnHr>1(VPvKmmA@5hgGJTa!X2HUWZ@c_u9z+|(av>;V7( zI0OIy6aWAK000000RSKX003)~!6rcsn-c&4cx*3oba`xLbCZB1Ad@dA4gnjJJ|{K; zLJ5;#2^EuzCn^DnleQ;30hyEYCm|cF+n}Bx1ONc-4*&od000000000103ZMW0L7Cp MC@Tg&Bme*a0456MO8@`> diff --git a/数据表/UISound.txt b/数据表/UISound.txt deleted file mode 100644 index 87e1cd2..0000000 --- a/数据表/UISound.txt +++ /dev/null @@ -1,6 +0,0 @@ -# 声音配置表 -# Id AssetName Priority Volume -# int string int float -# 声音编号 策划备注 资源名称 优先级（默认0，128最高，-128最低） 音量（0~1） - 10000 选择音效 select 0 1 - 10001 点击音效 click 0 1 diff --git a/数据表/UISound.xlsx b/数据表/UISound.xlsx deleted file mode 100644 index e27c9d25bdd8362b3da3d87cec9546d387bb675f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10516 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�y!7rU*;(KwQh3y& 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 diff --git a/数据表/convert.py b/数据表/convert.py index 5ca4b8a..560b3c1 100644 --- a/数据表/convert.py +++ b/数据表/convert.py @@ -5,10 +5,17 @@ import pandas as pd def convert_excel_to_txt(folder_path='.'): - # 计数器，用于最后统计 + # ✅ 关键修复：将 '.' 转换为脚本所在目录的绝对路径 + if folder_path == '.': + folder_path = os.path.dirname(os.path.abspath(__file__)) + + print(f"【调试】当前工作目录: {os.getcwd()}") + print(f"【调试】遍历起始目录: {folder_path}\n") + count = 0 - target_dir = os.path.join(os.path.dirname(__file__), '../Assets/GameMain/DataTables') + target_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), '../Assets/GameMain/DataTables') target_dir = os.path.abspath(target_dir) + # ... 后续代码不变 # 确保目标目录存在 os.makedirs(target_dir, exist_ok=True)