CaiYanPeng bf3b0d2642 Merge remote-tracking branch 'origin/dev_combine' into dev_release ...

# Conflicts:
#	Assets/Scenes/Test.unity
#	Assets/SoftMaskForUGUI-1.0.2/Samples~/Demo/Mobile.meta

2022-07-15 13:35:28 +08:00

..

Control

Merge branch 'dev_cyp1' into dev_combine

2022-07-11 14:52:54 +08:00

Prefab

Merge remote-tracking branch 'origin/dev_combine' into dev_release

2022-07-15 13:35:28 +08:00

UIEffect

暂存

2021-12-28 11:25:09 +08:00

ButtonHoverScript.cs

细节调整

2021-04-23 09:22:12 +08:00

ButtonHoverScript.cs.meta

前两个页面迁移完成

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

Control.meta

增加编号，loading页提示，延迟毫秒

2021-11-01 11:04:22 +08:00

Prefab.meta

添加uimanager和主场景

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

UIEffect.meta

完成大地图主要界面

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