Conjure/creative-jam-20
4
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into music

Browse Source
This commit is contained in:
TheDaringDan 2022-05-15 15:24:35 -04:00
commit cd95e1ffa1
5 changed files with 1272 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

830
Assets/Prefabs/Canvas_UI.prefab
View File

File diff suppressed because it is too large Load Diff

123
Assets/Prefabs/ChangeDimension.prefab Normal file
View File

@ -0,0 +1,123 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &6877713656209657579
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1113207575844450216}
- component: {fileID: 63573765965039346}
- component: {fileID: 7893275847817886005}
- component: {fileID: 979262304345967077}
m_Layer: 5
m_Name: ChangeDimension
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1113207575844450216
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6877713656209657579}
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}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -918, y: 0}
m_SizeDelta: {x: 40, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &63573765965039346
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6877713656209657579}
m_CullTransparentMesh: 1
--- !u!114 &7893275847817886005
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6877713656209657579}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 6a83e328de6f8fc4fbecb998016c7399, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &979262304345967077
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6877713656209657579}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 7893275847817886005}
m_OnClick:
m_PersistentCalls:
m_Calls: []

7
Assets/Prefabs/ChangeDimension.prefab.meta Normal file
View File

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

373
Assets/Scenes/Jason.unity
View File

@ -130,86 +130,170 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 297948476404860644, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 297948476404860644, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 297948476404860644, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 297948476404860644, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 430403745636601587, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: player
- target: {fileID: 118443340735125584, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_fontAsset
value:
objectReference: {fileID: 2014026694}
- target: {fileID: 1245760476298502058, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2082787375140496085, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2082787375140496085, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2082787375140496085, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2082787375140496085, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3203615922723506192, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: player
objectReference: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
- target: {fileID: 118443340735125584, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_sharedMaterial
value:
objectReference: {fileID: 2014026694}
- target: {fileID: 3290620518113273233, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
objectReference: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
- target: {fileID: 297948476404860644, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3290620518113273233, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
- target: {fileID: 297948476404860644, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3290620518113273233, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
- target: {fileID: 297948476404860644, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3290620518113273233, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
- target: {fileID: 297948476404860644, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3868787890645716629, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_AnchorMax.y
value: 0
- target: {fileID: 512180123099629689, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3868787890645716629, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_AnchorMin.y
value: 0
- target: {fileID: 512180123099629689, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 3
objectReference: {fileID: 0}
- target: {fileID: 3868787890645716629, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3868787890645716629, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4088869081495123135, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: player
- target: {fileID: 512180123099629689, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 2014026694}
objectReference: {fileID: 1383061313}
- target: {fileID: 512180123099629689, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 512180123099629689, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: SwitchWorld
objectReference: {fileID: 0}
- target: {fileID: 512180123099629689, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: WorldSwitcher, Assembly-CSharp
objectReference: {fileID: 0}
- target: {fileID: 512180123099629689, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_IntArgument
value: 2
objectReference: {fileID: 0}
- target: {fileID: 512180123099629689, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 852356801747251430, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_fontAsset
value:
objectReference: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
- target: {fileID: 852356801747251430, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_sharedMaterial
value:
objectReference: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
- target: {fileID: 946565392929179851, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_fontAsset
value:
objectReference: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
- target: {fileID: 946565392929179851, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_sharedMaterial
value:
objectReference: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
- target: {fileID: 975399117228444407, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_fontAsset
value:
objectReference: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
- target: {fileID: 975399117228444407, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_sharedMaterial
value:
objectReference: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
- target: {fileID: 2082787375140496085, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2082787375140496085, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2082787375140496085, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2082787375140496085, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3168393835055405244, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3168393835055405244, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 3
objectReference: {fileID: 0}
- target: {fileID: 3168393835055405244, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 1383061313}
- target: {fileID: 3168393835055405244, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 3168393835055405244, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: SwitchWorld
objectReference: {fileID: 0}
- target: {fileID: 3168393835055405244, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: WorldSwitcher, Assembly-CSharp
objectReference: {fileID: 0}
- target: {fileID: 3168393835055405244, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 3290620518113273233, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3290620518113273233, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3290620518113273233, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3290620518113273233, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3868787890645716629, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3868787890645716629, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3868787890645716629, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3868787890645716629, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3942264960756445310, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_fontAsset
value:
objectReference: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
- target: {fileID: 3942264960756445310, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_sharedMaterial
value:
objectReference: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
- target: {fileID: 4637900801277279150, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_AnchorMax.y
value: 0
@ -242,6 +326,46 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4964015081399241302, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_fontAsset
value:
objectReference: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
- target: {fileID: 4964015081399241302, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_sharedMaterial
value:
objectReference: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
- target: {fileID: 5119874463897783294, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5119874463897783294, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 3
objectReference: {fileID: 0}
- target: {fileID: 5119874463897783294, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 1383061313}
- target: {fileID: 5119874463897783294, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 5119874463897783294, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: SwitchWorld
objectReference: {fileID: 0}
- target: {fileID: 5119874463897783294, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: WorldSwitcher, Assembly-CSharp
objectReference: {fileID: 0}
- target: {fileID: 5119874463897783294, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_IntArgument
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5119874463897783294, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 6310781014458571912, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_AnchorMax.y
value: 0
@ -362,26 +486,30 @@ PrefabInstance:
propertyPath: m_Name
value: Canvas_UI
objectReference: {fileID: 0}
- target: {fileID: 7292790684055438790, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: player
- target: {fileID: 8145377689690508936, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8145377689690508936, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8145377689690508936, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8145377689690508936, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8367707976770782541, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_fontAsset
value:
objectReference: {fileID: 2014026694}
- target: {fileID: 8145377689690508936, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8145377689690508936, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8145377689690508936, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8145377689690508936, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
objectReference: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
- target: {fileID: 8367707976770782541, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_sharedMaterial
value:
objectReference: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
- target: {fileID: 8397818908293747857, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_AnchorMax.y
value: 0
@ -398,6 +526,14 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8570802679731193335, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_fontAsset
value:
objectReference: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
- target: {fileID: 8570802679731193335, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_sharedMaterial
value:
objectReference: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
- target: {fileID: 8762152485571598497, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
propertyPath: m_AnchorMax.y
value: 0
@ -510,6 +646,11 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 40ba255bbdd1b2b47967e8390a85cca9, type: 3}
--- !u!224 &242379725 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 7483763325311061105, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
m_PrefabInstance: {fileID: 89540976}
m_PrefabAsset: {fileID: 0}
--- !u!1 &252866210
GameObject:
m_ObjectHideFlags: 0
@ -603,6 +744,11 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 575ac473626334346a420aa1ebda6da6, type: 3}
--- !u!224 &373297280 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 4950234079745660449, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
m_PrefabInstance: {fileID: 89540976}
m_PrefabAsset: {fileID: 0}
--- !u!1 &413647990
GameObject:
m_ObjectHideFlags: 0
@ -912,6 +1058,11 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 432372982}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!224 &554716307 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 431853668021382708, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
m_PrefabInstance: {fileID: 89540976}
m_PrefabAsset: {fileID: 0}
--- !u!1 &584960875
GameObject:
m_ObjectHideFlags: 0
@ -1203,6 +1354,11 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 703399637}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!224 &750491238 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 4950234080813960360, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
m_PrefabInstance: {fileID: 89540976}
m_PrefabAsset: {fileID: 0}
--- !u!1 &759710055
GameObject:
m_ObjectHideFlags: 0
@ -1526,6 +1682,11 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!224 &823631620 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 2962670241177435889, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
m_PrefabInstance: {fileID: 89540976}
m_PrefabAsset: {fileID: 0}
--- !u!1 &826661676
GameObject:
m_ObjectHideFlags: 0
@ -1720,6 +1881,11 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 828477694}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!224 &840386051 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 4950234080357054355, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
m_PrefabInstance: {fileID: 89540976}
m_PrefabAsset: {fileID: 0}
--- !u!1 &867942699
GameObject:
m_ObjectHideFlags: 0
@ -1818,6 +1984,11 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!224 &916479801 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 5037438043825057203, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
m_PrefabInstance: {fileID: 89540976}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1048485771
GameObject:
m_ObjectHideFlags: 0
@ -2348,6 +2519,11 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 93ada555490a6074cab43a712f12b1ef, type: 3}
--- !u!224 &1147496830 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 7877029066061758710, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
m_PrefabInstance: {fileID: 89540976}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1186895210
GameObject:
m_ObjectHideFlags: 0
@ -2754,6 +2930,11 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1228484058}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!224 &1277501206 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 444301740144869469, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
m_PrefabInstance: {fileID: 89540976}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1321018409
GameObject:
m_ObjectHideFlags: 0
@ -3172,19 +3353,34 @@ MonoBehaviour:
texture: {fileID: 0}
renderQuad: {fileID: 817274629}
material: {fileID: 0}
healthBar: {fileID: 242379725}
button: {fileID: 823631620}
alert: {fileID: 750491238}
layer: 7
- camera: {fileID: 799351736}
texture: {fileID: 0}
renderQuad: {fileID: 867942703}
material: {fileID: 0}
healthBar: {fileID: 1147496830}
button: {fileID: 916479801}
alert: {fileID: 373297280}
layer: 8
- camera: {fileID: 1616849997}
texture: {fileID: 0}
renderQuad: {fileID: 2080936950}
material: {fileID: 0}
healthBar: {fileID: 1277501206}
button: {fileID: 554716307}
alert: {fileID: 840386051}
layer: 9
tabWidth: 0.2
tabWidth: 0.05
healthBarPosFromTabEdge: 0.025
buttonPosFromTabEdge: 0.025
alertPosFromTabEdge: 0.025
quadOffset: 1
OnChangeWorld:
m_PersistentCalls:
m_Calls: []
--- !u!1 &1385339222
GameObject:
m_ObjectHideFlags: 0
@ -4524,17 +4720,6 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 547051710011ee146aa8c829d9642ca5, type: 3}
--- !u!114 &2014026694 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 3548093524067688457, guid: 547051710011ee146aa8c829d9642ca5, type: 3}
m_PrefabInstance: {fileID: 2014026693}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 44fc4a66977bce94dbaccf9ae1d06e2b, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &2034440855
GameObject:
m_ObjectHideFlags: 0

92
Assets/Scripts/WorldSwitcher.cs
View File

@ -4,7 +4,7 @@ using UnityEngine;
using UnityEngine.Events;
[Serializable]
public class IntEvent : UnityEvent<int> { }
public class IntEvent : UnityEvent<int> {}
public class WorldSwitcher : MonoBehaviour {
[Range(0, 5)]
@ -13,11 +13,16 @@ public class WorldSwitcher : MonoBehaviour {
[SerializeField] float fadeDuration;*/
[SerializeField] AnimationCurve transitionCurve;
//[SerializeField] AnimationCurve fadeCurve;
[SerializeField] WorldInfo[] worldInfos;
[Range(0, 1)]
[SerializeField] float tabWidth;
[SerializeField] float healthBarPosFromTabEdge;
[SerializeField] float buttonPosFromTabEdge;
[SerializeField] float alertPosFromTabEdge;
//TODO Hardcode
[SerializeField]
@ -26,6 +31,7 @@ public class WorldSwitcher : MonoBehaviour {
int lastWorldIndex;
int currentWorldIndex;
Coroutine transition;
static readonly int UVOffset = Shader.PropertyToID("_UVOffset");
//static readonly int Opacity = Shader.PropertyToID("_Opacity");
@ -45,14 +51,14 @@ public class WorldSwitcher : MonoBehaviour {
worldInfos[i].GenerateRenderTexture(quadOffset);
}
ResetQuadPositions();
}
public void SwitchWorld(int index) {
if (transition != null)
return;
if (index == currentWorldIndex || index < 0 || index > worldInfos.Length - 1)
return;
@ -64,7 +70,7 @@ public class WorldSwitcher : MonoBehaviour {
lastWorldIndex = currentWorldIndex;
currentWorldIndex = index;
OnChangeWorld.Invoke(currentWorldIndex);
transition = StartCoroutine(TransitionCamera(currentWorldIndex - lastWorldIndex < 0));
@ -82,25 +88,39 @@ public class WorldSwitcher : MonoBehaviour {
float startTime = Time.time;
Camera lastCam = lastWorld.camera;
if (fromRight) {
for (int i = lastWorldIndex - 1; i >= currentWorldIndex; --i) {
worldInfos[i].healthBar.gameObject.SetActive(false);
worldInfos[i].button.gameObject.SetActive(false);
worldInfos[i].alert.gameObject.SetActive(false);
}
} else {
for (int i = lastWorldIndex + 1; i <= currentWorldIndex; ++i) {
worldInfos[i].healthBar.gameObject.SetActive(false);
worldInfos[i].button.gameObject.SetActive(false);
worldInfos[i].alert.gameObject.SetActive(false);
}
}
while (Time.time < startTime + transitionDuration) {
float t = transitionCurve.Evaluate((Time.time - startTime) / transitionDuration);
if (fromRight) {
for (int i = lastWorldIndex - 1; i >= currentWorldIndex; --i) {
worldInfos[i].renderQuad.position = GetQuadOffset(lastCam, worldInfos[i], i, fromRight, true, t);
worldInfos[i].material.SetFloat(UVOffset, GetUVOffset(t, fromRight, i));
worldInfos[i].renderQuad.position = GetQuadOffset(lastCam, worldInfos[i], i, true, true, t);
worldInfos[i].material.SetFloat(UVOffset, GetUVOffset(t, true, i));
}
} else {
for (int i = lastWorldIndex + 1; i <= currentWorldIndex; ++i) {
worldInfos[i].renderQuad.position = GetQuadOffset(lastCam, worldInfos[i], i, fromRight, true, t);
worldInfos[i].material.SetFloat(UVOffset, GetUVOffset(t, fromRight, i));
worldInfos[i].renderQuad.position = GetQuadOffset(lastCam, worldInfos[i], i, false, true, t);
worldInfos[i].material.SetFloat(UVOffset, GetUVOffset(t, false, i));
}
}
yield return null;
}
/*startTime = Time.time;
while (Time.time < startTime + fadeDuration) {
@ -117,20 +137,16 @@ public class WorldSwitcher : MonoBehaviour {
}
Vector3 GetQuadOffset(Camera cam, WorldInfo worldInfo, int index, bool fromRight, bool moving, float t = 0f) {
float x = fromRight ?
Mathf.Lerp((1 + index) * tabWidth, 1f - (worldInfos.Length - 1 - index) * tabWidth, t) :
Mathf.Lerp(1f - tabWidth * (worldInfos.Length - index), index * tabWidth, t);
float x = fromRight ? Mathf.Lerp((1 + index) * tabWidth, 1f - (worldInfos.Length - 1 - index) * tabWidth, t) : Mathf.Lerp(1f - tabWidth * (worldInfos.Length - index), index * tabWidth, t);
Vector3 quadHalfWidthOffset = Vector3.right * (fromRight ? -worldInfo.renderQuad.localScale.x / 2f : worldInfo.renderQuad.localScale.x / 2f);
float depthOffset = moving ?
Mathf.Abs(currentWorldIndex - index) * .0001f :
-Mathf.Abs(currentWorldIndex - index) * .0001f;
float depthOffset = moving ? Mathf.Abs(currentWorldIndex - index) * .0001f : -Mathf.Abs(currentWorldIndex - index) * .0001f;
//TODO Offset epsilon
return cam.ViewportToWorldPoint(
new Vector3(
x,
.5f,
.5f,
quadOffset + depthOffset
)
) + quadHalfWidthOffset;
@ -138,23 +154,51 @@ public class WorldSwitcher : MonoBehaviour {
float GetUVOffset(float t, bool fromRight, int index) {
return fromRight ?
Mathf.Lerp(-1f + tabWidth * (index + 1), -(worldInfos.Length - 1 - index) * tabWidth, t):
Mathf.Lerp(-1f + tabWidth * (index + 1), -(worldInfos.Length - 1 - index) * tabWidth, t) :
Mathf.Lerp(1f - tabWidth * (worldInfos.Length - index), index * tabWidth, t);
}
float GetTabUIPos(float t, bool fromRight, int index, float offset) {
return fromRight ?
Mathf.Lerp(tabWidth * (index + 1), -(worldInfos.Length - 1 - index) * tabWidth, t) - offset :
Mathf.Lerp(1f - tabWidth * (worldInfos.Length - index), index * tabWidth, t) + offset;
}
void ResetQuadPositions() {
Camera currCam = worldInfos[currentWorldIndex].camera;
LayerMask currLayer = worldInfos[currentWorldIndex].layer;
for (int i = 0; i < worldInfos.Length; ++i) {
bool usingRenderTexture = i != currentWorldIndex;
worldInfos[i].SetUsingRenderTexture(usingRenderTexture, currLayer);
//worldInfos[i].material.SetFloat(Opacity, 1f);
if (usingRenderTexture) {
bool fromRight = i - currentWorldIndex < 0;
worldInfos[i].renderQuad.position = GetQuadOffset(currCam, worldInfos[i], i, fromRight, false);
worldInfos[i].material.SetFloat(UVOffset, GetUVOffset(0f, fromRight, i));
worldInfos[i].healthBar.gameObject.SetActive(true);
worldInfos[i].healthBar.position = new Vector3(
Screen.width * GetTabUIPos(0f, fromRight, i, healthBarPosFromTabEdge),
worldInfos[i].healthBar.position.y,
worldInfos[i].healthBar.position.z
);
worldInfos[i].button.gameObject.SetActive(true);
worldInfos[i].button.position = new Vector3(
Screen.width * GetTabUIPos(0f, fromRight, i, buttonPosFromTabEdge),
worldInfos[i].button.position.y,
worldInfos[i].button.position.z
);
worldInfos[i].alert.gameObject.SetActive(true);
worldInfos[i].alert.position = new Vector3(
Screen.width * GetTabUIPos(0f, fromRight, i, alertPosFromTabEdge),
worldInfos[i].alert.position.y,
worldInfos[i].alert.position.z
);
}else {
worldInfos[i].healthBar.gameObject.SetActive(false);
worldInfos[i].button.gameObject.SetActive(false);
worldInfos[i].alert.gameObject.SetActive(false);
}
}
}
@ -166,7 +210,11 @@ struct WorldInfo {
[HideInInspector] public RenderTexture texture;
public Transform renderQuad;
[HideInInspector] public Material material;
public RectTransform healthBar;
public RectTransform button;
public RectTransform alert;
public int layer;
static readonly int CameraTexture = Shader.PropertyToID("_CameraTexture");
public void SetUsingRenderTexture(bool usingTexture, int layer) {
@ -174,7 +222,7 @@ struct WorldInfo {
camera.targetTexture = texture;
renderQuad.gameObject.SetActive(true);
renderQuad.gameObject.layer = layer;
}else {
} else {
camera.targetTexture = null;
renderQuad.gameObject.SetActive(false);
}