17 Commits

Author SHA1 Message Date
60bf5bd59d 增加confirm类型;国家省份城市json;增加列表缓存 2021-05-08 10:52:37 +08:00
9f4e446850 修改设备图标。连接设备加缓存功能。 2021-04-30 18:03:34 +08:00
5080503ebd 添加地球 2021-04-27 19:47:02 +08:00
02b8f97d83 细节调整 2021-04-25 19:41:35 +08:00
a96d538dc1 Merge remote-tracking branch 'origin/dev' into dev_lishuo 2021-04-23 09:37:55 +08:00
d35c9daa82 合并前备份 2021-04-23 09:37:41 +08:00
4347a8eeba 细节调整 2021-04-23 09:22:12 +08:00
2d20edf57a 加淡入淡出效果。重设字体。加退出导航。 2021-04-19 18:16:56 +08:00
f065bf4bbb 调整样式 2021-04-19 14:36:08 +08:00
d22eecd133 完成大地图主要界面 2021-04-15 09:01:07 +08:00
5156473bb2 加弹框。修改连接设备样式。 2021-04-09 09:44:06 +08:00
ae9cefc645 Merge remote-tracking branch 'origin/dev' into dev_lishuo
# Conflicts:
#	Assets/Cyp/Prefab.meta
#	Assets/Mapbox/Core/Plugins/Android.meta
#	Assets/Mapbox/Core/Plugins/Mapbox.meta
#	Assets/Mapbox/Core/Plugins/Mapbox/MapboxAccounts.meta
#	Assets/Plugins/Circle/ImageWithRoundedCorners.cs
#	Assets/Resources/Images/Devices.meta
#	Assets/Resources/UI/Prefab/Item.meta
#	Assets/Scripts/Devices/Ant/LegacyPages.meta
#	Assets/Scripts/UI/Prefab/Item.meta
#	Assets/StreamingAssets.meta
#	ProjectSettings/EditorBuildSettings.asset
2021-04-01 14:09:23 +08:00
ec7589096f 实现连接设备界面 2021-04-01 11:09:53 +08:00
326b74bd03 注释模态窗口 2021-03-30 14:27:09 +08:00
3c2bb10f07 加ant+相关代码。 2021-03-30 14:23:41 +08:00
38d1c387c3 加场景切换和事件绑定功能 2021-03-29 09:10:59 +08:00
4ecf26ec80 添加uimanager和主场景 2021-03-25 16:53:39 +08:00