sharedacc520k/WhaleAdventure_VR
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
49f99647a13a034709683a53b42d758da1500829
WhaleAdventure_VR/Assets
History
NJ\skrwn 49f99647a1 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR 
# Conflicts:
#	Assets/RealToon.meta
#	Assets/RealToon/Editor.meta
#	Assets/RealToon/RealToon Shaders.meta
#	Assets/RealToon/RealToon Shaders/RealToon Core.meta
#	Assets/RealToon/RealToon Shaders/RealToon Core/URP.meta
#	Assets/RealToon/RealToon Shaders/RealToon Core/URP/Pass.meta
#	Assets/RealToon/RealToon Shaders/Version 5.meta
#	Assets/RealToon/RealToon Shaders/Version 5/URP.meta
#	Assets/RealToon/RealToon Shaders/Version 5/URP/Default.meta
#	Assets/RealToon/RealToon Tools.meta
#	Assets/RealToon/RealToon Tools/FrameByFrameRendering.meta
2026-06-20 16:56:52 +09:00
..
_Recovery
…
01_Scenes
aaa
2026-06-19 18:23:38 +09:00
02_Scripts
Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR
2026-06-19 18:17:11 +09:00
03_Shaders
…
04_Models
Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR
2026-06-20 16:56:52 +09:00
05_Textures
Merge pull request '블랙잭 NPC 코인 및 AI Navigation 기능 추가' (#7) from feature/hyeonsu-blackjack-restore into main
2026-06-19 06:35:40 +00:00
06_Materials
Merge pull request '블랙잭 NPC 코인 및 AI Navigation 기능 추가' (#7) from feature/hyeonsu-blackjack-restore into main
2026-06-19 06:35:40 +00:00
07_Data
2026-06-19 월드다이얼로그 프로토타입
2026-06-19 17:58:22 +09:00
08_Timeline
2026-06-17 게임시작 - 고래습격씬 프로토타입
2026-06-17 13:17:04 +09:00
09_UI
…
10_FX
…
11_Audio
…
12_Font
2026-06-17 게임시작 - 고래습격씬 프로토타입
2026-06-17 13:17:04 +09:00
99_Settings
대화 프로토타입
2026-06-19 17:09:36 +09:00
CartoonVFX9X
…
GUIPackCartoon
…
HighlightPlus
2026-06-17 highlight 에셋추가. 스틱그랩 추가중
2026-06-17 19:06:09 +09:00
HighlightPlusBundle
2026-06-17 highlight 에셋추가. 스틱그랩 추가중
2026-06-17 19:06:09 +09:00
Hovl Studio
…
Ilumisoft
…
Layer Lab
…
MagicaCloth2
2026-06-20 뉴페어리
2026-06-20 16:46:29 +09:00
My project
2026-06-19 월드다이얼로그 프로토타입
2026-06-19 17:58:22 +09:00
NV3D
…
Piloto Studio
…
PolyOne
…
RealToon
2026-06-20 뉴페어리
2026-06-20 16:46:29 +09:00
Rocks and Boulders 2
…
Samples
…
Stylized Door
…
Stylized Water 3
Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR
2026-06-19 18:17:11 +09:00
TextMesh Pro
up
2026-06-18 17:09:07 +09:00
ToonScapes
…
VRTemplateAssets
…
XR
2026-06-19 UI, UI로직
2026-06-19 14:27:40 +09:00
XRI
동굴재건
2026-06-18 17:47:41 +09:00
XRI Starter Kit
동글 운항
2026-06-19 18:16:40 +09:00
_Recovery.meta
…
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
…
99_Settings.meta
…
CartoonVFX9X.meta
…
DefaultVolumeProfile.asset
…
DefaultVolumeProfile.asset.meta
…
GUIPackCartoon.meta
…
HighlightPlus.meta
2026-06-17 highlight 에셋추가. 스틱그랩 추가중
2026-06-17 19:06:09 +09:00
HighlightPlusBundle.meta
2026-06-17 highlight 에셋추가. 스틱그랩 추가중
2026-06-17 19:06:09 +09:00
Hovl Studio.meta
…
Ilumisoft.meta
…
Layer Lab.meta
…
MagicaCloth2.meta
2026-06-20 뉴페어리
2026-06-20 16:46:29 +09:00
My project.meta
2026-06-19 UI, UI로직
2026-06-19 14:27:40 +09:00
New Terrain.asset
…
New Terrain.asset.meta
…
NV3D.meta
…
Piloto Studio.meta
…
PolyOne.meta
…
RealToon.meta
2026-06-20 뉴페어리
2026-06-20 16:46:29 +09:00
Rocks and Boulders 2.meta
…
Samples.meta
…
Stylized Door.meta
…
Stylized Water 3.meta
…
SubstanceAssets.meta
…
TerrainData_75b39ee6-b05b-4594-99db-de37c7da953a.asset
…
TerrainData_75b39ee6-b05b-4594-99db-de37c7da953a.asset.meta
…
TextMesh Pro.meta
…
ToonScapes.meta
…
VRTemplateAssets.meta
…
XR.meta
…
XRI Starter Kit.meta
…
XRI.meta
…