修复Canvas大小变更时UI不随之移动错误。使用UIColorContainer来储存Color信息。
(cherry picked from commit 5ccaeefa5c)
This commit is contained in:
@@ -942,7 +942,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: -61, y: 215}
|
||||
m_AnchoredPosition: {x: 411.6, y: -24.599976}
|
||||
m_SizeDelta: {x: 200, y: 50}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &431112176
|
||||
@@ -2096,55 +2096,6 @@ Transform:
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1129476375
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1129476376}
|
||||
- component: {fileID: 1129476377}
|
||||
m_Layer: 5
|
||||
m_Name: UIColorContainer
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1129476376
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1129476375}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1144208399}
|
||||
m_RootOrder: 10
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1129476377
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1129476375}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 3fef23608d0a5d242a781d8ca28ed23b, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &1144208395
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -2247,7 +2198,6 @@ RectTransform:
|
||||
- {fileID: 1614969824}
|
||||
- {fileID: 1899537997}
|
||||
- {fileID: 237721382}
|
||||
- {fileID: 1129476376}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
@@ -2645,10 +2595,10 @@ MonoBehaviour:
|
||||
gotoButton: {fileID: 1614969818}
|
||||
freeButton: {fileID: 1899537996}
|
||||
animeDuration: 0.2
|
||||
mixDestination: {x: -85, y: 29, z: 0}
|
||||
attackDestination: {x: -100, y: 0, z: 0}
|
||||
gotoDestination: {x: -115, y: -29, z: 0}
|
||||
freeDestination: {x: -130, y: -58, z: 0}
|
||||
animeMoveXDistance: 5
|
||||
animeMoveYDistance: 10
|
||||
animeScaleX: 3
|
||||
animeScaleY: 3
|
||||
maskScaleX: 1
|
||||
maskScaleY: 0.4
|
||||
--- !u!114 &1432557595
|
||||
@@ -2670,32 +2620,9 @@ MonoBehaviour:
|
||||
unclickableButton:
|
||||
- {fileID: 850190065}
|
||||
- {fileID: 546575679}
|
||||
normalTextColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4293717228
|
||||
normalBGColor:
|
||||
serializedVersion: 2
|
||||
rgba: 16777215
|
||||
highLightTextColor:
|
||||
serializedVersion: 2
|
||||
rgba: 3861457193
|
||||
highLightBGColor:
|
||||
serializedVersion: 2
|
||||
rgba: 1744830463
|
||||
pressedTextColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4026531840
|
||||
pressedBGColor:
|
||||
serializedVersion: 2
|
||||
rgba: 2701131775
|
||||
disableTextColor:
|
||||
serializedVersion: 2
|
||||
rgba: 1354020020
|
||||
disableBGColor:
|
||||
serializedVersion: 2
|
||||
rgba: 16777215
|
||||
colorChangeSpeed: 0.1
|
||||
clickable: 1
|
||||
uiColor: {fileID: 11400000, guid: c75edf08eba25eb40896936387c07e89, type: 2}
|
||||
--- !u!1 &1575146385
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -2729,9 +2656,9 @@ RectTransform:
|
||||
m_Father: {fileID: 1144208399}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 50, y: -50}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &1614969818
|
||||
@@ -3403,7 +3330,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: -372, y: 211}
|
||||
m_AnchoredPosition: {x: 100.6, y: -28.6}
|
||||
m_SizeDelta: {x: 200, y: 50}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &2145851918
|
||||
|
||||
+15
-15
@@ -10008,7 +10008,7 @@ Mesh:
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: pb_Mesh30798
|
||||
m_Name: pb_Mesh30802
|
||||
serializedVersion: 10
|
||||
m_SubMeshes:
|
||||
- serializedVersion: 2
|
||||
@@ -12884,7 +12884,7 @@ Mesh:
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: pb_Mesh27090
|
||||
m_Name: pb_Mesh27092
|
||||
serializedVersion: 10
|
||||
m_SubMeshes:
|
||||
- serializedVersion: 2
|
||||
@@ -15870,7 +15870,7 @@ Mesh:
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: pb_Mesh27172
|
||||
m_Name: pb_Mesh27174
|
||||
serializedVersion: 10
|
||||
m_SubMeshes:
|
||||
- serializedVersion: 2
|
||||
@@ -25621,7 +25621,7 @@ Mesh:
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: pb_Mesh26962
|
||||
m_Name: pb_Mesh26964
|
||||
serializedVersion: 10
|
||||
m_SubMeshes:
|
||||
- serializedVersion: 2
|
||||
@@ -39264,14 +39264,14 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 2100000, guid: f6d46f1e916b3486c90a448a441fac6a, type: 2}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 0}
|
||||
m_Color: {r: 0.8867924, g: 0.8867924, b: 0.8867924, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_Sprite: {fileID: 0}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
@@ -39307,8 +39307,8 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -94.1, y: -35.076}
|
||||
m_SizeDelta: {x: 171.8483, y: 52.1512}
|
||||
m_AnchoredPosition: {x: -98.800446, y: -35.076004}
|
||||
m_SizeDelta: {x: 181.2491, y: 52.1512}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &1403501266
|
||||
GameObject:
|
||||
@@ -40705,7 +40705,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0.000030517578, y: -246.20192}
|
||||
m_AnchoredPosition: {x: 0.000030517578, y: -246.20204}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0, y: 0}
|
||||
--- !u!114 &1442113294
|
||||
@@ -43031,15 +43031,15 @@ MonoBehaviour:
|
||||
|
||||
In Next Episode'
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: 07e34e9000492a2468743178b0960f4e, type: 2}
|
||||
m_sharedMaterial: {fileID: -5512001432465614552, guid: 07e34e9000492a2468743178b0960f4e, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
m_fontColor32:
|
||||
serializedVersion: 2
|
||||
rgba: 4281479730
|
||||
m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
|
||||
rgba: 4294967295
|
||||
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_enableVertexGradient: 0
|
||||
m_colorMode: 3
|
||||
m_fontColorGradient:
|
||||
@@ -43056,10 +43056,10 @@ MonoBehaviour:
|
||||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 24
|
||||
m_fontSize: 21.45
|
||||
m_fontSizeBase: 24
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_enableAutoSizing: 1
|
||||
m_fontSizeMin: 18
|
||||
m_fontSizeMax: 72
|
||||
m_fontStyle: 0
|
||||
|
||||
Reference in New Issue
Block a user