Merge remote-tracking branch 'origin/Syntriax' into Over

# Conflicts:
#	Assets/Resources/Levels/2.prefab
This commit is contained in:
OverflowNarhoym 2022-02-26 23:36:42 +01:00
commit 11a1c037b9
19 changed files with 129842 additions and 2786 deletions

View File

@ -0,0 +1,135 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-8965603392484994096
MonoBehaviour:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 40b924e2dad56384a8df2a1e111bb675, type: 3}
m_Name: Vignette
m_EditorClassIdentifier:
active: 1
enabled:
overrideState: 1
value: 1
mode:
overrideState: 1
value: 0
color:
overrideState: 1
value: {r: 0, g: 0, b: 0, a: 1}
center:
overrideState: 1
value: {x: 0.5, y: 0.5}
intensity:
overrideState: 1
value: 0.189
smoothness:
overrideState: 1
value: 1
roundness:
overrideState: 0
value: 1
rounded:
overrideState: 0
value: 0
mask:
overrideState: 0
value: {fileID: 0}
defaultState: 1
opacity:
overrideState: 0
value: 1
--- !u!114 &-1380422288664597932
MonoBehaviour:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 48a79b01ea5641d4aa6daa2e23605641, type: 3}
m_Name: Bloom
m_EditorClassIdentifier:
active: 1
enabled:
overrideState: 1
value: 1
intensity:
overrideState: 1
value: 20
threshold:
overrideState: 1
value: 1
softKnee:
overrideState: 0
value: 0.307
clamp:
overrideState: 0
value: 65472
diffusion:
overrideState: 1
value: 6.33
anamorphicRatio:
overrideState: 0
value: 1
color:
overrideState: 0
value: {r: 1, g: 1, b: 1, a: 1}
fastMode:
overrideState: 0
value: 0
dirtTexture:
overrideState: 0
value: {fileID: 0}
defaultState: 1
dirtIntensity:
overrideState: 0
value: 0
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8e6292b2c06870d4495f009f912b9600, type: 3}
m_Name: Main Camera Profile
m_EditorClassIdentifier:
settings:
- {fileID: -1380422288664597932}
- {fileID: -8965603392484994096}
- {fileID: 93079295664231736}
--- !u!114 &93079295664231736
MonoBehaviour:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6050e2d5de785ce4d931e4dbdbf2d755, type: 3}
m_Name: ChromaticAberration
m_EditorClassIdentifier:
active: 0
enabled:
overrideState: 1
value: 1
spectralLut:
overrideState: 1
value: {fileID: 0}
defaultState: 1
intensity:
overrideState: 1
value: 0.242
fastMode:
overrideState: 0
value: 0

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 1aedc90f49b786b40ad5df633a7b3fa8
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -101,6 +101,8 @@ GameObject:
- component: {fileID: 2662163039882375474}
- component: {fileID: 2662163039882375479}
- component: {fileID: 2662163039882375478}
- component: {fileID: 8940945563218864277}
- component: {fileID: 6035977110930100987}
m_Layer: 0
m_Name: Main Camera
m_TagString: MainCamera
@ -228,6 +230,83 @@ MonoBehaviour:
m_CropFrameX: 1
m_CropFrameY: 1
m_StretchFill: 1
--- !u!114 &8940945563218864277
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2662163039882375475}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 948f4100a11a5c24981795d21301da5c, type: 3}
m_Name:
m_EditorClassIdentifier:
volumeTrigger: {fileID: 2662163039882375472}
volumeLayer:
serializedVersion: 2
m_Bits: 2147483647
stopNaNPropagation: 1
finalBlitToCameraTarget: 0
antialiasingMode: 0
temporalAntialiasing:
jitterSpread: 0.75
sharpness: 0.25
stationaryBlending: 0.95
motionBlending: 0.85
subpixelMorphologicalAntialiasing:
quality: 2
fastApproximateAntialiasing:
fastMode: 0
keepAlpha: 0
fog:
enabled: 1
excludeSkybox: 1
debugLayer:
lightMeter:
width: 512
height: 256
showCurves: 1
histogram:
width: 512
height: 256
channel: 3
waveform:
exposure: 0.12
height: 256
vectorscope:
size: 256
exposure: 0.12
overlaySettings:
linearDepth: 0
motionColorIntensity: 4
motionGridSize: 64
colorBlindnessType: 0
colorBlindnessStrength: 1
m_Resources: {fileID: 11400000, guid: d82512f9c8e5d4a4d938b575d47f88d4, type: 2}
m_ShowToolkit: 0
m_ShowCustomSorter: 0
breakBeforeColorGrading: 0
m_BeforeTransparentBundles: []
m_BeforeStackBundles: []
m_AfterStackBundles: []
--- !u!114 &6035977110930100987
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2662163039882375475}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8b9a305e18de0c04dbd257a21cd47087, type: 3}
m_Name:
m_EditorClassIdentifier:
sharedProfile: {fileID: 11400000, guid: 1aedc90f49b786b40ad5df633a7b3fa8, type: 2}
isGlobal: 1
blendDistance: 0
weight: 1
priority: 0
--- !u!1 &2662163039948621855
GameObject:
m_ObjectHideFlags: 0

