Merge remote-tracking branch 'refs/remotes/origin/main'

This commit is contained in:
Sveske Juice 2024-04-21 13:10:42 +02:00
commit f237274cb1
4 changed files with 292 additions and 247 deletions

File diff suppressed because one or more lines are too long

View File

@ -660,10 +660,8 @@ RectTransform:
- {fileID: 7094050956717546836} - {fileID: 7094050956717546836}
- {fileID: 5203690656153714838} - {fileID: 5203690656153714838}
- {fileID: 4429602029198271624} - {fileID: 4429602029198271624}
- {fileID: 2823721143316666755}
- {fileID: 9000047314404377693} - {fileID: 9000047314404377693}
- {fileID: 4451447212631766592} - {fileID: 4451447212631766592}
- {fileID: 7211211680280156960}
- {fileID: 6256671941795819917} - {fileID: 6256671941795819917}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -917,7 +915,7 @@ RectTransform:
m_GameObject: {fileID: 997464933317995472} m_GameObject: {fileID: 997464933317995472}
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_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_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 8033284387431059995} - {fileID: 8033284387431059995}
@ -1449,19 +1447,18 @@ RectTransform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2074820118910961211} 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_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 9031083463025029788} - {fileID: 9031083463025029788}
- {fileID: 6365064286897064314} - {fileID: 6365064286897064314}
- {fileID: 6503638792597430501} m_Father: {fileID: 5203690656153714838}
m_Father: {fileID: 3367038424042638127}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {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_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &2229423673042055192 --- !u!1 &2229423673042055192
@ -1824,7 +1821,7 @@ RectTransform:
m_GameObject: {fileID: 3350686447832094965} m_GameObject: {fileID: 3350686447832094965}
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_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_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 3942624307517849485} - {fileID: 3942624307517849485}
@ -2424,12 +2421,13 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children:
- {fileID: 6503638792597430501}
m_Father: {fileID: 2823721143316666755} m_Father: {fileID: 2823721143316666755}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {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_SizeDelta: {x: 110, y: 110}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &714755010345844841 --- !u!222 &714755010345844841
@ -2846,10 +2844,10 @@ MonoBehaviour:
m_Padding: m_Padding:
m_Left: 0 m_Left: 0
m_Right: 0 m_Right: 0
m_Top: 30 m_Top: 3
m_Bottom: 30 m_Bottom: 59
m_ChildAlignment: 1 m_ChildAlignment: 1
m_Spacing: 31.5 m_Spacing: -111.5
m_ChildForceExpandWidth: 1 m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 1 m_ChildForceExpandHeight: 1
m_ChildControlWidth: 0 m_ChildControlWidth: 0
@ -3204,7 +3202,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0} m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {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_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2593507632019896054 --- !u!222 &2593507632019896054
@ -3450,15 +3448,15 @@ RectTransform:
m_GameObject: {fileID: 4676866721297065436} m_GameObject: {fileID: 4676866721297065436}
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_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_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 975370961898811032} - {fileID: 975370961898811032}
m_Father: {fileID: 3367038424042638127} m_Father: {fileID: 9125599128698433918}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: -629.7, y: -437.6} m_AnchoredPosition: {x: 106.56448, y: -971.9}
m_SizeDelta: {x: 100, y: 100} m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8622396985485827187 --- !u!222 &8622396985485827187
@ -3712,6 +3710,7 @@ RectTransform:
m_Children: m_Children:
- {fileID: 5785125258108911782} - {fileID: 5785125258108911782}
- {fileID: 1571444269651810830} - {fileID: 1571444269651810830}
- {fileID: 7211211680280156960}
m_Father: {fileID: 5203690656153714838} m_Father: {fileID: 5203690656153714838}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5} m_AnchorMin: {x: 1, y: 0.5}
@ -3789,7 +3788,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 0 m_IsActive: 1
--- !u!224 &5203690656153714838 --- !u!224 &5203690656153714838
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -3805,6 +3804,7 @@ RectTransform:
- {fileID: 9125599128698433918} - {fileID: 9125599128698433918}
- {fileID: 41458428043916546} - {fileID: 41458428043916546}
- {fileID: 5814772211296616353} - {fileID: 5814772211296616353}
- {fileID: 2823721143316666755}
m_Father: {fileID: 3367038424042638127} m_Father: {fileID: 3367038424042638127}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5} m_AnchorMin: {x: 1, y: 0.5}
@ -3925,7 +3925,7 @@ RectTransform:
m_GameObject: {fileID: 5450244923080922271} m_GameObject: {fileID: 5450244923080922271}
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_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_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 4355958989142029154} - {fileID: 4355958989142029154}
@ -5224,7 +5224,7 @@ RectTransform:
m_GameObject: {fileID: 8386636982944994587} m_GameObject: {fileID: 8386636982944994587}
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_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_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 8911409135165688101} - {fileID: 8911409135165688101}
@ -5823,11 +5823,11 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 2823721143316666755} m_Father: {fileID: 6365064286897064314}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0} m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {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_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2186931942408298377 --- !u!222 &2186931942408298377
@ -5941,7 +5941,7 @@ RectTransform:
m_GameObject: {fileID: 9154155236048502357} m_GameObject: {fileID: 9154155236048502357}
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_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_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 8765000387057169679} - {fileID: 8765000387057169679}

