chenxin
2020-12-09 e5762beba68373e2f39cf8f9abf143ead736737f
refs
author chenxin <chenxin6991@163.com>
Wednesday, December 9, 2020 10:19 +0800
committer chenxin <chenxin6991@163.com>
Wednesday, December 9, 2020 10:19 +0800
commite5762beba68373e2f39cf8f9abf143ead736737f
tree 964d5a3c2cf9629cca0250503bed7c622c0fa661 tree | zip | gz
parent bc6d093e89b319fe7f5b33d70db104a1352774a9 view | diff
b01151f932f8faa041a8facfb03059147170f40c view | diff
Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
12 files added
1 files modified
15035 ■■■■■ changed files
Assets/00000/package/Materials/EffectShader_AlphaUvflow_003.mat 44 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/EffectShader_AlphaUvflow_003.mat.meta 8 ●●●●● diff | view | raw | blame | history
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/Object_046.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Object_046.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Texmap_015.mat 2 ●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_Boss_Shui_FenShen.prefab 14672 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_Boss_Shui_FenShen.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Object_046.png diff | view | raw | blame | history
Assets/00000/package/Texture/Object_046.png.meta 106 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Object_047.png diff | view | raw | blame | history
Assets/00000/package/Texture/Object_047.png.meta 106 ●●●●● diff | view | raw | blame | history