Merge branch 'dev_cyp1' into dev_combine
# Conflicts: # .gitignore # Assets/Scripts/Devices/Ble/Characteristic/C2RowerData.cs # Assets/Scripts/Scenes/MainController.cs
This commit is contained in:
lishuo committed
commit
342740b740
13 files changed
+132
-109
No files matched your search
@@ -130,7 +130,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 362.5, y: -12}
|
||||
m_AnchoredPosition: {x: 370.5, y: -12}
|
||||
m_SizeDelta: {x: 63, y: 24}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5907608872145303852
|
||||
@@ -300,7 +300,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 170.5, y: -12}
|
||||
m_AnchoredPosition: {x: 178.5, y: -12}
|
||||
m_SizeDelta: {x: 63, y: 24}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7186105676469645931
|
||||
@@ -772,8 +772,8 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 57.5, y: -12}
|
||||
m_SizeDelta: {x: 53, y: 24}
|
||||
m_AnchoredPosition: {x: 61.5, y: -12}
|
||||
m_SizeDelta: {x: 61, y: 24}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3836652121421275166
|
||||
CanvasRenderer:
|
||||
@@ -812,10 +812,10 @@ MonoBehaviour:
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: 12:00
|
||||
m_Text: 00:00:00:00
|
||||
--- !u!1 &2361253683883903539
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -1342,7 +1342,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 234.5, y: -10}
|
||||
m_AnchoredPosition: {x: 239.5, y: -10}
|
||||
m_SizeDelta: {x: 63, y: 20}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &269708835447031313
|
||||
@@ -1811,8 +1811,8 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 57.5, y: -10}
|
||||
m_SizeDelta: {x: 53, y: 20}
|
||||
m_AnchoredPosition: {x: 60, y: -10}
|
||||
m_SizeDelta: {x: 57, y: 20}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &9087205330612000289
|
||||
CanvasRenderer:
|
||||
@@ -1851,10 +1851,10 @@ MonoBehaviour:
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: 12:00
|
||||
m_Text: 00:00:00
|
||||
--- !u!1 &4008537939924920360
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -2244,7 +2244,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 288.7, y: 81.4}
|
||||
m_AnchoredPosition: {x: 285.7, y: 105.39996}
|
||||
m_SizeDelta: {x: 458, y: 24}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!222 &7444512366960477214
|
||||
@@ -2421,7 +2421,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 362.5, y: -10}
|
||||
m_AnchoredPosition: {x: 367.5, y: -10}
|
||||
m_SizeDelta: {x: 63, y: 20}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7402218478811892123
|
||||
@@ -2662,7 +2662,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 426.5, y: -10}
|
||||
m_AnchoredPosition: {x: 431.5, y: -10}
|
||||
m_SizeDelta: {x: 63, y: 20}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7588943949929111357
|
||||
@@ -2740,7 +2740,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 426.5, y: -12}
|
||||
m_AnchoredPosition: {x: 434.5, y: -12}
|
||||
m_SizeDelta: {x: 63, y: 24}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8229538892286258918
|
||||
@@ -2818,7 +2818,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 298.5, y: -12}
|
||||
m_AnchoredPosition: {x: 306.5, y: -12}
|
||||
m_SizeDelta: {x: 63, y: 24}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8887962303842604337
|
||||
@@ -2972,7 +2972,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 234.5, y: -12}
|
||||
m_AnchoredPosition: {x: 242.5, y: -12}
|
||||
m_SizeDelta: {x: 63, y: 24}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1292433779917309027
|
||||
@@ -3412,7 +3412,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 111.5, y: -12}
|
||||
m_AnchoredPosition: {x: 119.5, y: -12}
|
||||
m_SizeDelta: {x: 53, y: 24}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3812684676960283277
|
||||
@@ -4196,7 +4196,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 298.5, y: -10}
|
||||
m_AnchoredPosition: {x: 303.5, y: -10}
|
||||
m_SizeDelta: {x: 63, y: 20}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1079738450500434844
|
||||
@@ -4412,7 +4412,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 111.5, y: -10}
|
||||
m_AnchoredPosition: {x: 116.5, y: -10}
|
||||
m_SizeDelta: {x: 53, y: 20}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1973580062630642371
|
||||
@@ -4490,7 +4490,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 170.5, y: -10}
|
||||
m_AnchoredPosition: {x: 175.5, y: -10}
|
||||
m_SizeDelta: {x: 63, y: 20}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8126899616570297098
|
||||
@@ -4847,12 +4847,12 @@ PrefabInstance:
|
||||
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
@@ -5022,12 +5022,12 @@ PrefabInstance:
|
||||
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
|
||||
Reference in new issue
Block a user