宝石塔防
parent: f45340 | patch | commitdiff
chenxin
2020-12-11 fac697773b8cb65b3ab54569413e15fca03ad1d7
refs
author chenxin <chenxin6991@163.com>
Friday, December 11, 2020 20:21 +0800
committer chenxin <chenxin6991@163.com>
Friday, December 11, 2020 20:21 +0800
commitfac697773b8cb65b3ab54569413e15fca03ad1d7
tree 4b22bc168c03072591595a3c1c3b5d4c8f1d0ad0 tree | zip | gz
parent f453404715d4e4951d46856578de068b75fe0f34 view | diff
31f0c1761b37dfd47408a93df9ed18468b50ef40 view | diff 
Merge commit '31f0c1761b37dfd47408a93df9ed18468b50ef40' into master

# Conflicts:
#	Assets/StreamingAssets/Table/elf_info.json
#	Assets/StreamingAssets/Table/elf_upgrade.json
#	Assets/StreamingAssets/Table/endless_port.json
1 files renamed
1 files deleted
1 files added
7 files modified
152 ■■■■■ changed files
Assets/Scenes/LoadingScene.unity 116 ●●●●● diff | view | raw | blame | history
Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs 23 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs 3 ●●●●● 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/Loading/Lark20201211-193242.png diff | view | raw | blame | history
Assets/UI/Loading/Lark20201211-201038.png diff | view | raw | blame | history
Assets/UI/Loading/Lark20201211-201038.png.meta 2 ●●●●● diff | view | raw | blame | history