View File

@ -81,7 +81,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
layerMask:
serializedVersion: 2
m_Bits: 4294967103
m_Bits: 4294965311
--- !u!1 &5991452379241120368
GameObject:
m_ObjectHideFlags: 0
@ -128,7 +128,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
layerMask:
serializedVersion: 2
m_Bits: 4294967103
m_Bits: 4294965311
--- !u!1 &7391517555913877016
GameObject:
m_ObjectHideFlags: 0
@ -371,7 +371,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
layerMask:
serializedVersion: 2
m_Bits: 4294967231
m_Bits: 4294965439
--- !u!1 &7984300476647789986
GameObject:
m_ObjectHideFlags: 0
@ -418,4 +418,4 @@ MonoBehaviour:
m_EditorClassIdentifier:
layerMask:
serializedVersion: 2
m_Bits: 4294967231
m_Bits: 4294965439

View File

@ -14,7 +14,7 @@ GameObject:
- component: {fileID: 6241563109229534231}
- component: {fileID: 6151226926209823380}
- component: {fileID: 4209054098996045085}
m_Layer: 0
m_Layer: 8
m_Name: End Point
m_TagString: Untagged
m_Icon: {fileID: 0}

View File

@ -31,6 +31,7 @@ Transform:
- {fileID: 1670627767197824294}
- {fileID: 1510587947020119214}
- {fileID: 4965404924299203782}
- {fileID: 946406419476967723}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -263,6 +264,68 @@ TilemapCollider2D:
m_Offset: {x: 0, y: 0}
m_MaximumTileChangeCount: 1000
m_ExtrusionFactor: 0.00001
--- !u!1001 &1625016414579237235
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 7358600700238641017}
m_Modifications:
- target: {fileID: 1889645376396323357, guid: e3cbe68649dcad941a616ff82c488e61, type: 3}
propertyPath: m_Name
value: Mirror Line
objectReference: {fileID: 0}
- target: {fileID: 1994945436606943320, guid: e3cbe68649dcad941a616ff82c488e61, type: 3}
propertyPath: m_RootOrder
value: 3
objectReference: {fileID: 0}
- target: {fileID: 1994945436606943320, guid: e3cbe68649dcad941a616ff82c488e61, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1994945436606943320, guid: e3cbe68649dcad941a616ff82c488e61, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1994945436606943320, guid: e3cbe68649dcad941a616ff82c488e61, type: 3}
propertyPath: m_LocalPosition.z
value: -1
objectReference: {fileID: 0}
- target: {fileID: 1994945436606943320, guid: e3cbe68649dcad941a616ff82c488e61, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1994945436606943320, guid: e3cbe68649dcad941a616ff82c488e61, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1994945436606943320, guid: e3cbe68649dcad941a616ff82c488e61, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1994945436606943320, guid: e3cbe68649dcad941a616ff82c488e61, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1994945436606943320, guid: e3cbe68649dcad941a616ff82c488e61, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1994945436606943320, guid: e3cbe68649dcad941a616ff82c488e61, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1994945436606943320, guid: e3cbe68649dcad941a616ff82c488e61, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e3cbe68649dcad941a616ff82c488e61, type: 3}
--- !u!4 &946406419476967723 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1994945436606943320, guid: e3cbe68649dcad941a616ff82c488e61, type: 3}
m_PrefabInstance: {fileID: 1625016414579237235}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1736243607391024486
PrefabInstance:
m_ObjectHideFlags: 0

