parent: 8d10b6 | patch | commitdiff
chenxin
2020-10-27 1c693485cc0492d78ae4e120bb10f82a4aac9539
refs
author chenxin <chenxin6991@163.com>
Tuesday, October 27, 2020 10:20 +0800
committer chenxin <chenxin6991@163.com>
Tuesday, October 27, 2020 10:20 +0800
commit1c693485cc0492d78ae4e120bb10f82a4aac9539
tree 1e854bbb1a1a4c8dca8d0e44c8fc45cb27c7114a tree | zip | gz
parent 8d10b61b215a3fad7eb53a7e7ee4dc9e9987d262 view | diff
08045e13ea97bed6212cf024bd87a1109b7e2d71 view | diff 
Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master

Conflicts:
#	Assets/Materials/Guide/RectGuidance.mat
4 files modified
81 ■■■■■ changed files
Assets/Materials/Guide/RectGuidance.mat 8 ●●●●● diff | view | raw | blame | history
Assets/Scripts/GameAnalytics_SDK/GA_SDK_Manager.cs 22 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Guide/GuideCtrl.cs 49 ●●●●● diff | view | raw | blame | history
ProjectSettings/ProjectSettings.asset 2 ●●●●● diff | view | raw | blame | history