CaiYanPeng f4cbad819b Merge remote-tracking branch 'origin/dev' into dev_cyp ...

# Conflicts:
#	Assets/Resources/Images/back.png.meta
#	Assets/Resources/Images/change account.png.meta
#	Assets/Scripts/UI/Prefab/Panel/EditUserController.cs

2021-04-15 15:59:57 +08:00

..

Control

细节调整

2021-04-15 15:57:29 +08:00

Prefab

Merge remote-tracking branch 'origin/dev' into dev_cyp

2021-04-15 15:59:57 +08:00

UIEffect

完成大地图主要界面

2021-04-15 09:01:07 +08:00

ButtonHoverScript.cs

浏览器嵌入，国旗文件

2021-04-09 09:19:04 +08:00

ButtonHoverScript.cs.meta

前两个页面迁移完成

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

Control.meta

加场景切换和事件绑定功能

2021-03-29 09:10:59 +08:00

Prefab.meta

添加uimanager和主场景

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

UIEffect.meta

完成大地图主要界面

2021-04-15 09:01:07 +08:00