View File

@ -233,7 +233,7 @@ Transform:
type: 3} type: 3}
m_PrefabInstance: {fileID: 66896262} m_PrefabInstance: {fileID: 66896262}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!21 &96894727 --- !u!21 &68632875
Material: Material:
serializedVersion: 8 serializedVersion: 8
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -356,47 +356,6 @@ Material:
- _r: {r: 0, g: 0, b: 0, a: 40} - _r: {r: 0, g: 0, b: 0, a: 40}
- _rect2props: {r: 10, g: 9.999939, b: 407.01352, a: 392.87137} - _rect2props: {r: 10, g: 9.999939, b: 407.01352, a: 392.87137}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
--- !u!21 &143624822
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/RoundedCorners/IndependentRoundedCorners
m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _halfSize: {r: 5, g: 13.05, b: 0, a: 0}
- _r: {r: 5, g: 5, b: 0, a: 0}
- _rect2props: {r: 0, g: -2.500002, b: 10.995511, a: 10.995511}
m_BuildTextureStacks: []
--- !u!1001 &203396308 --- !u!1001 &203396308
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -839,6 +798,47 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c2cdf8a35ccaacc4695675d2ada4aecf, type: 3} m_Script: {fileID: 11500000, guid: c2cdf8a35ccaacc4695675d2ada4aecf, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
--- !u!21 &348611130
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/RoundedCorners/IndependentRoundedCorners
m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _halfSize: {r: 35.4485, g: 38.0555, b: 0, a: 0}
- _r: {r: 40, g: 0, b: 0, a: 40}
- _rect2props: {r: 20.000002, g: -0.0000038146973, b: 37.833046, a: 37.833046}
m_BuildTextureStacks: []
--- !u!1001 &359510068 --- !u!1001 &359510068
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1323,6 +1323,47 @@ Transform:
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!21 &768593159
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/RoundedCorners/IndependentRoundedCorners
m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _halfSize: {r: 97.85, g: 477.754, b: 0, a: 0}
- _r: {r: 0, g: 0, b: 0, a: 40}
- _rect2props: {r: 10, g: 9.999939, b: 407.01352, a: 392.87137}
m_BuildTextureStacks: []
--- !u!1 &779612215 --- !u!1 &779612215
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1733,6 +1774,26 @@ PrefabInstance:
propertyPath: m_LocalRotation.x propertyPath: m_LocalRotation.x
value: 0.021683881 value: 0.021683881
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3255403189825384754, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
type: 3}
propertyPath: m_ClearFlags
value: 2
objectReference: {fileID: 0}
- target: {fileID: 3255403189825384754, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
type: 3}
propertyPath: m_BackGroundColor.b
value: 0.22630823
objectReference: {fileID: 0}
- target: {fileID: 3255403189825384754, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
type: 3}
propertyPath: m_BackGroundColor.g
value: 0.6164398
objectReference: {fileID: 0}
- target: {fileID: 3255403189825384754, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
type: 3}
propertyPath: m_BackGroundColor.r
value: 0.735849
objectReference: {fileID: 0}
- target: {fileID: 5753661378891917460, guid: fd9f9b61c0ebb324ebc9f929e26706bc, - target: {fileID: 5753661378891917460, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
type: 3} type: 3}
propertyPath: m_LocalRotation.w propertyPath: m_LocalRotation.w
@ -1870,47 +1931,6 @@ Material:
- _r: {r: 40, g: 0, b: 0, a: 40} - _r: {r: 40, g: 0, b: 0, a: 40}
- _rect2props: {r: 20.000002, g: -0.0000038146973, b: 37.833046, a: 37.833046} - _rect2props: {r: 20.000002, g: -0.0000038146973, b: 37.833046, a: 37.833046}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
--- !u!21 &966649735
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/RoundedCorners/IndependentRoundedCorners
m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _halfSize: {r: 340.1145, g: 535, b: 0, a: 0}
- _r: {r: 0, g: 0, b: 0, a: 40}
- _rect2props: {r: 10.0000305, g: 9.999878, b: 618.79944, a: 604.6573}
m_BuildTextureStacks: []
--- !u!1 &968288134 --- !u!1 &968288134
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -2241,47 +2261,6 @@ MeshFilter:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1117810916} m_GameObject: {fileID: 1117810916}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!21 &1129750886
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/RoundedCorners/IndependentRoundedCorners
m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _halfSize: {r: 35.4485, g: 38.0555, b: 0, a: 0}
- _r: {r: 40, g: 0, b: 0, a: 40}
- _rect2props: {r: 20.000002, g: -0.0000038146973, b: 37.833046, a: 37.833046}
m_BuildTextureStacks: []
--- !u!1 &1211328792 --- !u!1 &1211328792
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -2399,47 +2378,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 7355133f21643b44e8b997303686916c, type: 3} m_Script: {fileID: 11500000, guid: 7355133f21643b44e8b997303686916c, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
--- !u!21 &1337340550
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/RoundedCorners/IndependentRoundedCorners
m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _halfSize: {r: 97.8265, g: 37.763, b: 0, a: 0}
- _r: {r: 30.96, g: 0, b: 0, a: 0}
- _rect2props: {r: 7.7400208, g: -7.7400017, b: 84.93025, a: 95.87626}
m_BuildTextureStacks: []
--- !u!114 &1346132657 stripped --- !u!114 &1346132657 stripped
MonoBehaviour: MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 6162594480593627889, guid: 1c668d8e87e6aee4a8527281f0b61954, m_CorrespondingSourceObject: {fileID: 6162594480593627889, guid: 1c668d8e87e6aee4a8527281f0b61954,
@ -2501,47 +2439,6 @@ Transform:
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!21 &1410484379
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/RoundedCorners/IndependentRoundedCorners
m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _halfSize: {r: 360, g: 550, b: 0, a: 0}
- _r: {r: 0, g: 59.4, b: 59.4, a: 59.4}
- _rect2props: {r: -14.850006, g: 14.849915, b: 622.4661, a: 601.4651}
m_BuildTextureStacks: []
--- !u!21 &1454190399 --- !u!21 &1454190399
Material: Material:
serializedVersion: 8 serializedVersion: 8
@ -2766,6 +2663,47 @@ Transform:
- {fileID: 779612216} - {fileID: 779612216}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!21 &1551214632
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/RoundedCorners/IndependentRoundedCorners
m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _halfSize: {r: 97.8265, g: 37.763, b: 0, a: 0}
- _r: {r: 30.96, g: 0, b: 0, a: 0}
- _rect2props: {r: 7.7400208, g: -7.7400017, b: 84.93025, a: 95.87626}
m_BuildTextureStacks: []
--- !u!21 &1553206229 --- !u!21 &1553206229
Material: Material:
serializedVersion: 8 serializedVersion: 8
@ -3011,6 +2949,47 @@ MeshFilter:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1644633573} m_GameObject: {fileID: 1644633573}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!21 &1733481261
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/RoundedCorners/IndependentRoundedCorners
m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _halfSize: {r: 5, g: 13.05, b: 0, a: 0}
- _r: {r: 0, g: 0, b: 5, a: 5}
- _rect2props: {r: 0.00000047683716, g: 2.4999986, b: 10.995511, a: 10.995511}
m_BuildTextureStacks: []
--- !u!1 &1785574039 --- !u!1 &1785574039
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -3147,7 +3126,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 8e7a492524fd6434aae9b71446cfe174, type: 3} m_Script: {fileID: 11500000, guid: 8e7a492524fd6434aae9b71446cfe174, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
--- !u!21 &1857690523 --- !u!21 &1842328056
Material: Material:
serializedVersion: 8 serializedVersion: 8
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -3184,9 +3163,9 @@ Material:
- _StencilWriteMask: 255 - _StencilWriteMask: 255
- _UseUIAlphaClip: 0 - _UseUIAlphaClip: 0
m_Colors: m_Colors:
- _halfSize: {r: 5, g: 13.05, b: 0, a: 0} - _halfSize: {r: 360, g: 550, b: 0, a: 0}
- _r: {r: 0, g: 0, b: 5, a: 5} - _r: {r: 0, g: 59.4, b: 59.4, a: 59.4}
- _rect2props: {r: 0.00000047683716, g: 2.4999986, b: 10.995511, a: 10.995511} - _rect2props: {r: -14.850006, g: 14.849915, b: 622.4661, a: 601.4651}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
--- !u!1 &1875223176 --- !u!1 &1875223176
GameObject: GameObject:
@ -3411,7 +3390,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c2cdf8a35ccaacc4695675d2ada4aecf, type: 3} m_Script: {fileID: 11500000, guid: c2cdf8a35ccaacc4695675d2ada4aecf, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
--- !u!21 &1903073779 --- !u!21 &1918592339
Material: Material:
serializedVersion: 8 serializedVersion: 8
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -3448,9 +3427,50 @@ Material:
- _StencilWriteMask: 255 - _StencilWriteMask: 255
- _UseUIAlphaClip: 0 - _UseUIAlphaClip: 0
m_Colors: m_Colors:
- _halfSize: {r: 97.85, g: 477.754, b: 0, a: 0} - _halfSize: {r: 5, g: 13.05, b: 0, a: 0}
- _r: {r: 5, g: 5, b: 0, a: 0}
- _rect2props: {r: 0, g: -2.500002, b: 10.995511, a: 10.995511}
m_BuildTextureStacks: []
--- !u!21 &1930221358
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/RoundedCorners/IndependentRoundedCorners
m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _halfSize: {r: 340.1145, g: 535, b: 0, a: 0}
- _r: {r: 0, g: 0, b: 0, a: 40} - _r: {r: 0, g: 0, b: 0, a: 40}
- _rect2props: {r: 10, g: 9.999939, b: 407.01352, a: 392.87137} - _rect2props: {r: 10.0000305, g: 9.999878, b: 618.79944, a: 604.6573}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
--- !u!1 &2004418198 --- !u!1 &2004418198
GameObject: GameObject:

View File

@ -74,7 +74,9 @@ public class HideWall : MonoBehaviour
Gizmos.color = Color.red; Gizmos.color = Color.red;
Gizmos.DrawWireSphere(origin.transform.position, sphereRadius); Gizmos.DrawWireSphere(origin.transform.position, sphereRadius);
if(target != null && origin != null)
maxSphereRayDistance = Vector3.Distance(origin.transform.position, target.transform.position) - (sphereRadius); maxSphereRayDistance = Vector3.Distance(origin.transform.position, target.transform.position) - (sphereRadius);
Vector3 direction = (target.transform.position - origin.transform.position).normalized; Vector3 direction = (target.transform.position - origin.transform.position).normalized;
Gizmos.DrawRay(origin.transform.position, direction * maxSphereRayDistance); Gizmos.DrawRay(origin.transform.position, direction * maxSphereRayDistance);
} }