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

This commit is contained in:
Caiyanpeng committed 2021-09-15 19:30:47 +08:00
commit 7d4617eca6
7 files changed
+55 -21

No files matched your search

@@ -1317,8 +1317,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: 20, y: -201}
m_SizeDelta: {x: 160, y: 30}
m_AnchoredPosition: {x: 51, y: -204.5}
m_SizeDelta: {x: 132, y: 23}
m_Pivot: {x: 0, y: 1}
--- !u!222 &5054656622091827353
CanvasRenderer:
@@ -2127,7 +2127,7 @@ PrefabInstance:
- target: {fileID: 9180225337925263917, guid: 95d5b69c6ebb5f34bb864b2c0756d442,
type: 3}
propertyPath: m_SizeDelta.x
value: 154.09998
value: 126.099945
objectReference: {fileID: 0}
- target: {fileID: 9180225337925263917, guid: 95d5b69c6ebb5f34bb864b2c0756d442,
type: 3}
@@ -2137,12 +2137,12 @@ PrefabInstance:
- target: {fileID: 9180225337925263917, guid: 95d5b69c6ebb5f34bb864b2c0756d442,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 77.99998
value: 109
objectReference: {fileID: 0}
- target: {fileID: 9180225337925263917, guid: 95d5b69c6ebb5f34bb864b2c0756d442,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -76.86
value: -74.430016
objectReference: {fileID: 0}
- target: {fileID: 9182849809646276971, guid: 95d5b69c6ebb5f34bb864b2c0756d442,
type: 3}
@@ -2565,7 +2565,7 @@ PrefabInstance:
- target: {fileID: 7414013380646078914, guid: 95d5b69c6ebb5f34bb864b2c0756d442,
type: 3}
propertyPath: m_SizeDelta.y
value: 14
value: 14.425751
objectReference: {fileID: 0}
- target: {fileID: 7414013380646078914, guid: 95d5b69c6ebb5f34bb864b2c0756d442,
type: 3}
@@ -2640,22 +2640,22 @@ PrefabInstance:
- target: {fileID: 9180225337925263917, guid: 95d5b69c6ebb5f34bb864b2c0756d442,
type: 3}
propertyPath: m_SizeDelta.x
value: 162.14935
value: 134.14935
objectReference: {fileID: 0}
- target: {fileID: 9180225337925263917, guid: 95d5b69c6ebb5f34bb864b2c0756d442,
type: 3}
propertyPath: m_SizeDelta.y
value: 22.477173
value: 23
objectReference: {fileID: 0}
- target: {fileID: 9180225337925263917, guid: 95d5b69c6ebb5f34bb864b2c0756d442,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 78
value: 109
objectReference: {fileID: 0}
- target: {fileID: 9180225337925263917, guid: 95d5b69c6ebb5f34bb864b2c0756d442,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -77.523
value: -74.5
objectReference: {fileID: 0}
- target: {fileID: 9182849809646276971, guid: 95d5b69c6ebb5f34bb864b2c0756d442,
type: 3}
@@ -3568,6 +3568,11 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 9180225337925263917, guid: 95d5b69c6ebb5f34bb864b2c0756d442,
type: 3}
propertyPath: m_SizeDelta.x
value: 132
objectReference: {fileID: 0}
- target: {fileID: 9180225337925263917, guid: 95d5b69c6ebb5f34bb864b2c0756d442,
type: 3}
propertyPath: m_SizeDelta.y
@@ -3576,12 +3581,12 @@ PrefabInstance:
- target: {fileID: 9180225337925263917, guid: 95d5b69c6ebb5f34bb864b2c0756d442,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 78
value: 109
objectReference: {fileID: 0}
- target: {fileID: 9180225337925263917, guid: 95d5b69c6ebb5f34bb864b2c0756d442,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -81.89999
value: -76.95
objectReference: {fileID: 0}
- target: {fileID: 9182849809646276971, guid: 95d5b69c6ebb5f34bb864b2c0756d442,
type: 3}
@@ -4007,6 +4012,21 @@ PrefabInstance:
propertyPath: m_Color.r
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4527791653199611421, guid: 95d5b69c6ebb5f34bb864b2c0756d442,
type: 3}
propertyPath: m_Color.b
value: 0.5254902
objectReference: {fileID: 0}
- target: {fileID: 4527791653199611421, guid: 95d5b69c6ebb5f34bb864b2c0756d442,
type: 3}
propertyPath: m_Color.g
value: 0.1882353
objectReference: {fileID: 0}
- target: {fileID: 4527791653199611421, guid: 95d5b69c6ebb5f34bb864b2c0756d442,
type: 3}
propertyPath: m_Color.r
value: 0.9764706
objectReference: {fileID: 0}
- target: {fileID: 4634260803276928508, guid: 95d5b69c6ebb5f34bb864b2c0756d442,
type: 3}
propertyPath: m_Pivot.x
@@ -4227,20 +4247,25 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 9180225337925263917, guid: 95d5b69c6ebb5f34bb864b2c0756d442,
type: 3}
propertyPath: m_SizeDelta.x
value: 132
objectReference: {fileID: 0}
- target: {fileID: 9180225337925263917, guid: 95d5b69c6ebb5f34bb864b2c0756d442,
type: 3}
propertyPath: m_SizeDelta.y
value: 22.707062
value: 23
objectReference: {fileID: 0}
- target: {fileID: 9180225337925263917, guid: 95d5b69c6ebb5f34bb864b2c0756d442,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 78.00002
value: 109
objectReference: {fileID: 0}
- target: {fileID: 9180225337925263917, guid: 95d5b69c6ebb5f34bb864b2c0756d442,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -77.29294
value: -74.646
objectReference: {fileID: 0}
- target: {fileID: 9182849809646276971, guid: 95d5b69c6ebb5f34bb864b2c0756d442,
type: 3}