chenxin
2020-11-26 81cc28df1dd4b7389282f04685ae4e50a36532cd
refs
author chenxin <chenxin6991@163.com>
Thursday, November 26, 2020 19:30 +0800
committer chenxin <chenxin6991@163.com>
Thursday, November 26, 2020 19:30 +0800
commit81cc28df1dd4b7389282f04685ae4e50a36532cd
tree 628390b43dca0a2c158173ee5bd2140b1b8ce84e tree | zip | gz
parent 937ef2656a25e55be32891677dc5d0b1385610ba view | diff
1ff48547fc130428f3013cc1049d54acbb8db568 view | diff
Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
30 files added
3 files modified
54345 ■■■■ changed files
Assets/00000/package/Materials/EffectShader_AddUvflow_007.mat 44 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/EffectShader_AddUvflow_007.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/EffectShader_AlphaUvflow_004.mat 14 ●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/EffectShader_AlphaUvflow_005.mat 44 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/EffectShader_AlphaUvflow_005.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Object_054.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Object_054.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Object_055.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Object_055.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Object_056.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Object_056.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Object_057.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Object_057.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_UI_JiNengTuBiao.prefab 38738 ●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_UI_JiNengTuBiao.prefab.meta 2 ●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_UI_JiNengTuBiao_02.prefab 14510 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_UI_JiNengTuBiao_02.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Object_054.png diff | view | raw | blame | history
Assets/00000/package/Texture/Object_054.png.meta 94 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Object_055.png diff | view | raw | blame | history
Assets/00000/package/Texture/Object_055.png.meta 94 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Object_056.png diff | view | raw | blame | history
Assets/00000/package/Texture/Object_056.png.meta 94 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Object_057.png diff | view | raw | blame | history
Assets/00000/package/Texture/Object_057.png.meta 94 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Object_058.png diff | view | raw | blame | history
Assets/00000/package/Texture/Object_058.png.meta 94 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Object_059.png diff | view | raw | blame | history
Assets/00000/package/Texture/Object_059.png.meta 94 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Texmap_013.png diff | view | raw | blame | history
Assets/00000/package/Texture/Texmap_013.png.meta 127 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Texmap_014.tga diff | view | raw | blame | history
Assets/00000/package/Texture/Texmap_014.tga.meta 127 ●●●●● diff | view | raw | blame | history