fix problems from merging with upstream

2026-02-07 12:29:59 +02:00
parent b1d5b73df4
commit 0fbfaed5c3
12 changed files with 40 additions and 79 deletions
--- a/Assets/_PROJECT/Prefabs/ModelGeneration/Characters/CafeWaiterNPC.prefab
+++ b/Assets/_PROJECT/Prefabs/ModelGeneration/Characters/CafeWaiterNPC.prefab
@@ -206,8 +206,8 @@ MonoBehaviour:
  - Ulrich_Enjoy
  mouth: {fileID: 5759406807219530703}
  minScaleY: 1
-  maxScaleY: 1.75
-  gain: 30
+  maxScaleY: 2
+  gain: 20
  attack: 0.6
  release: 0.2
  inverted: 0
--- a/Assets/_PROJECT/Prefabs/ModelGeneration/ModelGenerationManager.prefab
+++ b/Assets/_PROJECT/Prefabs/ModelGeneration/ModelGenerationManager.prefab
@@ -14,7 +14,6 @@ GameObject:
  - component: {fileID: 2166102850012183631}
  - component: {fileID: 8356602476881383464}
  - component: {fileID: 5682436338090300270}
-  - component: {fileID: 5910538061401192019}
  m_Layer: 0
  m_Name: ModelGenerationManager
  m_TagString: Untagged
@@ -129,15 +128,3 @@ MonoBehaviour:
  bufferLengthSec: 5
  playLoopback: 0
  loopbackVolume: 1
--- !u!114 &5910538061401192019
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 154411548685861447}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 6a9ed26713a3c4c4f8f6be3bbd4af5c7, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: