CaiYanPeng 190a66bb68 Merge branch 'dev_lishuo' into dev_cyp ...

# Conflicts:
#	Assets/Resources/UI/Prefab/Panel/Mobile/DevicePanel.prefab
#	Assets/Scenes/Login-Mobile.unity
#	Assets/Scenes/Login.unity
#	Assets/Scripts/App.cs
#	Assets/Scripts/Editor.meta
#	Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs

2021-11-23 09:51:10 +08:00

..

Control

中文版本

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

flags-mini

修改台湾旗帜

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

Font

调整样式

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

Material

细节调整

2021-05-14 16:11:22 +08:00

Prefab

Merge branch 'dev_lishuo' into dev_cyp

2021-11-23 09:51:10 +08:00

Control.meta

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

2021-03-29 09:10:59 +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

多语言微调

2021-11-11 14:20:08 +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