Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/ColorDefense
This commit is contained in:
commit
e6d6146eea
|
@ -660,10 +660,8 @@ RectTransform:
|
|||
- {fileID: 7094050956717546836}
|
||||
- {fileID: 5203690656153714838}
|
||||
- {fileID: 4429602029198271624}
|
||||
- {fileID: 2823721143316666755}
|
||||
- {fileID: 9000047314404377693}
|
||||
- {fileID: 4451447212631766592}
|
||||
- {fileID: 7211211680280156960}
|
||||
- {fileID: 6256671941795819917}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
@ -917,7 +915,7 @@ RectTransform:
|
|||
m_GameObject: {fileID: 997464933317995472}
|
||||
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_LocalScale: {x: 0.88211, y: 0.88211, z: 0.88211}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 8033284387431059995}
|
||||
|
@ -1449,19 +1447,18 @@ RectTransform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2074820118910961211}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
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:
|
||||
- {fileID: 9031083463025029788}
|
||||
- {fileID: 6365064286897064314}
|
||||
- {fileID: 6503638792597430501}
|
||||
m_Father: {fileID: 3367038424042638127}
|
||||
m_Father: {fileID: 5203690656153714838}
|
||||
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_AnchoredPosition: {x: 308.65002, y: 0}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &2229423673042055192
|
||||
|
@ -1824,7 +1821,7 @@ RectTransform:
|
|||
m_GameObject: {fileID: 3350686447832094965}
|
||||
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_LocalScale: {x: 0.88211, y: 0.88211, z: 0.88211}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 3942624307517849485}
|
||||
|
@ -2424,12 +2421,13 @@ RectTransform:
|
|||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Children:
|
||||
- {fileID: 6503638792597430501}
|
||||
m_Father: {fileID: 2823721143316666755}
|
||||
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: -747.5, y: -437.09998}
|
||||
m_AnchoredPosition: {x: -747.5, y: -455}
|
||||
m_SizeDelta: {x: 110, y: 110}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &714755010345844841
|
||||
|
@ -2846,10 +2844,10 @@ MonoBehaviour:
|
|||
m_Padding:
|
||||
m_Left: 0
|
||||
m_Right: 0
|
||||
m_Top: 30
|
||||
m_Bottom: 30
|
||||
m_Top: 3
|
||||
m_Bottom: 59
|
||||
m_ChildAlignment: 1
|
||||
m_Spacing: 31.5
|
||||
m_Spacing: -111.5
|
||||
m_ChildForceExpandWidth: 1
|
||||
m_ChildForceExpandHeight: 1
|
||||
m_ChildControlWidth: 0
|
||||
|
@ -3204,7 +3202,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0}
|
||||
m_AnchorMax: {x: 0.5, y: 0}
|
||||
m_AnchoredPosition: {x: -863.80005, y: -387.09998}
|
||||
m_AnchoredPosition: {x: -863.4, y: -404.375}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2593507632019896054
|
||||
|
@ -3450,15 +3448,15 @@ RectTransform:
|
|||
m_GameObject: {fileID: 4676866721297065436}
|
||||
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_LocalScale: {x: 1.277, y: 1.277, z: 1.277}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 975370961898811032}
|
||||
m_Father: {fileID: 3367038424042638127}
|
||||
m_Father: {fileID: 9125599128698433918}
|
||||
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: -629.7, y: -437.6}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 106.56448, y: -971.9}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8622396985485827187
|
||||
|
@ -3712,6 +3710,7 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 5785125258108911782}
|
||||
- {fileID: 1571444269651810830}
|
||||
- {fileID: 7211211680280156960}
|
||||
m_Father: {fileID: 5203690656153714838}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0.5}
|
||||
|
@ -3789,7 +3788,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &5203690656153714838
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -3805,6 +3804,7 @@ RectTransform:
|
|||
- {fileID: 9125599128698433918}
|
||||
- {fileID: 41458428043916546}
|
||||
- {fileID: 5814772211296616353}
|
||||
- {fileID: 2823721143316666755}
|
||||
m_Father: {fileID: 3367038424042638127}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0.5}
|
||||
|
@ -3925,7 +3925,7 @@ RectTransform:
|
|||
m_GameObject: {fileID: 5450244923080922271}
|
||||
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_LocalScale: {x: 0.88211, y: 0.88211, z: 0.88211}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 4355958989142029154}
|
||||
|
@ -5224,7 +5224,7 @@ RectTransform:
|
|||
m_GameObject: {fileID: 8386636982944994587}
|
||||
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_LocalScale: {x: 0.88211, y: 0.88211, z: 0.88211}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 8911409135165688101}
|
||||
|
@ -5823,11 +5823,11 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 2823721143316666755}
|
||||
m_Father: {fileID: 6365064286897064314}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0}
|
||||
m_AnchorMax: {x: 0.5, y: 0}
|
||||
m_AnchoredPosition: {x: -747.5, y: -387.09998}
|
||||
m_AnchoredPosition: {x: 0, y: 55}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2186931942408298377
|
||||
|
@ -5941,7 +5941,7 @@ RectTransform:
|
|||
m_GameObject: {fileID: 9154155236048502357}
|
||||
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_LocalScale: {x: 0.88211, y: 0.88211, z: 0.88211}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 8765000387057169679}
|
||||
|
|
Loading…
Reference in New Issue