Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation

# Conflicts:
#	Assets/XR/Settings/OpenXR Package Settings.asset

Assets/02_Scripts/Managers/SceneLoadManager.cs

@@ -204,6 +204,26 @@ private void MovePlayerToLoadingArea()
         if (cc != null) cc.enabled = true;
     }
 
+    // 로딩 룸(로딩바 포함)을 플레이어가 지금 보고 있는 방향으로 한 번 돌려놓는다.
+    // Update에서는 위치만 따라가므로, 여기서 잡아둔 방향이 로딩 내내 유지된다.
+    // 매 프레임 돌리면 UI가 얼굴에 붙어다녀 멀미가 나므로 전환 시점에 한 번만 맞춘다.
+    private void AlignLoadingRootToPlayerView()
+    {
+        if (_loadingRoot == null || _loadingCamTargetTransform == null) return;
+
+        // 고개를 들거나 숙인 각도는 버리고 좌우(yaw) 방향만 쓴다
+        var forward = Vector3.ProjectOnPlane(_loadingCamTargetTransform.forward, Vector3.up);
+
+        // 정수리나 발끝을 보고 있으면 수평 성분이 0에 가까워진다 — 이때는 yaw 값을 직접 쓴다
+        if (forward.sqrMagnitude < 0.0001f)
+        {
+            _loadingRoot.transform.rotation = Quaternion.Euler(0f, _loadingCamTargetTransform.eulerAngles.y, 0f);
+            return;
+        }
+
+        _loadingRoot.transform.rotation = Quaternion.LookRotation(forward, Vector3.up);
+    }
+
     // 화면이 어두워진 뒤, HideDuringLoading 마커가 붙은 오브젝트를 전부 끈다 (로딩 중 노출/깜빡임 방지).
     // 글로벌 매니저라 씬 오브젝트를 직접 참조할 수 없으므로(씬 전환 시 참조가 끊김) 런타임에 씬에서 찾는다.
     private void DisableDarkObjects()
@@ -241,6 +261,9 @@ private async Awaitable SceneChange(string sceneName)
             // (로딩 룸은 카메라를 따라다니므로 함께 이동한다)
             MovePlayerToLoadingArea();
 
+            // 플레이어가 뒤를 보고 있어도 로딩바가 정면에 오도록 로딩 룸을 시선 방향으로 정렬
+            AlignLoadingRootToPlayerView();
+
             // 어두워진 상태에서 지정 오브젝트들 끄기 (로딩 중 보이면 안 되는 것들)
             DisableDarkObjects();
 

Assets/05_Textures/WetProjectProposal.png.meta

@@ -0,0 +1,156 @@
+fileFormatVersion: 2
+guid: 365aca18daafc6d43b97a32eaf19b15a
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 1024
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 4
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: WindowsStoreApps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/06_Materials/WetProjectProposal.mat

