Merge remote-tracking branch 'origin/Syntriax' into Over
This commit is contained in:
OverflowNarhoym
commit
7f14bcc819
|
|
@ -98,6 +98,17 @@ namespace Input
|
|||
""isComposite"": false,
|
||||
""isPartOfComposite"": true
|
||||
},
|
||||
{
|
||||
""name"": ""negative"",
|
||||
""id"": ""8e34175e-1972-4375-ba6e-a165f1665015"",
|
||||
""path"": ""<Keyboard>/a"",
|
||||
""interactions"": """",
|
||||
""processors"": """",
|
||||
""groups"": ""KeyBoard"",
|
||||
""action"": ""Move"",
|
||||
""isComposite"": false,
|
||||
""isPartOfComposite"": true
|
||||
},
|
||||
{
|
||||
""name"": ""positive"",
|
||||
""id"": ""064aa7d7-b08b-4cea-915f-e225e5c62072"",
|
||||
|
|
@ -109,6 +120,17 @@ namespace Input
|
|||
""isComposite"": false,
|
||||
""isPartOfComposite"": true
|
||||
},
|
||||
{
|
||||
""name"": ""positive"",
|
||||
""id"": ""51f40a3f-9685-40e9-8cbd-5d3147ee05e1"",
|
||||
""path"": ""<Keyboard>/d"",
|
||||
""interactions"": """",
|
||||
""processors"": """",
|
||||
""groups"": ""KeyBoard"",
|
||||
""action"": ""Move"",
|
||||
""isComposite"": false,
|
||||
""isPartOfComposite"": true
|
||||
},
|
||||
{
|
||||
""name"": ""1D Axis Gamepad"",
|
||||
""id"": ""93eaa249-8b44-4767-b233-0ed70a500631"",
|
||||
|
|
|
|||
|
|
@ -74,6 +74,17 @@
|
|||
"isComposite": false,
|
||||
"isPartOfComposite": true
|
||||
},
|
||||
{
|
||||
"name": "negative",
|
||||
"id": "8e34175e-1972-4375-ba6e-a165f1665015",
|
||||
"path": "<Keyboard>/a",
|
||||
"interactions": "",
|
||||
"processors": "",
|
||||
"groups": "KeyBoard",
|
||||
"action": "Move",
|
||||
"isComposite": false,
|
||||
"isPartOfComposite": true
|
||||
},
|
||||
{
|
||||
"name": "positive",
|
||||
"id": "064aa7d7-b08b-4cea-915f-e225e5c62072",
|
||||
|
|
@ -85,6 +96,17 @@
|
|||
"isComposite": false,
|
||||
"isPartOfComposite": true
|
||||
},
|
||||
{
|
||||
"name": "positive",
|
||||
"id": "51f40a3f-9685-40e9-8cbd-5d3147ee05e1",
|
||||
"path": "<Keyboard>/d",
|
||||
"interactions": "",
|
||||
"processors": "",
|
||||
"groups": "KeyBoard",
|
||||
"action": "Move",
|
||||
"isComposite": false,
|
||||
"isPartOfComposite": true
|
||||
},
|
||||
{
|
||||
"name": "1D Axis Gamepad",
|
||||
"id": "93eaa249-8b44-4767-b233-0ed70a500631",
|
||||
|
|
|
|||
|
|
@ -0,0 +1,135 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &8378017212783071875
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1204334895034878381}
|
||||
- component: {fileID: 1785641170992784563}
|
||||
- component: {fileID: 7247606339416968181}
|
||||
- component: {fileID: 8027659600259984568}
|
||||
m_Layer: 7
|
||||
m_Name: Death Square
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 2147483647
|
||||
m_IsActive: 1
|
||||
--- !u!4 &1204334895034878381
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8378017212783071875}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 100, y: 25, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!212 &1785641170992784563
|
||||
SpriteRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8378017212783071875}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 0
|
||||
m_ReceiveShadows: 0
|
||||
m_DynamicOccludee: 1
|
||||
m_StaticShadowCaster: 0
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 0
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
m_StaticBatchRoot: {fileID: 0}
|
||||
m_ProbeAnchor: {fileID: 0}
|
||||
m_LightProbeVolumeOverride: {fileID: 0}
|
||||
m_ScaleInLightmap: 1
|
||||
m_ReceiveGI: 1
|
||||
m_PreserveUVs: 0
|
||||
m_IgnoreNormalsForChartDetection: 0
|
||||
m_ImportantGI: 0
|
||||
m_StitchLightmapSeams: 1
|
||||
m_SelectedEditorRenderState: 0
|
||||
m_MinimumChartSize: 4
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3}
|
||||
m_Color: {r: 1, g: 0.4009434, b: 0.4009434, a: 1}
|
||||
m_FlipX: 0
|
||||
m_FlipY: 0
|
||||
m_DrawMode: 0
|
||||
m_Size: {x: 1, y: 1}
|
||||
m_AdaptiveModeThreshold: 0.5
|
||||
m_SpriteTileMode: 0
|
||||
m_WasSpriteAssigned: 1
|
||||
m_MaskInteraction: 0
|
||||
m_SpriteSortPoint: 0
|
||||
--- !u!61 &7247606339416968181
|
||||
BoxCollider2D:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8378017212783071875}
|
||||
m_Enabled: 1
|
||||
m_Density: 1
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 0
|
||||
m_UsedByEffector: 0
|
||||
m_UsedByComposite: 0
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_SpriteTilingProperty:
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
pivot: {x: 0.5, y: 0.5}
|
||||
oldSize: {x: 1, y: 1}
|
||||
newSize: {x: 1, y: 1}
|
||||
adaptiveTilingThreshold: 0.5
|
||||
drawMode: 0
|
||||
adaptiveTiling: 0
|
||||
m_AutoTiling: 0
|
||||
serializedVersion: 2
|
||||
m_Size: {x: 1, y: 1}
|
||||
m_EdgeRadius: 0
|
||||
--- !u!50 &8027659600259984568
|
||||
Rigidbody2D:
|
||||
serializedVersion: 4
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8378017212783071875}
|
||||
m_BodyType: 2
|
||||
m_Simulated: 1
|
||||
m_UseFullKinematicContacts: 0
|
||||
m_UseAutoMass: 0
|
||||
m_Mass: 1
|
||||
m_LinearDrag: 0
|
||||
m_AngularDrag: 0.05
|
||||
m_GravityScale: 1
|
||||
m_Material: {fileID: 0}
|
||||
m_Interpolate: 0
|
||||
m_SleepingMode: 1
|
||||
m_CollisionDetection: 0
|
||||
m_Constraints: 0
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 8317c6de9f7b2f14f87cd8c0a0131c3c
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -14,6 +14,7 @@ GameObject:
|
|||
- component: {fileID: 6241563109229534231}
|
||||
- component: {fileID: 6151226926209823380}
|
||||
- component: {fileID: 4209054098996045085}
|
||||
- component: {fileID: 2908524670421552996}
|
||||
m_Layer: 8
|
||||
m_Name: End Point
|
||||
m_TagString: Untagged
|
||||
|
|
@ -127,13 +128,65 @@ BoxCollider2D:
|
|||
m_Offset: {x: 0, y: 0}
|
||||
m_SpriteTilingProperty:
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
pivot: {x: 0, y: 0}
|
||||
oldSize: {x: 0, y: 0}
|
||||
newSize: {x: 0, y: 0}
|
||||
adaptiveTilingThreshold: 0
|
||||
pivot: {x: 0.5, y: 0.5}
|
||||
oldSize: {x: 1, y: 1}
|
||||
newSize: {x: 1, y: 1}
|
||||
adaptiveTilingThreshold: 0.5
|
||||
drawMode: 0
|
||||
adaptiveTiling: 0
|
||||
m_AutoTiling: 0
|
||||
serializedVersion: 2
|
||||
m_Size: {x: 1, y: 1}
|
||||
m_EdgeRadius: 0
|
||||
--- !u!212 &2908524670421552996
|
||||
SpriteRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1721370151973774447}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 0
|
||||
m_ReceiveShadows: 0
|
||||
m_DynamicOccludee: 1
|
||||
m_StaticShadowCaster: 0
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 0
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
m_StaticBatchRoot: {fileID: 0}
|
||||
m_ProbeAnchor: {fileID: 0}
|
||||
m_LightProbeVolumeOverride: {fileID: 0}
|
||||
m_ScaleInLightmap: 1
|
||||
m_ReceiveGI: 1
|
||||
m_PreserveUVs: 0
|
||||
m_IgnoreNormalsForChartDetection: 0
|
||||
m_ImportantGI: 0
|
||||
m_StitchLightmapSeams: 1
|
||||
m_SelectedEditorRenderState: 0
|
||||
m_MinimumChartSize: 4
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3}
|
||||
m_Color: {r: 0, g: 0.47058824, b: 1, a: 1}
|
||||
m_FlipX: 0
|
||||
m_FlipY: 0
|
||||
m_DrawMode: 0
|
||||
m_Size: {x: 1, y: 1}
|
||||
m_AdaptiveModeThreshold: 0.5
|
||||
m_SpriteTileMode: 0
|
||||
m_WasSpriteAssigned: 1
|
||||
m_MaskInteraction: 0
|
||||
m_SpriteSortPoint: 0
|
||||
|
|
|
|||
|
|
@ -13,15 +13,15 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6701593432788782526, guid: 85e13cc38c9c13145bdb0c612c6e2cbe, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 4
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6701593432788782526, guid: 85e13cc38c9c13145bdb0c612c6e2cbe, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -6
|
||||
value: -13.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6701593432788782526, guid: 85e13cc38c9c13145bdb0c612c6e2cbe, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -19.470001
|
||||
value: -10.470001
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6701593432788782526, guid: 85e13cc38c9c13145bdb0c612c6e2cbe, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
|
|
@ -70,15 +70,15 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6701593432788782526, guid: 85e13cc38c9c13145bdb0c612c6e2cbe, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 10
|
||||
value: 11
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6701593432788782526, guid: 85e13cc38c9c13145bdb0c612c6e2cbe, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 21
|
||||
value: 13.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6701593432788782526, guid: 85e13cc38c9c13145bdb0c612c6e2cbe, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -19.5
|
||||
value: -10.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6701593432788782526, guid: 85e13cc38c9c13145bdb0c612c6e2cbe, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
|
|
@ -127,15 +127,15 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6701593432788782526, guid: 85e13cc38c9c13145bdb0c612c6e2cbe, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 7
|
||||
value: 8
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6701593432788782526, guid: 85e13cc38c9c13145bdb0c612c6e2cbe, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -6
|
||||
value: -13.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6701593432788782526, guid: 85e13cc38c9c13145bdb0c612c6e2cbe, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -11.47
|
||||
value: -2.4700003
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6701593432788782526, guid: 85e13cc38c9c13145bdb0c612c6e2cbe, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
|
|
@ -180,15 +180,15 @@ PrefabInstance:
|
|||
m_Modifications:
|
||||
- target: {fileID: 3910403382500490960, guid: 11dc5bea289b2e94aacdc677ff0d500e, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 8
|
||||
value: 9
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3910403382500490960, guid: 11dc5bea289b2e94aacdc677ff0d500e, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -6
|
||||
value: -13.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3910403382500490960, guid: 11dc5bea289b2e94aacdc677ff0d500e, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -5
|
||||
value: 4
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3910403382500490960, guid: 11dc5bea289b2e94aacdc677ff0d500e, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
|
|
@ -241,11 +241,11 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 946406419476967723, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 18
|
||||
value: 3
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 946406419476967723, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 7.5
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 946406419476967723, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
|
|
@ -253,19 +253,27 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1510587947020119214, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -16.91
|
||||
value: -24.41
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1510587947020119214, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -20.44
|
||||
value: -11.44
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1670627767197824294, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
|
||||
propertyPath: m_LocalScale.x
|
||||
value: 3
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1670627767197824294, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
|
||||
propertyPath: m_LocalScale.y
|
||||
value: 5.7125
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1670627767197824294, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 34.55
|
||||
value: 29
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1670627767197824294, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -22.25
|
||||
value: -13.25
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1793469087448140271, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
|
||||
propertyPath: m_Size.x
|
||||
|
|
@ -20107,6 +20115,14 @@ PrefabInstance:
|
|||
propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.data[0].Array.data[320].Y
|
||||
value: -250000100
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4965404924299203782, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -7.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4965404924299203782, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 9
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7358600700238641017, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 0
|
||||
|
|
@ -20171,15 +20187,15 @@ PrefabInstance:
|
|||
m_Modifications:
|
||||
- target: {fileID: 3910403382500490960, guid: 11dc5bea289b2e94aacdc677ff0d500e, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 14
|
||||
value: 15
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3910403382500490960, guid: 11dc5bea289b2e94aacdc677ff0d500e, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 21
|
||||
value: 13.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3910403382500490960, guid: 11dc5bea289b2e94aacdc677ff0d500e, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -5
|
||||
value: 4
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3910403382500490960, guid: 11dc5bea289b2e94aacdc677ff0d500e, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
|
|
@ -20228,15 +20244,15 @@ PrefabInstance:
|
|||
m_Modifications:
|
||||
- target: {fileID: 2372936093215954024, guid: 793d5aaf9f2c50245aafbb6165f827a0, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 12
|
||||
value: 13
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2372936093215954024, guid: 793d5aaf9f2c50245aafbb6165f827a0, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 29
|
||||
value: 21.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2372936093215954024, guid: 793d5aaf9f2c50245aafbb6165f827a0, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -7.5
|
||||
value: 1.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2372936093215954024, guid: 793d5aaf9f2c50245aafbb6165f827a0, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
|
|
@ -20289,15 +20305,15 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5846939066456683150, guid: 31e12405ec9ab4145bfae33b308ffae1, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 16
|
||||
value: 17
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5846939066456683150, guid: 31e12405ec9ab4145bfae33b308ffae1, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 13
|
||||
value: 5.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5846939066456683150, guid: 31e12405ec9ab4145bfae33b308ffae1, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -7.5
|
||||
value: 1.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5846939066456683150, guid: 31e12405ec9ab4145bfae33b308ffae1, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
|
|
@ -20346,15 +20362,15 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6701593432788782526, guid: 85e13cc38c9c13145bdb0c612c6e2cbe, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 13
|
||||
value: 14
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6701593432788782526, guid: 85e13cc38c9c13145bdb0c612c6e2cbe, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 21
|
||||
value: 13.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6701593432788782526, guid: 85e13cc38c9c13145bdb0c612c6e2cbe, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -11.5
|
||||
value: -2.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6701593432788782526, guid: 85e13cc38c9c13145bdb0c612c6e2cbe, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
|
|
@ -20399,15 +20415,15 @@ PrefabInstance:
|
|||
m_Modifications:
|
||||
- target: {fileID: 6709420203007410392, guid: e156a7d368002544996415bbd26e4195, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 15
|
||||
value: 16
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6709420203007410392, guid: e156a7d368002544996415bbd26e4195, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 21
|
||||
value: 13.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6709420203007410392, guid: e156a7d368002544996415bbd26e4195, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -1.5
|
||||
value: 7.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6709420203007410392, guid: e156a7d368002544996415bbd26e4195, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
|
|
@ -20464,15 +20480,15 @@ PrefabInstance:
|
|||
m_Modifications:
|
||||
- target: {fileID: 2372936093215954024, guid: 793d5aaf9f2c50245aafbb6165f827a0, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 6
|
||||
value: 7
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2372936093215954024, guid: 793d5aaf9f2c50245aafbb6165f827a0, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -14
|
||||
value: -21.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2372936093215954024, guid: 793d5aaf9f2c50245aafbb6165f827a0, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -7.5
|
||||
value: 1.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2372936093215954024, guid: 793d5aaf9f2c50245aafbb6165f827a0, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
|
|
@ -20525,15 +20541,15 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5846939066456683150, guid: 31e12405ec9ab4145bfae33b308ffae1, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 17
|
||||
value: 18
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5846939066456683150, guid: 31e12405ec9ab4145bfae33b308ffae1, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 29
|
||||
value: 21.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5846939066456683150, guid: 31e12405ec9ab4145bfae33b308ffae1, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -15.5
|
||||
value: -6.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5846939066456683150, guid: 31e12405ec9ab4145bfae33b308ffae1, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
|
|
@ -20578,15 +20594,15 @@ PrefabInstance:
|
|||
m_Modifications:
|
||||
- target: {fileID: 6709420203007410392, guid: e156a7d368002544996415bbd26e4195, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 9
|
||||
value: 10
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6709420203007410392, guid: e156a7d368002544996415bbd26e4195, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -6
|
||||
value: -13.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6709420203007410392, guid: e156a7d368002544996415bbd26e4195, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -1.5
|
||||
value: 7.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6709420203007410392, guid: e156a7d368002544996415bbd26e4195, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
|
|
@ -20643,15 +20659,15 @@ PrefabInstance:
|
|||
m_Modifications:
|
||||
- target: {fileID: 2372936093215954024, guid: 793d5aaf9f2c50245aafbb6165f827a0, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 5
|
||||
value: 6
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2372936093215954024, guid: 793d5aaf9f2c50245aafbb6165f827a0, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 2
|
||||
value: -5.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2372936093215954024, guid: 793d5aaf9f2c50245aafbb6165f827a0, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -15.570001
|
||||
value: -6.5700006
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2372936093215954024, guid: 793d5aaf9f2c50245aafbb6165f827a0, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
|
|
@ -20700,15 +20716,15 @@ PrefabInstance:
|
|||
m_Modifications:
|
||||
- target: {fileID: 2372936093215954024, guid: 793d5aaf9f2c50245aafbb6165f827a0, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 11
|
||||
value: 12
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2372936093215954024, guid: 793d5aaf9f2c50245aafbb6165f827a0, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 13
|
||||
value: 5.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2372936093215954024, guid: 793d5aaf9f2c50245aafbb6165f827a0, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -15.5
|
||||
value: -6.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2372936093215954024, guid: 793d5aaf9f2c50245aafbb6165f827a0, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
|
|
@ -20761,15 +20777,15 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5137337335022132405, guid: 8bb5d26746f32bd41bb00bc9809065ac, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 3
|
||||
value: 4
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5137337335022132405, guid: 8bb5d26746f32bd41bb00bc9809065ac, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 7.5
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5137337335022132405, guid: 8bb5d26746f32bd41bb00bc9809065ac, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -9
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5137337335022132405, guid: 8bb5d26746f32bd41bb00bc9809065ac, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
|
|
@ -20781,15 +20797,15 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5137337335022132405, guid: 8bb5d26746f32bd41bb00bc9809065ac, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5137337335022132405, guid: 8bb5d26746f32bd41bb00bc9809065ac, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5137337335022132405, guid: 8bb5d26746f32bd41bb00bc9809065ac, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5137337335022132405, guid: 8bb5d26746f32bd41bb00bc9809065ac, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
|
|
|
|||
|
|
@ -8081,35 +8081,35 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 946406419476967723, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 7.5
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1510587947020119214, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -16.86
|
||||
value: -24.36
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1510587947020119214, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -21.97
|
||||
value: -11.97
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1670627767197824294, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
|
||||
propertyPath: m_LocalScale.x
|
||||
value: 1.9899
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1670627767197824294, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
|
||||
propertyPath: m_LocalScale.y
|
||||
value: 1.9899
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1670627767197824294, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
|
||||
propertyPath: m_LocalScale.z
|
||||
value: 1.9899
|
||||
value: 4.698552
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1670627767197824294, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 34.22
|
||||
value: 27.47
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1670627767197824294, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -21.5
|
||||
value: -11.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1793469087448140271, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
|
||||
propertyPath: m_Size.x
|
||||
|
|
@ -11899,6 +11899,14 @@ PrefabInstance:
|
|||
propertyPath: m_Tiles.Array.data[138].second.m_TileObjectToInstantiateIndex
|
||||
value: 65535
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4965404924299203782, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -7.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4965404924299203782, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 10
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7358600700238641017, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 0
|
||||
|
|
@ -12031,11 +12039,11 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5137337335022132405, guid: 8bb5d26746f32bd41bb00bc9809065ac, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 7.5
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5137337335022132405, guid: 8bb5d26746f32bd41bb00bc9809065ac, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -10
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5137337335022132405, guid: 8bb5d26746f32bd41bb00bc9809065ac, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -591,7 +591,7 @@ Transform:
|
|||
m_GameObject: {fileID: 7008207193600475141}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: -1.02, z: 0}
|
||||
m_LocalScale: {x: 0.95, y: 0.05, z: 1}
|
||||
m_LocalScale: {x: 0.95, y: 0.2, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 7008207192594766311}
|
||||
|
|
|
|||
|
|
@ -1,39 +1,43 @@
|
|||
using System;
|
||||
using Cinemachine;
|
||||
using Level;
|
||||
using UnityEngine;
|
||||
using UnityEngine.Events;
|
||||
using UnityEngine.U2D;
|
||||
|
||||
namespace Camera
|
||||
{
|
||||
public class CameraPlayerFinder : MonoBehaviour
|
||||
{
|
||||
private const float FollowOrthoSize = 7.5f;
|
||||
private const float FixedOrthoSize = 15f;
|
||||
[SerializeField] private int FixedResolutionX = 426;
|
||||
[SerializeField] private int FixedResolutionY = 240;
|
||||
[SerializeField] private int FollowResolutionX = 278;
|
||||
[SerializeField] private int FollowResolutionY = 162;
|
||||
|
||||
private CinemachineVirtualCamera _cinemachineVirtualCamera;
|
||||
private PixelPerfectCamera pixelPerfectCamera = null;
|
||||
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
_cinemachineVirtualCamera = GetComponent<CinemachineVirtualCamera>();
|
||||
pixelPerfectCamera = GameObject.FindObjectOfType<PixelPerfectCamera>();
|
||||
LevelManager.Instance.OnLevelChanged.AddListener(UpdateCamera);
|
||||
}
|
||||
|
||||
private void Update()
|
||||
private void UpdateCamera()
|
||||
{
|
||||
if (LevelManager.Instance.CurrentLevel?.FixedCameraPoint == null)
|
||||
if (LevelManager.Instance.CurrentLevel.FixedCameraPoint == null)
|
||||
{
|
||||
if (_cinemachineVirtualCamera.Follow == null)
|
||||
{
|
||||
_cinemachineVirtualCamera.Follow = LevelManager.Instance.Player.transform;
|
||||
_cinemachineVirtualCamera.m_Lens.OrthographicSize = FollowOrthoSize;
|
||||
pixelPerfectCamera.enabled = false;
|
||||
}
|
||||
_cinemachineVirtualCamera.Follow = LevelManager.Instance.Player.transform;
|
||||
pixelPerfectCamera.refResolutionX = FollowResolutionX;
|
||||
pixelPerfectCamera.refResolutionY = FollowResolutionY;
|
||||
}
|
||||
else if (_cinemachineVirtualCamera.Follow != LevelManager.Instance.CurrentLevel.FixedCameraPoint)
|
||||
else
|
||||
{
|
||||
_cinemachineVirtualCamera.Follow = LevelManager.Instance.CurrentLevel.FixedCameraPoint;
|
||||
// _cinemachineVirtualCamera.m_Lens.OrthographicSize = FixedOrthoSize;
|
||||
pixelPerfectCamera.enabled = true;
|
||||
pixelPerfectCamera.refResolutionX = FixedResolutionX;
|
||||
pixelPerfectCamera.refResolutionY = FixedResolutionY;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ using System;
|
|||
using System.Collections.Generic;
|
||||
using UI;
|
||||
using UnityEngine;
|
||||
using UnityEngine.Events;
|
||||
|
||||
namespace Level
|
||||
{
|
||||
|
|
@ -38,6 +39,8 @@ namespace Level
|
|||
private Level currentLevel = null;
|
||||
public Level CurrentLevel => currentLevel;
|
||||
|
||||
public UnityEvent OnLevelChanged = new UnityEvent();
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
if (_instance == null)
|
||||
|
|
@ -92,6 +95,7 @@ namespace Level
|
|||
Player.GetComponent<Rigidbody2D>().velocity = Vector2.zero;
|
||||
|
||||
UIManager.Instance.CloseAllCanvases();
|
||||
OnLevelChanged?.Invoke();
|
||||
}
|
||||
|
||||
public void DisableAllLevels()
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 275 B |
|
|
@ -0,0 +1,98 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 5d80e2263a879b64bae1b714e4ba2f31
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
serializedVersion: 11
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
vTOnly: 0
|
||||
ignoreMasterTextureLimit: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 1
|
||||
aniso: 1
|
||||
mipBias: 0
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
flipbookRows: 1
|
||||
flipbookColumns: 1
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
ignorePngGamma: 0
|
||||
applyGammaDecoding: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 3
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 5e97eb03825dee720800000000000000
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
nameFileIdTable: {}
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Loading…
Reference in New Issue