Merge branch 'dev_cyp1' into dev_ar_cyp

Browse Source

# 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

...

This commit is contained in:

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

2 parents 6542dd9882 06b9051b3c

commit 1d015706db

41 files changed

+14379 -166815

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Scenes/Login-Mobile.unity

+1463 -1463

File diff suppressed because it is too large. Load diff

Assets/Scenes/MainScene.unity

+151 -156052

File diff suppressed because it is too large. Load diff