Commit Graph

4 Commits

Author SHA1 Message Date
M1_IDMhan
d2ccd05be3 #33 MainScene change 2023-10-01 02:43:16 +09:00
f7dd43d4f4 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	BlueWater/Assets/Resources/SPUM/SPUM_Sprites/Packages/MS_Orc.meta
#	BlueWater/Assets/Resources/SPUM/SPUM_Sprites/Packages/MS_Orc/0_Hair.meta
#	BlueWater/Assets/Resources/SPUM/SPUM_Sprites/Packages/MS_Orc/1_FaceHair.meta
#	BlueWater/Assets/Resources/SPUM/SPUM_Sprites/Packages/MS_Orc/2_Cloth.meta
2023-09-27 14:45:33 +09:00
5b62ff74f6 spum 캐릭터들 업데이트 2023-09-27 14:41:24 +09:00
M1_IDMhan
6e42cb693a [Asset] PixelHeroes, SPUM 2023-09-26 15:24:34 +09:00