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

..

ActivityAdController.cs

修改活动逻辑；增加一些接口；可弹多个广告

2022-02-17 16:56:18 +08:00

ActivityAdController.cs.meta

活动暂存

2022-02-16 18:22:27 +08:00

ActivityController.cs

Merge branch 'dev_cyp1' into dev_ar_cyp

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

ActivityController.cs.meta

活动暂存

2022-02-11 17:26:36 +08:00

AddressController.cs

修改细节

2022-02-18 15:48:23 +08:00

AddressController.cs.meta

活动暂存

2022-02-16 18:22:27 +08:00