From dac301197c4ef620bdd94f5aba776297b12f8266 Mon Sep 17 00:00:00 2001 From: Matt Graber Date: Fri, 10 Nov 2023 02:37:18 -0800 Subject: [PATCH] Added MET collision in Jaded Journey stage --- Assets/Scenes/Stages/JadedJourney.unity | 379 +++++++++++++++++- .../JadedJourney/Scripts/METBodySlam.cs | 16 + .../JadedJourney/Scripts/METBodySlam.cs.meta | 11 + .../JadedJourney/Scripts/METColliders.cs | 18 + .../JadedJourney/Scripts/METColliders.cs.meta | 11 + ProjectSettings/ProjectSettings.asset | 2 +- 6 files changed, 420 insertions(+), 17 deletions(-) create mode 100644 Assets/Stages/JadedJourney/Scripts/METBodySlam.cs create mode 100644 Assets/Stages/JadedJourney/Scripts/METBodySlam.cs.meta create mode 100644 Assets/Stages/JadedJourney/Scripts/METColliders.cs create mode 100644 Assets/Stages/JadedJourney/Scripts/METColliders.cs.meta diff --git a/Assets/Scenes/Stages/JadedJourney.unity b/Assets/Scenes/Stages/JadedJourney.unity index e0c8a033..3e4b9475 100644 --- a/Assets/Scenes/Stages/JadedJourney.unity +++ b/Assets/Scenes/Stages/JadedJourney.unity @@ -339,7 +339,7 @@ Transform: - {fileID: 634850326} - {fileID: 378875823} m_Father: {fileID: 1375819907} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!82 &74445578 AudioSource: @@ -438,6 +438,81 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 +--- !u!1 &88464118 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 88464119} + - component: {fileID: 88464120} + - component: {fileID: 88464122} + - component: {fileID: 88464121} + m_Layer: 0 + m_Name: 3DBodyCollider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &88464119 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 88464118} + 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_Children: [] + m_Father: {fileID: 1375819907} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &88464120 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 88464118} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 5.711724, y: 7.530588, z: 2.4576035} + m_Center: {x: 0.005108595, y: -3.8081007, z: -1.1824684} +--- !u!54 &88464121 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 88464118} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 126 + m_CollisionDetection: 0 +--- !u!114 &88464122 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 88464118} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3bbb927f89f6483439449248c933e433, type: 3} + m_Name: + m_EditorClassIdentifier: + collider2d: {fileID: 170241752} --- !u!4 &129926739 stripped Transform: m_CorrespondingSourceObject: {fileID: 7840484598393004513, guid: 0d9d11148e5ac2940b4ed2fd3821e5aa, @@ -506,13 +581,100 @@ Transform: m_Father: {fileID: 1399340043} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &170241752 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 170241753} + - component: {fileID: 170241755} + - component: {fileID: 170241754} + - component: {fileID: 170241756} + m_Layer: 18 + m_Name: 2DBodyCollider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &170241753 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 170241752} + 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_Children: [] + m_Father: {fileID: 1375819907} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!70 &170241754 +CapsuleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 170241752} + 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.22500014} + m_Size: {x: 5.69, y: 5.69} + m_Direction: 0 +--- !u!61 &170241755 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 170241752} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: -4.118166} + 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: 5.7620096, y: 8.215902} + m_EdgeRadius: 0 +--- !u!114 &170241756 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 170241752} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d43827add1220834cb827f002ae34cbd, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!43 &180366466 Mesh: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh319996 + m_Name: pb_Mesh159264 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -2566,6 +2728,66 @@ Transform: m_Father: {fileID: 498068031} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &432480970 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 432480971} + - component: {fileID: 432480972} + - component: {fileID: 432480973} + m_Layer: 0 + m_Name: 2DFaceCollider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &432480971 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 432480970} + 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_Children: [] + m_Father: {fileID: 1375819907} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!70 &432480972 +CapsuleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 432480970} + 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.22500014} + m_Size: {x: 5.13, y: 5.03} + m_Direction: 0 +--- !u!114 &432480973 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 432480970} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d43827add1220834cb827f002ae34cbd, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &435905756 GameObject: m_ObjectHideFlags: 0 @@ -3616,7 +3838,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 606118788} - m_LocalRotation: {x: 1.0587913e-22, y: -0.000000031789146, z: 3.365807e-30, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 9.300001, y: 0, z: -15} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: @@ -3738,7 +3960,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh319776 + m_Name: pb_Mesh159028 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -5017,7 +5239,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh319880 + m_Name: pb_Mesh159132 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -5239,7 +5461,7 @@ Transform: - {fileID: 1624336613} - {fileID: 502780077} m_Father: {fileID: 1792181285} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &827465957 PrefabInstance: @@ -8068,7 +8290,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh319966 + m_Name: pb_Mesh159234 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -8333,7 +8555,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 963194225} - m_LocalRotation: {x: 1.0587913e-22, y: -0.000000031789146, z: 3.365807e-30, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 9.300001, y: 0, z: -15} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] @@ -9328,7 +9550,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh320048 + m_Name: pb_Mesh159316 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -9548,6 +9770,82 @@ Transform: m_Father: {fileID: 474571083} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1115043942 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1115043943} + - component: {fileID: 1115043944} + - component: {fileID: 1115043946} + - component: {fileID: 1115043945} + m_Layer: 0 + m_Name: 3DFaceCollider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1115043943 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1115043942} + 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_Children: [] + m_Father: {fileID: 1375819907} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!136 &1115043944 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1115043942} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + m_Radius: 2.51 + m_Height: 1 + m_Direction: 1 + m_Center: {x: 0, y: 0, z: 0} +--- !u!54 &1115043945 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1115043942} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 126 + m_CollisionDetection: 0 +--- !u!114 &1115043946 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1115043942} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3bbb927f89f6483439449248c933e433, type: 3} + m_Name: + m_EditorClassIdentifier: + collider2d: {fileID: 432480970} --- !u!1 &1149640915 GameObject: m_ObjectHideFlags: 0 @@ -10599,7 +10897,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh319930 + m_Name: pb_Mesh159194 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -10867,8 +11165,12 @@ Transform: m_LocalPosition: {x: 4.610271, y: 1.9, z: -1.7} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1678714476} - {fileID: 74445577} + - {fileID: 1678714476} + - {fileID: 88464119} + - {fileID: 170241753} + - {fileID: 1115043943} + - {fileID: 432480971} m_Father: {fileID: 1792181285} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} @@ -12323,6 +12625,50 @@ Terrain: m_GroupingID: 0 m_RenderingLayerMask: 1 m_AllowAutoConnect: 1 +--- !u!1 &1527306123 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1527306124} + - component: {fileID: 1527306125} + m_Layer: 0 + m_Name: StageIntersection + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1527306124 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1527306123} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -3.23, z: -95.9} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1792181285} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &1527306125 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1527306123} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 47.559387, y: 16.504232, z: 1} + m_Center: {x: 6.340988, y: 4.5361447, z: 0} --- !u!4 &1552023761 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 3cfe926f1a0fe3b429633c1ee6369411, @@ -13294,7 +13640,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh319760 + m_Name: pb_Mesh159012 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -13894,7 +14240,7 @@ PrefabInstance: - target: {fileID: -8679921383154817045, guid: 096b3ca50629e4841af09fb15799f9c3, type: 3} propertyPath: m_RootOrder - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 096b3ca50629e4841af09fb15799f9c3, type: 3} @@ -14006,6 +14352,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1375819907} + - {fileID: 1527306124} - {fileID: 825375522} m_Father: {fileID: 0} m_RootOrder: 1 @@ -14156,7 +14503,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh320096 + m_Name: pb_Mesh159364 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -14602,7 +14949,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh320174 + m_Name: pb_Mesh159442 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -14832,7 +15179,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh319948 + m_Name: pb_Mesh159216 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 diff --git a/Assets/Stages/JadedJourney/Scripts/METBodySlam.cs b/Assets/Stages/JadedJourney/Scripts/METBodySlam.cs new file mode 100644 index 00000000..95bec536 --- /dev/null +++ b/Assets/Stages/JadedJourney/Scripts/METBodySlam.cs @@ -0,0 +1,16 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class METBodySlam : MonoBehaviour +{ + void OnCollisionEnter2D(Collision2D other) + { + CharacterController cc = other.transform.GetComponent(); + if (cc != null) + { + int dir = transform.position.x > other.transform.position.x ? -1 : 1; + cc.Strike(15, Mathf.PI / 4, 0.35f, dir, true); + } + } +} diff --git a/Assets/Stages/JadedJourney/Scripts/METBodySlam.cs.meta b/Assets/Stages/JadedJourney/Scripts/METBodySlam.cs.meta new file mode 100644 index 00000000..37cdf527 --- /dev/null +++ b/Assets/Stages/JadedJourney/Scripts/METBodySlam.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d43827add1220834cb827f002ae34cbd +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Stages/JadedJourney/Scripts/METColliders.cs b/Assets/Stages/JadedJourney/Scripts/METColliders.cs new file mode 100644 index 00000000..70ee9482 --- /dev/null +++ b/Assets/Stages/JadedJourney/Scripts/METColliders.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class METColliders : MonoBehaviour +{ + public GameObject collider2d; + + void OnTriggerEnter(Collider other) + { + collider2d.SetActive(true); + } + + void OnTriggerExit(Collider other) + { + collider2d.SetActive(false); + } +} diff --git a/Assets/Stages/JadedJourney/Scripts/METColliders.cs.meta b/Assets/Stages/JadedJourney/Scripts/METColliders.cs.meta new file mode 100644 index 00000000..34df7331 --- /dev/null +++ b/Assets/Stages/JadedJourney/Scripts/METColliders.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3bbb927f89f6483439449248c933e433 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index fb28ca6c..dc0008bd 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -127,7 +127,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 0.2.3-alpha + bundleVersion: 0.2.4-alpha preloadedAssets: - {fileID: 0} - {fileID: 0}