chenxin
2020-11-02 17a1cba7c291f7048978df329a9e5519ccf1a0b9
refs
author chenxin <chenxin6991@163.com>
Monday, November 2, 2020 14:40 +0800
committer chenxin <chenxin6991@163.com>
Monday, November 2, 2020 14:40 +0800
commit17a1cba7c291f7048978df329a9e5519ccf1a0b9
tree 5d71975e89b2c88614ae5c5f8604b1adb8d67765 tree | zip | gz
parent 327d9995cfa30f3dae15fc53426dc29c68bba232 view | diff
21a973db6321fd1bbeb7ca30b3fa207f29854ec1 view | diff
Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
41 files added
3 files modified
137513 ■■■■■ changed files
Assets/00000/package/Materials/Effectshader_ice_001.mat 116 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Effectshader_ice_001.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Glow_017_b.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Glow_017_b.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Glow_033.mat 78 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Glow_033.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Glow_034.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Glow_034.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Glow_035.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Glow_035.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Glow_036.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Glow_036.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Glow_037.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Glow_037.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Glow_038.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Glow_038.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Effect_BingDong.prefab 53487 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Effect_BingDong.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Effect_GuaiWuFaZhen_Bing.prefab 14402 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Effect_GuaiWuFaZhen_Bing.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Effect_GuaiWuFaZhen_Huo.prefab 14402 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Effect_GuaiWuFaZhen_Huo.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Effect_GuaiWuFaZhen_Mu.prefab 14402 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Effect_GuaiWuFaZhen_Mu.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Effect_PenBing.prefab 34048 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Effect_PenBing.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Effect_PenHuo.prefab 12 ●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Effect_ShuiJingLingDengChang.prefab 4877 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Effect_baomihua.prefab 556 ●●●● diff | view | raw | blame | history
Assets/00000/package/Shader.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Shader/EffectShader_ice.shader 201 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Shader/EffectShader_ice.shader.meta 9 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Glow_033.png diff | view | raw | blame | history
Assets/00000/package/Texture/Glow_033.png.meta 106 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Glow_034.png diff | view | raw | blame | history
Assets/00000/package/Texture/Glow_034.png.meta 106 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Glow_035.png diff | view | raw | blame | history
Assets/00000/package/Texture/Glow_035.png.meta 106 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Glow_036.png diff | view | raw | blame | history
Assets/00000/package/Texture/Glow_036.png.meta 106 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Glow_037.png diff | view | raw | blame | history
Assets/00000/package/Texture/Glow_037.png.meta 106 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Glow_038.png diff | view | raw | blame | history
Assets/00000/package/Texture/Glow_038.png.meta 106 ●●●●● diff | view | raw | blame | history