chenxin
2020-11-25 554eda43e00d5817cd3e06a60e39d4bd882ee584
refs
author chenxin <chenxin6991@163.com>
Wednesday, November 25, 2020 10:33 +0800
committer chenxin <chenxin6991@163.com>
Wednesday, November 25, 2020 10:33 +0800
commit554eda43e00d5817cd3e06a60e39d4bd882ee584
tree b74f807754d986f0318e94641b559f5b300c173b tree | zip | gz
parent 56f409504f41dc514a75f39995d11f86aec07e34 view | diff
a27b3510185c04eb385f5ab3ad24fd4e87a27626 view | diff
Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
4 files added
16 files modified
1293 ■■■■ changed files
Assets/Prefabs/UI/Endless/BottomCanvas.prefab 423 ●●●● diff | view | raw | blame | history
Assets/Resources/UI/Guide/GuidePanel.prefab 2 ●●● diff | view | raw | blame | history
Assets/Scripts/Common/GameConfig.cs 7 ●●●● diff | view | raw | blame | history
Assets/Scripts/Event/EventType.cs 8 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Guide/GuideConfig.cs 20 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Guide/GuideCtrl.cs 181 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Guide/GuidePanel.cs 95 ●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Input/EndlessTowerDefenseKeyboardMouseInput.cs 25 ●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Input/EndlessTowerDefenseTouchInput.cs 24 ●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs 43 ●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs 19 ●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs 63 ●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs 141 ●●●● diff | view | raw | blame | history
Assets/StreamingAssets/Table/battle.json 2 ●●● diff | view | raw | blame | history
Assets/StreamingAssets/Table/endless_port.json 2 ●●● diff | view | raw | blame | history
Assets/StreamingAssets/Table/skilllevelinfo.json 2 ●●● diff | view | raw | blame | history
Assets/UI/Endless/Bottom/SkillLevelBg.png diff | view | raw | blame | history
Assets/UI/Endless/Bottom/SkillLevelBg.png.meta 118 ●●●●● diff | view | raw | blame | history
Assets/UI/GuideUser/WoodIcon.png diff | view | raw | blame | history
Assets/UI/GuideUser/WoodIcon.png.meta 118 ●●●●● diff | view | raw | blame | history