Symmetrical/BGJ-2022.1
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	UserSettings/EditorUserSettings.asset
#	UserSettings/Layouts/default-2021.dwlt
This commit is contained in:
OverflowNarhoym
2022-02-23 12:05:27 +01:00
parent eb0accb0ec a1e5a5ad88
commit 2ab3a57899
95 changed files with 14728 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Assets/Prefabs/Interactable.meta Normal file
View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 74528440f805bcc4aa9a2c36257c98ba
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

155
Assets/Prefabs/Interactable/Collider Trigger Interactable Variant.prefab Normal file
View File

@@ -0,0 +1,155 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &3107641084688348912
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1282702290520677836, guid: 3864d3da05213f64788c898032ba32b2, type: 3}
propertyPath: onInteractEvent.m_PersistentCalls.m_Calls.Array.size
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1282702290520677836, guid: 3864d3da05213f64788c898032ba32b2, type: 3}
propertyPath: onInteractEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 6
objectReference: {fileID: 0}
- target: {fileID: 1282702290520677836, guid: 3864d3da05213f64788c898032ba32b2, type: 3}
propertyPath: onInteractEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 0}
- target: {fileID: 1282702290520677836, guid: 3864d3da05213f64788c898032ba32b2, type: 3}
propertyPath: onInteractEvent.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 1282702290520677836, guid: 3864d3da05213f64788c898032ba32b2, type: 3}
propertyPath: onInteractEvent.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: SetActive
objectReference: {fileID: 0}
- target: {fileID: 1282702290520677836, guid: 3864d3da05213f64788c898032ba32b2, type: 3}
propertyPath: onInteractEvent.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: UnityEngine.GameObject, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 1282702290520677836, guid: 3864d3da05213f64788c898032ba32b2, type: 3}
propertyPath: onInteractEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_BoolArgument
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1282702290520677836, guid: 3864d3da05213f64788c898032ba32b2, type: 3}
propertyPath: onInteractEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 1282702290520677837, guid: 3864d3da05213f64788c898032ba32b2, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1282702290520677837, guid: 3864d3da05213f64788c898032ba32b2, type: 3}
propertyPath: m_LocalPosition.x
value: 8
objectReference: {fileID: 0}
- target: {fileID: 1282702290520677837, guid: 3864d3da05213f64788c898032ba32b2, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1282702290520677837, guid: 3864d3da05213f64788c898032ba32b2, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1282702290520677837, guid: 3864d3da05213f64788c898032ba32b2, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1282702290520677837, guid: 3864d3da05213f64788c898032ba32b2, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1282702290520677837, guid: 3864d3da05213f64788c898032ba32b2, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1282702290520677837, guid: 3864d3da05213f64788c898032ba32b2, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1282702290520677837, guid: 3864d3da05213f64788c898032ba32b2, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1282702290520677837, guid: 3864d3da05213f64788c898032ba32b2, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1282702290520677837, guid: 3864d3da05213f64788c898032ba32b2, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1282702290520677839, guid: 3864d3da05213f64788c898032ba32b2, type: 3}
propertyPath: m_Name
value: Collider Trigger Interactable Variant
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 3864d3da05213f64788c898032ba32b2, type: 3}
--- !u!1 &4246223703925500735 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1282702290520677839, guid: 3864d3da05213f64788c898032ba32b2, type: 3}
m_PrefabInstance: {fileID: 3107641084688348912}
m_PrefabAsset: {fileID: 0}
--- !u!50 &765001272
Rigidbody2D:
serializedVersion: 4
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4246223703925500735}
m_BodyType: 0
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
--- !u!61 &765001273
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4246223703925500735}
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, y: 0}
oldSize: {x: 0, y: 0}
newSize: {x: 0, y: 0}
adaptiveTilingThreshold: 0
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 2, y: 2}
m_EdgeRadius: 0
--- !u!114 &765001274
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4246223703925500735}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c53f90e7ee31f3d45b696e5a54b098b5, type: 3}
m_Name:
m_EditorClassIdentifier:

7
Assets/Prefabs/Interactable/Collider Trigger Interactable Variant.prefab.meta Normal file
View File

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

52
Assets/Prefabs/Interactable/Interactable Base.prefab Normal file
View File

