DESKTOP-FB72PO8\Administrator 13 годин тому
батько
коміт
5f8a4c94f5
62 змінених файлів з 2409 додано та 321 видалено
  1. 1 1
      Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_glow_add.mat
  2. 1 1
      Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_quan.mat
  3. 2 2
      Assets/Res/Aduio/Bgm/battle1.mp3.meta
  4. 2 2
      Assets/Res/Aduio/Bgm/battle2.mp3.meta
  5. 2 2
      Assets/Res/Aduio/Bgm/dongfu.mp3.meta
  6. 2 2
      Assets/Res/Aduio/Bgm/dujiebgm.wav.meta
  7. 2 2
      Assets/Res/Aduio/Bgm/xunlongduobao.wav.meta
  8. 2 2
      Assets/Res/Aduio/Bgm/xunlongduobao1.wav.meta
  9. 2 2
      Assets/Res/Aduio/Bgm/yunmengze.mp3.meta
  10. 3 3
      Assets/Res/Aduio/Skill/fb10001/chuxian.wav.meta
  11. 3 3
      Assets/Res/Aduio/Skill/fb10001/fabaochuxian.wav.meta
  12. 3 3
      Assets/Res/Aduio/Skill/fb10001/fabaohit.wav.meta
  13. 3 3
      Assets/Res/Aduio/Skill/fb10001/fb_10002gj.wav.meta
  14. 3 3
      Assets/Res/Aduio/Skill/fb10001/fb_10003cixu.wav.meta
  15. 3 3
      Assets/Res/Aduio/Skill/fb10001/fb_10004chuxian.wav.meta
  16. 3 3
      Assets/Res/Aduio/Skill/fb10001/fb_10004hit.wav.meta
  17. 3 3
      Assets/Res/Aduio/Skill/fb10001/fb_10007shengxiao.wav.meta
  18. 3 3
      Assets/Res/Aduio/Skill/fb10001/fb_10008chixu.wav.meta
  19. 3 3
      Assets/Res/Aduio/Skill/fb10001/fb_10008loop.wav.meta
  20. 3 3
      Assets/Res/Aduio/Skill/fb10001/fb_10010chixu.wav.meta
  21. 3 3
      Assets/Res/Aduio/Skill/fb10001/fb_10010chuxian.wav.meta
  22. 3 3
      Assets/Res/Aduio/Skill/fb10001/fb_duiping.wav.meta
  23. 3 3
      Assets/Res/Aduio/Skill/fb10001/fb_duipingbaozha.wav.meta
  24. 3 3
      Assets/Res/Aduio/Skill/fb10001/fb_feixing.wav.meta
  25. 3 3
      Assets/Res/Aduio/Skill/fb10001/fb_xiaopengzhuang.wav.meta
  26. 3 3
      Assets/Res/Aduio/UI/combat_win.wav.meta
  27. 3 3
      Assets/Res/Aduio/UI/dujie_pizhong.wav.meta
  28. 4 4
      Assets/Res/Aduio/UI/jingbi.wav.meta
  29. 4 4
      Assets/Res/Aduio/UI/openui.wav.meta
  30. 4 4
      Assets/Res/Aduio/UI/shibai.wav.meta
  31. 3 3
      Assets/Res/Aduio/UI/ui_button.ogg.meta
  32. 3 3
      Assets/Res/Aduio/UI/ui_cexiadaolv.wav.meta
  33. 3 3
      Assets/Res/Aduio/UI/ui_chaozuoshibai.WAV.meta
  34. 3 3
      Assets/Res/Aduio/UI/ui_chouqugongfa.wav.meta
  35. 3 3
      Assets/Res/Aduio/UI/ui_daoyou_nv_gx1.wav.meta
  36. 3 3
      Assets/Res/Aduio/UI/ui_fanhui.wav.meta
  37. 3 3
      Assets/Res/Aduio/UI/ui_fbgfsj.wav.meta
  38. 3 3
      Assets/Res/Aduio/UI/ui_fzgf_yx.wav.meta
  39. 3 3
      Assets/Res/Aduio/UI/ui_jianglimianban.wav.meta
  40. 3 3
      Assets/Res/Aduio/UI/ui_jinduwancheng.wav.meta
  41. 3 3
      Assets/Res/Aduio/UI/ui_shangdian.wav.meta
  42. 3 3
      Assets/Res/Aduio/UI/ui_shanggongfa.wav.meta
  43. 3 3
      Assets/Res/Aduio/UI/ui_shangzhengdaolv.wav.meta
  44. 3 3
      Assets/Res/Aduio/UI/ui_shengji.WAV.meta
  45. 3 3
      Assets/Res/Aduio/UI/ui_shengshitansuo.wav.meta
  46. 3 3
      Assets/Res/Aduio/UI/ui_shiyonghuode.wav.meta
  47. 3 3
      Assets/Res/Aduio/UI/ui_tupo.WAV.meta
  48. 3 3
      Assets/Res/Aduio/UI/ui_tuposhibai.wav.meta
  49. 3 3
      Assets/Res/Aduio/UI/ui_tycg.wav.meta
  50. 3 3
      Assets/Res/Aduio/UI/ui_xiazhenggongfa.wav.meta
  51. 3 3
      Assets/Res/Aduio/UI/ui_zbfbcg.wav.meta
  52. 4 4
      Assets/Res/Aduio/UI/zhuangbei.wav.meta
  53. 0 1
      Assets/Res/CombatScenes/LevelBattle02.prefab
  54. 2 1
      Assets/Resources/Shader/Shader Graphs_ShengShiShader.mat
  55. 10 10
      Assets/Resources/Shader/ShengShiShader.shadergraph
  56. 2 2
      Assets/Scenes/testCombat.scene
  57. 12 7
      Assets/Scripts/GameLogic/Combat/CombatTool/SceneTool/CombatSenceController.cs
  58. 1 1
      Assets/Scripts/GameLogic/Combat/CombatTool/SceneTool/SceneMonoConfigBasic.cs
  59. 0 0
      Assets/StreamingAssets/assetConfig.txt
  60. 2 2
      ProjectSettings/AudioManager.asset
  61. 3 3
      UserSettings/EditorUserSettings.asset
  62. 2228 145
      UserSettings/Layouts/default-2022.dwlt

