宝石塔防
parent: 440f37 | patch | commitdiff
chenxin
2020-12-04 9ad1afab7d9962af7b8e0f592c0b150887b4f2f6
refs
author chenxin <chenxin6991@163.com>
Friday, December 4, 2020 11:31 +0800
committer chenxin <chenxin6991@163.com>
Friday, December 4, 2020 11:31 +0800
commit9ad1afab7d9962af7b8e0f592c0b150887b4f2f6
tree d52eee744f33405ff9de1d11bf06397ded81ab46 tree | zip | gz
parent 440f374d3049704f013d1ec8b2a2c12e2b58e8c7 view | diff
1fb39ecb7c8e540ed31ad6b976ed509ea98f3d87 view | diff 
Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
22 files added
16 files modified
21505 ■■■■■ changed files
Assets/00000/package/Materials/EffectShader_AddUvflow_001.mat 2 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Glow_050.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Glow_050.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Object_065.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Object_065.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Object_066.mat 30 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Object_066.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Sequence_049_3X4.mat 2 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Texmap_015.mat 112 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Materials/Texmap_015.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Model/fangtong.FBX diff | view | raw | blame | history
Assets/00000/package/Model/fangtong.FBX.meta 2 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Model/zhadan.FBX diff | view | raw | blame | history
Assets/00000/package/Model/zhadan.FBX.meta 101 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_Elf_Huo_Atk.prefab 5099 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_UI_GouMaiAnNiu.prefab 4961 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_UI_GouMaiAnNiu.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_UI_YinDaoJieShu.prefab 9792 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_UI_YinDaoJieShu.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Glow_050.png diff | view | raw | blame | history
Assets/00000/package/Texture/Glow_050.png.meta 94 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Object_065.png diff | view | raw | blame | history
Assets/00000/package/Texture/Object_065.png.meta 94 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Texture/Object_066.png diff | view | raw | blame | history
Assets/00000/package/Texture/Object_066.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 94 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Time/Effect_HuoJingLingTimeline.playable 32 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/UI/Endless/BottomCanvas.prefab 199 ●●●●● diff | view | raw | blame | history
Assets/Resources/UI/Final/FinalPanel.prefab 432 ●●●●● diff | view | raw | blame | history
Assets/Resources/UI/Guide/GuidePanel.prefab 116 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Common/HttpHelper.cs 2 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Guide/GuidePanelNew.cs 4 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs 2 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/HUD/EndlessRandomTower.cs 6 ●●●●● diff | view | raw | blame | history
Assets/Scripts/UI/FinalPanel/FinalHttp.cs 12 ●●●●● diff | view | raw | blame | history
Assets/Scripts/UI/FinalPanel/FinalPanel.cs 114 ●●●●● diff | view | raw | blame | history
Assets/Scripts/UI/FinalPanel/FinalPanelItem.cs 3 ●●●●● diff | view | raw | blame | history