liuzhiwei
2020-11-25 925d4b4b286a5d8dff4b62be0ceb25db0c45fedc
refs
author liuzhiwei <liuzhiwei@qq.com>
Wednesday, November 25, 2020 20:44 +0800
committer liuzhiwei <liuzhiwei@qq.com>
Wednesday, November 25, 2020 20:44 +0800
commit925d4b4b286a5d8dff4b62be0ceb25db0c45fedc
tree 4b64c89aa8718c846d27e142d5eabc79d0b5a2a1 tree | zip | gz
parent 6939092e03dbe4b13da3e05a710c1f8dd96ff9f9 view | diff
debd7533e15a3418d7e8a0b1ea7fd4dc507f475a view | diff
Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
2 files deleted
15 files modified
4043 ■■■■■ changed files
Assets/Resources/UI/Guide/GameObject.prefab 2584 ●●●●● diff | view | raw | blame | history
Assets/Resources/UI/Guide/GameObject.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/Resources/UI/Guide/GuidePanel.prefab 1129 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Common/GameConfig.cs 5 ●●●● diff | view | raw | blame | history
Assets/Scripts/Event/EventType.cs 2 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Guide/GuideConfig.cs 7 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Guide/GuideCtrl.cs 30 ●●●● diff | view | raw | blame | history
Assets/Scripts/Guide/GuidePanel.cs 122 ●●●● diff | view | raw | blame | history
Assets/Scripts/Guide/ImageTowerPos2.cs 3 ●●●● diff | view | raw | blame | history
Assets/Scripts/Json/JsonDataCenter.cs 2 ●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Input/EndlessTowerDefenseKeyboardMouseInput.cs 9 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Input/EndlessTowerDefenseTouchInput.cs 9 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs 3 ●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs 60 ●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/HUD/EndlessRandomTower.cs 71 ●●●● diff | view | raw | blame | history
Assets/UI/GuideUser/WoodIcon.png diff | view | raw | blame | history
Assets/UI/GuideUser/fire.png diff | view | raw | blame | history