suntao 92676d7cf8 Merge branch 'dev_cyp' into dev ...

# Conflicts:
#	Assets/Scripts/App.cs
#	Assets/Scripts/UIManager.cs

2021-05-08 11:15:28 +08:00

..

LoginController.cs

增加confirm类型；国家省份城市json；增加列表缓存

2021-05-08 10:52:37 +08:00

LoginController.cs.meta

前两个页面迁移完成

2021-03-26 09:50:04 +08:00

MainController.cs

Merge branch 'dev_cyp' into dev

2021-05-08 11:15:28 +08:00

MainController.cs.meta

添加uimanager和主场景

2021-03-25 16:53:39 +08:00