Kritik Punkte im Szene 14 angegangen
-> Neues Partikel Prefab für jeweils Plattformen anderen Dimension -> NoShift Prefab mit Trigger in dem nicht dimShifted werden kann -> Richtige Musik -> Plattformen laufen jetzt Synchron -> Frank fällt hinter das Wasser
This commit is contained in:
parent
279e8976af
commit
869f066a92
83
Assets/AssetsFORELLE/Prefabs/FloatingPlatform(N) Variant 1.prefab
generated
Normal file
83
Assets/AssetsFORELLE/Prefabs/FloatingPlatform(N) Variant 1.prefab
generated
Normal file
@ -0,0 +1,83 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!1001 &6252729175500780014
|
||||||
|
PrefabInstance:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Modification:
|
||||||
|
m_TransformParent: {fileID: 0}
|
||||||
|
m_Modifications:
|
||||||
|
- target: {fileID: 3128876235421336206, guid: 525621658d61b09439b07a6c216a3d3a, type: 3}
|
||||||
|
propertyPath: m_SpriteTilingProperty.drawMode
|
||||||
|
value: 2
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 3128876235421336206, guid: 525621658d61b09439b07a6c216a3d3a, type: 3}
|
||||||
|
propertyPath: m_SpriteTilingProperty.oldSize.x
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 3128876235421336206, guid: 525621658d61b09439b07a6c216a3d3a, type: 3}
|
||||||
|
propertyPath: m_SpriteTilingProperty.oldSize.y
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 4706343723101285080, guid: 525621658d61b09439b07a6c216a3d3a, type: 3}
|
||||||
|
propertyPath: m_Sprite
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 21300000, guid: 0cf9ee8ccc024624f943995d05fe41e2, type: 3}
|
||||||
|
- target: {fileID: 5311324458996372741, guid: 525621658d61b09439b07a6c216a3d3a, type: 3}
|
||||||
|
propertyPath: m_RootOrder
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 5311324458996372741, guid: 525621658d61b09439b07a6c216a3d3a, type: 3}
|
||||||
|
propertyPath: m_LocalScale.x
|
||||||
|
value: 0.99999994
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 5311324458996372741, guid: 525621658d61b09439b07a6c216a3d3a, type: 3}
|
||||||
|
propertyPath: m_LocalScale.y
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 5311324458996372741, guid: 525621658d61b09439b07a6c216a3d3a, type: 3}
|
||||||
|
propertyPath: m_LocalPosition.x
|
||||||
|
value: 41.219112
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 5311324458996372741, guid: 525621658d61b09439b07a6c216a3d3a, type: 3}
|
||||||
|
propertyPath: m_LocalPosition.y
|
||||||
|
value: -4.400285
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 5311324458996372741, guid: 525621658d61b09439b07a6c216a3d3a, type: 3}
|
||||||
|
propertyPath: m_LocalPosition.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 5311324458996372741, guid: 525621658d61b09439b07a6c216a3d3a, type: 3}
|
||||||
|
propertyPath: m_LocalRotation.w
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 5311324458996372741, guid: 525621658d61b09439b07a6c216a3d3a, type: 3}
|
||||||
|
propertyPath: m_LocalRotation.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 5311324458996372741, guid: 525621658d61b09439b07a6c216a3d3a, type: 3}
|
||||||
|
propertyPath: m_LocalRotation.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 5311324458996372741, guid: 525621658d61b09439b07a6c216a3d3a, type: 3}
|
||||||
|
propertyPath: m_LocalRotation.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 5311324458996372741, guid: 525621658d61b09439b07a6c216a3d3a, type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 5311324458996372741, guid: 525621658d61b09439b07a6c216a3d3a, type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 5311324458996372741, guid: 525621658d61b09439b07a6c216a3d3a, type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 6570034849947570412, guid: 525621658d61b09439b07a6c216a3d3a, type: 3}
|
||||||
|
propertyPath: m_Name
|
||||||
|
value: FloatingPlatform(N) Variant 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
m_RemovedComponents: []
|
||||||
|
m_SourcePrefab: {fileID: 100100000, guid: 525621658d61b09439b07a6c216a3d3a, type: 3}
|
7
Assets/AssetsFORELLE/Prefabs/FloatingPlatform(N) Variant 1.prefab.meta
generated
Normal file
7
Assets/AssetsFORELLE/Prefabs/FloatingPlatform(N) Variant 1.prefab.meta
generated
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 5f238cd0992249a45a0e9c8e6266795e
|
||||||
|
PrefabImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
73
Assets/AssetsFORELLE/Prefabs/NoDimShift.prefab
generated
Normal file
73
Assets/AssetsFORELLE/Prefabs/NoDimShift.prefab
generated
Normal file
@ -0,0 +1,73 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!1 &550275523921638491
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 550275523921638488}
|
||||||
|
- component: {fileID: 550275523921638489}
|
||||||
|
- component: {fileID: 550275523921638486}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: NoDimShift
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!4 &550275523921638488
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 550275523921638491}
|
||||||
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
|
m_LocalPosition: {x: 9.19, y: -4.18, 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!61 &550275523921638489
|
||||||
|
BoxCollider2D:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 550275523921638491}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_Density: 1
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_IsTrigger: 1
|
||||||
|
m_UsedByEffector: 0
|
||||||
|
m_UsedByComposite: 0
|
||||||
|
m_Offset: {x: -5.57, 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: 22.82, y: 3.34}
|
||||||
|
m_EdgeRadius: 0
|
||||||
|
--- !u!114 &550275523921638486
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 550275523921638491}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: ca046cb971e6b024aa39f680d291b6cb, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
7
Assets/AssetsFORELLE/Prefabs/NoDimShift.prefab.meta
generated
Normal file
7
Assets/AssetsFORELLE/Prefabs/NoDimShift.prefab.meta
generated
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 41aef91f60ca7f14797653dfa4481227
|
||||||
|
PrefabImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
4872
Assets/AssetsFORELLE/Prefabs/ParticlePlatformsDim1.prefab
generated
Normal file
4872
Assets/AssetsFORELLE/Prefabs/ParticlePlatformsDim1.prefab
generated
Normal file
File diff suppressed because it is too large
Load Diff
7
Assets/AssetsFORELLE/Prefabs/ParticlePlatformsDim1.prefab.meta
generated
Normal file
7
Assets/AssetsFORELLE/Prefabs/ParticlePlatformsDim1.prefab.meta
generated
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: f6843a55cb00c214ebc74e6f5e3b8ba2
|
||||||
|
PrefabImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
4872
Assets/AssetsFORELLE/Prefabs/ParticlePlatformsDim2.prefab
generated
Normal file
4872
Assets/AssetsFORELLE/Prefabs/ParticlePlatformsDim2.prefab
generated
Normal file
File diff suppressed because it is too large
Load Diff
7
Assets/AssetsFORELLE/Prefabs/ParticlePlatformsDim2.prefab.meta
generated
Normal file
7
Assets/AssetsFORELLE/Prefabs/ParticlePlatformsDim2.prefab.meta
generated
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: de0dcd9c433e06d47a2c541a01d54f65
|
||||||
|
PrefabImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
@ -8,7 +8,7 @@ public class DimShift : MonoBehaviour
|
|||||||
// 0 = inactive in Dimension 1
|
// 0 = inactive in Dimension 1
|
||||||
// 1 = active in Dimension 1
|
// 1 = active in Dimension 1
|
||||||
[SerializeField] private bool inFirstDim;
|
[SerializeField] private bool inFirstDim;
|
||||||
[SerializeField] private bool ShiftingEnabled;
|
[SerializeField] public bool ShiftingEnabled;
|
||||||
|
|
||||||
|
|
||||||
AudioSource Audio1;
|
AudioSource Audio1;
|
||||||
|
38
Assets/AssetsFORELLE/Script/NoShift.cs
Normal file
38
Assets/AssetsFORELLE/Script/NoShift.cs
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
public class NoShift : MonoBehaviour
|
||||||
|
{
|
||||||
|
|
||||||
|
private DimShift dimshift;
|
||||||
|
// Start is called before the first frame update
|
||||||
|
void Start()
|
||||||
|
{
|
||||||
|
dimshift = GameObject.Find("Frank").GetComponent<DimShift>();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Update is called once per frame
|
||||||
|
void Update()
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
void OnTriggerEnter2D(Collider2D col)
|
||||||
|
{
|
||||||
|
if(col.CompareTag("Player"))
|
||||||
|
{
|
||||||
|
dimshift.ShiftingEnabled = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void OnTriggerExit2D(Collider2D col)
|
||||||
|
{
|
||||||
|
if(col.CompareTag("Player"))
|
||||||
|
{
|
||||||
|
dimshift.ShiftingEnabled = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
11
Assets/AssetsFORELLE/Script/NoShift.cs.meta
generated
Normal file
11
Assets/AssetsFORELLE/Script/NoShift.cs.meta
generated
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: ca046cb971e6b024aa39f680d291b6cb
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
907
Assets/Scenes/ScenesInGame/14Level_Vanessa.unity
generated
907
Assets/Scenes/ScenesInGame/14Level_Vanessa.unity
generated
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user