liuzhiwei
2020-11-13 adf4e32c75f0886b330c6ad449f6a2a46b3d3771
refs
author liuzhiwei <liuzhiwei@qq.com>
Friday, November 13, 2020 15:25 +0800
committer liuzhiwei <liuzhiwei@qq.com>
Friday, November 13, 2020 15:25 +0800
commitadf4e32c75f0886b330c6ad449f6a2a46b3d3771
tree 90c97fe970d6db7b6ba5e3f4fdf0772db8b17540 tree | zip | gz
parent 9f04a056bf5af2b29f14327df408d3afe64c7b1c view | diff
87ce9cceddd08af1579b3b74451ca0754627e0ec view | diff
Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
11 files added
20 files modified
115156 ■■■■■ changed files
Assets/00000/package/Prefab/Prefab/Effect_UI_KaPai_Huo.prefab 6 ●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Prefab/Effect_UI_KaPai_Huo_02.prefab 6 ●●●● diff | view | raw | blame | history
Assets/Materials/UI/tileTowerVSMat.mat 2 ●●● diff | view | raw | blame | history
Assets/Prefabs/Camera.meta 8 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Camera/ClearCamera.prefab 76 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Camera/ClearCamera.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Fire/GrowUpTower_0.prefab 2 ●●● diff | view | raw | blame | history
Assets/Prefabs/UI/PlacementTileMobile.prefab 90 ●●●●● diff | view | raw | blame | history
Assets/Resources/UI/Effect_Elf_Huo_DengChang_101.prefab 34039 ●●●●● diff | view | raw | blame | history
Assets/Resources/UI/Effect_Elf_Huo_DengChang_101.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/Resources/UI/Effect_Elf_Mu_DengChang_109.prefab 29168 ●●●●● diff | view | raw | blame | history
Assets/Resources/UI/Effect_Elf_Mu_DengChang_109.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/Resources/UI/Effect_Elf_Shui_DengChang_105.prefab 34049 ●●●●● diff | view | raw | blame | history
Assets/Resources/UI/Effect_Elf_Shui_DengChang_105.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/Resources/UI/Final/FinalPanel.prefab 135 ●●●●● diff | view | raw | blame | history
Assets/Resources/UI/Final/FinalPanelItem.prefab 40 ●●●● diff | view | raw | blame | history
Assets/Scenes/Levels/Battle/Endless.unity 22 ●●●● diff | view | raw | blame | history
Assets/Scenes/Levels/Battle/Endless2D.unity 17103 ●●●●● diff | view | raw | blame | history
Assets/Scenes/Levels/Battle/Endless2D.unity.meta 7 ●●●●● diff | view | raw | blame | history
Assets/Scenes/LoadingScene.unity 79 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Common/ErrorLogOnGUIMyTools.cs 3 ●●●● diff | view | raw | blame | history
Assets/Scripts/Event/EventBase.cs 3 ●●●●● diff | view | raw | blame | history
Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs 2 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Manager/ManagerRoot.cs 2 ●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Input/EndlessTowerDefenseKeyboardMouseInput.cs 1 ●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs 4 ●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs 95 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/HUD/EndlessRandomTower.cs 44 ●●●●● diff | view | raw | blame | history
Assets/Scripts/UI/FinalPanel/FinalPanel.cs 128 ●●●●● diff | view | raw | blame | history
Assets/Scripts/UI/FinalPanel/FinalPanelItem.cs 12 ●●●●● diff | view | raw | blame | history
ProjectSettings/TagManager.asset 2 ●●● diff | view | raw | blame | history