lishuo 1d015706db Merge branch 'dev_cyp1' into dev_ar_cyp ...

# Conflicts:
#	Assets/Plugins/Android/unityandroidbluetoothlelib.jar
#	Assets/Resources/UI/language.json
#	Assets/Scenes/MainScene.unity
#	Assets/Scripts/Devices/Ble/mobile/BleMobileInterface.cs
#	Assets/Scripts/Devices/Ble/mobile/BleMobileThread.cs
#	Assets/Scripts/Scenes/MainController.cs
#	Assets/Scripts/UI/Prefab/Panel/RowerHomeScript.cs
#	Assets/Scripts/UI/Prefab/Rower/RowerDeviceView.cs
#	Assets/Scripts/UI/Prefab/Rower/RowerGraphChartFeed.cs
#	Assets/Scripts/UIManager.cs

2022-06-27 10:36:20 +08:00

..

audio

音效&骑行loading优化

2021-12-16 16:53:38 +08:00

Circle

修改细节

2021-09-03 15:03:54 +08:00

Images

Merge branch 'dev_cyp1' into dev_ar_cyp

2022-06-27 10:36:20 +08:00

Loading

更新页面，目前是强制更新

2021-05-11 10:47:04 +08:00

Mapbox

单人骑行

2021-03-30 17:27:50 +08:00

UI

Merge branch 'dev_cyp1' into dev_ar_cyp

2022-06-27 10:36:20 +08:00

audio.meta

骑行视角等优化

2021-12-09 18:17:39 +08:00

Circle.meta

浏览器嵌入，国旗文件

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

DOTweenSettings.asset

处理合并冲突

2021-03-30 20:00:11 +08:00

DOTweenSettings.asset.meta

骑行界面UI

2021-03-30 17:29:40 +08:00

Images.meta

添加uimanager和主场景

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

Loading.meta

暂存

2021-04-19 14:11:53 +08:00

Mapbox.meta

单人骑行

2021-03-30 17:27:50 +08:00

UI.meta

添加uimanager和主场景

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