+ 1 - 1
Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_glow_add.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.6672832
+    - _Alpha: 0.37745452
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0

+ 1 - 1
Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_quan.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.07833733
+    - _Alpha: 0.07884556
     - _AlphaCutoff: 0.5
     - _ColorMask: 0
     - _EnableExternalAlpha: 0

+ 2 - 2
Assets/Res/Aduio/Bgm/battle1.mp3.meta

@@ -5,11 +5,11 @@ AudioImporter:
   serializedVersion: 7
   defaultSettings:
     serializedVersion: 2
-    loadType: 2
+    loadType: 1
     sampleRateSetting: 0
     sampleRateOverride: 44100
     compressionFormat: 1
-    quality: 0.31
+    quality: 0.22
     conversionMode: 0
     preloadAudioData: 0
   platformSettingOverrides: {}

+ 2 - 2
Assets/Res/Aduio/Bgm/battle2.mp3.meta

@@ -5,11 +5,11 @@ AudioImporter:
   serializedVersion: 7
   defaultSettings:
     serializedVersion: 2
-    loadType: 2
+    loadType: 1
     sampleRateSetting: 0
     sampleRateOverride: 44100
     compressionFormat: 1
-    quality: 1
+    quality: 0.22
     conversionMode: 0
     preloadAudioData: 0
   platformSettingOverrides: {}

+ 2 - 2
Assets/Res/Aduio/Bgm/dongfu.mp3.meta

@@ -5,11 +5,11 @@ AudioImporter:
   serializedVersion: 7
   defaultSettings:
     serializedVersion: 2
-    loadType: 0
+    loadType: 1
     sampleRateSetting: 0
     sampleRateOverride: 44100
     compressionFormat: 1
