|
|
62938ec6ae
|
Merge remote-tracking branch 'origin/dev' into dev_lishuo
# Conflicts:
# Assets/Scripts/Apis/MapApi.cs
# Assets/Scripts/App.cs
|
2021-04-15 10:22:55 +08:00 |
|
|
|
7744eec847
|
伴侣骑行
|
2021-04-15 10:13:01 +08:00 |
|
|
|
d22eecd133
|
完成大地图主要界面
|
2021-04-15 09:01:07 +08:00 |
|
|
|
34cde86a28
|
Merge remote-tracking branch 'origin/dev' into dev_lishuo
# Conflicts:
# Assets/Scripts/Apis/UserApi.cs
# Assets/Scripts/App.cs
# Assets/Scripts/ConfigHelper.cs
# Assets/Scripts/Scenes/LoginController.cs
# Assets/Scripts/UI/Prefab/Panel/HomeController.cs
|
2021-04-12 17:42:56 +08:00 |
|
|
|
2fcd9b23fa
|
附近的人
|
2021-04-12 17:35:56 +08:00 |
|
|
|
5156473bb2
|
加弹框。修改连接设备样式。
|
2021-04-09 09:44:06 +08:00 |
|
|
|
07feba912c
|
浏览器嵌入，国旗文件
|
2021-04-09 09:19:04 +08:00 |
|
|
|
65fc5b5c50
|
场景加载处理一些卡顿的情况
|
2021-04-02 19:17:23 +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 |
|
|
|
e7044b3cde
|
前两个页面迁移完成
|
2021-03-26 09:50:04 +08:00 |
|
|
|
4ecf26ec80
|
添加uimanager和主场景
|
2021-03-25 16:53:39 +08:00 |
|
