wangguan
2020-12-11 6f328e27fd7106b6fd4b77ecdae585e7ef4429eb
refs
author wangguan <wangguan@kt007.com>
Friday, December 11, 2020 20:23 +0800
committer wangguan <wangguan@kt007.com>
Friday, December 11, 2020 20:23 +0800
commit6f328e27fd7106b6fd4b77ecdae585e7ef4429eb
tree fee56d9995843054c6e97ad590aa31ce16f755a0 tree | zip | gz
parent 0dbb0703284a1fd8eafb920942db2e990305d0ab view | diff
fac697773b8cb65b3ab54569413e15fca03ad1d7 view | diff
Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle
1 files renamed
3 files copied
1 files deleted
5 files added
10 files modified
340 ■■■■ changed files
Assets/Resources/UI/Loading.meta 8 ●●●●● diff | view | raw | blame | history
Assets/Resources/UI/Loading/0.png diff | view | raw | blame | history
Assets/Resources/UI/Loading/0.png.meta 6 ●●●● diff | view | raw | blame | history
Assets/Resources/UI/Loading/1.png diff | view | raw | blame | history
Assets/Resources/UI/Loading/1.png.meta 6 ●●●● diff | view | raw | blame | history
Assets/Scenes/Levels/Battle/Endless2D.unity 6 ●●●●● diff | view | raw | blame | history
Assets/Scenes/LoadingScene.unity 197 ●●●● diff | view | raw | blame | history
Assets/Scripts/Common/GameConfig.cs 5 ●●●●● diff | view | raw | blame | history
Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs 84 ●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs 4 ●●● diff | view | raw | blame | history
Assets/StreamingAssets/Table/battle.json 2 ●●● diff | view | raw | blame | history
Assets/StreamingAssets/Table/elf_info.json 2 ●●● diff | view | raw | blame | history
Assets/StreamingAssets/Table/elf_upgrade.json 2 ●●● diff | view | raw | blame | history
Assets/StreamingAssets/Table/endless_port.json 2 ●●● diff | view | raw | blame | history
Assets/UI/Endless/Bottom/Lark20201211-101254.png diff | view | raw | blame | history
Assets/UI/Endless/Bottom/Lark20201211-101254.png.meta 6 ●●●● diff | view | raw | blame | history
Assets/UI/Endless/Bottom/进度底.png diff | view | raw | blame | history
Assets/UI/Loading/Lark20201211-201038.png diff | view | raw | blame | history
Assets/UI/Loading/Lark20201211-201038.png.meta 6 ●●●● diff | view | raw | blame | history
Assets/UI/Loading/LoadingBg.png.meta 4 ●●●● diff | view | raw | blame | history