-    quality: 1
+    quality: 0.22
     conversionMode: 0
     preloadAudioData: 0
   platformSettingOverrides: {}

+ 2 - 2
Assets/Res/Aduio/Bgm/dujiebgm.wav.meta

@@ -5,11 +5,11 @@ AudioImporter:
   serializedVersion: 7
   defaultSettings:
     serializedVersion: 2
-    loadType: 0
+    loadType: 1
     sampleRateSetting: 0
     sampleRateOverride: 44100
     compressionFormat: 1
-    quality: 1
+    quality: 0.22
     conversionMode: 0
     preloadAudioData: 0
   platformSettingOverrides: {}

+ 2 - 2
Assets/Res/Aduio/Bgm/xunlongduobao.wav.meta

@@ -5,11 +5,11 @@ AudioImporter:
   serializedVersion: 7
   defaultSettings:
     serializedVersion: 2
-    loadType: 2
+    loadType: 1
     sampleRateSetting: 0
     sampleRateOverride: 44100
     compressionFormat: 1
-    quality: 1
+    quality: 0.22
     conversionMode: 0
     preloadAudioData: 0
   platformSettingOverrides: {}

+ 2 - 2
Assets/Res/Aduio/Bgm/xunlongduobao1.wav.meta

@@ -5,11 +5,11 @@ AudioImporter:
   serializedVersion: 7
   defaultSettings:
     serializedVersion: 2
-    loadType: 0
+    loadType: 1
     sampleRateSetting: 0
     sampleRateOverride: 44100
     compressionFormat: 1
-    quality: 1
+    quality: 0.22
     conversionMode: 0
     preloadAudioData: 0
   platformSettingOverrides: {}

+ 2 - 2
Assets/Res/Aduio/Bgm/yunmengze.mp3.meta

@@ -5,11 +5,11 @@ AudioImporter:
   serializedVersion: 7
   defaultSettings:
     serializedVersion: 2
-    loadType: 0
+    loadType: 1
     sampleRateSetting: 0
     sampleRateOverride: 44100
     compressionFormat: 1
-    quality: 1
+    quality: 0.22
     conversionMode: 0
     preloadAudioData: 0
   platformSettingOverrides: {}

+ 3 - 3
Assets/Res/Aduio/Skill/fb10001/chuxian.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

+ 3 - 3
Assets/Res/Aduio/Skill/fb10001/fabaochuxian.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

+ 3 - 3
Assets/Res/Aduio/Skill/fb10001/fabaohit.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

+ 3 - 3
Assets/Res/Aduio/Skill/fb10001/fb_10002gj.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

+ 3 - 3
Assets/Res/Aduio/Skill/fb10001/fb_10003cixu.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

+ 3 - 3
Assets/Res/Aduio/Skill/fb10001/fb_10004chuxian.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

+ 3 - 3
Assets/Res/Aduio/Skill/fb10001/fb_10004hit.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

+ 3 - 3
Assets/Res/Aduio/Skill/fb10001/fb_10007shengxiao.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

+ 3 - 3
Assets/Res/Aduio/Skill/fb10001/fb_10008chixu.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

+ 3 - 3
Assets/Res/Aduio/Skill/fb10001/fb_10008loop.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

+ 3 - 3
Assets/Res/Aduio/Skill/fb10001/fb_10010chixu.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

+ 3 - 3
Assets/Res/Aduio/Skill/fb10001/fb_10010chuxian.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

+ 3 - 3
Assets/Res/Aduio/Skill/fb10001/fb_duiping.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

+ 3 - 3
Assets/Res/Aduio/Skill/fb10001/fb_duipingbaozha.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

+ 3 - 3
Assets/Res/Aduio/Skill/fb10001/fb_feixing.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

+ 3 - 3
Assets/Res/Aduio/Skill/fb10001/fb_xiaopengzhuang.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

+ 3 - 3
Assets/Res/Aduio/UI/combat_win.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 1
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

