myCommit
ss

a
Merge branch 'master' of https://github.com/geniikw/Assets
이팩트 매니저 만들다 맘
update
합치는거
합치는거2
옵션좀 바꿈 ㅇㅇ;
Merge remote-tracking branch 'origin/maptile-making'

Conflicts:
	[DLC]/NGUI/Examples/Atlases/Fantasy/Fantasy Atlas.mat
	[DLC]/NGUI/Examples/Atlases/Refractive/Refractive Atlas.mat
	[DLC]/NGUI/Examples/Atlases/SciFi/SciFi Atlas.mat
	[DLC]/NGUI/Examples/Models/Orc Armor/Orc Armor.mat
	[Particle]/Elementals/Media/Desktop/Materials/Lava_01.mat
	[Particle]/FT_FreeSample/Material/RedDotLine02.mat
	[Particle]/FT_FreeSample/Material/ShockWave02.mat
	[Particle]/FT_FreeSample/Material/Spark02.mat
	[Scene]/ShootingGame.unity
	[Texture]/[Other]/Materials/tile02.mat
근수꺼 없데이트