chenxin
2020-11-25 0bd774ab57a54230ad78d3b9224d1f49b9b6dcca
refs
author chenxin <chenxin6991@163.com>
Wednesday, November 25, 2020 21:22 +0800
committer chenxin <chenxin6991@163.com>
Wednesday, November 25, 2020 21:22 +0800
commit0bd774ab57a54230ad78d3b9224d1f49b9b6dcca
tree 1320c87f8f0245f1bb07bddfdb3ad81ce9ce7ab5 tree | zip | gz
parent b2722bf84115092dcf61a0f612b737c20eb11f27 view | diff
fdcd5dce9dce65cb607a0f578b593a3a4c9b8cbe view | diff
Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
32 files added
5 files modified
44590 ■■■■ changed files
Assets/00000/package/Materials/EffectShader_AlphaUvflow_004.mat 44 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/EffectShader_AlphaUvflow_004.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Glow_049.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Glow_049.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Object_047.mat 2 ●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Object_048.mat 2 ●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Object_049.mat 2 ●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Object_050.mat 2 ●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Object_051.mat 44 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Object_051.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Object_052.mat 44 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Object_052.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Object_053.mat 44 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Object_053.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Sequence_029_4X4.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Sequence_029_4X4.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Sequence_047_4X4.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Sequence_047_4X4.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Sequence_048_4X4.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Sequence_048_4X4.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_Elf_Mu_SpHit.prefab 4875 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_UI_JiNengTuBiao.prefab 38622 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_UI_JiNengTuBiao.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Glow_049.png diff | view | raw | blame | history
Assets/00000/package/Texture/Glow_049.png.meta 106 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Object_051.png diff | view | raw | blame | history
Assets/00000/package/Texture/Object_051.png.meta 106 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Object_052.png diff | view | raw | blame | history
Assets/00000/package/Texture/Object_052.png.meta 106 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Object_053.png diff | view | raw | blame | history
Assets/00000/package/Texture/Object_053.png.meta 106 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Sequence_029_4X4.png diff | view | raw | blame | history
Assets/00000/package/Texture/Sequence_029_4X4.png.meta 94 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Sequence_047_4X4.png diff | view | raw | blame | history
Assets/00000/package/Texture/Sequence_047_4X4.png.meta 94 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Sequence_048_4X4.png diff | view | raw | blame | history
Assets/00000/package/Texture/Sequence_048_4X4.png.meta 106 ●●●●● diff | view | raw | blame | history