new
Move file
Merge commit '30a9a3174bba172890a0333d412e7b2b3b593194'

Conflicts:
	Assets/Animation/Tamashi/B/TamashiB.anim
	Assets/Animation/Tamashi/B/TamashiB.anim.meta
	Assets/Animation/Tamashi/B/tamashiB_0.controller
	Assets/Animation/Tamashi/B/tamashiB_0.controller.meta
	Assets/Animation/Tamashi/W/TamashiW.anim
	Assets/Animation/Tamashi/W/TamashiW.anim.meta
	Assets/Animation/Tamashi/W/tamashiW_0.controller.meta
	Assets/Animation/Tamashi/Y/TamashiSY.anim
	Assets/Animation/Tamashi/Y/TamashiY.anim
	Assets/Animation/Tamashi/Y/tamashiY_0.controller.meta
	Assets/Resources/Fight/Tamashi/tamashi1.prefab
	Assets/Resources/Fight/Tamashi/tamashi1.prefab.meta
	Assets/Resources/Fight/Tamashi/tamashi2.prefab
	Assets/Resources/Fight/Tamashi/tamashi2.prefab.meta
	Assets/Resources/Fight/Tamashi/tamashi3.prefab
	Assets/Resources/Fight/Tamashi/tamashi3.prefab.meta
	Assets/Resources/Fight/Tamashi/tamashi4.prefab
	Assets/Resources/Fight/Tamashi/tamashi4.prefab.meta
	Assets/Resources/Fight/Tamashi/tamashiE_0.prefab.meta
	Assets/Resources/Fight/Tamashi/tamashiR_0.prefab.meta
	Assets/Resources/Fight/cube1.mat
	Assets/Resources/Fight/cube2.mat
	Assets/Resources/Fight/cube3.mat
	Assets/Resources/Fight/cube4.mat
	Assets/Resources/Fight/cube6.mat
	Assets/Resources/Fight/cube6.mat.meta
	Assets/Scene/Fight 1.unity
	Assets/Script/Fight/CharacterBar/CharacterCtrl.cs
	Assets/Script/Fight/FightArea/CardCtrl.cs
	Assets/Script/Fight/FightArea/FightCtrl.cs
	Assets/Texture/Fight/CharacterBar/firetest.png
	Assets/Texture/Fight/CharacterBar/firetest.png.meta
	Assets/Texture/Fight/CharacterBar/tamashiB.png
	Assets/Texture/Fight/FightArea/type6_au.jpg