@@ -0,0 +1,142 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: WetProjectProposal
+  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _ALPHAPREMULTIPLY_ON
+  - _ALPHATEST_ON
+  - _SURFACE_TYPE_TRANSPARENT
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 3000
+  stringTagMap:
+    RenderType: Transparent
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  - DepthOnly
+  - SHADOWCASTER
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BaseMap:
+        m_Texture: {fileID: 2800000, guid: 365aca18daafc6d43b97a32eaf19b15a, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 365aca18daafc6d43b97a32eaf19b15a, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _AddPrecomputedVelocity: 0
+    - _AlphaClip: 1
+    - _AlphaToMask: 0
+    - _Blend: 0
+    - _BlendModePreserveSpecular: 1
+    - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
+    - _Cull: 2
+    - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 10
+    - _DstBlendAlpha: 10
+    - _EnvironmentReflections: 1
+    - _GlossMapScale: 0
+    - _Glossiness: 0
+    - _GlossyReflections: 0
+    - _Metallic: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.005
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _Smoothness: 0.5
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _SrcBlendAlpha: 1
+    - _Surface: 1
+    - _WorkflowMode: 1
+    - _XRMotionVectorsPass: 1
+    - _ZWrite: 0
+    m_Colors:
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
+--- !u!114 &8243918870500824734
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion
+  version: 10

Assets/06_Materials/WetProjectProposal.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 939c4b26b2483c34791af6b56e669691
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/11_Audio/BGM/Etc/결혼해 줄래 (feat. Bizniz)_이승기_결혼해 줄래.mp3.meta

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

Assets/11_Audio/MainMixer.mixer

@@ -15,6 +15,9 @@ AudioMixerGroupController:
   m_Send: 00000000000000000000000000000000
   m_Effects:
   - {fileID: 6499960502945122}
+  - {fileID: 4754378330777255674}
+  - {fileID: -5274263231835176847}
+  - {fileID: 901220893356080106}
   m_UserColorIndex: 0
   m_Mute: 0
   m_Solo: 0
@@ -34,10 +37,62 @@ AudioMixerGroupController:
   m_Send: 00000000000000000000000000000000
   m_Effects:
   - {fileID: -1111153668822042352}
+  - {fileID: -1454759029808046165}
+  - {fileID: -4734788075015124645}
   m_UserColorIndex: 0
   m_Mute: 0
   m_Solo: 0
   m_BypassEffects: 0
+--- !u!244 &-5274263231835176847
+AudioMixerEffectController:
+  m_ObjectHideFlags: 3
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_EffectID: a43cf80ca87e4534889a1df64a7ada22
+  m_EffectName: Compressor
+  m_MixLevel: 1a889bbed9253a845863a659d8e35e8d
+  m_Parameters:
+  - m_ParameterName: Threshold
+    m_GUID: 851cd56ca0178c242b10f0b893c02081
+  - m_ParameterName: Attack
+    m_GUID: f003eff2a47bd23418873b3ba5470d88
+  - m_ParameterName: Release
+    m_GUID: 0887b662687a00a4b9001b3754bdee24
+  - m_ParameterName: Make up gain
+    m_GUID: 166d69f6c67935d449fa2d654abf8bd7
+  m_SendTarget: {fileID: 0}
+  m_EnableWetMix: 0
+  m_Bypass: 0
+--- !u!244 &-4734788075015124645
+AudioMixerEffectController:
+  m_ObjectHideFlags: 3
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_EffectID: fbac7017bfe42ce4ea3f04bcb3631c61
+  m_EffectName: Duck Volume
+  m_MixLevel: 37178e86e67671d49afa5a35865baff6
+  m_Parameters:
+  - m_ParameterName: Threshold
+    m_GUID: 5eeafa51b290d974b8c74f0e51b62184
+  - m_ParameterName: Ratio
+    m_GUID: 6758627ec830d1f4cad307f333d68e43
+  - m_ParameterName: Attack Time
+    m_GUID: 6d0726fe668bab543b881317bef54793
+  - m_ParameterName: Release Time
+    m_GUID: a323a4cbeb78c974e94650c463a7b535
+  - m_ParameterName: Make-up Gain
+    m_GUID: 119fe712fdb353b4cb365b3f68655b8e
+  - m_ParameterName: Knee
+    m_GUID: d075844a196366a4f94e52ee387a836b
+  - m_ParameterName: Sidechain Mix
+    m_GUID: eea963575e5bf934ea206a48f34bde1b
+  m_SendTarget: {fileID: 0}
+  m_EnableWetMix: 0
+  m_Bypass: 0
 --- !u!244 &-1496916555325082197
 AudioMixerEffectController:
   m_ObjectHideFlags: 3
@@ -52,6 +107,26 @@ AudioMixerEffectController:
   m_SendTarget: {fileID: 0}
   m_EnableWetMix: 0
   m_Bypass: 0
+--- !u!244 &-1454759029808046165
+AudioMixerEffectController:
+  m_ObjectHideFlags: 3
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_EffectID: 7739f898165ea4b459b28a6c8c4b3c5b
+  m_EffectName: ParamEQ
+  m_MixLevel: b512e51876101a94a81790457e3357db
+  m_Parameters:
+  - m_ParameterName: Center freq
+    m_GUID: 07cf4c877a798e947bf4dd24444439f8
+  - m_ParameterName: Octave range
+    m_GUID: 0d93648c9b517844896e719950ea4f25
+  - m_ParameterName: Frequency gain
+    m_GUID: 329a0c2a5a9393f4798af66f6dd69578
+  m_SendTarget: {fileID: 0}
+  m_EnableWetMix: 0
+  m_Bypass: 0
 --- !u!244 &-1111153668822042352
 AudioMixerEffectController:
   m_ObjectHideFlags: 3
@@ -143,7 +218,20 @@ AudioMixerSnapshotController:
   m_AudioMixer: {fileID: 24100000}
   m_SnapshotID: 65a440c2a830da0468487d2a92c4cb88
   m_FloatValues:
+    586c7fb068c4c544eb223f4c762b32d6: 1.3
+    5eeafa51b290d974b8c74f0e51b62184: -20
+    9cb35485508d2a94985383dd03a3e971: 1.6
+    bfe25c26ae55123488247b46094af1c1: -1
+    166d69f6c67935d449fa2d654abf8bd7: 2
+    07cf4c877a798e947bf4dd24444439f8: 2000
     8e7ec41ac6b2c6349b35bd772cadbda0: 5
+    329a0c2a5a9393f4798af66f6dd69578: 0.7
+    0014edda5c9fa5d4eb0a88b63d7e6363: 2000
+    a323a4cbeb78c974e94650c463a7b535: 1.5
+    851cd56ca0178c242b10f0b893c02081: -10
+    0d93648c9b517844896e719950ea4f25: 1.6
+    6758627ec830d1f4cad307f333d68e43: 3.5
+    6d0726fe668bab543b881317bef54793: 0.1
   m_TransitionOverrides: {}
 --- !u!244 &6499960502945122
 AudioMixerEffectController:
@@ -159,6 +247,20 @@ AudioMixerEffectController:
   m_SendTarget: {fileID: 0}
   m_EnableWetMix: 0
   m_Bypass: 0
+--- !u!244 &901220893356080106
+AudioMixerEffectController:
+  m_ObjectHideFlags: 3
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_EffectID: 5d23f94540edb474ea8c155f85e761bf
+  m_EffectName: Send
+  m_MixLevel: bfe25c26ae55123488247b46094af1c1
+  m_Parameters: []
+  m_SendTarget: {fileID: -4734788075015124645}
+  m_EnableWetMix: 0
+  m_Bypass: 0
 --- !u!243 &3851611846971593479
 AudioMixerGroupController:
   m_ObjectHideFlags: 0
@@ -178,3 +280,23 @@ AudioMixerGroupController:
   m_Mute: 0
   m_Solo: 0
   m_BypassEffects: 0
+--- !u!244 &4754378330777255674
+AudioMixerEffectController:
+  m_ObjectHideFlags: 3
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_EffectID: eda358ec43a23a546862e1d78a51ad2e
+  m_EffectName: ParamEQ
+  m_MixLevel: 3344792be8e4b334f9390af8d52fc4ac
+  m_Parameters:
+  - m_ParameterName: Center freq
+    m_GUID: 0014edda5c9fa5d4eb0a88b63d7e6363
+  - m_ParameterName: Octave range
+    m_GUID: 9cb35485508d2a94985383dd03a3e971
+  - m_ParameterName: Frequency gain
+    m_GUID: 586c7fb068c4c544eb223f4c762b32d6
+  m_SendTarget: {fileID: 0}
+  m_EnableWetMix: 0
+  m_Bypass: 0