diff --git a/Assets/Scenes/PuzzleTest.unity b/Assets/Scenes/PuzzleTest.unity index c99b1af..ab4af54 100644 --- a/Assets/Scenes/PuzzleTest.unity +++ b/Assets/Scenes/PuzzleTest.unity @@ -130,7 +130,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1340421038} + m_TransformParent: {fileID: 411421604} m_Modifications: - target: {fileID: 8558524283348193081, guid: 47b21ad213905c342b92fc5b384878c4, type: 3} @@ -1434,6 +1434,19 @@ Transform: - {fileID: 1101383441} - {fileID: 437759389} - {fileID: 241734411} + - {fileID: 874637333} + - {fileID: 5113659104536846700} + - {fileID: 796526694} + - {fileID: 987689138} + - {fileID: 604728745} + - {fileID: 681930983} + - {fileID: 6067357455631746734} + - {fileID: 1853180256} + - {fileID: 1949077063} + - {fileID: 1532540192886921385} + - {fileID: 675198211105780961} + - {fileID: 538618498} + - {fileID: 9336441} - {fileID: 3750376657174321754} - {fileID: 2343402481646314946} m_Father: {fileID: 1340421038} @@ -1861,7 +1874,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1340421038} + m_TransformParent: {fileID: 411421604} m_Modifications: - target: {fileID: 1478369497145927568, guid: ceec192b57a11254eae63f938fbd3eb8, type: 3} @@ -2013,7 +2026,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1340421038} + m_TransformParent: {fileID: 411421604} m_Modifications: - target: {fileID: 251845578051121456, guid: 62927df188f2d924abbd1345eb9d2cdf, type: 3} @@ -2092,7 +2105,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1340421038} + m_TransformParent: {fileID: 411421604} m_Modifications: - target: {fileID: 2835502344937141734, guid: 7a8b76a212391334ea8e3937df152874, type: 3} @@ -2384,7 +2397,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1340421038} + m_TransformParent: {fileID: 411421604} m_Modifications: - target: {fileID: 2835502344937141734, guid: 2013ed7eebc36b54e8fab3b09e08b6de, type: 3} @@ -2542,7 +2555,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1340421038} + m_TransformParent: {fileID: 411421604} m_Modifications: - target: {fileID: 2914491806035128037, guid: 5167cb020dbd15b46a7548cfe941e182, type: 3} @@ -2615,7 +2628,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1340421038} + m_TransformParent: {fileID: 411421604} m_Modifications: - target: {fileID: 251845578051121456, guid: 62927df188f2d924abbd1345eb9d2cdf, type: 3} @@ -3203,7 +3216,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1340421038 Transform: m_ObjectHideFlags: 0 @@ -3216,19 +3229,6 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 874637333} - - {fileID: 5113659104536846700} - - {fileID: 796526694} - - {fileID: 987689138} - - {fileID: 604728745} - - {fileID: 681930983} - - {fileID: 6067357455631746734} - - {fileID: 1853180256} - - {fileID: 1949077063} - - {fileID: 1532540192886921385} - - {fileID: 675198211105780961} - - {fileID: 538618498} - - {fileID: 9336441} - {fileID: 411421604} m_Father: {fileID: 0} m_RootOrder: 4 @@ -4205,7 +4205,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1851812988 Transform: m_ObjectHideFlags: 0 @@ -4229,7 +4229,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1340421038} + m_TransformParent: {fileID: 411421604} m_Modifications: - target: {fileID: 3645814314867400154, guid: 056f81ef6ccf57645b24b2b317a578e7, type: 3} @@ -4819,7 +4819,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1340421038} + m_TransformParent: {fileID: 411421604} m_Modifications: - target: {fileID: 8558524283348193081, guid: 47b21ad213905c342b92fc5b384878c4, type: 3} @@ -4898,7 +4898,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1340421038} + m_TransformParent: {fileID: 411421604} m_Modifications: - target: {fileID: 5820700980591386288, guid: 97cc1523ce05b9544bccb2e3be7f024d, type: 3} @@ -4971,7 +4971,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1340421038} + m_TransformParent: {fileID: 411421604} m_Modifications: - target: {fileID: 3645814314867400154, guid: 056f81ef6ccf57645b24b2b317a578e7, type: 3} @@ -5248,7 +5248,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1340421038} + m_TransformParent: {fileID: 411421604} m_Modifications: - target: {fileID: 872448883161704311, guid: 511d605163a2abf49a0f1f69be067561, type: 3} @@ -5327,7 +5327,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1340421038} + m_TransformParent: {fileID: 411421604} m_Modifications: - target: {fileID: 463845462802249093, guid: b05b36186d7fa524aaec74a927b37b71, type: 3} diff --git a/Assets/Station46/Module Descriptions/P Align Steles.asset b/Assets/Station46/Module Descriptions/P Align Rings.asset similarity index 96% rename from Assets/Station46/Module Descriptions/P Align Steles.asset rename to Assets/Station46/Module Descriptions/P Align Rings.asset index 18d8b3c..7baee1e 100644 --- a/Assets/Station46/Module Descriptions/P Align Steles.asset +++ b/Assets/Station46/Module Descriptions/P Align Rings.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f928b97941e3469a9015316bb5ac1309, type: 3} - m_Name: P Align Steles + m_Name: P Align Rings m_EditorClassIdentifier: types: 02000000 modulePrefab: {fileID: 6537805278405256415, guid: 688a459dfb23b3844b9f14f23236d50c, diff --git a/Assets/Station46/Module Descriptions/P Align Steles.asset.meta b/Assets/Station46/Module Descriptions/P Align Rings.asset.meta similarity index 100% rename from Assets/Station46/Module Descriptions/P Align Steles.asset.meta rename to Assets/Station46/Module Descriptions/P Align Rings.asset.meta diff --git a/Assets/Station46/Modules/Steles.meta b/Assets/Station46/Modules/Rings.meta similarity index 100% rename from Assets/Station46/Modules/Steles.meta rename to Assets/Station46/Modules/Rings.meta diff --git a/Assets/Station46/Modules/Steles/Align Steles.prefab b/Assets/Station46/Modules/Rings/Align Rings.prefab similarity index 94% rename from Assets/Station46/Modules/Steles/Align Steles.prefab rename to Assets/Station46/Modules/Rings/Align Rings.prefab index 8d41fb1..a616faf 100644 --- a/Assets/Station46/Modules/Steles/Align Steles.prefab +++ b/Assets/Station46/Modules/Rings/Align Rings.prefab @@ -44,7 +44,7 @@ GameObject: m_Component: - component: {fileID: 5438075180398223774} m_Layer: 0 - m_Name: Stele X Offset + m_Name: Ring X Offset m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -76,7 +76,7 @@ GameObject: m_Component: - component: {fileID: 4556871430726547708} m_Layer: 0 - m_Name: Stele Y Offset + m_Name: Ring Y Offset m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -108,7 +108,7 @@ GameObject: m_Component: - component: {fileID: 6232625892806627483} m_Layer: 0 - m_Name: Stele Z Offset + m_Name: Ring Z Offset m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -173,7 +173,7 @@ GameObject: - component: {fileID: 6537805278405256415} - component: {fileID: 7994627676923678814} m_Layer: 0 - m_Name: Align Steles + m_Name: Align Rings m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -194,7 +194,7 @@ Transform: - {fileID: 3486750519070425340} - {fileID: 1666949579012228321} m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &6537805278405256415 MonoBehaviour: @@ -217,9 +217,9 @@ MonoBehaviour: sensitivity: 0.001 movementScaling: {x: 5, y: -10, z: 2} target: {fileID: 3486750519070425340} - steleX: {fileID: 6855642418435424590} - steleY: {fileID: 4524786553574166324} - steleZ: {fileID: 7632061696842244722} + ringX: {fileID: 6855642418435424590} + ringY: {fileID: 4524786553574166324} + ringZ: {fileID: 7632061696842244722} animator: {fileID: 7994627676923678814} --- !u!95 &7994627676923678814 Animator: @@ -250,6 +250,16 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 4556871430726547708} m_Modifications: + - target: {fileID: 1688937860767534064, guid: c9f64f0efcef6214db38caa5c975adee, + type: 3} + propertyPath: m_LocalScale.x + value: 0.71428573 + objectReference: {fileID: 0} + - target: {fileID: 1688937860767534064, guid: c9f64f0efcef6214db38caa5c975adee, + type: 3} + propertyPath: m_LocalScale.z + value: 0.71428573 + objectReference: {fileID: 0} - target: {fileID: 5351095067423715808, guid: c9f64f0efcef6214db38caa5c975adee, type: 3} propertyPath: m_RootOrder @@ -308,7 +318,7 @@ PrefabInstance: - target: {fileID: 8391494527741424172, guid: c9f64f0efcef6214db38caa5c975adee, type: 3} propertyPath: m_Name - value: Stele Y + value: Ring Y objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -399,7 +409,7 @@ PrefabInstance: - target: {fileID: 8391494527741424172, guid: c9f64f0efcef6214db38caa5c975adee, type: 3} propertyPath: m_Name - value: Stele X + value: Ring X objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -432,6 +442,16 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 6232625892806627483} m_Modifications: + - target: {fileID: 1688937860767534064, guid: c9f64f0efcef6214db38caa5c975adee, + type: 3} + propertyPath: m_LocalScale.x + value: 1.4 + objectReference: {fileID: 0} + - target: {fileID: 1688937860767534064, guid: c9f64f0efcef6214db38caa5c975adee, + type: 3} + propertyPath: m_LocalScale.z + value: 1.4 + objectReference: {fileID: 0} - target: {fileID: 5351095067423715808, guid: c9f64f0efcef6214db38caa5c975adee, type: 3} propertyPath: m_RootOrder @@ -490,7 +510,7 @@ PrefabInstance: - target: {fileID: 8391494527741424172, guid: c9f64f0efcef6214db38caa5c975adee, type: 3} propertyPath: m_Name - value: Stele Z + value: Ring Z objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] diff --git a/Assets/Station46/Modules/Steles/Align Steles.prefab.meta b/Assets/Station46/Modules/Rings/Align Rings.prefab.meta similarity index 100% rename from Assets/Station46/Modules/Steles/Align Steles.prefab.meta rename to Assets/Station46/Modules/Rings/Align Rings.prefab.meta diff --git a/Assets/Station46/Modules/Steles/Animations.meta b/Assets/Station46/Modules/Rings/Animations.meta similarity index 100% rename from Assets/Station46/Modules/Steles/Animations.meta rename to Assets/Station46/Modules/Rings/Animations.meta diff --git a/Assets/Station46/Modules/Steles/Animations/Align Steles.controller b/Assets/Station46/Modules/Rings/Animations/Rings.controller similarity index 99% rename from Assets/Station46/Modules/Steles/Animations/Align Steles.controller rename to Assets/Station46/Modules/Rings/Animations/Rings.controller index 796d2cb..6c96775 100644 --- a/Assets/Station46/Modules/Steles/Animations/Align Steles.controller +++ b/Assets/Station46/Modules/Rings/Animations/Rings.controller @@ -58,7 +58,7 @@ AnimatorController: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Align Steles + m_Name: Rings serializedVersion: 5 m_AnimatorParameters: - m_Name: Slot In diff --git a/Assets/Station46/Modules/Steles/Animations/Align Steles.controller.meta b/Assets/Station46/Modules/Rings/Animations/Rings.controller.meta similarity index 100% rename from Assets/Station46/Modules/Steles/Animations/Align Steles.controller.meta rename to Assets/Station46/Modules/Rings/Animations/Rings.controller.meta diff --git a/Assets/Station46/Modules/Steles/Animations/Slot In.anim b/Assets/Station46/Modules/Rings/Animations/Slot In.anim similarity index 86% rename from Assets/Station46/Modules/Steles/Animations/Slot In.anim rename to Assets/Station46/Modules/Rings/Animations/Slot In.anim index 9da893a..0320318 100644 --- a/Assets/Station46/Modules/Steles/Animations/Slot In.anim +++ b/Assets/Station46/Modules/Rings/Animations/Slot In.anim @@ -28,16 +28,16 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 1 + time: 0.8333333 value: {x: 0, y: 0, z: -0.5} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 2.5077333} + outSlope: {x: 0, y: 0, z: 2.5077333} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.14148414} - serializedVersion: 3 - time: 2 + time: 1.8333334 value: {x: 0, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -48,7 +48,7 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: Center/Stele Y Offset + path: Center/Ring Y Offset - curve: serializedVersion: 2 m_Curve: @@ -62,16 +62,16 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 1 + time: 0.8333333 value: {x: 0, y: 0, z: 0.5} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: -2.531174} + outSlope: {x: 0, y: 0, z: -2.531174} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.04869008} - serializedVersion: 3 - time: 2 + time: 1.8333334 value: {x: 0, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -82,7 +82,7 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: Center/Stele Z Offset + path: Center/Ring Z Offset m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: [] @@ -94,7 +94,7 @@ AnimationClip: m_ClipBindingConstant: genericBindings: - serializedVersion: 2 - path: 3759349908 + path: 1512042035 attribute: 1 script: {fileID: 0} typeID: 4 @@ -103,7 +103,7 @@ AnimationClip: isIntCurve: 0 isSerializeReferenceCurve: 0 - serializedVersion: 2 - path: 1855727479 + path: 3566266832 attribute: 1 script: {fileID: 0} typeID: 4 @@ -117,7 +117,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 2 + m_StopTime: 1.8333334 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -147,16 +147,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 + time: 0.8333333 value: -0.5 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: 2.5077333 + outSlope: 2.5077333 + tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 - outWeight: 0.33333334 + outWeight: 0.14148414 - serializedVersion: 3 - time: 2 + time: 1.8333334 value: 0 inSlope: 0 outSlope: 0 @@ -168,7 +168,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.z - path: Center/Stele Y Offset + path: Center/Ring Y Offset classID: 4 script: {fileID: 0} flags: 0 @@ -186,16 +186,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 + time: 0.8333333 value: 0.5 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: -2.531174 + outSlope: -2.531174 + tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 - outWeight: 0.33333334 + outWeight: 0.04869008 - serializedVersion: 3 - time: 2 + time: 1.8333334 value: 0 inSlope: 0 outSlope: 0 @@ -207,7 +207,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.z - path: Center/Stele Z Offset + path: Center/Ring Z Offset classID: 4 script: {fileID: 0} flags: 0 @@ -228,7 +228,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.x - path: Center/Stele Y Offset + path: Center/Ring Y Offset classID: 4 script: {fileID: 0} flags: 8 @@ -249,7 +249,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.y - path: Center/Stele Y Offset + path: Center/Ring Y Offset classID: 4 script: {fileID: 0} flags: 8 @@ -270,7 +270,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.x - path: Center/Stele Z Offset + path: Center/Ring Z Offset classID: 4 script: {fileID: 0} flags: 8 @@ -291,7 +291,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.y - path: Center/Stele Z Offset + path: Center/Ring Z Offset classID: 4 script: {fileID: 0} flags: 8 diff --git a/Assets/Station46/Modules/Steles/Animations/Slot In.anim.meta b/Assets/Station46/Modules/Rings/Animations/Slot In.anim.meta similarity index 100% rename from Assets/Station46/Modules/Steles/Animations/Slot In.anim.meta rename to Assets/Station46/Modules/Rings/Animations/Slot In.anim.meta diff --git a/Assets/Station46/Modules/Rings/Materials.meta b/Assets/Station46/Modules/Rings/Materials.meta new file mode 100644 index 0000000..19af40d --- /dev/null +++ b/Assets/Station46/Modules/Rings/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0aed16bf87167b64bb8f79a5b80d1921 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Modules/Rings/Materials/Ring.mat b/Assets/Station46/Modules/Rings/Materials/Ring.mat new file mode 100644 index 0000000..2f38ac7 --- /dev/null +++ b/Assets/Station46/Modules/Rings/Materials/Ring.mat @@ -0,0 +1,137 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Ring + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _EMISSION + - _METALLICSPECGLOSSMAP + - _NORMALMAP + - _OCCLUSIONMAP + m_InvalidKeywords: [] + m_LightmapFlags: 2 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 6a0b636982e7a0548b399d96660f10ee, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 2800000, guid: bde72b98641532c45a92b3416e64e8ca, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 2800000, guid: b7bac3311cd2347479aaacda2ae9e7eb, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 6a0b636982e7a0548b399d96660f10ee, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 2800000, guid: bffd09f35b81d92478cf51c322cc43f1, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 2800000, guid: 62f53c990fb0c694d93b683376f749b9, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 1 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 8, g: 3.5137255, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] +--- !u!114 &4058728564645809827 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 7 diff --git a/Assets/Station46/Modules/Rings/Materials/Ring.mat.meta b/Assets/Station46/Modules/Rings/Materials/Ring.mat.meta new file mode 100644 index 0000000..c24a550 --- /dev/null +++ b/Assets/Station46/Modules/Rings/Materials/Ring.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3ad6815af25253f49a598f66014eac37 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Modules/Rings/Materials/Textures.meta b/Assets/Station46/Modules/Rings/Materials/Textures.meta new file mode 100644 index 0000000..b12c0ec --- /dev/null +++ b/Assets/Station46/Modules/Rings/Materials/Textures.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 96129961beede374dad8e4b407a1963e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Modules/Rings/Materials/Textures/Ring_Elevated Platform_AlbedoTransparency.png b/Assets/Station46/Modules/Rings/Materials/Textures/Ring_Elevated Platform_AlbedoTransparency.png new file mode 100644 index 0000000..64edd8c --- /dev/null +++ b/Assets/Station46/Modules/Rings/Materials/Textures/Ring_Elevated Platform_AlbedoTransparency.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6c18885f781b9055383f1bb5c302da14ec4c98c9f7e877c8918bf032d16bef2a +size 7929422 diff --git a/Assets/Station46/Modules/Rings/Materials/Textures/Ring_Elevated Platform_AlbedoTransparency.png.meta b/Assets/Station46/Modules/Rings/Materials/Textures/Ring_Elevated Platform_AlbedoTransparency.png.meta new file mode 100644 index 0000000..8b9551a --- /dev/null +++ b/Assets/Station46/Modules/Rings/Materials/Textures/Ring_Elevated Platform_AlbedoTransparency.png.meta @@ -0,0 +1,124 @@ +fileFormatVersion: 2 +guid: 6a0b636982e7a0548b399d96660f10ee +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Modules/Rings/Materials/Textures/Ring_Elevated Platform_Emission.png b/Assets/Station46/Modules/Rings/Materials/Textures/Ring_Elevated Platform_Emission.png new file mode 100644 index 0000000..e8a090e --- /dev/null +++ b/Assets/Station46/Modules/Rings/Materials/Textures/Ring_Elevated Platform_Emission.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:99fe0107c45b58e798e47451476e9a3085da2b0eabdbdfe35a33658f67dbec40 +size 59013 diff --git a/Assets/Station46/Modules/Rings/Materials/Textures/Ring_Elevated Platform_Emission.png.meta b/Assets/Station46/Modules/Rings/Materials/Textures/Ring_Elevated Platform_Emission.png.meta new file mode 100644 index 0000000..71fae25 --- /dev/null +++ b/Assets/Station46/Modules/Rings/Materials/Textures/Ring_Elevated Platform_Emission.png.meta @@ -0,0 +1,124 @@ +fileFormatVersion: 2 +guid: b7bac3311cd2347479aaacda2ae9e7eb +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Modules/Rings/Materials/Textures/Ring_Elevated Platform_MetallicSmoothness.png b/Assets/Station46/Modules/Rings/Materials/Textures/Ring_Elevated Platform_MetallicSmoothness.png new file mode 100644 index 0000000..151f6b2 --- /dev/null +++ b/Assets/Station46/Modules/Rings/Materials/Textures/Ring_Elevated Platform_MetallicSmoothness.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a8dff70ae5d6d57cf98739cfeb7b654007cf1812684b3ed52d10857b29e8e828 +size 7597674 diff --git a/Assets/Station46/Modules/Rings/Materials/Textures/Ring_Elevated Platform_MetallicSmoothness.png.meta b/Assets/Station46/Modules/Rings/Materials/Textures/Ring_Elevated Platform_MetallicSmoothness.png.meta new file mode 100644 index 0000000..1b46fe4 --- /dev/null +++ b/Assets/Station46/Modules/Rings/Materials/Textures/Ring_Elevated Platform_MetallicSmoothness.png.meta @@ -0,0 +1,124 @@ +fileFormatVersion: 2 +guid: bffd09f35b81d92478cf51c322cc43f1 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Modules/Rings/Materials/Textures/Ring_Elevated Platform_Normal.png b/Assets/Station46/Modules/Rings/Materials/Textures/Ring_Elevated Platform_Normal.png new file mode 100644 index 0000000..cfe6576 --- /dev/null +++ b/Assets/Station46/Modules/Rings/Materials/Textures/Ring_Elevated Platform_Normal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dc33d537318985096de03d93e3462fb05acc39d2870e2ec85b8d9e0a5733c2c5 +size 9057044 diff --git a/Assets/Station46/Modules/Rings/Materials/Textures/Ring_Elevated Platform_Normal.png.meta b/Assets/Station46/Modules/Rings/Materials/Textures/Ring_Elevated Platform_Normal.png.meta new file mode 100644 index 0000000..45756c2 --- /dev/null +++ b/Assets/Station46/Modules/Rings/Materials/Textures/Ring_Elevated Platform_Normal.png.meta @@ -0,0 +1,124 @@ +fileFormatVersion: 2 +guid: bde72b98641532c45a92b3416e64e8ca +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 0 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 1 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Modules/Rings/Materials/Textures/Ring_Elevated Platform_Occlusion.png b/Assets/Station46/Modules/Rings/Materials/Textures/Ring_Elevated Platform_Occlusion.png new file mode 100644 index 0000000..db53ebd --- /dev/null +++ b/Assets/Station46/Modules/Rings/Materials/Textures/Ring_Elevated Platform_Occlusion.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b967b58d7e696b130df4776a68957556a0a6d37c6c65a680a4e1df395efc095e +size 1925424 diff --git a/Assets/Station46/Modules/Rings/Materials/Textures/Ring_Elevated Platform_Occlusion.png.meta b/Assets/Station46/Modules/Rings/Materials/Textures/Ring_Elevated Platform_Occlusion.png.meta new file mode 100644 index 0000000..42dc9ea --- /dev/null +++ b/Assets/Station46/Modules/Rings/Materials/Textures/Ring_Elevated Platform_Occlusion.png.meta @@ -0,0 +1,124 @@ +fileFormatVersion: 2 +guid: 62f53c990fb0c694d93b683376f749b9 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Modules/Rings/Models.meta b/Assets/Station46/Modules/Rings/Models.meta new file mode 100644 index 0000000..d55da49 --- /dev/null +++ b/Assets/Station46/Modules/Rings/Models.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b19fb6d9b6be8cf44ab66de1dbdf702c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Modules/Rings/Models/Ring.blend b/Assets/Station46/Modules/Rings/Models/Ring.blend new file mode 100644 index 0000000..e4886cd --- /dev/null +++ b/Assets/Station46/Modules/Rings/Models/Ring.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ee0606ae94931c9a054ce5498500159b2a67396333806d573463acc9dda67c44 +size 1157736 diff --git a/Assets/Station46/Modules/Rings/Models/Ring.blend.meta b/Assets/Station46/Modules/Rings/Models/Ring.blend.meta new file mode 100644 index 0000000..bb5302f --- /dev/null +++ b/Assets/Station46/Modules/Rings/Models/Ring.blend.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: 2683e0bef7df14143b0d7fc742822ef9 +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Modules/Rings/Models/Ring.blend1 b/Assets/Station46/Modules/Rings/Models/Ring.blend1 new file mode 100644 index 0000000..764d7fc Binary files /dev/null and b/Assets/Station46/Modules/Rings/Models/Ring.blend1 differ diff --git a/Assets/Station46/Modules/Rings/Models/Ring.blend1.meta b/Assets/Station46/Modules/Rings/Models/Ring.blend1.meta new file mode 100644 index 0000000..8c91254 --- /dev/null +++ b/Assets/Station46/Modules/Rings/Models/Ring.blend1.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8aa83755df3d3954792cf8475fa3fb3b +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Modules/Rings/Models/Ring.fbx b/Assets/Station46/Modules/Rings/Models/Ring.fbx new file mode 100644 index 0000000..92f1733 --- /dev/null +++ b/Assets/Station46/Modules/Rings/Models/Ring.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c6241934707de524b126fbb3a49fae78ed2c8e514909bbfc644ff1c29cde2861 +size 145932 diff --git a/Assets/Station46/Modules/Rings/Models/Ring.fbx.meta b/Assets/Station46/Modules/Rings/Models/Ring.fbx.meta new file mode 100644 index 0000000..d2a5424 --- /dev/null +++ b/Assets/Station46/Modules/Rings/Models/Ring.fbx.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: b028115447be88a46b989c740890d244 +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Modules/Steles/Stele.prefab b/Assets/Station46/Modules/Rings/Ring.prefab similarity index 59% rename from Assets/Station46/Modules/Steles/Stele.prefab rename to Assets/Station46/Modules/Rings/Ring.prefab index 45ba904..959739b 100644 --- a/Assets/Station46/Modules/Steles/Stele.prefab +++ b/Assets/Station46/Modules/Rings/Ring.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &3302982186101801852 +--- !u!1 &5926871859514921037 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,47 +8,46 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4822827650078765387} - - component: {fileID: 7370477893254798401} - - component: {fileID: 6885447830141951681} - - component: {fileID: 894542594047277095} + - component: {fileID: 1688937860767534064} + - component: {fileID: 7459170132895352882} + - component: {fileID: 4578935338137646884} m_Layer: 0 - m_Name: Cube + m_Name: Ring m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4822827650078765387 +--- !u!4 &1688937860767534064 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3302982186101801852} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: 0} - m_LocalScale: {x: 0.5, y: 2, z: 0.5} + m_GameObject: {fileID: 5926871859514921037} + m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 5815855292540061822} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &7370477893254798401 + m_Father: {fileID: 5351095067423715808} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} +--- !u!33 &7459170132895352882 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3302982186101801852} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &6885447830141951681 + m_GameObject: {fileID: 5926871859514921037} + m_Mesh: {fileID: -8264766115119967290, guid: 2683e0bef7df14143b0d7fc742822ef9, type: 3} +--- !u!23 &4578935338137646884 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3302982186101801852} + m_GameObject: {fileID: 5926871859514921037} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -62,7 +61,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 3e334d6799a0d0040a41fe4794da90f5, type: 2} + - {fileID: 2100000, guid: 3ad6815af25253f49a598f66014eac37, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -84,27 +83,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!65 &894542594047277095 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3302982186101801852} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: -0.00000011920929, y: 0, z: 0} --- !u!1 &8391494527741424172 GameObject: m_ObjectHideFlags: 0 @@ -115,8 +93,9 @@ GameObject: m_Component: - component: {fileID: 5351095067423715808} - component: {fileID: 1507880546355657783} + - component: {fileID: 393448824122152593} m_Layer: 0 - m_Name: Stele + m_Name: Ring m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -134,9 +113,9 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 5815855292540061822} + - {fileID: 1688937860767534064} m_Father: {fileID: 0} - m_RootOrder: -1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1507880546355657783 MonoBehaviour: @@ -151,36 +130,18 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: speed: 0.2 - Displacement: 0 ---- !u!1 &8793346168272628290 -GameObject: +--- !u!114 &393448824122152593 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5815855292540061822} - m_Layer: 0 - m_Name: Model - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5815855292540061822 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8793346168272628290} - 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: - - {fileID: 4822827650078765387} - m_Father: {fileID: 5351095067423715808} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_GameObject: {fileID: 8391494527741424172} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 17de1e2991b64847bceea06f966f0560, type: 3} + m_Name: + m_EditorClassIdentifier: + color: {r: 8, g: 3.5137255, b: 0, a: 1} + startActive: 1 + emissionRenderer: {fileID: 4578935338137646884} diff --git a/Assets/Station46/Modules/Steles/Stele.prefab.meta b/Assets/Station46/Modules/Rings/Ring.prefab.meta similarity index 100% rename from Assets/Station46/Modules/Steles/Stele.prefab.meta rename to Assets/Station46/Modules/Rings/Ring.prefab.meta diff --git a/Assets/Station46/Modules/Steles/Scripts.meta b/Assets/Station46/Modules/Rings/Scripts.meta similarity index 100% rename from Assets/Station46/Modules/Steles/Scripts.meta rename to Assets/Station46/Modules/Rings/Scripts.meta diff --git a/Assets/Station46/Modules/Steles/Scripts/AlignSteles.cs b/Assets/Station46/Modules/Rings/Scripts/AlignRings.cs similarity index 69% rename from Assets/Station46/Modules/Steles/Scripts/AlignSteles.cs rename to Assets/Station46/Modules/Rings/Scripts/AlignRings.cs index b72fffb..747d131 100644 --- a/Assets/Station46/Modules/Steles/Scripts/AlignSteles.cs +++ b/Assets/Station46/Modules/Rings/Scripts/AlignRings.cs @@ -7,9 +7,9 @@ using Station46.Scripts; using UnityEngine; using UnityEngine.XR.Interaction.Toolkit; -namespace Station46.Modules.Steles.Scripts +namespace Station46.Modules.Rings.Scripts { - public class AlignSteles : StatePuzzle + public class AlignRings : StatePuzzle { private static readonly int SlotIn = Animator.StringToHash("Slot In"); @@ -17,7 +17,7 @@ namespace Station46.Modules.Steles.Scripts public float sensitivity = 0.001f; public Vector3 movementScaling = Vector3.one; [BoxGroup("Internal")] [SerializeField] private Transform target; - [BoxGroup("Internal")] [SerializeField] private AlignStele steleX, steleY, steleZ; + [BoxGroup("Internal")] [SerializeField] private Ring ringX, ringY, ringZ; [BoxGroup("Internal")] [SerializeField] private Animator animator; private DispenserOrb _orb; @@ -38,10 +38,14 @@ namespace Station46.Modules.Steles.Scripts break; case PuzzleEventType.Solved: _orb.transform.position = target.position; - steleX.Displacement = 0; - steleY.Displacement = 0; - steleZ.Displacement = 0; - _orb.Color = EscapeRoomEngine.Engine.Runtime.Engine.Theme.solvedColor.hdr; + ringX.Displacement = 0; + ringY.Displacement = 0; + ringZ.Displacement = 0; + var color = EscapeRoomEngine.Engine.Runtime.Engine.Theme.solvedColor.hdr; + ringX.Emission.color = color; + ringY.Emission.color = color; + ringZ.Emission.color = color; + _orb.Color = color; _orb.GetComponent().enabled = false; animator.SetTrigger(SlotIn); break; @@ -54,13 +58,13 @@ namespace Station46.Modules.Steles.Scripts if (!Solved) { var position = _orb.transform.position - target.position; - steleX.Displacement = position.x * movementScaling.x; - steleY.Displacement = position.y * movementScaling.y; - steleZ.Displacement = position.z * movementScaling.z; + ringX.Displacement = position.x * movementScaling.x; + ringY.Displacement = position.y * movementScaling.y; + ringZ.Displacement = position.z * movementScaling.z; - SetState(0, Mathf.RoundToInt(steleX.Displacement / accuracy), false); - SetState(1, Mathf.RoundToInt(steleY.Displacement / accuracy), false); - SetState(2, Mathf.RoundToInt(steleZ.Displacement / accuracy), true); + SetState(0, Mathf.RoundToInt(ringX.Displacement / accuracy), false); + SetState(1, Mathf.RoundToInt(ringY.Displacement / accuracy), false); + SetState(2, Mathf.RoundToInt(ringZ.Displacement / accuracy), true); if (_orb.Color != EscapeRoomEngine.Engine.Runtime.Engine.Theme.solvedColor.hdr) { @@ -84,7 +88,7 @@ namespace Station46.Modules.Steles.Scripts } else { - throw new EngineException("Align steles was not assigned a related dispenser orb."); + throw new EngineException("Align rings was not assigned a related dispenser orb."); } } } diff --git a/Assets/Station46/Modules/Steles/Scripts/AlignSteles.cs.meta b/Assets/Station46/Modules/Rings/Scripts/AlignRings.cs.meta similarity index 100% rename from Assets/Station46/Modules/Steles/Scripts/AlignSteles.cs.meta rename to Assets/Station46/Modules/Rings/Scripts/AlignRings.cs.meta diff --git a/Assets/Station46/Modules/Steles/Scripts/AlignStele.cs b/Assets/Station46/Modules/Rings/Scripts/Ring.cs similarity index 53% rename from Assets/Station46/Modules/Steles/Scripts/AlignStele.cs rename to Assets/Station46/Modules/Rings/Scripts/Ring.cs index cbc2f91..e7b4bc5 100644 --- a/Assets/Station46/Modules/Steles/Scripts/AlignStele.cs +++ b/Assets/Station46/Modules/Rings/Scripts/Ring.cs @@ -1,13 +1,22 @@ -using NaughtyAttributes; +using System; +using NaughtyAttributes; +using Station46.Scripts; using UnityEngine; -namespace Station46.Modules.Steles.Scripts +namespace Station46.Modules.Rings.Scripts { - public class AlignStele : MonoBehaviour + [RequireComponent(typeof(Emission))] + public class Ring : MonoBehaviour { public float speed; [ShowNativeProperty] public float Displacement { get; set; } + public Emission Emission { get; private set; } + + private void Awake() + { + Emission = GetComponent(); + } private void Update() { diff --git a/Assets/Station46/Modules/Rings/Scripts/Ring.cs.meta b/Assets/Station46/Modules/Rings/Scripts/Ring.cs.meta new file mode 100644 index 0000000..1ec4602 --- /dev/null +++ b/Assets/Station46/Modules/Rings/Scripts/Ring.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0a920c663eb740c084fc8e87fbe72cb7 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Modules/Steles/Scripts/AlignStele.cs.meta b/Assets/Station46/Modules/Steles/Scripts/AlignStele.cs.meta deleted file mode 100644 index 8cb0f50..0000000 --- a/Assets/Station46/Modules/Steles/Scripts/AlignStele.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 0a920c663eb740c084fc8e87fbe72cb7 -timeCreated: 1683754591 \ No newline at end of file diff --git a/Assets/Station46/Station 46.asset b/Assets/Station46/Station 46.asset index a78e3b4..b1d74e4 100644 --- a/Assets/Station46/Station 46.asset +++ b/Assets/Station46/Station 46.asset @@ -12,8 +12,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 28d04249c1c4438da94b524e7d4afff2, type: 3} m_Name: Station 46 m_EditorClassIdentifier: - minRoomSize: {x: 2, y: 4} - playSpace: {x: 2, y: 4} + minRoomSize: {x: 2, y: 3} + playSpace: {x: 2, y: 3} spaceTile: {fileID: 3229991053255736984, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} environment: {fileID: 5743657079028767629, guid: 17ecdbaca50efaa4ab503614dfec54a8, diff --git a/Assets/Test Assets/Test Theme.asset b/Assets/Test Assets/Test Theme.asset index 86fc342..44a1dde 100644 --- a/Assets/Test Assets/Test Theme.asset +++ b/Assets/Test Assets/Test Theme.asset @@ -32,6 +32,4 @@ MonoBehaviour: - {fileID: 11400000, guid: 83d6800536b1df14287ff2cd8e0d58ce, type: 2} puzzleCount: {x: 1, y: 1} puzzleTypes: - - {fileID: 11400000, guid: 6ea70b544b4cffb4ca12286c749da98d, type: 2} - - {fileID: 11400000, guid: 6ea70b544b4cffb4ca12286c749da98d, type: 2} - - {fileID: 11400000, guid: 6ea70b544b4cffb4ca12286c749da98d, type: 2} + - {fileID: 11400000, guid: 9d56e3bfca17b264e9f04bd8242030f8, type: 2}