View File

@ -0,0 +1,86 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &1889645376396323357
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1994945436606943320}
- component: {fileID: 8631553122391045642}
m_Layer: 0
m_Name: Mirror Line
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1994945436606943320
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1889645376396323357}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.25, y: 1000, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &8631553122391045642
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1889645376396323357}
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.47021246, 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

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: e3cbe68649dcad941a616ff82c488e61
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -239,6 +239,18 @@ PrefabInstance:
propertyPath: m_Name
value: 1
objectReference: {fileID: 0}
- target: {fileID: 946406419476967723, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
propertyPath: m_RootOrder
value: 18
objectReference: {fileID: 0}
- target: {fileID: 946406419476967723, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
propertyPath: m_LocalPosition.x
value: 7.5
objectReference: {fileID: 0}
- target: {fileID: 946406419476967723, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
propertyPath: m_LocalPosition.z
value: -5
objectReference: {fileID: 0}
- target: {fileID: 1510587947020119214, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
propertyPath: m_LocalPosition.x
value: -16.91
@ -20753,11 +20765,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5137337335022132405, guid: 8bb5d26746f32bd41bb00bc9809065ac, type: 3}
propertyPath: m_LocalPosition.x
value: 73
value: 7.5
objectReference: {fileID: 0}
- target: {fileID: 5137337335022132405, guid: 8bb5d26746f32bd41bb00bc9809065ac, type: 3}
propertyPath: m_LocalPosition.y
value: -42.1
value: -9
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

View File

@ -46,7 +46,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
layerMask:
serializedVersion: 2
m_Bits: 4294966335
m_Bits: 4294965311
--- !u!1 &2083070160
GameObject:
m_ObjectHideFlags: 0
@ -93,7 +93,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
layerMask:
serializedVersion: 2
m_Bits: 4294966335
m_Bits: 4294965311
--- !u!1 &2460162872455742730
GameObject:
m_ObjectHideFlags: 0
@ -140,7 +140,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
layerMask:
serializedVersion: 2
m_Bits: 4294966912
m_Bits: 4294965888
--- !u!1 &4589051977042145238
GameObject:
m_ObjectHideFlags: 0
@ -611,7 +611,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
layerMask:
serializedVersion: 2
m_Bits: 4294966280
m_Bits: 4294965256
--- !u!1 &7718275112619760423
GameObject:
m_ObjectHideFlags: 0

View File

@ -65,7 +65,7 @@ namespace AI
spriteRenderer.flipX = !isMovingRight;
}
movement.Move(isMovingRight ? 1f : -1f);
movement.Move(isMovingRight ? 2f : -2f);
}
protected CollisionChecker GetCollisionCheckerOnChild(string childName)

View File

@ -1,21 +1,40 @@
using Cinemachine;
using Level;
using UnityEngine;
using UnityEngine.U2D;
namespace Camera
{
public class CameraPlayerFinder : MonoBehaviour
{
private const float FollowOrthoSize = 7.5f;
private const float FixedOrthoSize = 15f;
private CinemachineVirtualCamera _cinemachineVirtualCamera;
private PixelPerfectCamera pixelPerfectCamera = null;
private void Awake()
{
_cinemachineVirtualCamera = GetComponent<CinemachineVirtualCamera>();
pixelPerfectCamera = GameObject.FindObjectOfType<PixelPerfectCamera>();
}
private void Update()
{
if (_cinemachineVirtualCamera.Follow == null && GameObject.FindWithTag("Player") != null && !GameObject.Find("Fixed Camera Point"))
_cinemachineVirtualCamera.Follow = GameObject.FindWithTag("Player").transform;
if (LevelManager.Instance.CurrentLevel?.FixedCameraPoint == null)
{
if (_cinemachineVirtualCamera.Follow == null)
{
_cinemachineVirtualCamera.Follow = LevelManager.Instance.Player.transform;
_cinemachineVirtualCamera.m_Lens.OrthographicSize = FollowOrthoSize;
pixelPerfectCamera.enabled = false;
}
}
else if (_cinemachineVirtualCamera.Follow != LevelManager.Instance.CurrentLevel.FixedCameraPoint)
{
_cinemachineVirtualCamera.Follow = LevelManager.Instance.CurrentLevel.FixedCameraPoint;
// _cinemachineVirtualCamera.m_Lens.OrthographicSize = FixedOrthoSize;
pixelPerfectCamera.enabled = true;
}
}
}
}

View File

@ -8,6 +8,7 @@
"com.unity.ide.visualstudio": "2.0.14",
"com.unity.ide.vscode": "1.2.5",
"com.unity.inputsystem": "1.3.0",
"com.unity.postprocessing": "3.2.1",
"com.unity.test-framework": "1.1.31",
"com.unity.textmeshpro": "3.0.6",
"com.unity.timeline": "1.6.4",

View File

@ -189,6 +189,15 @@
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.postprocessing": {
"version": "3.2.1",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.modules.physics": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.services.core": {
"version": "1.0.1",
"depth": 1,

View File

@ -53,4 +53,4 @@ Physics2DSettings:
m_ColliderAsleepColor: {r: 0.5686275, g: 0.95686275, b: 0.54509807, a: 0.36078432}
m_ColliderContactColor: {r: 1, g: 0, b: 1, a: 0.6862745}
m_ColliderAABBColor: {r: 1, g: 1, b: 0, a: 0.2509804}
m_LayerCollisionMatrix: fffefffffffefffffffefffffffefffffffefffffffefffffffffffffffeffff40feffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
m_LayerCollisionMatrix: fffefffffffefffffffefffffffefffffffefffffffefffffffbfffffffaffff40fafffffffbffff3ffcffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

View File

@ -658,7 +658,21 @@ PlayerSettings:
webGLLinkerTarget: 1
webGLThreadsSupport: 0
webGLDecompressionFallback: 0
scriptingDefineSymbols: {}
scriptingDefineSymbols:
Android: UNITY_POST_PROCESSING_STACK_V2
CloudRendering: UNITY_POST_PROCESSING_STACK_V2
EmbeddedLinux: UNITY_POST_PROCESSING_STACK_V2
GameCoreXboxOne: UNITY_POST_PROCESSING_STACK_V2
Lumin: UNITY_POST_PROCESSING_STACK_V2
Nintendo Switch: UNITY_POST_PROCESSING_STACK_V2
PS4: UNITY_POST_PROCESSING_STACK_V2
PS5: UNITY_POST_PROCESSING_STACK_V2
Stadia: UNITY_POST_PROCESSING_STACK_V2
Standalone: UNITY_POST_PROCESSING_STACK_V2
WebGL: UNITY_POST_PROCESSING_STACK_V2
Windows Store Apps: UNITY_POST_PROCESSING_STACK_V2
XboxOne: UNITY_POST_PROCESSING_STACK_V2
tvOS: UNITY_POST_PROCESSING_STACK_V2
additionalCompilerArguments: {}
platformArchitecture: {}
scriptingBackend: {}

View File

@ -15,7 +15,7 @@ TagManager:
- Enemy
- Interactables
- Projectiles
-
- Fake
-
-
-