宝石塔防
parent: 47998d | patch | commitdiff
chenxin
2020-12-11 f453404715d4e4951d46856578de068b75fe0f34
refs
author chenxin <chenxin6991@163.com>
Friday, December 11, 2020 20:20 +0800
committer chenxin <chenxin6991@163.com>
Friday, December 11, 2020 20:20 +0800
commitf453404715d4e4951d46856578de068b75fe0f34
tree b3340a3218441f5413581a2d8197355a230a7f3a tree | zip | gz
parent 47998dc6daec5da4562ed23d51af65990e9cf3af view | diff
4b116e3d552fd8b317be611cd7aee2c091317d9f view | diff 
Merge commit '4b116e3d552fd8b317be611cd7aee2c091317d9f' into master

# Conflicts:
#	Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs
5 files added
4 files modified
392 ■■■■■ 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 118 ●●●●● diff | view | raw | blame | history
Assets/Resources/UI/Loading/1.png diff | view | raw | blame | history
Assets/Resources/UI/Loading/1.png.meta 118 ●●●●● diff | view | raw | blame | history
Assets/Scenes/LoadingScene.unity 82 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Common/GameConfig.cs 5 ●●●●● diff | view | raw | blame | history
Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs 60 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs 1 ●●●●● diff | view | raw | blame | history