Browse Source

音效修改

TTTN1997 1 year ago
parent
commit
526e94eb28
37 changed files with 120 additions and 49 deletions
  1. BIN
      Assets/Resources/SoundEffect/Scene04.mp3
  2. 22 0
      Assets/Resources/SoundEffect/Scene04.mp3.meta
  3. BIN
      Assets/Resources/SoundEffect/SowrdDraw.mp3
  4. 22 0
      Assets/Resources/SoundEffect/SowrdDraw.mp3.meta
  5. BIN
      Assets/Resources/SoundEffect/title.mp3
  6. 22 0
      Assets/Resources/SoundEffect/title.mp3.meta
  7. 40 40
      Assets/Scenes/main.unity
  8. 4 0
      Assets/Scripts/AppLauncher.cs
  9. 8 6
      Assets/Scripts/Mono/UI/Panel/TipPanel.cs
  10. BIN
      EXE/PoetryTour_Data/Managed/Assembly-CSharp.dll
  11. BIN
      EXE/PoetryTour_Data/Managed/Cinemachine.dll
  12. BIN
      EXE/PoetryTour_Data/Managed/Unity.Recorder.Base.dll
  13. BIN
      EXE/PoetryTour_Data/Managed/Unity.Recorder.dll
  14. BIN
      EXE/PoetryTour_Data/Managed/Unity.RenderPipelines.Universal.Runtime.dll
  15. BIN
      EXE/PoetryTour_Data/Plugins/x86_64/lib_burst_generated.dll
  16. 0 1
      EXE/PoetryTour_Data/RuntimeInitializeOnLoads.json
  17. 0 0
      EXE/PoetryTour_Data/ScriptingAssemblies.json
  18. BIN
      EXE/PoetryTour_Data/globalgamemanagers
  19. BIN
      EXE/PoetryTour_Data/globalgamemanagers.assets
  20. BIN
      EXE/PoetryTour_Data/globalgamemanagers.assets.resS
  21. BIN
      EXE/PoetryTour_Data/level0
  22. BIN
      EXE/PoetryTour_Data/level0.resS
  23. BIN
      EXE/PoetryTour_Data/level1
  24. BIN
      EXE/PoetryTour_Data/level1.resS
  25. BIN
      EXE/PoetryTour_Data/level2
  26. BIN
      EXE/PoetryTour_Data/level2.resS
  27. BIN
      EXE/PoetryTour_Data/level3
  28. BIN
      EXE/PoetryTour_Data/resources.assets
  29. BIN
      EXE/PoetryTour_Data/resources.assets.resS
  30. BIN
      EXE/PoetryTour_Data/sharedassets0.assets
  31. BIN
      EXE/PoetryTour_Data/sharedassets0.assets.resS
  32. BIN
      EXE/PoetryTour_Data/sharedassets1.assets
  33. BIN
      EXE/PoetryTour_Data/sharedassets1.assets.resS
  34. BIN
      EXE/PoetryTour_Data/sharedassets2.assets
  35. BIN
      EXE/PoetryTour_Data/sharedassets2.assets.resS
  36. BIN
      EXE/PoetryTour_Data/sharedassets3.assets
  37. 2 2
      ProjectSettings/EditorBuildSettings.asset

BIN
Assets/Resources/SoundEffect/Scene04.mp3


+ 22 - 0
Assets/Resources/SoundEffect/Scene04.mp3.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 8962b82ab4cfabc4980d27910275fd4b
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/Resources/SoundEffect/SowrdDraw.mp3


+ 22 - 0
Assets/Resources/SoundEffect/SowrdDraw.mp3.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 99ee5600c0c7dfb42a1ec64fefb89396
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/Resources/SoundEffect/title.mp3


+ 22 - 0
Assets/Resources/SoundEffect/title.mp3.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: d5936e54ae40e584481edd72246fabae
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 40 - 40
Assets/Scenes/main.unity

@@ -16576,7 +16576,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2011968897}
+        m_Texture: {fileID: 1934335231}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     m_Ints: []
@@ -16599,7 +16599,7 @@ Material:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _DetailColor: {r: 0.5533019, g: 0.5533019, b: 0.5533019, a: 0}
     - _DetailData: {r: 0.5, g: 4, b: -0.5, a: 0}
