chenxin
2020-11-20 219ec1ffe930e38e04bf9a0afc356890c451cf8f
refs
author chenxin <chenxin6991@163.com>
Friday, November 20, 2020 19:18 +0800
committer chenxin <chenxin6991@163.com>
Friday, November 20, 2020 19:18 +0800
commit219ec1ffe930e38e04bf9a0afc356890c451cf8f
tree d8e80fe265f37b32cf7c2477b0c9fd57d9b6a82b tree | zip | gz
parent 424feadd6adf57195da00db43caced2ede6884e9 view | diff
a736e7909c4700b5131616a2b8ac2c5a5f22baa2 view | diff
Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
10 files added
6 files modified
73908 ■■■■ changed files
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/Object_045.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Object_045.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Sequence_004_4X4.mat 2 ●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Effect_XinSui.prefab 19690 ●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_Boss_JinBi.prefab 14645 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_Boss_JinBi.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_Boss_Shui_SiWang.prefab 29343 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_Boss_Shui_SiWang.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_JiNengBaoShi_Dian.prefab 16 ●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_JiNengBaoShi_Dian_Hit.prefab 6 ●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_UI_BuffKaPaiXuanZe.prefab 22 ●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_UI_XinSui.prefab 9988 ●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Object_045.png diff | view | raw | blame | history
Assets/00000/package/Texture/Object_045.png.meta 106 ●●●●● diff | view | raw | blame | history