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

合并后错误修改

2022-06-02 18:05:41 +08:00

flags-mini

修改台湾旗帜

2021-08-10 09:41:14 +08:00

Font

AR骑行动画&换装基本交互逻辑

2022-04-15 18:14:55 +08:00

Material

新版设计稿

2022-03-30 18:41:06 +08:00

Prefab

Merge branch 'dev_cyp1' into dev_ar_cyp

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

Chongqing Fengjie Zilian stage 7.txt

AR多人骑行研究

2022-03-10 18:32:53 +08:00

Chongqing Fengjie Zilian stage 7.txt.meta

AR多人骑行研究

2022-03-10 18:32:53 +08:00

Control.meta

加场景切换和事件绑定功能

2021-03-29 09:10:59 +08:00

direction.txt

合并后错误修改

2022-06-02 18:05:41 +08:00

direction.txt.meta

AR多人骑行研究

2022-03-10 18:32:53 +08:00

flags-mini.json

浏览器嵌入，国旗文件

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

flags-mini.json.meta

浏览器嵌入，国旗文件

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

flags-mini.meta

浏览器嵌入，国旗文件

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

Font.meta

调整样式

2021-04-19 14:36:08 +08:00

language.json

拉力曲线性能优化&解决划船时间误差问题

2022-06-21 17:49:43 +08:00

language.json.meta

中文版本

2021-11-10 18:13:38 +08:00

Material.meta

暂存

2021-03-29 09:19:48 +08:00

Prefab.meta

添加uimanager和主场景

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

simpleCountry.json

增加confirm类型；国家省份城市json；增加列表缓存

2021-05-08 10:52:37 +08:00

simpleCountry.json.meta

增加confirm类型；国家省份城市json；增加列表缓存

2021-05-08 10:52:37 +08:00