Merge remote-tracking branch 'origin/dev_mobile_ble' into dev_mobile

# Conflicts:
#	Assets/Scripts/Scenes/MainController.cs
This commit is contained in:
Caiyanpeng committed 2021-09-28 11:30:08 +08:00
commit 5bd1c3b1ca
278 files changed
+19740 -112

No files matched your search

@@ -742,7 +742,6 @@ GameObject:
- component: {fileID: 4085630360285719622}
- component: {fileID: 4085630360285719621}
- component: {fileID: 4085630360285719623}
- component: {fileID: 8165744897097518677}
- component: {fileID: 6147895834536267412}
- component: {fileID: 1057269569260839362}
m_Layer: 5
@@ -825,18 +824,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
radius: 10
--- !u!114 &8165744897097518677
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4085630360285719619}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f822eddd7a641a744a198d79e43e3f55, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &6147895834536267412
MonoBehaviour:
m_ObjectHideFlags: 0