chenxin
2020-12-12 367d85ce2d913c2efb83e211d03c20ccf6369bfd
refs
author chenxin <chenxin6991@163.com>
Saturday, December 12, 2020 18:57 +0800
committer chenxin <chenxin6991@163.com>
Saturday, December 12, 2020 18:57 +0800
commit367d85ce2d913c2efb83e211d03c20ccf6369bfd
tree eaeeb82600492e277c20e53e02315548963e8f0f tree | zip | gz
parent ab4da1b9b0c04ed4ea548c152631c0c47c4bdab2 view | diff
6d3bfdaad36f4af65494854e5651f7d37ad81d6b view | diff
Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
88 files added
6 files modified
276953 ■■■■■ changed files
Assets/00000/package/Materials/EffectShader_AlphaUvflow_005.mat 86 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/EffectShader_AlphaUvflow_005.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/EffectShader_Niuqu_003.mat 92 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/EffectShader_Niuqu_003.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Sequence_050_4X4.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Sequence_050_4X4.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Sequence_051_2X8.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Sequence_051_2X8.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Somke_002.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Somke_002.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Model/Plan.FBX diff | view | raw | blame | history
Assets/00000/package/Model/Plan.FBX.meta 101 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_Elf_Huo_Atk.prefab 9788 ●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_Elf_Mu_Hit.prefab 6 ●●●● diff | view | raw | blame | history
Assets/00000/package/Scene.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/DengLu.unity 263169 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/DengLu.unity.meta 7 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/baozha.mat 92 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/baozha.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/baozha.png diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/baozha.png.meta 106 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/dl_01.FBX diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/dl_01.FBX.meta 133 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/dl_di01.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/dl_di01.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/dl_di01.png diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/dl_di01.png.meta 94 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/dl_mu1.mat 80 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/dl_mu1.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/dl_mu1.png diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/dl_mu1.png.meta 106 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/dl_niao3.mat 78 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/dl_niao3.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/dl_niao3.png diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/dl_niao3.png.meta 106 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/dl_niao4.mat 78 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/dl_niao4.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/dl_niao4.png diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/dl_niao4.png.meta 94 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/dl_paodan1.mat 92 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/dl_paodan1.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/dl_paodan1.png diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/dl_paodan1.png.meta 106 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/dl_paodan1_02.mat 92 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/dl_paodan1_02.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/dl_tian01.mat 78 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/dl_tian01.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/dl_tian01.png diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/dl_tian01.png.meta 94 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/dl_tian02.mat 44 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/dl_tian02.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/dl_tian02.png diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/dl_tian02.png.meta 106 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/dl_yan1.mat 78 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/dl_yan1.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/dl_yan1.png diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/dl_yan1.png.meta 106 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/dl_yan1_02.mat 92 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/dl_yan1_02.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/dl_yan1_02.png diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/dl_yan1_02.png.meta 94 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/dl_zhu1.mat 80 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/dl_zhu1.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/dl_zhu1.png diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/dl_zhu1.png.meta 94 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/dl_zhu1_02.mat 44 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/dl_zhu1_02.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/dl_zhu1_02.png diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/dl_zhu1_02.png.meta 94 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/dl_zhu1_02_b.png diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/dl_zhu1_02_b.png.meta 94 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/logo2.mat 78 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/logo2.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/logo2.png diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/logo2.png.meta 94 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/logo2_02.mat 101 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/logo2_02.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/logo2_02.png diff | view | raw | blame | history
Assets/00000/package/Scene/DengLu/logo2_02.png.meta 94 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Object_037.png diff | view | raw | blame | history
Assets/00000/package/Texture/Object_038.png diff | view | raw | blame | history
Assets/00000/package/Texture/Sequence_041_3X3.png.meta 4 ●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Sequence_050_4X4.png diff | view | raw | blame | history
Assets/00000/package/Texture/Sequence_050_4X4.png.meta 127 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Sequence_051_2X8.png diff | view | raw | blame | history
Assets/00000/package/Texture/Sequence_051_2X8.png.meta 127 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Somke_002.png diff | view | raw | blame | history
Assets/00000/package/Texture/Somke_002.png.meta 127 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Texmap_009_02.png diff | view | raw | blame | history
Assets/00000/package/Texture/Texmap_009_02.png.meta 94 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Texmap_015.png diff | view | raw | blame | history
Assets/00000/package/Texture/Texmap_015.png.meta 127 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Time/Effect_HuoJingLingTimeline.playable 80 ●●●● diff | view | raw | blame | history