Commit Graph

17 Commits

Author SHA1 Message Date
8c764be378 파티클 재수정 2026-06-20 17:38:52 +09:00
b90f996d14 파티클 수정 2026-06-20 17:35:54 +09:00
f85ea1ffc1 2026-06-20 뉴페어리 마테리얼 수정 2026-06-20 17:33:30 +09:00
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
295e284dd0 2026-06-20 뉴페어리 2026-06-20 16:46:29 +09:00
711c9a5986 대화 프로토타입 2026-06-19 17:09:36 +09:00
49883e4585 ㅁㅁㅁ 2026-06-19 15:36:42 +09:00
skrwns304@gmail.com
b1e85a5b89 2026-06-19 UI, UI로직 2026-06-19 14:27:40 +09:00
f69d0ef273 2026-06-18 앉기 UI등등 2026-06-18 18:09:08 +09:00
c81a276eba 2026-06-17 게임시작 - 고래습격씬 프로토타입 2026-06-17 13:17:04 +09:00
skrwns304@gmail.com
c92e9f648a Reapply "Merge pull request '리듬게임' (#5) from CatsRhythmGame into main"
This reverts commit d7d5519fbf.
2026-06-16 12:26:10 +09:00
skrwns304@gmail.com
d7d5519fbf Revert "Merge pull request '리듬게임' (#5) from CatsRhythmGame into main"
This reverts commit 58385bf819, reversing
changes made to 8369e2ab51.
2026-06-16 12:23:32 +09:00
58385bf819 Merge pull request '리듬게임' (#5) from CatsRhythmGame into main
Reviewed-on: #5
2026-06-16 02:09:52 +00:00
38936c211a 2026-06-15 리듬게임 자동기능 2026-06-15 17:37:32 +09:00
HIHIHIHIHIHIzz
88160938b9 페어리 추가 2026-06-15 17:32:10 +09:00
skrwns304@gmail.com
ca88395a1a 2026-06-12 고양이 마테리얼, 양동이 모델 2026-06-12 00:31:30 +09:00
skrwns304@gmail.com
efaea47ae6 2026-06-11 고양이 모델링추가 2026-06-11 18:06:52 +09:00