-    - _DetailWindDirection: {r: -0.0002, g: 0, b: 0, a: 0}
+    - _DetailWindDirection: {r: -0.04371777, g: 0, b: 0, a: 0}
     - _DistanceData: {r: 0, g: 5, b: 1, a: 1}
     - _FogOfWarCenter: {r: 0, g: 0, b: 0, a: 1}
     - _FogOfWarCenterAdjusted: {r: 0, g: 0, b: 0, a: 1}
@@ -16610,7 +16610,7 @@ Material:
     - _ShadowData: {r: 0.5, g: 0, b: 62500, a: 0}
     - _SpecularColor: {r: 0.5, g: 0.5, b: 0.5, a: 0}
     - _SunDir: {r: 0.49525782, g: 0.36346677, b: 0.78905755, a: 0}
-    - _WindDirection: {r: -0.0002, g: 0, b: 0, a: 0}
+    - _WindDirection: {r: -0.04371777, g: 0, b: 0, a: 0}
   m_BuildTextureStacks: []
 --- !u!4 &1833292951
 Transform:
@@ -16896,6 +16896,43 @@ Transform:
   m_Father: {fileID: 6933930956171087367}
   m_RootOrder: 71
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!84 &1934335231
+RenderTexture:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_ImageContentsHash:
+    serializedVersion: 2
+    Hash: 00000000000000000000000000000000
+  m_ForcedFallbackFormat: 4
+  m_DownscaleFallback: 0
+  m_IsAlphaChannelOptional: 0
+  serializedVersion: 5
+  m_Width: 256
+  m_Height: 256
+  m_AntiAliasing: 1
+  m_MipCount: -1
+  m_DepthStencilFormat: 0
+  m_ColorFormat: 8
+  m_MipMap: 0
+  m_GenerateMips: 1
+  m_SRGB: 0
+  m_UseDynamicScale: 0
+  m_BindMS: 0
+  m_EnableCompatibleFormat: 1
+  m_TextureSettings:
+    serializedVersion: 2
+    m_FilterMode: 1
+    m_Aniso: 1
+    m_MipBias: 0
+    m_WrapU: 0
+    m_WrapV: 0
+    m_WrapW: 0
+  m_Dimension: 2
+  m_VolumeDepth: 1
+  m_ShadowSamplingMode: 2
 --- !u!4 &1960215722
 Transform:
   m_ObjectHideFlags: 0
@@ -21931,43 +21968,6 @@ LODGroup:
     renderers:
     - renderer: {fileID: 307741535}
   m_Enabled: 1
---- !u!84 &2011968897
-RenderTexture:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_ImageContentsHash:
-    serializedVersion: 2
-    Hash: 00000000000000000000000000000000
-  m_ForcedFallbackFormat: 4
-  m_DownscaleFallback: 0
-  m_IsAlphaChannelOptional: 0
-  serializedVersion: 5
-  m_Width: 256
-  m_Height: 256
-  m_AntiAliasing: 1
-  m_MipCount: -1
-  m_DepthStencilFormat: 0
-  m_ColorFormat: 8
-  m_MipMap: 0
-  m_GenerateMips: 1
-  m_SRGB: 0
-  m_UseDynamicScale: 0
-  m_BindMS: 0
-  m_EnableCompatibleFormat: 1
-  m_TextureSettings:
-    serializedVersion: 2
-    m_FilterMode: 1
-    m_Aniso: 1
-    m_MipBias: 0
-    m_WrapU: 0
-    m_WrapV: 0
-    m_WrapW: 0
-  m_Dimension: 2
-  m_VolumeDepth: 1
-  m_ShadowSamplingMode: 2
 --- !u!1001 &2015702648
 PrefabInstance:
   m_ObjectHideFlags: 0

+ 4 - 0
Assets/Scripts/AppLauncher.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using Mono;
 using Mono.UI.Core;
 using UnityEngine;