@@ -0,0 +1,52 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &1282702290520677839
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1282702290520677837}
- component: {fileID: 1282702290520677836}
m_Layer: 8
m_Name: Interactable Base
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1282702290520677837
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1282702290520677839}
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: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1282702290520677836
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1282702290520677839}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 91f70c4da2fbf6e45995a8aa8153dded, type: 3}
m_Name:
m_EditorClassIdentifier:
onInteractEvent:
m_PersistentCalls:
m_Calls: []
onResetInteractionEvent:
m_PersistentCalls:
m_Calls: []

7
Assets/Prefabs/Interactable/Interactable Base.prefab.meta Normal file
View File

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

151
Assets/Prefabs/Interactable/Key Press Interactable Variant.prefab Normal file
View File

@@ -0,0 +1,151 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &6684652328006411780
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1282702290520677836, guid: 3864d3da05213f64788c898032ba32b2, type: 3}
propertyPath: onInteractEvent.m_PersistentCalls.m_Calls.Array.size
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1282702290520677836, guid: 3864d3da05213f64788c898032ba32b2, type: 3}
propertyPath: onInteractEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 6
objectReference: {fileID: 0}
- target: {fileID: 1282702290520677836, guid: 3864d3da05213f64788c898032ba32b2, type: 3}
propertyPath: onInteractEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 0}
- target: {fileID: 1282702290520677836, guid: 3864d3da05213f64788c898032ba32b2, type: 3}
propertyPath: onInteractEvent.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 1282702290520677836, guid: 3864d3da05213f64788c898032ba32b2, type: 3}
propertyPath: onInteractEvent.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: SetActive
objectReference: {fileID: 0}
- target: {fileID: 1282702290520677836, guid: 3864d3da05213f64788c898032ba32b2, type: 3}
propertyPath: onInteractEvent.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: UnityEngine.GameObject, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 1282702290520677836, guid: 3864d3da05213f64788c898032ba32b2, type: 3}
propertyPath: onInteractEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 1282702290520677837, guid: 3864d3da05213f64788c898032ba32b2, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1282702290520677837, guid: 3864d3da05213f64788c898032ba32b2, type: 3}
propertyPath: m_LocalPosition.x
value: 7.66
objectReference: {fileID: 0}
- target: {fileID: 1282702290520677837, guid: 3864d3da05213f64788c898032ba32b2, type: 3}
propertyPath: m_LocalPosition.y
value: 2.38
objectReference: {fileID: 0}
- target: {fileID: 1282702290520677837, guid: 3864d3da05213f64788c898032ba32b2, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1282702290520677837, guid: 3864d3da05213f64788c898032ba32b2, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1282702290520677837, guid: 3864d3da05213f64788c898032ba32b2, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1282702290520677837, guid: 3864d3da05213f64788c898032ba32b2, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1282702290520677837, guid: 3864d3da05213f64788c898032ba32b2, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1282702290520677837, guid: 3864d3da05213f64788c898032ba32b2, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1282702290520677837, guid: 3864d3da05213f64788c898032ba32b2, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1282702290520677837, guid: 3864d3da05213f64788c898032ba32b2, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1282702290520677839, guid: 3864d3da05213f64788c898032ba32b2, type: 3}
propertyPath: m_Name
value: Key Press Interactable
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 3864d3da05213f64788c898032ba32b2, type: 3}
--- !u!1 &5551167095143660491 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1282702290520677839, guid: 3864d3da05213f64788c898032ba32b2, type: 3}
m_PrefabInstance: {fileID: 6684652328006411780}
m_PrefabAsset: {fileID: 0}
--- !u!50 &1129381507
Rigidbody2D:
serializedVersion: 4
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5551167095143660491}
m_BodyType: 0
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
--- !u!61 &1129381508
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5551167095143660491}
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, y: 0}
oldSize: {x: 0, y: 0}
newSize: {x: 0, y: 0}
adaptiveTilingThreshold: 0
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 2, y: 2}
m_EdgeRadius: 0
--- !u!114 &1129381506
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5551167095143660491}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 43ee1645cb5332c4b86608159117c837, type: 3}
m_Name:
m_EditorClassIdentifier:

7
Assets/Prefabs/Interactable/Key Press Interactable Variant.prefab.meta Normal file
View File

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