diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Animations/Ball.controller b/Assets/Desert/Assets/Modules/Puzzle A/Animations/Ball.controller index 5fcfe1b..c4b0348 100644 --- a/Assets/Desert/Assets/Modules/Puzzle A/Animations/Ball.controller +++ b/Assets/Desert/Assets/Modules/Puzzle A/Animations/Ball.controller @@ -26,58 +26,6 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1102 &-7970321022854130865 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Default - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: - - {fileID: 3896175313453450285} - m_StateMachineBehaviours: [] - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 0 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 0 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 0} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1107 &-6177685051463467014 -AnimatorStateMachine: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Light - m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: -7970321022854130865} - m_Position: {x: 340, y: 120, z: 0} - - serializedVersion: 1 - m_State: {fileID: 2868234142170902506} - m_Position: {x: 340, y: 30, z: 0} - m_ChildStateMachines: [] - m_AnyStateTransitions: [] - m_EntryTransitions: [] - m_StateMachineTransitions: {} - m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} - m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: -7970321022854130865} --- !u!1102 &-5897180308845547544 AnimatorState: serializedVersion: 6 @@ -156,13 +104,7 @@ AnimatorController: m_PrefabAsset: {fileID: 0} m_Name: Ball serializedVersion: 5 - m_AnimatorParameters: - - m_Name: Light Flash - m_Type: 9 - m_DefaultFloat: 0 - m_DefaultInt: 0 - m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_AnimatorParameters: [] m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -200,18 +142,6 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} - - serializedVersion: 5 - m_Name: Light - m_StateMachine: {fileID: -6177685051463467014} - m_Mask: {fileID: 0} - m_Motions: [] - m_Behaviours: [] - m_BlendingMode: 0 - m_SyncedLayerIndex: -1 - m_DefaultWeight: 1 - m_IKPass: 0 - m_SyncedLayerAffectsTiming: 0 - m_Controller: {fileID: 9100000} --- !u!1107 &2209054577498530713 AnimatorStateMachine: serializedVersion: 6 @@ -234,80 +164,6 @@ AnimatorStateMachine: m_ExitPosition: {x: 570, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: -5897180308845547544} ---- !u!1101 &2515615889856913227 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: [] - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -7970321022854130865} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0 - m_TransitionOffset: 0 - m_ExitTime: 1 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1102 &2868234142170902506 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Light Flash - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: - - {fileID: 2515615889856913227} - m_StateMachineBehaviours: [] - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 0 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 0 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 85151fe00b889bb4d9b13cd2a51e2f14, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1101 &3896175313453450285 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: - - m_ConditionMode: 1 - m_ConditionEvent: Light Flash - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 2868234142170902506} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0 - m_TransitionOffset: 0 - m_ExitTime: 1 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1102 &8957109444666979854 AnimatorState: serializedVersion: 6 diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Animations/Crystal Rotation.anim b/Assets/Desert/Assets/Modules/Puzzle A/Animations/Crystal Rotation.anim index fb4f077..18b84f0 100644 --- a/Assets/Desert/Assets/Modules/Puzzle A/Animations/Crystal Rotation.anim +++ b/Assets/Desert/Assets/Modules/Puzzle A/Animations/Crystal Rotation.anim @@ -38,7 +38,7 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: Origin/Ball/Crystal + path: Origin/Crystal m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: @@ -94,7 +94,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_Range - path: Origin/Ball/Crystal Light + path: Origin/Crystal Light classID: 108 script: {fileID: 0} m_PPtrCurves: [] @@ -166,7 +166,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.z - path: Origin/Ball/Crystal + path: Origin/Crystal classID: 4 script: {fileID: 0} - curve: @@ -221,7 +221,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_Range - path: Origin/Ball/Crystal Light + path: Origin/Crystal Light classID: 108 script: {fileID: 0} m_EulerEditorCurves: [] diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Animations/Hover.anim b/Assets/Desert/Assets/Modules/Puzzle A/Animations/Hover.anim index 1d5b375..541c7c6 100644 --- a/Assets/Desert/Assets/Modules/Puzzle A/Animations/Hover.anim +++ b/Assets/Desert/Assets/Modules/Puzzle A/Animations/Hover.anim @@ -48,7 +48,7 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: Origin/Ball + path: Origin - curve: serializedVersion: 2 m_Curve: @@ -91,7 +91,7 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: Origin/Ball/Ring + path: Origin/Ring m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: [] @@ -172,7 +172,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.y - path: Origin/Ball + path: Origin classID: 4 script: {fileID: 0} - curve: @@ -218,7 +218,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.z - path: Origin/Ball/Ring + path: Origin/Ring classID: 4 script: {fileID: 0} m_EulerEditorCurves: [] diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Animations/Ring Rotation.anim b/Assets/Desert/Assets/Modules/Puzzle A/Animations/Ring Rotation.anim index e77a74d..a4f988b 100644 --- a/Assets/Desert/Assets/Modules/Puzzle A/Animations/Ring Rotation.anim +++ b/Assets/Desert/Assets/Modules/Puzzle A/Animations/Ring Rotation.anim @@ -42,7 +42,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: rotationAngle - path: Origin/Ball/Ring + path: Origin/Ring classID: 114 script: {fileID: 11500000, guid: 7902f6a7fa0fd844f8ed93e3debd7778, type: 3} m_PPtrCurves: [] @@ -107,7 +107,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: rotationAngle - path: Origin/Ball/Ring + path: Origin/Ring classID: 114 script: {fileID: 11500000, guid: 7902f6a7fa0fd844f8ed93e3debd7778, type: 3} m_EulerEditorCurves: [] diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Materials/Ring and Crystal.mat b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Ring and Crystal.mat index 8441d05..83ee3d8 100644 --- a/Assets/Desert/Assets/Modules/Puzzle A/Materials/Ring and Crystal.mat +++ b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Ring and Crystal.mat @@ -12,11 +12,12 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: + - _EMISSION - _METALLICSPECGLOSSMAP - _NORMALMAP - _OCCLUSIONMAP m_InvalidKeywords: [] - m_LightmapFlags: 4 + m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 @@ -48,7 +49,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _EmissionMap: - m_Texture: {fileID: 2800000, guid: 80f4ae60ce33e25408ea5fbd4c499f4c, type: 3} + m_Texture: {fileID: 2800000, guid: ff9592df217738046922978273370bfe, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Materials/Symbol.mat b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Symbol.mat new file mode 100644 index 0000000..312f9f3 --- /dev/null +++ b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Symbol.mat @@ -0,0 +1,133 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-2460207158206054948 +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: 6 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Symbol + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _EMISSION + 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: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + 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: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + 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 + - _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: [] diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Materials/Symbol.mat.meta b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Symbol.mat.meta new file mode 100644 index 0000000..2c52d09 --- /dev/null +++ b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Symbol.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fb673d50d37c580449e4df79d236d6d1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_AlbedoTransparency.png b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_AlbedoTransparency.png index 84739da..c086096 100644 --- a/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_AlbedoTransparency.png +++ b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_AlbedoTransparency.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1476e6931ded8000ca93eccf6dd5b43433d0f7fb18e006c486385495087ce51e -size 72073 +oid sha256:fc39c99c8c7243e7aad45d046fa9b76bd03bfcef94745c9490b53debce241f5f +size 65127 diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_AlbedoTransparency.png.meta b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_AlbedoTransparency.png.meta index e4c3fd5..b5dc7e9 100644 --- a/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_AlbedoTransparency.png.meta +++ b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_AlbedoTransparency.png.meta @@ -20,6 +20,7 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 @@ -63,6 +64,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 cookieLightType: 0 platformSettings: - serializedVersion: 3 @@ -117,7 +119,6 @@ TextureImporter: nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_MetallicSmoothness.png b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_MetallicSmoothness.png index 8e64e4e..8e2e78d 100644 --- a/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_MetallicSmoothness.png +++ b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_MetallicSmoothness.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:67df13f39427da925f25ec5963e4242a22ee6484f23344fe7e34242ef3190ac6 -size 7802294 +oid sha256:64153f149e9e81100f3c9218f3e1940a2f372ff6b2eb38e0c746e05993f7f08f +size 5042796 diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_MetallicSmoothness.png.meta b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_MetallicSmoothness.png.meta index c370765..4bf0fba 100644 --- a/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_MetallicSmoothness.png.meta +++ b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_MetallicSmoothness.png.meta @@ -20,6 +20,7 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 @@ -63,6 +64,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 cookieLightType: 0 platformSettings: - serializedVersion: 3 @@ -117,7 +119,6 @@ TextureImporter: nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_Normal.png b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_Normal.png index da36957..95827cb 100644 --- a/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_Normal.png +++ b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_Normal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ed5a7796345aa4576e6fcd8e484f3a5ed528c4ffbfc6eec8afa38876f213cd3a -size 4240127 +oid sha256:36cb44b0ad5086836f6bc16d4df9feb02c6fafa69311a78dfe5b8662cc1b22fb +size 2644097 diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_Normal.png.meta b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_Normal.png.meta index 536fd06..b2706ce 100644 --- a/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_Normal.png.meta +++ b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_Normal.png.meta @@ -20,6 +20,7 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 @@ -63,6 +64,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 cookieLightType: 0 platformSettings: - serializedVersion: 3 @@ -117,7 +119,6 @@ TextureImporter: nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_Occlusion.png b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_Occlusion.png index 464d889..de23513 100644 --- a/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_Occlusion.png +++ b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_Occlusion.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:148b765df9889bda25bdd1101aba10cb901a24206b6084a6586ad2d2437eca04 -size 3444758 +oid sha256:d42af5f5aff3f56e56985031dbc9645917bf69c32eb57a1cfd2d767ccb85cdc1 +size 1881097 diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_Occlusion.png.meta b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_Occlusion.png.meta index b69f5d8..c0066fd 100644 --- a/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_Occlusion.png.meta +++ b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Light_Occlusion.png.meta @@ -20,6 +20,7 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 @@ -63,6 +64,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 cookieLightType: 0 platformSettings: - serializedVersion: 3 @@ -117,7 +119,6 @@ TextureImporter: nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_AlbedoTransparency.png b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_AlbedoTransparency.png index 4775b71..f109ed8 100644 --- a/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_AlbedoTransparency.png +++ b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_AlbedoTransparency.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cc8f258800284ce3a5832a58e6cb5ab576dc6ea37252d24f081e47f7420f8380 -size 12802212 +oid sha256:0f164ab00101dd3ce3d73f4d272ca457751a6bf268ffab5d067786adbac4b275 +size 10572682 diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_AlbedoTransparency.png.meta b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_AlbedoTransparency.png.meta index d50bd7f..6df21c3 100644 --- a/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_AlbedoTransparency.png.meta +++ b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_AlbedoTransparency.png.meta @@ -20,6 +20,7 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 @@ -63,6 +64,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 cookieLightType: 0 platformSettings: - serializedVersion: 3 @@ -117,7 +119,6 @@ TextureImporter: nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_Emission.png b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_Emission.png new file mode 100644 index 0000000..2498c6c --- /dev/null +++ b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_Emission.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dff78b2414b160559181140950257cb850059a0d1e36d12efca60e3c52bbda13 +size 1393151 diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_Emission.png.meta b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_Emission.png.meta new file mode 100644 index 0000000..8bc2382 --- /dev/null +++ b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_Emission.png.meta @@ -0,0 +1,124 @@ +fileFormatVersion: 2 +guid: ff9592df217738046922978273370bfe +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 + ignoreMasterTextureLimit: 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: 4096 + 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: {} + spritePackingTag: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_MetallicSmoothness.png b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_MetallicSmoothness.png index cd91b42..cbcd602 100644 --- a/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_MetallicSmoothness.png +++ b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_MetallicSmoothness.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dd9054adace06c1c074338f516305f6077175691f76ee2de3795785f83ee0d8b -size 13107325 +oid sha256:1bf8e81ccbd953b74c4119223267bfe2c983b90d3b72f51950f6a2ec636ff3f7 +size 9719244 diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_MetallicSmoothness.png.meta b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_MetallicSmoothness.png.meta index c04e9a0..7dd83ae 100644 --- a/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_MetallicSmoothness.png.meta +++ b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_MetallicSmoothness.png.meta @@ -20,6 +20,7 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 @@ -63,6 +64,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 cookieLightType: 0 platformSettings: - serializedVersion: 3 @@ -117,7 +119,6 @@ TextureImporter: nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_Normal.png b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_Normal.png index 26ac8b8..bb4114a 100644 --- a/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_Normal.png +++ b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_Normal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e2f4749ded147859fee4b90e61c2ae81d7ee204eca49b5b8dd9b0f722a860765 -size 8808955 +oid sha256:f9ef1ad7f1ec40e440d677aa704aba2016ca7c576f625f612576060e3c260d9f +size 7009957 diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_Normal.png.meta b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_Normal.png.meta index 9fe38ff..7095617 100644 --- a/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_Normal.png.meta +++ b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_Normal.png.meta @@ -20,6 +20,7 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 @@ -63,6 +64,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 cookieLightType: 0 platformSettings: - serializedVersion: 3 @@ -117,7 +119,6 @@ TextureImporter: nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_Occlusion.png b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_Occlusion.png index 4299dea..011f3e2 100644 --- a/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_Occlusion.png +++ b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_Occlusion.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:99780bacc9b133f7f0be2119b424ff854d853d44a137a1fa534da7a63c286a1f -size 6232458 +oid sha256:8ed83ebbb85df59569f466cdfc0a8416a478d23311c53c7dfdc9b13bdaea54c6 +size 5271123 diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_Occlusion.png.meta b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_Occlusion.png.meta index fc126de..07b3186 100644 --- a/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_Occlusion.png.meta +++ b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Ring and Crystal_Occlusion.png.meta @@ -20,6 +20,7 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 @@ -63,6 +64,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 cookieLightType: 0 platformSettings: - serializedVersion: 3 @@ -117,7 +119,6 @@ TextureImporter: nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Sphere_AlbedoTransparency.png.meta b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Sphere_AlbedoTransparency.png.meta index 0be0d29..bbf0390 100644 --- a/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Sphere_AlbedoTransparency.png.meta +++ b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Sphere_AlbedoTransparency.png.meta @@ -20,6 +20,7 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 @@ -63,6 +64,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 cookieLightType: 0 platformSettings: - serializedVersion: 3 @@ -117,7 +119,6 @@ TextureImporter: nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Sphere_MetallicSmoothness.png.meta b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Sphere_MetallicSmoothness.png.meta index 99d15e0..3603f94 100644 --- a/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Sphere_MetallicSmoothness.png.meta +++ b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Sphere_MetallicSmoothness.png.meta @@ -20,6 +20,7 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 @@ -63,6 +64,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 cookieLightType: 0 platformSettings: - serializedVersion: 3 @@ -117,7 +119,6 @@ TextureImporter: nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Sphere_Normal.png.meta b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Sphere_Normal.png.meta index f99d901..34cdece 100644 --- a/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Sphere_Normal.png.meta +++ b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Sphere_Normal.png.meta @@ -20,6 +20,7 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 @@ -63,6 +64,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 cookieLightType: 0 platformSettings: - serializedVersion: 3 @@ -117,7 +119,6 @@ TextureImporter: nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Sphere_Occlusion.png b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Sphere_Occlusion.png index 9fd18c1..6ff4512 100644 --- a/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Sphere_Occlusion.png +++ b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Sphere_Occlusion.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6bd0c4c1a2cc18ca4e8974296f238912d3562cc320b75eea9a56096e13d121a5 -size 3578722 +oid sha256:b201639be72e2ebff97a8c0969546a881268b07d267a0c27323f2665f7bb007b +size 3577249 diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Sphere_Occlusion.png.meta b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Sphere_Occlusion.png.meta index 83043e1..db15e12 100644 --- a/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Sphere_Occlusion.png.meta +++ b/Assets/Desert/Assets/Modules/Puzzle A/Materials/Textures/Ball/Ball_Sphere_Occlusion.png.meta @@ -20,6 +20,7 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 @@ -63,6 +64,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 cookieLightType: 0 platformSettings: - serializedVersion: 3 @@ -117,7 +119,6 @@ TextureImporter: nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Models/Ball.blend b/Assets/Desert/Assets/Modules/Puzzle A/Models/Ball.blend index 48347a4..4edd8ee 100644 --- a/Assets/Desert/Assets/Modules/Puzzle A/Models/Ball.blend +++ b/Assets/Desert/Assets/Modules/Puzzle A/Models/Ball.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b286de1aa2f38322367b3dae5ef50db2b62fe5c48816aacd5c0f4a5888538074 -size 2305428 +oid sha256:eea9a193ec0c117af999f3970ed01b41e6b412999db08acac810cc063e40b4b8 +size 1591312 diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Models/Ball.blend.meta b/Assets/Desert/Assets/Modules/Puzzle A/Models/Ball.blend.meta index 8cf770b..ebf29f4 100644 --- a/Assets/Desert/Assets/Modules/Puzzle A/Models/Ball.blend.meta +++ b/Assets/Desert/Assets/Modules/Puzzle A/Models/Ball.blend.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 guid: 8bfe86028a0486d4cad45e2ed4a25328 ModelImporter: - serializedVersion: 21300 + serializedVersion: 22103 internalIDToNameTable: [] externalObjects: {} materials: @@ -67,6 +67,7 @@ ModelImporter: secondaryUVMinObjectScale: 1 secondaryUVPackMargin: 4 useFileScale: 1 + strictVertexDataChecks: 0 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 @@ -99,6 +100,7 @@ ModelImporter: humanoidOversampling: 1 avatarSetup: 0 addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 0 remapMaterialsIfMaterialImportModeIsNone: 0 additionalBone: 0 userData: diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Models/Ball.blend1 b/Assets/Desert/Assets/Modules/Puzzle A/Models/Ball.blend1 index bfe2b78..5e89ac2 100644 Binary files a/Assets/Desert/Assets/Modules/Puzzle A/Models/Ball.blend1 and b/Assets/Desert/Assets/Modules/Puzzle A/Models/Ball.blend1 differ diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Models/Ball.fbx b/Assets/Desert/Assets/Modules/Puzzle A/Models/Ball.fbx index 602046d..3eb809f 100644 --- a/Assets/Desert/Assets/Modules/Puzzle A/Models/Ball.fbx +++ b/Assets/Desert/Assets/Modules/Puzzle A/Models/Ball.fbx @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1ade2801297ca272370036256f1c4cfd94e9f3845190cbd6cc731567fdb02b3a -size 923420 +oid sha256:e1f25a7eef43d3259a29c475c9b31de318a5e58e1622b69ad7567d651f834575 +size 693340 diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Models/Symbols.blend b/Assets/Desert/Assets/Modules/Puzzle A/Models/Symbols.blend new file mode 100644 index 0000000..c31eb50 --- /dev/null +++ b/Assets/Desert/Assets/Modules/Puzzle A/Models/Symbols.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:07b6a2af8793ac1c41a5ce8ca39a8bdd224177c997656e3733a74771e4d6dbe9 +size 1668608 diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Models/Symbols.blend.meta b/Assets/Desert/Assets/Modules/Puzzle A/Models/Symbols.blend.meta new file mode 100644 index 0000000..45338b6 --- /dev/null +++ b/Assets/Desert/Assets/Modules/Puzzle A/Models/Symbols.blend.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: d85d1c4a0aee1c0488ecef3460974169 +ModelImporter: + serializedVersion: 22103 + 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/Desert/Assets/Modules/Puzzle A/Models/Symbols.blend1 b/Assets/Desert/Assets/Modules/Puzzle A/Models/Symbols.blend1 new file mode 100644 index 0000000..3dee463 Binary files /dev/null and b/Assets/Desert/Assets/Modules/Puzzle A/Models/Symbols.blend1 differ diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Models/Symbols.blend1.meta b/Assets/Desert/Assets/Modules/Puzzle A/Models/Symbols.blend1.meta new file mode 100644 index 0000000..b272556 --- /dev/null +++ b/Assets/Desert/Assets/Modules/Puzzle A/Models/Symbols.blend1.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9792f411fba7e4746a746bb309cc6f34 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Models/Terminal.blend b/Assets/Desert/Assets/Modules/Puzzle A/Models/Terminal.blend index 7a7ccb3..af00a72 100644 --- a/Assets/Desert/Assets/Modules/Puzzle A/Models/Terminal.blend +++ b/Assets/Desert/Assets/Modules/Puzzle A/Models/Terminal.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2c5c2cfdcec4a30a0f2c3078bd2cf189ed73758756b9e5b42db25ec62fc34e2b -size 941920 +oid sha256:b6e88341b1ad572371b5462287fee3a4d3d13395dd3a62d390811a2779324eec +size 941600 diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Models/Terminal.blend1 b/Assets/Desert/Assets/Modules/Puzzle A/Models/Terminal.blend1 index 6a2eeb8..d4eb4a8 100644 Binary files a/Assets/Desert/Assets/Modules/Puzzle A/Models/Terminal.blend1 and b/Assets/Desert/Assets/Modules/Puzzle A/Models/Terminal.blend1 differ diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Ball.prefab b/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Ball.prefab index 4f1e399..f5fccb9 100644 --- a/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Ball.prefab +++ b/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Ball.prefab @@ -1,5 +1,36 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &1802627664471589967 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6139719356195850697} + m_Layer: 0 + m_Name: Symbol 0 Slot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6139719356195850697 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1802627664471589967} + m_LocalRotation: {x: -0.00000008940697, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -0.35000002, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3726041809801977347} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1866521633337521293 GameObject: m_ObjectHideFlags: 0 @@ -31,9 +62,9 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 8054747497531214955} - - {fileID: 4685734356664916467} - - {fileID: 3255809339753780837} + - {fileID: 6139719356195850697} + - {fileID: 6031700874301053090} + - {fileID: 482053561973229316} m_Father: {fileID: 3551594203716208114} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -101,13 +132,17 @@ MonoBehaviour: m_EditorClassIdentifier: rotating: 1 rotationAngle: 0 - activeRange: {x: -20, y: 20} + activeRange: {x: -25, y: 25} crystal: {fileID: 5479821360340449616} symbols: - - {fileID: 1496886773925654589} - - {fileID: 588859562845345223} - - {fileID: 8332558567568654656} ---- !u!1 &2290318712142008096 + - {fileID: 2887328222646426809, guid: 566e8dae7e2ac9b4abf618d00025ea5e, type: 3} + - {fileID: 2887328222646426809, guid: b40c2b3a68d0bb44fa9c18ea3ba3d054, type: 3} + - {fileID: 2887328222646426809, guid: eac27af4fb2fa8346a9f99f12270dc4d, type: 3} + symbolSlots: + - {fileID: 6139719356195850697} + - {fileID: 6031700874301053090} + - {fileID: 482053561973229316} +--- !u!1 &3317350134075385036 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -115,222 +150,29 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4685734356664916467} - - component: {fileID: 6202986585814907903} - - component: {fileID: 965655743021538627} - - component: {fileID: 5612641253605404945} - - component: {fileID: 588859562845345223} + - component: {fileID: 482053561973229316} m_Layer: 0 - m_Name: Symbol 1 + m_Name: Symbol 2 Slot m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4685734356664916467 +--- !u!4 &482053561973229316 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2290318712142008096} - m_LocalRotation: {x: 0.000000059604638, y: -0.00000008940696, z: 0.86602545, w: -0.5} - m_LocalPosition: {x: -0.30310887, y: 0.17500003, z: 0} + m_GameObject: {fileID: 3317350134075385036} + m_LocalRotation: {x: 0.00000008940696, y: 0.00000017881392, z: 0.8660254, w: 0.49999994} + m_LocalPosition: {x: 0.3031089, y: 0.175, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3726041809801977347} - m_RootOrder: 1 + m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &6202986585814907903 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2290318712142008096} - m_Mesh: {fileID: -6097616886491281762, guid: 8bfe86028a0486d4cad45e2ed4a25328, type: 3} ---- !u!23 &965655743021538627 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2290318712142008096} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: ae1eea39931515141a0b371e57b65948, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &5612641253605404945 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2290318712142008096} - 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} ---- !u!114 &588859562845345223 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2290318712142008096} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1e099fd852792c34188dcf102aa895e4, type: 3} - m_Name: - m_EditorClassIdentifier: - symbolNumber: 1 - anglePosition: 120 ---- !u!1 &3032249595895728242 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8054747497531214955} - - component: {fileID: 3269011222938728034} - - component: {fileID: 6644726816612317193} - - component: {fileID: 4863973920609991930} - - component: {fileID: 1496886773925654589} - m_Layer: 0 - m_Name: Symbol 0 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8054747497531214955 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3032249595895728242} - m_LocalRotation: {x: -0.000000119209275, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -0.3500001, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 3726041809801977347} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &3269011222938728034 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3032249595895728242} - m_Mesh: {fileID: 4060858011744859214, guid: 8bfe86028a0486d4cad45e2ed4a25328, type: 3} ---- !u!23 &6644726816612317193 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3032249595895728242} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: ae1eea39931515141a0b371e57b65948, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &4863973920609991930 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3032249595895728242} - 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} ---- !u!114 &1496886773925654589 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3032249595895728242} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1e099fd852792c34188dcf102aa895e4, type: 3} - m_Name: - m_EditorClassIdentifier: - symbolNumber: 0 - anglePosition: 0 --- !u!1 &3501693287014819891 GameObject: m_ObjectHideFlags: 0 @@ -442,6 +284,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: color: {r: 8, g: 3.5137255, b: 0, a: 1} + emissionRenderer: {fileID: 5316980818402345830} --- !u!1 &3567493004391185636 GameObject: m_ObjectHideFlags: 0 @@ -539,118 +382,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: color: {r: 8, g: 3.5137255, b: 0, a: 1} ---- !u!1 &3629096364680104226 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3255809339753780837} - - component: {fileID: 2583177187591852803} - - component: {fileID: 1484093686627548433} - - component: {fileID: 7219244091874369325} - - component: {fileID: 8332558567568654656} - m_Layer: 0 - m_Name: Symbol 2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3255809339753780837 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3629096364680104226} - m_LocalRotation: {x: 0.00000008940696, y: 0.00000017881392, z: 0.8660254, w: 0.49999994} - m_LocalPosition: {x: 0.30310893, y: 0.17500003, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 3726041809801977347} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &2583177187591852803 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3629096364680104226} - m_Mesh: {fileID: -214668054094066933, guid: 8bfe86028a0486d4cad45e2ed4a25328, type: 3} ---- !u!23 &1484093686627548433 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3629096364680104226} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: ae1eea39931515141a0b371e57b65948, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &7219244091874369325 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3629096364680104226} - 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} ---- !u!114 &8332558567568654656 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3629096364680104226} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1e099fd852792c34188dcf102aa895e4, type: 3} - m_Name: - m_EditorClassIdentifier: - symbolNumber: 2 - anglePosition: 240 + emissionRenderer: {fileID: 8071682251213623948} --- !u!1 &3858759582118357347 GameObject: m_ObjectHideFlags: 0 @@ -696,7 +428,7 @@ Light: m_Type: 2 m_Shape: 0 m_Color: {r: 1, g: 0.4392157, b: 0, a: 1} - m_Intensity: 1 + m_Intensity: 0.2 m_Range: 0.35 m_SpotAngle: 30 m_InnerSpotAngle: 21.80208 @@ -776,7 +508,7 @@ GameObject: m_Component: - component: {fileID: 3551594203716208114} m_Layer: 0 - m_Name: Ball + m_Name: Origin m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -789,7 +521,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4179934950292135752} - m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 0, y: 1.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -799,8 +531,8 @@ Transform: - {fileID: 4686079292882662655} - {fileID: 187177369402190177} - {fileID: 7967134179848797030} - m_Father: {fileID: 6971389597904162428} - m_RootOrder: 0 + m_Father: {fileID: 6632296159696107301} + m_RootOrder: -1 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!1 &5124972529400987023 GameObject: @@ -885,6 +617,37 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &6161800585124939589 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6031700874301053090} + m_Layer: 0 + m_Name: Symbol 1 Slot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6031700874301053090 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6161800585124939589} + m_LocalRotation: {x: 0.000000029802322, y: -0.00000008940697, z: 0.86602545, w: -0.5} + m_LocalPosition: {x: -0.30310887, y: 0.175, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3726041809801977347} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8483390061905403097 GameObject: m_ObjectHideFlags: 0 @@ -915,7 +678,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 6971389597904162428} + - {fileID: 3551594203716208114} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -954,35 +717,3 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!1 &8774961869938559592 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6971389597904162428} - m_Layer: 0 - m_Name: Origin - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &6971389597904162428 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8774961869938559592} - 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: 3551594203716208114} - m_Father: {fileID: 6632296159696107301} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Ring Symbol 0.prefab b/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Ring Symbol 0.prefab new file mode 100644 index 0000000..468d5c7 --- /dev/null +++ b/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Ring Symbol 0.prefab @@ -0,0 +1,79 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &5086539726305614196 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 2 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4833432624659214914, guid: c1db242c9c9011b40a6acaf73b4990a0, + type: 3} + propertyPath: m_Name + value: Ring Symbol A + objectReference: {fileID: 0} + - target: {fileID: 5212949492091382008, guid: c1db242c9c9011b40a6acaf73b4990a0, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5212949492091382008, guid: c1db242c9c9011b40a6acaf73b4990a0, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5212949492091382008, guid: c1db242c9c9011b40a6acaf73b4990a0, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5212949492091382008, guid: c1db242c9c9011b40a6acaf73b4990a0, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5212949492091382008, guid: c1db242c9c9011b40a6acaf73b4990a0, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5212949492091382008, guid: c1db242c9c9011b40a6acaf73b4990a0, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5212949492091382008, guid: c1db242c9c9011b40a6acaf73b4990a0, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5212949492091382008, guid: c1db242c9c9011b40a6acaf73b4990a0, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5212949492091382008, guid: c1db242c9c9011b40a6acaf73b4990a0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5212949492091382008, guid: c1db242c9c9011b40a6acaf73b4990a0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5212949492091382008, guid: c1db242c9c9011b40a6acaf73b4990a0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5880362977227864918, guid: c1db242c9c9011b40a6acaf73b4990a0, + type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 4060858011744859214, guid: d85d1c4a0aee1c0488ecef3460974169, + type: 3} + m_RemovedComponents: [] + m_AddedGameObjects: [] + m_SourcePrefab: {fileID: 100100000, guid: c1db242c9c9011b40a6acaf73b4990a0, type: 3} diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Ring Symbol 0.prefab.meta b/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Ring Symbol 0.prefab.meta new file mode 100644 index 0000000..7e4914c --- /dev/null +++ b/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Ring Symbol 0.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 566e8dae7e2ac9b4abf618d00025ea5e +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Ring Symbol 1.prefab b/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Ring Symbol 1.prefab new file mode 100644 index 0000000..8d4d7c9 --- /dev/null +++ b/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Ring Symbol 1.prefab @@ -0,0 +1,84 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &5086539726305614196 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 2 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4833432624659214914, guid: c1db242c9c9011b40a6acaf73b4990a0, + type: 3} + propertyPath: m_Name + value: Ring Symbol 1 + objectReference: {fileID: 0} + - target: {fileID: 5212949492091382008, guid: c1db242c9c9011b40a6acaf73b4990a0, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5212949492091382008, guid: c1db242c9c9011b40a6acaf73b4990a0, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5212949492091382008, guid: c1db242c9c9011b40a6acaf73b4990a0, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5212949492091382008, guid: c1db242c9c9011b40a6acaf73b4990a0, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5212949492091382008, guid: c1db242c9c9011b40a6acaf73b4990a0, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5212949492091382008, guid: c1db242c9c9011b40a6acaf73b4990a0, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5212949492091382008, guid: c1db242c9c9011b40a6acaf73b4990a0, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5212949492091382008, guid: c1db242c9c9011b40a6acaf73b4990a0, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5212949492091382008, guid: c1db242c9c9011b40a6acaf73b4990a0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5212949492091382008, guid: c1db242c9c9011b40a6acaf73b4990a0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5212949492091382008, guid: c1db242c9c9011b40a6acaf73b4990a0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5880362977227864918, guid: c1db242c9c9011b40a6acaf73b4990a0, + type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: -6097616886491281762, guid: d85d1c4a0aee1c0488ecef3460974169, + type: 3} + - target: {fileID: 7964296356625319373, guid: c1db242c9c9011b40a6acaf73b4990a0, + type: 3} + propertyPath: symbolNumber + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_AddedGameObjects: [] + m_SourcePrefab: {fileID: 100100000, guid: c1db242c9c9011b40a6acaf73b4990a0, type: 3} diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Ring Symbol 1.prefab.meta b/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Ring Symbol 1.prefab.meta new file mode 100644 index 0000000..12753e8 --- /dev/null +++ b/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Ring Symbol 1.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b40c2b3a68d0bb44fa9c18ea3ba3d054 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Ring Symbol 2.prefab b/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Ring Symbol 2.prefab new file mode 100644 index 0000000..02102b2 --- /dev/null +++ b/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Ring Symbol 2.prefab @@ -0,0 +1,84 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &5086539726305614196 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 2 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4833432624659214914, guid: c1db242c9c9011b40a6acaf73b4990a0, + type: 3} + propertyPath: m_Name + value: Ring Symbol 2 + objectReference: {fileID: 0} + - target: {fileID: 5212949492091382008, guid: c1db242c9c9011b40a6acaf73b4990a0, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5212949492091382008, guid: c1db242c9c9011b40a6acaf73b4990a0, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5212949492091382008, guid: c1db242c9c9011b40a6acaf73b4990a0, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5212949492091382008, guid: c1db242c9c9011b40a6acaf73b4990a0, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5212949492091382008, guid: c1db242c9c9011b40a6acaf73b4990a0, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5212949492091382008, guid: c1db242c9c9011b40a6acaf73b4990a0, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5212949492091382008, guid: c1db242c9c9011b40a6acaf73b4990a0, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5212949492091382008, guid: c1db242c9c9011b40a6acaf73b4990a0, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5212949492091382008, guid: c1db242c9c9011b40a6acaf73b4990a0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5212949492091382008, guid: c1db242c9c9011b40a6acaf73b4990a0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5212949492091382008, guid: c1db242c9c9011b40a6acaf73b4990a0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5880362977227864918, guid: c1db242c9c9011b40a6acaf73b4990a0, + type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: -214668054094066933, guid: d85d1c4a0aee1c0488ecef3460974169, + type: 3} + - target: {fileID: 7964296356625319373, guid: c1db242c9c9011b40a6acaf73b4990a0, + type: 3} + propertyPath: symbolNumber + value: 2 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_AddedGameObjects: [] + m_SourcePrefab: {fileID: 100100000, guid: c1db242c9c9011b40a6acaf73b4990a0, type: 3} diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Ring Symbol 2.prefab.meta b/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Ring Symbol 2.prefab.meta new file mode 100644 index 0000000..d7ba2d3 --- /dev/null +++ b/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Ring Symbol 2.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: eac27af4fb2fa8346a9f99f12270dc4d +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Ring Symbol.prefab b/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Ring Symbol.prefab new file mode 100644 index 0000000..6964652 --- /dev/null +++ b/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Ring Symbol.prefab @@ -0,0 +1,118 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &8393263056101448986 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 2 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3992741351158361944, guid: d448da7d4695ed54cbc3c951c4e78509, + type: 3} + propertyPath: m_Name + value: Ring Symbol + objectReference: {fileID: 0} + - target: {fileID: 4333238779474015714, guid: d448da7d4695ed54cbc3c951c4e78509, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4333238779474015714, guid: d448da7d4695ed54cbc3c951c4e78509, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4333238779474015714, guid: d448da7d4695ed54cbc3c951c4e78509, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4333238779474015714, guid: d448da7d4695ed54cbc3c951c4e78509, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4333238779474015714, guid: d448da7d4695ed54cbc3c951c4e78509, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4333238779474015714, guid: d448da7d4695ed54cbc3c951c4e78509, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4333238779474015714, guid: d448da7d4695ed54cbc3c951c4e78509, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4333238779474015714, guid: d448da7d4695ed54cbc3c951c4e78509, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4333238779474015714, guid: d448da7d4695ed54cbc3c951c4e78509, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4333238779474015714, guid: d448da7d4695ed54cbc3c951c4e78509, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4333238779474015714, guid: d448da7d4695ed54cbc3c951c4e78509, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6091946470802925607, guid: d448da7d4695ed54cbc3c951c4e78509, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: fb673d50d37c580449e4df79d236d6d1, type: 2} + m_RemovedComponents: [] + m_AddedGameObjects: [] + m_SourcePrefab: {fileID: 100100000, guid: d448da7d4695ed54cbc3c951c4e78509, type: 3} +--- !u!23 &2373446818059072829 stripped +MeshRenderer: + m_CorrespondingSourceObject: {fileID: 6091946470802925607, guid: d448da7d4695ed54cbc3c951c4e78509, + type: 3} + m_PrefabInstance: {fileID: 8393263056101448986} + m_PrefabAsset: {fileID: 0} +--- !u!1 &4833432624659214914 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3992741351158361944, guid: d448da7d4695ed54cbc3c951c4e78509, + type: 3} + m_PrefabInstance: {fileID: 8393263056101448986} + m_PrefabAsset: {fileID: 0} +--- !u!114 &7722767201901209326 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4833432624659214914} + 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} + emissionRenderer: {fileID: 2373446818059072829} +--- !u!114 &7964296356625319373 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4833432624659214914} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1e099fd852792c34188dcf102aa895e4, type: 3} + m_Name: + m_EditorClassIdentifier: + symbolNumber: 0 + anglePosition: 0 diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Ring Symbol.prefab.meta b/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Ring Symbol.prefab.meta new file mode 100644 index 0000000..07c2f11 --- /dev/null +++ b/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Ring Symbol.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c1db242c9c9011b40a6acaf73b4990a0 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Symbol Button 0.prefab b/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Symbol Button 0.prefab new file mode 100644 index 0000000..d223429 --- /dev/null +++ b/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Symbol Button 0.prefab @@ -0,0 +1,79 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &7407045062122761446 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 2 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4656853589317644725, guid: 74282103b754d2148a051b7b3693c921, + type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 4060858011744859214, guid: d85d1c4a0aee1c0488ecef3460974169, + type: 3} + - target: {fileID: 5920126912232503457, guid: 74282103b754d2148a051b7b3693c921, + type: 3} + propertyPath: m_Name + value: Symbol Button 0 + objectReference: {fileID: 0} + - target: {fileID: 6441084954992009755, guid: 74282103b754d2148a051b7b3693c921, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6441084954992009755, guid: 74282103b754d2148a051b7b3693c921, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6441084954992009755, guid: 74282103b754d2148a051b7b3693c921, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6441084954992009755, guid: 74282103b754d2148a051b7b3693c921, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6441084954992009755, guid: 74282103b754d2148a051b7b3693c921, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6441084954992009755, guid: 74282103b754d2148a051b7b3693c921, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6441084954992009755, guid: 74282103b754d2148a051b7b3693c921, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6441084954992009755, guid: 74282103b754d2148a051b7b3693c921, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6441084954992009755, guid: 74282103b754d2148a051b7b3693c921, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6441084954992009755, guid: 74282103b754d2148a051b7b3693c921, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6441084954992009755, guid: 74282103b754d2148a051b7b3693c921, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_AddedGameObjects: [] + m_SourcePrefab: {fileID: 100100000, guid: 74282103b754d2148a051b7b3693c921, type: 3} diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Symbol Button 0.prefab.meta b/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Symbol Button 0.prefab.meta new file mode 100644 index 0000000..f198422 --- /dev/null +++ b/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Symbol Button 0.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 86e2d17220add994180c68b9d1accedf +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Symbol Button 1.prefab b/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Symbol Button 1.prefab new file mode 100644 index 0000000..0effcd8 --- /dev/null +++ b/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Symbol Button 1.prefab @@ -0,0 +1,84 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &7407045062122761446 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 2 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4656853589317644725, guid: 74282103b754d2148a051b7b3693c921, + type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: -6097616886491281762, guid: d85d1c4a0aee1c0488ecef3460974169, + type: 3} + - target: {fileID: 5920126912232503457, guid: 74282103b754d2148a051b7b3693c921, + type: 3} + propertyPath: m_Name + value: Symbol Button 1 + objectReference: {fileID: 0} + - target: {fileID: 6441084954992009755, guid: 74282103b754d2148a051b7b3693c921, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6441084954992009755, guid: 74282103b754d2148a051b7b3693c921, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6441084954992009755, guid: 74282103b754d2148a051b7b3693c921, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6441084954992009755, guid: 74282103b754d2148a051b7b3693c921, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6441084954992009755, guid: 74282103b754d2148a051b7b3693c921, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6441084954992009755, guid: 74282103b754d2148a051b7b3693c921, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6441084954992009755, guid: 74282103b754d2148a051b7b3693c921, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6441084954992009755, guid: 74282103b754d2148a051b7b3693c921, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6441084954992009755, guid: 74282103b754d2148a051b7b3693c921, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6441084954992009755, guid: 74282103b754d2148a051b7b3693c921, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6441084954992009755, guid: 74282103b754d2148a051b7b3693c921, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8232915369211415309, guid: 74282103b754d2148a051b7b3693c921, + type: 3} + propertyPath: symbolNumber + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_AddedGameObjects: [] + m_SourcePrefab: {fileID: 100100000, guid: 74282103b754d2148a051b7b3693c921, type: 3} diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Symbol Button 1.prefab.meta b/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Symbol Button 1.prefab.meta new file mode 100644 index 0000000..b07003a --- /dev/null +++ b/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Symbol Button 1.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 56b1289ac81310842badca5f7d86fdb1 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Symbol Button 2.prefab b/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Symbol Button 2.prefab new file mode 100644 index 0000000..4e9b301 --- /dev/null +++ b/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Symbol Button 2.prefab @@ -0,0 +1,84 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &7407045062122761446 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 2 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4656853589317644725, guid: 74282103b754d2148a051b7b3693c921, + type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: -214668054094066933, guid: d85d1c4a0aee1c0488ecef3460974169, + type: 3} + - target: {fileID: 5920126912232503457, guid: 74282103b754d2148a051b7b3693c921, + type: 3} + propertyPath: m_Name + value: Symbol Button 2 + objectReference: {fileID: 0} + - target: {fileID: 6441084954992009755, guid: 74282103b754d2148a051b7b3693c921, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6441084954992009755, guid: 74282103b754d2148a051b7b3693c921, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6441084954992009755, guid: 74282103b754d2148a051b7b3693c921, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6441084954992009755, guid: 74282103b754d2148a051b7b3693c921, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6441084954992009755, guid: 74282103b754d2148a051b7b3693c921, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6441084954992009755, guid: 74282103b754d2148a051b7b3693c921, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6441084954992009755, guid: 74282103b754d2148a051b7b3693c921, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6441084954992009755, guid: 74282103b754d2148a051b7b3693c921, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6441084954992009755, guid: 74282103b754d2148a051b7b3693c921, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6441084954992009755, guid: 74282103b754d2148a051b7b3693c921, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6441084954992009755, guid: 74282103b754d2148a051b7b3693c921, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8232915369211415309, guid: 74282103b754d2148a051b7b3693c921, + type: 3} + propertyPath: symbolNumber + value: 2 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_AddedGameObjects: [] + m_SourcePrefab: {fileID: 100100000, guid: 74282103b754d2148a051b7b3693c921, type: 3} diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Symbol Button 2.prefab.meta b/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Symbol Button 2.prefab.meta new file mode 100644 index 0000000..456f250 --- /dev/null +++ b/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Symbol Button 2.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2fcd14b3dc000e542b7397d9b160228a +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Symbol Button.prefab b/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Symbol Button.prefab new file mode 100644 index 0000000..338c95f --- /dev/null +++ b/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Symbol Button.prefab @@ -0,0 +1,105 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &7296276792083978233 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 2 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3992741351158361944, guid: d448da7d4695ed54cbc3c951c4e78509, + type: 3} + propertyPath: m_Name + value: Symbol Button + objectReference: {fileID: 0} + - target: {fileID: 4333238779474015714, guid: d448da7d4695ed54cbc3c951c4e78509, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4333238779474015714, guid: d448da7d4695ed54cbc3c951c4e78509, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4333238779474015714, guid: d448da7d4695ed54cbc3c951c4e78509, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4333238779474015714, guid: d448da7d4695ed54cbc3c951c4e78509, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4333238779474015714, guid: d448da7d4695ed54cbc3c951c4e78509, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4333238779474015714, guid: d448da7d4695ed54cbc3c951c4e78509, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4333238779474015714, guid: d448da7d4695ed54cbc3c951c4e78509, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4333238779474015714, guid: d448da7d4695ed54cbc3c951c4e78509, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4333238779474015714, guid: d448da7d4695ed54cbc3c951c4e78509, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4333238779474015714, guid: d448da7d4695ed54cbc3c951c4e78509, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4333238779474015714, guid: d448da7d4695ed54cbc3c951c4e78509, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6091946470802925607, guid: d448da7d4695ed54cbc3c951c4e78509, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: d1f58490f6d04c64da01277723d63536, type: 2} + m_RemovedComponents: [] + m_AddedGameObjects: [] + m_SourcePrefab: {fileID: 100100000, guid: d448da7d4695ed54cbc3c951c4e78509, type: 3} +--- !u!23 &3588071600122019806 stripped +MeshRenderer: + m_CorrespondingSourceObject: {fileID: 6091946470802925607, guid: d448da7d4695ed54cbc3c951c4e78509, + type: 3} + m_PrefabInstance: {fileID: 7296276792083978233} + m_PrefabAsset: {fileID: 0} +--- !u!1 &5920126912232503457 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3992741351158361944, guid: d448da7d4695ed54cbc3c951c4e78509, + type: 3} + m_PrefabInstance: {fileID: 7296276792083978233} + m_PrefabAsset: {fileID: 0} +--- !u!114 &8232915369211415309 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5920126912232503457} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3d6620bee0f14224b11a19808d537cbd, type: 3} + m_Name: + m_EditorClassIdentifier: + symbolNumber: 0 + theme: {fileID: 11400000, guid: 568d9a7d70f3edb4cb6db66a0010f105, type: 2} + holoRenderer: {fileID: 3588071600122019806} diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Symbol Button.prefab.meta b/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Symbol Button.prefab.meta new file mode 100644 index 0000000..f5f53cc --- /dev/null +++ b/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Symbol Button.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 74282103b754d2148a051b7b3693c921 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Symbol.prefab b/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Symbol.prefab new file mode 100644 index 0000000..8954e9a --- /dev/null +++ b/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Symbol.prefab @@ -0,0 +1,117 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2497395721758087260 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7454593110803733573} + - component: {fileID: 2729712160695412300} + - component: {fileID: 6091946470802925607} + m_Layer: 0 + m_Name: Mesh + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7454593110803733573 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2497395721758087260} + 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: 4333238779474015714} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &2729712160695412300 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2497395721758087260} + m_Mesh: {fileID: 0} +--- !u!23 &6091946470802925607 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2497395721758087260} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &3992741351158361944 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4333238779474015714} + m_Layer: 0 + m_Name: Symbol + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4333238779474015714 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3992741351158361944} + 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: 7454593110803733573} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Symbol.prefab.meta b/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Symbol.prefab.meta new file mode 100644 index 0000000..c30fa5a --- /dev/null +++ b/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Symbol.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d448da7d4695ed54cbc3c951c4e78509 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Terminal.prefab b/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Terminal.prefab index 1914139..8550fa9 100644 --- a/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Terminal.prefab +++ b/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Terminal.prefab @@ -23,15 +23,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 638494408070513344} - m_LocalRotation: {x: -0.5611671, y: -0, z: -0, w: 0.8277025} + m_LocalRotation: {x: -0.9820791, y: -0, z: -0, w: 0.18846948} m_LocalPosition: {x: 0, y: 0.812958, z: -0.104633} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 143671197139830240} + m_Children: [] m_Father: {fileID: 5383329221585827904} m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: -158.273, y: 0, z: 0} --- !u!1 &2775512167163026764 GameObject: m_ObjectHideFlags: 0 @@ -129,6 +128,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: color: {r: 8, g: 3.5137255, b: 0, a: 1} + emissionRenderer: {fileID: 7409351737048267309} --- !u!1 &2869716636102105226 GameObject: m_ObjectHideFlags: 0 @@ -152,113 +152,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2869716636102105226} - m_LocalRotation: {x: -0.5611671, y: -0, z: -0, w: 0.8277025} + m_LocalRotation: {x: -0.9820791, y: -0, z: -0, w: 0.18846948} m_LocalPosition: {x: 0, y: 0.886395, z: -0.288131} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 3400578974218326136} + m_Children: [] m_Father: {fileID: 5383329221585827904} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &4909747043175940601 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 143671197139830240} - - component: {fileID: 4858124499749322729} - - component: {fileID: 3603044390296711554} - - component: {fileID: 7205539446313206328} - m_Layer: 0 - m_Name: Symbol 0 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &143671197139830240 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4909747043175940601} - m_LocalRotation: {x: -0.70710653, y: 5.123641e-14, z: 3.992727e-16, w: 0.70710707} - m_LocalPosition: {x: 0, y: 0, z: 0.0004} - m_LocalScale: {x: 1.5, y: 1.5000001, z: 1.5000001} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 6522234565953195748} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} ---- !u!33 &4858124499749322729 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4909747043175940601} - m_Mesh: {fileID: 4060858011744859214, guid: 8bfe86028a0486d4cad45e2ed4a25328, type: 3} ---- !u!23 &3603044390296711554 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4909747043175940601} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: d1f58490f6d04c64da01277723d63536, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &7205539446313206328 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4909747043175940601} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3d6620bee0f14224b11a19808d537cbd, type: 3} - m_Name: - m_EditorClassIdentifier: - symbolNumber: 0 - theme: {fileID: 11400000, guid: 568d9a7d70f3edb4cb6db66a0010f105, type: 2} + m_LocalEulerAnglesHint: {x: -158.273, y: 0, z: 0} --- !u!1 &5383329221585827911 GameObject: m_ObjectHideFlags: 0 @@ -329,209 +230,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: theme: {fileID: 11400000, guid: 568d9a7d70f3edb4cb6db66a0010f105, type: 2} + easyMode: 0 totalSteps: 3 currentStep: 0 + cycleStep: 0 terminalLight: {fileID: 7019057833946340774} symbols: - - {fileID: 7205539446313206328} - - {fileID: 7137138753029999131} - - {fileID: 3305065602426008998} ---- !u!1 &6659550577443356841 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4834806911612575726} - - component: {fileID: 5615729157681388168} - - component: {fileID: 8840237612263060634} - - component: {fileID: 3305065602426008998} - m_Layer: 0 - m_Name: Symbol 2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4834806911612575726 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6659550577443356841} - m_LocalRotation: {x: -0.70710653, y: 5.123641e-14, z: 3.992727e-16, w: 0.70710707} - m_LocalPosition: {x: 0, y: 0, z: 0.0004} - m_LocalScale: {x: 1.5, y: 1.5000002, z: 1.5000002} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 5306762529052481636} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} ---- !u!33 &5615729157681388168 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6659550577443356841} - m_Mesh: {fileID: -214668054094066933, guid: 8bfe86028a0486d4cad45e2ed4a25328, type: 3} ---- !u!23 &8840237612263060634 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6659550577443356841} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: d1f58490f6d04c64da01277723d63536, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &3305065602426008998 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6659550577443356841} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3d6620bee0f14224b11a19808d537cbd, type: 3} - m_Name: - m_EditorClassIdentifier: - symbolNumber: 2 - theme: {fileID: 11400000, guid: 568d9a7d70f3edb4cb6db66a0010f105, type: 2} ---- !u!1 &8214146423999858347 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3400578974218326136} - - component: {fileID: 4045135655228650100} - - component: {fileID: 7156475810192577736} - - component: {fileID: 7137138753029999131} - m_Layer: 0 - m_Name: Symbol 1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3400578974218326136 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8214146423999858347} - m_LocalRotation: {x: -0.70710653, y: 5.123641e-14, z: 3.992727e-16, w: 0.70710707} - m_LocalPosition: {x: 0, y: 0, z: 0.0004} - m_LocalScale: {x: 1.5, y: 1.5000001, z: 1.5000001} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1715039903437992233} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} ---- !u!33 &4045135655228650100 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8214146423999858347} - m_Mesh: {fileID: -6097616886491281762, guid: 8bfe86028a0486d4cad45e2ed4a25328, type: 3} ---- !u!23 &7156475810192577736 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8214146423999858347} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: d1f58490f6d04c64da01277723d63536, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &7137138753029999131 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8214146423999858347} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3d6620bee0f14224b11a19808d537cbd, type: 3} - m_Name: - m_EditorClassIdentifier: - symbolNumber: 1 - theme: {fileID: 11400000, guid: 568d9a7d70f3edb4cb6db66a0010f105, type: 2} + - {fileID: 1480044724853155819, guid: 86e2d17220add994180c68b9d1accedf, type: 3} + - {fileID: 1480044724853155819, guid: 56b1289ac81310842badca5f7d86fdb1, type: 3} + - {fileID: 1480044724853155819, guid: 2fcd14b3dc000e542b7397d9b160228a, type: 3} + symbolSlots: + - {fileID: 1715039903437992233} + - {fileID: 6522234565953195748} + - {fileID: 5306762529052481636} --- !u!1 &8471610280302804497 GameObject: m_ObjectHideFlags: 0 @@ -555,12 +266,11 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8471610280302804497} - m_LocalRotation: {x: -0.5611671, y: -0, z: -0, w: 0.8277025} + m_LocalRotation: {x: -0.9820791, y: -0, z: -0, w: 0.18846948} m_LocalPosition: {x: 0, y: 0.73952, z: 0.078867} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4834806911612575726} + m_Children: [] m_Father: {fileID: 5383329221585827904} m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: -158.273, y: 0, z: 0} diff --git a/Assets/Desert/Runtime/Button.cs b/Assets/Desert/Runtime/Button.cs index 0043cee..7674636 100644 --- a/Assets/Desert/Runtime/Button.cs +++ b/Assets/Desert/Runtime/Button.cs @@ -68,7 +68,7 @@ namespace EscapeRoomEngine.Desert.Runtime private bool _active = true, _pressed; - protected virtual void Awake() + protected virtual void Start() { ButtonEvent += (_, type) => { diff --git a/Assets/Desert/Runtime/Emission.cs b/Assets/Desert/Runtime/Emission.cs index 887c3c1..e002ef8 100644 --- a/Assets/Desert/Runtime/Emission.cs +++ b/Assets/Desert/Runtime/Emission.cs @@ -1,4 +1,5 @@ -using UnityEngine; +using NaughtyAttributes; +using UnityEngine; namespace EscapeRoomEngine.Desert.Runtime { @@ -8,6 +9,7 @@ namespace EscapeRoomEngine.Desert.Runtime internal bool active; [ColorUsage(false, true)] public Color color; + [BoxGroup("Internal")] [Required] public MeshRenderer emissionRenderer; private bool _previousActive; private Color _previousColor; @@ -15,7 +17,7 @@ namespace EscapeRoomEngine.Desert.Runtime private void Awake() { - _material = GetComponent().material; + _material = emissionRenderer.material; } private void Start() diff --git a/Assets/Desert/Runtime/Puzzle A/Ring.cs b/Assets/Desert/Runtime/Puzzle A/Ring.cs index ef3383f..ae15399 100644 --- a/Assets/Desert/Runtime/Puzzle A/Ring.cs +++ b/Assets/Desert/Runtime/Puzzle A/Ring.cs @@ -1,4 +1,6 @@ using System.Collections.Generic; +using EscapeRoomEngine.Engine.Runtime.Utilities; +using JetBrains.Annotations; using NaughtyAttributes; using UnityEngine; @@ -9,8 +11,28 @@ namespace EscapeRoomEngine.Desert.Runtime.Puzzle_A public bool rotating = true; public float rotationAngle; [MinMaxSlider(-180, 180)] public Vector2 activeRange; - [Required] public Crystal crystal; + [BoxGroup("Internal")] [Required] public Crystal crystal; + [BoxGroup("Internal")] + [ValidateInput("SymbolCount", "Must have same amount of symbols and slots.")] public List symbols; + [BoxGroup("Internal")] + public List symbolSlots; + + private void Awake() + { + var angleDistance = 360f / symbols.Count; + List symbolInstances = new(symbols.Count); + + for (var i = 0; i < symbols.Count; i++) + { + var symbol = Instantiate(symbols.RandomElement(), symbolSlots[i], false); + symbol.symbolPosition = i; + symbol.anglePosition = i * angleDistance; + symbolInstances.Add(symbol); + } + + symbols = symbolInstances; + } private void Update() { @@ -29,5 +51,7 @@ namespace EscapeRoomEngine.Desert.Runtime.Puzzle_A crystal.Active = activeSymbol; } } + + [UsedImplicitly] private bool SymbolCount(List list) => list.Count == symbolSlots.Count; } } diff --git a/Assets/Desert/Runtime/Puzzle A/Symbol.cs b/Assets/Desert/Runtime/Puzzle A/Symbol.cs index 77118f0..ab9f4ed 100644 --- a/Assets/Desert/Runtime/Puzzle A/Symbol.cs +++ b/Assets/Desert/Runtime/Puzzle A/Symbol.cs @@ -30,7 +30,7 @@ namespace EscapeRoomEngine.Desert.Runtime.Puzzle_A [RequireComponent(typeof(Emission))] public class Symbol : MonoBehaviour { - public int symbolNumber; + public int symbolNumber, symbolPosition; public float anglePosition; public event SymbolEventHandler SymbolEvent; diff --git a/Assets/Desert/Runtime/Puzzle A/SymbolButton.cs b/Assets/Desert/Runtime/Puzzle A/SymbolButton.cs index 4489b37..01b6ba6 100644 --- a/Assets/Desert/Runtime/Puzzle A/SymbolButton.cs +++ b/Assets/Desert/Runtime/Puzzle A/SymbolButton.cs @@ -1,9 +1,9 @@ using EscapeRoomEngine.Engine.Runtime; +using NaughtyAttributes; using UnityEngine; namespace EscapeRoomEngine.Desert.Runtime.Puzzle_A { - [RequireComponent(typeof(MeshRenderer))] public class SymbolButton : Button { private static readonly int FresnelColor = Shader.PropertyToID("_FresnelColor"); @@ -11,12 +11,18 @@ namespace EscapeRoomEngine.Desert.Runtime.Puzzle_A public int symbolNumber; public EngineTheme theme; + [BoxGroup("Internal")] [Required] public MeshRenderer holoRenderer; private Material _material; - private void Start() + private void Awake() { - _material = GetComponent().material; + _material = holoRenderer.material; + } + + protected override void Start() + { + base.Start(); ButtonEvent += (_, type) => { diff --git a/Assets/Desert/Runtime/Puzzle A/Terminal.cs b/Assets/Desert/Runtime/Puzzle A/Terminal.cs index bee58d6..3fabf14 100644 --- a/Assets/Desert/Runtime/Puzzle A/Terminal.cs +++ b/Assets/Desert/Runtime/Puzzle A/Terminal.cs @@ -1,7 +1,9 @@ using System; using System.Collections.Generic; +using System.Linq; using EscapeRoomEngine.Engine.Runtime.Modules; using EscapeRoomEngine.Engine.Runtime.Utilities; +using JetBrains.Annotations; using NaughtyAttributes; using UnityEngine; using Logger = EscapeRoomEngine.Engine.Runtime.Utilities.Logger; @@ -15,15 +17,23 @@ namespace EscapeRoomEngine.Desert.Runtime.Puzzle_A private static readonly int LightFlash = Animator.StringToHash("Light Flash"); [BoxGroup("Internal")] [Required] public Emission terminalLight; - [BoxGroup("Internal")] public List symbols; + [BoxGroup("Internal")] + [ValidateInput("SymbolCount", "Must have same amount of symbols and slots.")] + public List symbols; + [BoxGroup("Internal")] + public List symbolSlots; - private int _activeSymbol, _lastPressedSymbol; + private IOption _activeSymbol; private Animator _animator; private Ball _ball; private void Awake() { _animator = GetComponent(); + + List symbolInstances = new(symbols.Count); + symbolInstances.AddRange(symbols.Select((t, i) => Instantiate(t, symbolSlots[i], false))); + symbols = symbolInstances; } protected override void Start() @@ -66,7 +76,7 @@ namespace EscapeRoomEngine.Desert.Runtime.Puzzle_A _ball.ring.symbols.ForEach(symbol => { symbol.SymbolEvent += type => - _activeSymbol = type == SymbolEventType.Activated ? symbol.symbolNumber : -1; + _activeSymbol = type == SymbolEventType.Activated ? Some.Of(symbol) : None.New(); }); } @@ -88,33 +98,36 @@ namespace EscapeRoomEngine.Desert.Runtime.Puzzle_A } // required in animation - internal void TurnOnLights() + [UsedImplicitly] internal void TurnOnLights() { terminalLight.active = true; _ball.StatusLight = true; } // required in animation - internal void TurnOffLights() + [UsedImplicitly] internal void TurnOffLights() { terminalLight.active = false; _ball.StatusLight = false; } - internal void PressedSymbol(int number) + private void PressedSymbol(int number) { if (!Solved) { Logger.Log($"Pressed symbol {number} on {this}", LogType.PuzzleDetail); - if (number == _activeSymbol) + _activeSymbol.Match(some: symbol => { - CheckStep(number); - } - else - { - WrongInput(); - } + if (number == symbol.symbolNumber) + { + CheckStep(symbol.symbolPosition); + } + else + { + WrongInput(); + } + }, none: WrongInput); } } @@ -125,5 +138,7 @@ namespace EscapeRoomEngine.Desert.Runtime.Puzzle_A [Button(enabledMode: EButtonEnableMode.Playmode)] public void PressSymbol2() => PressedSymbol(2); #endregion + + [UsedImplicitly] private bool SymbolCount(List list) => list.Count == symbolSlots.Count; } } \ No newline at end of file