+ 3 - 3
Assets/Res/Aduio/UI/dujie_pizhong.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

+ 4 - 4
Assets/Res/Aduio/UI/jingbi.wav.meta

@@ -5,17 +5,17 @@ AudioImporter:
   serializedVersion: 7
   defaultSettings:
     serializedVersion: 2
-    loadType: 1
+    loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 0.01
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 1
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

+ 4 - 4
Assets/Res/Aduio/UI/openui.wav.meta

@@ -5,17 +5,17 @@ AudioImporter:
   serializedVersion: 7
   defaultSettings:
     serializedVersion: 2
-    loadType: 1
+    loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 0.01
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 1
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

+ 4 - 4
Assets/Res/Aduio/UI/shibai.wav.meta

@@ -5,17 +5,17 @@ AudioImporter:
   serializedVersion: 7
   defaultSettings:
     serializedVersion: 2
-    loadType: 1
+    loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 0.01
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 1
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

+ 3 - 3
Assets/Res/Aduio/UI/ui_button.ogg.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 1
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

+ 3 - 3
Assets/Res/Aduio/UI/ui_cexiadaolv.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

+ 3 - 3
Assets/Res/Aduio/UI/ui_chaozuoshibai.WAV.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

+ 3 - 3
Assets/Res/Aduio/UI/ui_chouqugongfa.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

+ 3 - 3
Assets/Res/Aduio/UI/ui_daoyou_nv_gx1.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

+ 3 - 3
Assets/Res/Aduio/UI/ui_fanhui.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

+ 3 - 3
Assets/Res/Aduio/UI/ui_fbgfsj.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

+ 3 - 3
Assets/Res/Aduio/UI/ui_fzgf_yx.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

+ 3 - 3
Assets/Res/Aduio/UI/ui_jianglimianban.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

+ 3 - 3
Assets/Res/Aduio/UI/ui_jinduwancheng.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

+ 3 - 3
Assets/Res/Aduio/UI/ui_shangdian.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

+ 3 - 3
Assets/Res/Aduio/UI/ui_shanggongfa.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

+ 3 - 3
Assets/Res/Aduio/UI/ui_shangzhengdaolv.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

+ 3 - 3
Assets/Res/Aduio/UI/ui_shengji.WAV.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

+ 3 - 3
Assets/Res/Aduio/UI/ui_shengshitansuo.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

+ 3 - 3
Assets/Res/Aduio/UI/ui_shiyonghuode.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

+ 3 - 3
Assets/Res/Aduio/UI/ui_tupo.WAV.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

+ 3 - 3
Assets/Res/Aduio/UI/ui_tuposhibai.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

+ 3 - 3
Assets/Res/Aduio/UI/ui_tycg.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

+ 3 - 3
Assets/Res/Aduio/UI/ui_xiazhenggongfa.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

+ 3 - 3
Assets/Res/Aduio/UI/ui_zbfbcg.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

+ 4 - 4
Assets/Res/Aduio/UI/zhuangbei.wav.meta

@@ -5,17 +5,17 @@ AudioImporter:
   serializedVersion: 7
   defaultSettings:
     serializedVersion: 2
-    loadType: 1
+    loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 0.01
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 1
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

+ 0 - 1
Assets/Res/CombatScenes/LevelBattle02.prefab

@@ -47,7 +47,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   skyObejct: {fileID: 1381729068282112590}
-  shengShiMaterial: {fileID: 2100000, guid: 5d9d871e58f5c1b4890049c6625f29c8, type: 2}
   fogColor: {r: 0.1794, g: 0.43469998, b: 0.69, a: 1}
   fogStartDistance: 80
   fogEndDistance: 150

+ 2 - 1
Assets/Resources/Shader/Shader Graphs_ShengShiShader.mat

@@ -62,9 +62,10 @@ Material:
     - _QueueOffset: 0
     - _depthoff: 1.18
     - _qiangdu: 5
