chenxin
2020-12-07 564940ff907928035d63eee7ececaec5ef2fcccd
refs
author chenxin <chenxin6991@163.com>
Monday, December 7, 2020 16:03 +0800
committer chenxin <chenxin6991@163.com>
Monday, December 7, 2020 16:03 +0800
commit564940ff907928035d63eee7ececaec5ef2fcccd
tree b01799f5a5027bba9a2f286b9b4915be16aa30b6 tree | zip | gz
parent 75bd9ddac2d94dd7b25470e8161ee389d9f6ddd2 view | diff
e8065e4c68e839d663b4d9a6885c1bff3c799827 view | diff
Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
1 files renamed
2 files copied
1 files deleted
11 files added
11 files modified
53732 ■■■■■ changed files
Assets/00000/package/Materials/EffectShader_Niuqu_001.mat 2 ●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Glow_046.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Glow_046.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Sequence_044_3X3.mat 2 ●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Somke_001.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Somke_001.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Texmap_003.mat.meta 2 ●●● diff | view | raw | blame | history
Assets/00000/package/Model/zhadan.FBX diff | view | raw | blame | history
Assets/00000/package/Model/zhadan.FBX.meta 6 ●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_Elf_Huo_Atk.prefab 12 ●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_Ta_GouMai.prefab 34039 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_Ta_GouMai.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_Ta_JiaoHuan.prefab 19516 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_Ta_JiaoHuan.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Glow_046.png diff | view | raw | blame | history
Assets/00000/package/Texture/Glow_046.png.meta 2 ●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Object_006.png diff | view | raw | blame | history
Assets/00000/package/Texture/Object_007.png diff | view | raw | blame | history
Assets/00000/package/Texture/Object_008.png diff | view | raw | blame | history
Assets/00000/package/Texture/Sequence_044_3X3.png diff | view | raw | blame | history
Assets/00000/package/Texture/Sequence_044_3X3.png.meta 28 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Somke_001.png diff | view | raw | blame | history
Assets/00000/package/Texture/Somke_001.png.meta 31 ●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Texmap_008.png diff | view | raw | blame | history
Assets/00000/package/Texture/Texmap_008.png.meta 2 ●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Texmap_015.png diff | view | raw | blame | history