+using UnityEngine.SceneManagement;
 
 public class AppLauncher : MonoBehaviour
 {
@@ -10,6 +11,7 @@ public class AppLauncher : MonoBehaviour
 
     void Start()
     {
+        DontDestroyOnLoad(this);
         GameObject prefab = Resources.Load<GameObject>("Canvas");
 
         GameObject _gameObject = GameObject.Instantiate(prefab);
@@ -19,7 +21,9 @@ public class AppLauncher : MonoBehaviour
         ConfigComponent.Instance.Preload();
         _isStart = true;
         _timer = 0;
+       // SceneManager.LoadScene("main");
         TimeComponent.Instance.AddTimer(10, () => { UIManager.Instance.LoadAndOpenPanel<StartPanel>(UIManager.UILayer.Middle); });
+        UIManager.Instance.PlayBGM("title");
     }
 
     private float _timer;

+ 8 - 6
Assets/Scripts/Mono/UI/Panel/TipPanel.cs

@@ -26,9 +26,9 @@ namespace Mono
         {
             base.Show();
             index = 0;
-            Text_01.StringContent = "龙泉剑\n在白帝城偶遇诗仙李白获赠的随身佩剑";
-            Text_01.SetContent();
-            
+            // Text_01.StringContent = "龙泉剑\n在白帝城偶遇诗仙李白获赠的随身佩剑";
+            // Text_01.SetContent();
+            //
              playableDirector = GameObject.Find("timeline").gameObject.GetComponent<PlayableDirector>();
 
 
@@ -92,21 +92,23 @@ namespace Mono
                         }
 
 
+                        UIManager.Instance.PlayAudioClip("SowrdDraw");
                         break;
                 }
             }
-
+            playableDirector.Stop();
             playableDirector.time = 0;
             playableDirector.Play();
             index++;
 
             if (index > 1)
             {
-                TimeComponent.Instance.AddTimer(1.8f, () =>
+                TimeComponent.Instance.AddTimer(1.5f, () =>
                 {
                     UIManager.Instance.HideUIPanel<TipPanel>();
                     SceneManager.LoadScene("baidicheng");
-                    TimeComponent.Instance.AddTimer(23f, () => { UIManager.Instance.LoadAndOpenPanel<ChatPanel>(UIManager.UILayer.Middle); });
+                    UIManager.Instance.PlayBGM("Scene04");
+                    TimeComponent.Instance.AddTimer(22f, () => { UIManager.Instance.LoadAndOpenPanel<ChatPanel>(UIManager.UILayer.Middle); });
                 });
             }
         }

BIN
EXE/PoetryTour_Data/Managed/Assembly-CSharp.dll


BIN
EXE/PoetryTour_Data/Managed/Cinemachine.dll


BIN
EXE/PoetryTour_Data/Managed/Unity.Recorder.Base.dll


BIN
EXE/PoetryTour_Data/Managed/Unity.Recorder.dll


BIN
EXE/PoetryTour_Data/Managed/Unity.RenderPipelines.Universal.Runtime.dll


BIN
EXE/PoetryTour_Data/Plugins/x86_64/lib_burst_generated.dll


File diff suppressed because it is too large
+ 0 - 1
EXE/PoetryTour_Data/RuntimeInitializeOnLoads.json


File diff suppressed because it is too large
+ 0 - 0
EXE/PoetryTour_Data/ScriptingAssemblies.json


BIN
EXE/PoetryTour_Data/globalgamemanagers


BIN
EXE/PoetryTour_Data/globalgamemanagers.assets


BIN
EXE/PoetryTour_Data/globalgamemanagers.assets.resS


BIN
EXE/PoetryTour_Data/level0


BIN
EXE/PoetryTour_Data/level0.resS


BIN
EXE/PoetryTour_Data/level1


BIN
EXE/PoetryTour_Data/level1.resS


BIN
EXE/PoetryTour_Data/level2


BIN
EXE/PoetryTour_Data/level2.resS


BIN
EXE/PoetryTour_Data/level3


BIN
EXE/PoetryTour_Data/resources.assets


BIN
EXE/PoetryTour_Data/resources.assets.resS


BIN
EXE/PoetryTour_Data/sharedassets0.assets


BIN
EXE/PoetryTour_Data/sharedassets0.assets.resS


BIN
EXE/PoetryTour_Data/sharedassets1.assets


BIN
EXE/PoetryTour_Data/sharedassets1.assets.resS


BIN
EXE/PoetryTour_Data/sharedassets2.assets


BIN
EXE/PoetryTour_Data/sharedassets2.assets.resS


BIN
EXE/PoetryTour_Data/sharedassets3.assets


+ 2 - 2
ProjectSettings/EditorBuildSettings.asset

@@ -6,8 +6,8 @@ EditorBuildSettings:
   serializedVersion: 2
   m_Scenes:
   - enabled: 1
-    path: Assets/Scenes/MainScene.unity
-    guid: 2cda990e2423bbf4892e6590ba056729
+    path: Assets/Scenes/main.unity
+    guid: 2e6aae558f36b7f468b9e6d63449f183
   - enabled: 1
     path: Assets/Scenes/dabaojian.unity
     guid: ad6f56d409503294a91242df5a6e5187

Some files were not shown because too many files changed in this diff