-    - _ran: 0.1
+    - _ran: 84.88
     m_Colors:
     - _mainColor: {r: 0.21314356, g: 1.4060051, b: 2.1517377, a: 0}
     - _off: {r: 0.01, g: 0.01, b: 0, a: 0}
     - _pos: {r: -1.8000001, g: -5.3999996, b: -30, a: 0}
+    - _shengShiPos: {r: 0, g: 0, b: 0, a: 0}
   m_BuildTextureStacks: []

+ 10 - 10
Assets/Resources/Shader/ShengShiShader.shadergraph

@@ -1763,7 +1763,7 @@
     "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
     "m_ObjectId": "220af7af4d1d4182a26c500cfbd0c345",
     "m_Id": 0,
-    "m_DisplayName": "ran",
+    "m_DisplayName": "shengshiRan",
     "m_SlotType": 1,
     "m_Hidden": false,
     "m_ShaderOutputName": "Out",
@@ -4336,12 +4336,12 @@
     "m_Guid": {
         "m_GuidSerialized": "b5e36e16-5903-4b7d-9b8f-09e8dd3ea0c1"
     },
-    "m_Name": "pos",
+    "m_Name": "shengShiPos",
     "m_DefaultRefNameVersion": 1,
-    "m_RefNameGeneratedByDisplayName": "pos",
-    "m_DefaultReferenceName": "_pos",
+    "m_RefNameGeneratedByDisplayName": "shengShiPos",
+    "m_DefaultReferenceName": "_shengShiPos",
     "m_OverrideReferenceName": "",
-    "m_GeneratePropertyBlock": true,
+    "m_GeneratePropertyBlock": false,
     "m_UseCustomSlotLabel": false,
     "m_CustomSlotLabel": "",
     "m_DismissedVersion": 0,
@@ -5448,12 +5448,12 @@
     "m_Guid": {
         "m_GuidSerialized": "e742a0b0-64ef-4bad-a451-ca43a9564c03"
     },
-    "m_Name": "ran",
+    "m_Name": "shengshiRan",
     "m_DefaultRefNameVersion": 1,
-    "m_RefNameGeneratedByDisplayName": "ran",
-    "m_DefaultReferenceName": "_ran",
+    "m_RefNameGeneratedByDisplayName": "shengshiRan",
+    "m_DefaultReferenceName": "_shengshiRan",
     "m_OverrideReferenceName": "",
-    "m_GeneratePropertyBlock": true,
+    "m_GeneratePropertyBlock": false,
     "m_UseCustomSlotLabel": false,
     "m_CustomSlotLabel": "",
     "m_DismissedVersion": 0,
@@ -5490,7 +5490,7 @@
     "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot",
     "m_ObjectId": "b7c4826c43a84fddb3c1eecd2e1e5250",
     "m_Id": 0,
-    "m_DisplayName": "pos",
+    "m_DisplayName": "shengShiPos",
     "m_SlotType": 1,
     "m_Hidden": false,
     "m_ShaderOutputName": "Out",

+ 2 - 2
Assets/Scenes/testCombat.scene

@@ -2532,7 +2532,7 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 7091770935250694576, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
   m_PrefabInstance: {fileID: 1733556487}
   m_PrefabAsset: {fileID: 0}
---- !u!213 &1811187060
+--- !u!213 &1802200223
 Sprite:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -2805,7 +2805,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 1811187060}
+  m_Sprite: {fileID: 1802200223}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1

+ 12 - 7
Assets/Scripts/GameLogic/Combat/CombatTool/SceneTool/CombatSenceController.cs

