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

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

2026-07-10 21:49:05 +09:00

..

01_Scenes

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

2026-07-10 21:49:05 +09:00

02_Scripts

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

2026-07-10 21:49:05 +09:00

03_Shaders

2026-07-10 대화 BGM,이펙트

2026-07-10 17:27:11 +09:00

04_Models

2026-07-10 비동기 씬전환

2026-07-10 21:46:10 +09:00

05_Textures

2026-07-10 비동기 씬전환

2026-07-10 21:46:10 +09:00

06_Materials

2026-07-10 비동기 씬전환

2026-07-10 21:46:10 +09:00

07_Data

2026-07-10 비동기 씬전환

2026-07-10 21:46:10 +09:00

08_Timeline

2026-07-10 학생회실 적용

2026-07-10 17:45:03 +09:00

09_UI

…

10_FX

2026-07-10 대화 BGM,이펙트

2026-07-10 17:27:11 +09:00

11_Audio

2026-07-10 대화 BGM,이펙트

2026-07-10 17:27:11 +09:00

12_Font

…

13_Image

2026-07-10 비동기 씬전환

2026-07-10 21:46:10 +09:00

99_Settings

…

CompositionLayers

…

EasyColliderEditor

…

HighlightPlus

…

HighlightPlusBundle

…

Ilumisoft

2026-07-09 문 프리팹화

2026-07-09 16:56:29 +09:00

LowPolyInterior2

…

Samples

…

Settings

…

Synty

…

TextMesh Pro

…

TutorialInfo

…

VRTemplateAssets

…

XR

2026-07-10 비동기 씬전환

2026-07-10 21:46:10 +09:00

XRI

…

01_Scenes.meta

…

02_Scripts.meta

…

03_Shaders.meta

…

04_Models.meta

…

05_Textures.meta

…

06_Materials.meta

…

07_Data.meta

…

08_Timeline.meta

…

09_UI.meta

…

10_FX.meta

…

11_Audio.meta

…

12_Font.meta

…

13_Image.meta

bgm

2026-07-09 13:03:04 +09:00

99_Settings.meta

…

CompositionLayers.meta

…

DefaultVolumeProfile.asset

…

DefaultVolumeProfile.asset.meta

…

EasyColliderEditor.meta

…

HighlightPlus.meta

…

HighlightPlusBundle.meta

…

Ilumisoft.meta

…

LowPolyInterior2.meta

…

Samples.meta

…

Settings.meta

…

Synty.meta

…

TextMesh Pro.meta

…

TutorialInfo.meta

…

VRTemplateAssets.meta

…

XR.meta

…

XRI.meta

…