powerfun-unity

History

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

Control

Merge branch 'dev_cyp1' into dev_ar_cyp

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

Prefab

Merge branch 'dev_cyp1' into dev_ar_cyp

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

UIEffect

暂存

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

ButtonHoverScript.cs

细节调整