@@ -15,9 +15,9 @@ namespace GameLogic.Combat.CombatTool
 {
     public class CombatSenceController : IDisposable
     {
-        private static readonly int Ran = Shader.PropertyToID("_ran");
+        private static readonly int Ran = Shader.PropertyToID("_shengshiRan");
 
-        private static readonly int Pos = Shader.PropertyToID("_pos");
+        private static readonly int Pos = Shader.PropertyToID("_shengShiPos");
         // public CombatSencePath currBesselPath;
         //
         // public CombatSencePath NextBesselPath;
@@ -106,7 +106,8 @@ namespace GameLogic.Combat.CombatTool
                 {
                     GameObject gameObject = assetHandle.AssetObject<GameObject>();
                     SceneMonoConfig = gameObject.GetComponent<SceneMonoConfigBasic>();
-                    SceneMonoConfig.shengShiMaterial.SetFloat(Ran, 0.1f);
+                    Shader.SetGlobalFloat(Ran, 0.1f);
+                    // SceneMonoConfig.shengShiMaterial.SetFloat(Ran, 0.1f);
                 });
             cTaskAwaitBuffer.AddTask(task_a);
 
@@ -176,11 +177,13 @@ namespace GameLogic.Combat.CombatTool
         public void StartPayShengShi(Transform root)
         {
             shengShiRan = 1;
-            SceneMonoConfig.shengShiMaterial.SetFloat(Ran, shengShiRan);
+            Shader.SetGlobalFloat(Ran, shengShiRan);
+            // SceneMonoConfig.shengShiMaterial.SetFloat(Ran, shengShiRan);
             Vector3 pos = CombatController.currActiveCombat.playerHeroEntity.dotPos - CombatController.currActiveCombat
                 .CombatCameraControllder.Camera.transform.position;
             pos.z = -30;
-            SceneMonoConfig.shengShiMaterial.SetVector(Pos, pos);
+            Shader.SetGlobalVector(Pos, pos);
+            // SceneMonoConfig.shengShiMaterial.SetVector(Pos, pos);
 
             _isUpdateShengShi = true;
 
@@ -198,12 +201,14 @@ namespace GameLogic.Combat.CombatTool
             {
                 // _shengShiAddTime += t * 1f;
                 shengShiRan += t * 150;
-                SceneMonoConfig.shengShiMaterial.SetFloat(Ran, shengShiRan);
+                Shader.SetGlobalFloat(Ran, shengShiRan);
+                // SceneMonoConfig.shengShiMaterial.SetFloat(Ran, shengShiRan);
                 // float v = Mathf.Lerp(shengShiStartSize, shengShiEndSize, _shengShiAddTime);
                 // ShengShiQiuTi.own.transform.localScale = Vector3.one * v;
                 if (shengShiRan >= 200)
                 {
-                    SceneMonoConfig.shengShiMaterial.SetFloat(Ran, 0.1f);
+                    Shader.SetGlobalFloat(Ran, 0.1f);
+                    // SceneMonoConfig.shengShiMaterial.SetFloat(Ran, 0.1f);
 
                     _isUpdateShengShi = false;
                 }

+ 1 - 1
Assets/Scripts/GameLogic/Combat/CombatTool/SceneTool/SceneMonoConfigBasic.cs

@@ -8,7 +8,7 @@ namespace GameLogic.Combat.CombatTool.SceneTool
     {
         public GameObject skyObejct;
 
-        public Material shengShiMaterial;
+       // public Material shengShiMaterial;
         protected Transform root;
         protected Transform moveRoot;
         public void Init(Transform root,Transform moveRoot)

Різницю між файлами не показано, бо вона завелика
+ 0 - 0
Assets/StreamingAssets/assetConfig.txt


+ 2 - 2
ProjectSettings/AudioManager.asset

@@ -9,7 +9,7 @@ AudioManager:
   Doppler Factor: 1
   Default Speaker Mode: 2
   m_SampleRate: 0
-  m_DSPBufferSize: 1024
+  m_DSPBufferSize: 256
   m_VirtualVoiceCount: 512
   m_RealVoiceCount: 32
   m_EnableOutputSuspension: 1
@@ -17,5 +17,5 @@ AudioManager:
   m_AmbisonicDecoderPlugin: 
   m_DisableAudio: 0
   m_VirtualizeEffects: 1
-  m_RequestedDSPBufferSize: 0
+  m_RequestedDSPBufferSize: 256
   m_AndroidAudioBackend: 0

+ 3 - 3
UserSettings/EditorUserSettings.asset

@@ -54,13 +54,13 @@ EditorUserSettings:
       value: 183b144645154b7802000a2b17364d11021e17246e72662b47695d73a2a07478a2a505e1e82d6f2f100cca3210371526d1051c05e22a040f2507f00b32f01c061ccb5a9f5ace1e10d81c50a48d5d91a3959694aa9ad8efd7c9f2afe0f1c0fcfdf6f8b6f2a5a6dacfb89debbfa1cbc9c3f5c3bac18e9c89c1bbdec2d6f2b992939996c59699c79ae8d182b7baad82aba0b0aea88398abdbf1dd8a8ea765ffc520262728fafcf8f6c28eb162945c71898d6167877a72a980809c9f71cecece859d579fd5f106dbdadb21de0dde237c686c76706641634c764f547c624a7e622d6628286620686f653d2b635a0204003e0805017509093043470e3643041c5d5b415c54450e1c424b420f6e4b634e636263696655641a1f273c0f083c1102ec362de62318e9ea25ab61ade8ed0ee30655b0b6b7b8176615
       flags: 0
     UnityEditor.ShaderGraph.Blackboard:
-      value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd3c3e302a07a37e0901373ae01e0008f707250d171df81a53a5405d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd8b908fecb0f9cfddf1eff4e7a1b1eae482f0fdaee1e1928b86d888ed909c928797a7cf
+      value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4baf5e435d8715fa32c70d15d11612dacc11fee5d3c5d1fe9ab1b4968e93e2ffcbc3e7e2f0b3ffe0e8b0be9af8ffaeffff8e85dd8390e394988899daa7
       flags: 0
     UnityEditor.ShaderGraph.FloatingWindowsLayout2:
-      value: 181344140043005e1a220d3b1f364b524c0c5a27130c293326201334cee5322ca0bd30e8eb293a707b0fd0180b3d0a36fc0d3d04e649500d1002ee0b5dbd1d2c27c00ad113cb1e10e41f1addc80993b98d9884a69ae6d8f0d1cda9e8fbfefaf9f9dea3fdb9ade882f0f7b0e1e380cafbf2c3adc18e9cd285a2908b82ec879c8395949c9483d68a8d97ddbd90bf
+      value: 181344140043005e1a220d3b1f364b524c0c5a27130c293326201334cee5322ca0bd30e8eb293a707b0fd0180b3d0a36fc0d3d04e649500d1002ee0b5dbd1d2c27c00ad113cb1e10e41f1addc80993b9859884a69ae6d8f0d1cda9e8fbfefaf9f9dea3fdb9ade882f0f7b0e1e380cafbf2c3adc18e9cd285a2908b82ec879c8395949c9483d68a8d97ddbd90bf
       flags: 0
     UnityEditor.ShaderGraph.InspectorWindow:
-      value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4baf5e435d8715fa32c70d15d11612dacc11fee5d3c5d1fe9ab1b7968e93e2ffcbc3e7e2f0b3ffe0e8b0be9af9f8aaffff8e85dd8390e392998899daa7
+      value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd3c3e302a07a37e0901373ae01e0008f707250d171df81a53a5405d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd88908fecb0f9cfddf1eff4e7a1b1eae482f0fca9e5e1928b86d888ed909a938797a7cf
       flags: 0
     UnityEditor.ShaderGraph.ToggleSettings:
       value: 18135d1527590858060c032302276919051e1a26296a7c243f3c187fa0e92708f0e220e0e22d09352a0bed30017c5b2be01f0c47b40219221f1ded0b12eb1f0127cc0bcc18c41a5e910d0edbc85193e0dadadbf8e8f9e8ced7dba5e0b6aaaca4dbfeabfef4eae1

Різницю між файлами не показано, бо вона завелика
+ 2228 - 145
UserSettings/Layouts/default-2022.dwlt


Деякі файли не було показано, через те що забагато файлів було змінено