diff --git a/Assets/Images/Split/mqdefault_6s.png b/Assets/Images/Split/mqdefault_6s.png new file mode 100644 index 0000000..fe0998e Binary files /dev/null and b/Assets/Images/Split/mqdefault_6s.png differ diff --git a/Assets/Images/Split/mqdefault_6s.png.meta b/Assets/Images/Split/mqdefault_6s.png.meta new file mode 100644 index 0000000..2e9f5df --- /dev/null +++ b/Assets/Images/Split/mqdefault_6s.png.meta @@ -0,0 +1,303 @@ +fileFormatVersion: 2 +guid: 04614744e166b5f4b8b0621ad8c3f362 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + 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: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: mqdefault_6s_0 + rect: + serializedVersion: 2 + x: 0 + y: 90 + width: 80 + height: 90 + alignment: 9 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 169eb47570f383140b54a6663c27987a + internalID: -1064862615 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: mqdefault_6s_1 + rect: + serializedVersion: 2 + x: 80 + y: 90 + width: 80 + height: 90 + alignment: 9 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: eab46054ae242b84792a1af5478a0051 + internalID: -2102979285 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: mqdefault_6s_2 + rect: + serializedVersion: 2 + x: 160 + y: 90 + width: 80 + height: 90 + alignment: 9 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 1ed5777a02c2db44ca521c3a2482dc5e + internalID: 1651142211 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: mqdefault_6s_3 + rect: + serializedVersion: 2 + x: 240 + y: 90 + width: 80 + height: 90 + alignment: 9 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: d456289421115ab439c3ada8028d7ae7 + internalID: 1723850524 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: mqdefault_6s_4 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 80 + height: 90 + alignment: 9 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: d88650c7aea07ef44a30a97808dfa9a1 + internalID: -948625817 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: mqdefault_6s_5 + rect: + serializedVersion: 2 + x: 80 + y: 0 + width: 80 + height: 90 + alignment: 9 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 1a0cdba45492f5a4398d782a62f6b955 + internalID: 2061557561 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: mqdefault_6s_6 + rect: + serializedVersion: 2 + x: 160 + y: 0 + width: 80 + height: 90 + alignment: 9 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 27c294f8132cecf4c82d8909213b8a4a + internalID: -2110342779 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: mqdefault_6s_7 + rect: + serializedVersion: 2 + x: 240 + y: 0 + width: 80 + height: 90 + alignment: 9 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 3674e0eee7ce5174289c4b6626e97a12 + internalID: -1484945511 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + mqdefault_6s_0: -1064862615 + mqdefault_6s_1: -2102979285 + mqdefault_6s_2: 1651142211 + mqdefault_6s_3: 1723850524 + mqdefault_6s_4: -948625817 + mqdefault_6s_5: 2061557561 + mqdefault_6s_6: -2110342779 + mqdefault_6s_7: -1484945511 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Art3D.meta b/Assets/Prefabs/Art3D.meta new file mode 100644 index 0000000..0c39bd8 --- /dev/null +++ b/Assets/Prefabs/Art3D.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bc889be29e8e8dd4bbf784c31537fa9f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Art3D/Character.prefab b/Assets/Prefabs/Art3D/Character.prefab new file mode 100644 index 0000000..8a65645 --- /dev/null +++ b/Assets/Prefabs/Art3D/Character.prefab @@ -0,0 +1,124 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &371116989439902891 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6812304174526681661} + m_Layer: 0 + m_Name: Character + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6812304174526681661 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 371116989439902891} + serializedVersion: 2 + 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: 706957102024296084} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1028268498706784639 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6812304174526681661} + m_Modifications: + - target: {fileID: -9041317220418388901, guid: 5360f0c79ef63c048af55ea29d3be3aa, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: c416f83c5071bba478c6762cda95ecca, type: 2} + - target: {fileID: -9041317220418388901, guid: 5360f0c79ef63c048af55ea29d3be3aa, + type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: c50db264a5686ed418b4821b21fa533f, type: 2} + - target: {fileID: -9041317220418388901, guid: 5360f0c79ef63c048af55ea29d3be3aa, + type: 3} + propertyPath: m_Materials.Array.data[2] + value: + objectReference: {fileID: 2100000, guid: 772f79a46fd28d844bd98c93f10436b0, type: 2} + - target: {fileID: -8679921383154817045, guid: 5360f0c79ef63c048af55ea29d3be3aa, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5360f0c79ef63c048af55ea29d3be3aa, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5360f0c79ef63c048af55ea29d3be3aa, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5360f0c79ef63c048af55ea29d3be3aa, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5360f0c79ef63c048af55ea29d3be3aa, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5360f0c79ef63c048af55ea29d3be3aa, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5360f0c79ef63c048af55ea29d3be3aa, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5360f0c79ef63c048af55ea29d3be3aa, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5360f0c79ef63c048af55ea29d3be3aa, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5360f0c79ef63c048af55ea29d3be3aa, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 5360f0c79ef63c048af55ea29d3be3aa, + type: 3} + propertyPath: m_Name + value: Character_V001 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: + - {fileID: -8391222552659086748, guid: 5360f0c79ef63c048af55ea29d3be3aa, type: 3} + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5360f0c79ef63c048af55ea29d3be3aa, type: 3} +--- !u!4 &706957102024296084 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 5360f0c79ef63c048af55ea29d3be3aa, + type: 3} + m_PrefabInstance: {fileID: 1028268498706784639} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Art3D/Character.prefab.meta b/Assets/Prefabs/Art3D/Character.prefab.meta new file mode 100644 index 0000000..107b658 --- /dev/null +++ b/Assets/Prefabs/Art3D/Character.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 16ff033aae936014092803accad2be58 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Art3D/Cursor.prefab b/Assets/Prefabs/Art3D/Cursor.prefab new file mode 100644 index 0000000..c86ad74 --- /dev/null +++ b/Assets/Prefabs/Art3D/Cursor.prefab @@ -0,0 +1,133 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7563216493506774349 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6997620146033860791} + - component: {fileID: 3265567963809100238} + m_Layer: 0 + m_Name: Cursor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6997620146033860791 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7563216493506774349} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 7297418410848169550} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3265567963809100238 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7563216493506774349} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 353f192b40556e34dada2d432a9ffa85, type: 3} + m_Name: + m_EditorClassIdentifier: + AttachedCamera: {fileID: 0} + ZValue: 8 + Scale: 15 +--- !u!1001 &7119938247261505957 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6997620146033860791} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: b23626860a8e47241b2eb8033c3ea124, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b23626860a8e47241b2eb8033c3ea124, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b23626860a8e47241b2eb8033c3ea124, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b23626860a8e47241b2eb8033c3ea124, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b23626860a8e47241b2eb8033c3ea124, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b23626860a8e47241b2eb8033c3ea124, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b23626860a8e47241b2eb8033c3ea124, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b23626860a8e47241b2eb8033c3ea124, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b23626860a8e47241b2eb8033c3ea124, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b23626860a8e47241b2eb8033c3ea124, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: b23626860a8e47241b2eb8033c3ea124, + type: 3} + propertyPath: m_Name + value: Cursor_V001 + objectReference: {fileID: 0} + - target: {fileID: 3757724274799010451, guid: b23626860a8e47241b2eb8033c3ea124, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 66213569fa2fb1443a8c9947133a056e, type: 2} + m_RemovedComponents: [] + m_RemovedGameObjects: + - {fileID: 3840272111657957570, guid: b23626860a8e47241b2eb8033c3ea124, type: 3} + - {fileID: 8174907068477135312, guid: b23626860a8e47241b2eb8033c3ea124, type: 3} + - {fileID: 4974984522306558807, guid: b23626860a8e47241b2eb8033c3ea124, type: 3} + - {fileID: 5050422055867433376, guid: b23626860a8e47241b2eb8033c3ea124, type: 3} + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b23626860a8e47241b2eb8033c3ea124, type: 3} +--- !u!4 &7297418410848169550 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: b23626860a8e47241b2eb8033c3ea124, + type: 3} + m_PrefabInstance: {fileID: 7119938247261505957} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Art3D/Cursor.prefab.meta b/Assets/Prefabs/Art3D/Cursor.prefab.meta new file mode 100644 index 0000000..0f6d57c --- /dev/null +++ b/Assets/Prefabs/Art3D/Cursor.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 15c9da29f34c88d4c82acf24cc874e3b +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Art3D/Map.prefab b/Assets/Prefabs/Art3D/Map.prefab new file mode 100644 index 0000000..eaa868a --- /dev/null +++ b/Assets/Prefabs/Art3D/Map.prefab @@ -0,0 +1,123 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7491457170800244299 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7033510869583823145} + m_Layer: 0 + m_Name: Map + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7033510869583823145 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7491457170800244299} + serializedVersion: 2 + 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: 3549406272374328216} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &3947615421608701043 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 7033510869583823145} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: d92758bce3b648142b2fc4cd2305d92d, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d92758bce3b648142b2fc4cd2305d92d, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d92758bce3b648142b2fc4cd2305d92d, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d92758bce3b648142b2fc4cd2305d92d, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d92758bce3b648142b2fc4cd2305d92d, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d92758bce3b648142b2fc4cd2305d92d, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d92758bce3b648142b2fc4cd2305d92d, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d92758bce3b648142b2fc4cd2305d92d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d92758bce3b648142b2fc4cd2305d92d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d92758bce3b648142b2fc4cd2305d92d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4823157568640072384, guid: d92758bce3b648142b2fc4cd2305d92d, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 57975875ee9e4e74d8ee4c0d09db86b7, type: 2} + - target: {fileID: 494759351821791377, guid: d92758bce3b648142b2fc4cd2305d92d, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: fd98d1c63346de54992666d55b06682a, type: 2} + - target: {fileID: 494759351821791377, guid: d92758bce3b648142b2fc4cd2305d92d, + type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: 90e7dbcd847cd404893d60e5ab49540a, type: 2} + - target: {fileID: 919132149155446097, guid: d92758bce3b648142b2fc4cd2305d92d, + type: 3} + propertyPath: m_Name + value: Globe_Map_V001 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d92758bce3b648142b2fc4cd2305d92d, type: 3} +--- !u!4 &3549406272374328216 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: d92758bce3b648142b2fc4cd2305d92d, + type: 3} + m_PrefabInstance: {fileID: 3947615421608701043} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Art3D/Map.prefab.meta b/Assets/Prefabs/Art3D/Map.prefab.meta new file mode 100644 index 0000000..958c797 --- /dev/null +++ b/Assets/Prefabs/Art3D/Map.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 47699e1e17b5e154ab4f83c14e0392e7 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Art3D/ShieldBar.prefab b/Assets/Prefabs/Art3D/ShieldBar.prefab new file mode 100644 index 0000000..6550878 --- /dev/null +++ b/Assets/Prefabs/Art3D/ShieldBar.prefab @@ -0,0 +1,129 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &228621501325938318 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4417313079524746681} + - component: {fileID: 582498797338587669} + m_Layer: 0 + m_Name: ShieldBar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4417313079524746681 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 228621501325938318} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 3} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 7207716708273798845} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &582498797338587669 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 228621501325938318} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 260819a4950a1f54d921ee3d6b3da010, type: 3} + m_Name: + m_EditorClassIdentifier: + HealthBarObject: {fileID: 850249494288935909} + Spawner: {fileID: 0} +--- !u!1001 &7173193334112115030 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4417313079524746681} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 7bc83d134a74a2a468929a7200cba18e, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7bc83d134a74a2a468929a7200cba18e, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7bc83d134a74a2a468929a7200cba18e, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7bc83d134a74a2a468929a7200cba18e, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7bc83d134a74a2a468929a7200cba18e, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7bc83d134a74a2a468929a7200cba18e, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7bc83d134a74a2a468929a7200cba18e, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7bc83d134a74a2a468929a7200cba18e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7bc83d134a74a2a468929a7200cba18e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7bc83d134a74a2a468929a7200cba18e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 7bc83d134a74a2a468929a7200cba18e, + type: 3} + propertyPath: m_Name + value: Shield_Bar_V002 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7bc83d134a74a2a468929a7200cba18e, type: 3} +--- !u!4 &850249494288935909 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7512281513308713651, guid: 7bc83d134a74a2a468929a7200cba18e, + type: 3} + m_PrefabInstance: {fileID: 7173193334112115030} + m_PrefabAsset: {fileID: 0} +--- !u!4 &7207716708273798845 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 7bc83d134a74a2a468929a7200cba18e, + type: 3} + m_PrefabInstance: {fileID: 7173193334112115030} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Art3D/ShieldBar.prefab.meta b/Assets/Prefabs/Art3D/ShieldBar.prefab.meta new file mode 100644 index 0000000..667d94e --- /dev/null +++ b/Assets/Prefabs/Art3D/ShieldBar.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c0a03ce6c4f39224299267b83719ceb7 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Art3D/WeaponStats.prefab b/Assets/Prefabs/Art3D/WeaponStats.prefab new file mode 100644 index 0000000..7141d1c --- /dev/null +++ b/Assets/Prefabs/Art3D/WeaponStats.prefab @@ -0,0 +1,173 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1730500731044735019 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1044419668733226994} + m_Layer: 0 + m_Name: WeaponStats + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1044419668733226994 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1730500731044735019} + serializedVersion: 2 + 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: 958187019283342279} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &776470133911274540 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1044419668733226994} + m_Modifications: + - target: {fileID: -8743708241877161412, guid: 703cd189b868d4c42a8be20b38d92906, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 0559d680961420b4283f6c41b038e1c8, type: 2} + - target: {fileID: -8679921383154817045, guid: 703cd189b868d4c42a8be20b38d92906, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 703cd189b868d4c42a8be20b38d92906, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 703cd189b868d4c42a8be20b38d92906, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 703cd189b868d4c42a8be20b38d92906, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 703cd189b868d4c42a8be20b38d92906, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 703cd189b868d4c42a8be20b38d92906, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 703cd189b868d4c42a8be20b38d92906, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 703cd189b868d4c42a8be20b38d92906, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 703cd189b868d4c42a8be20b38d92906, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 703cd189b868d4c42a8be20b38d92906, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8411208151607889731, guid: 703cd189b868d4c42a8be20b38d92906, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 0559d680961420b4283f6c41b038e1c8, type: 2} + - target: {fileID: -5082775208107051557, guid: 703cd189b868d4c42a8be20b38d92906, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 0559d680961420b4283f6c41b038e1c8, type: 2} + - target: {fileID: -4494622481652884282, guid: 703cd189b868d4c42a8be20b38d92906, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 0559d680961420b4283f6c41b038e1c8, type: 2} + - target: {fileID: -4006721073217672483, guid: 703cd189b868d4c42a8be20b38d92906, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 0559d680961420b4283f6c41b038e1c8, type: 2} + - target: {fileID: -3113411552344121775, guid: 703cd189b868d4c42a8be20b38d92906, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 0559d680961420b4283f6c41b038e1c8, type: 2} + - target: {fileID: -2773002617504296819, guid: 703cd189b868d4c42a8be20b38d92906, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 0559d680961420b4283f6c41b038e1c8, type: 2} + - target: {fileID: -540276461574901224, guid: 703cd189b868d4c42a8be20b38d92906, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 0559d680961420b4283f6c41b038e1c8, type: 2} + - target: {fileID: 34571417957489200, guid: 703cd189b868d4c42a8be20b38d92906, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 0559d680961420b4283f6c41b038e1c8, type: 2} + - target: {fileID: 919132149155446097, guid: 703cd189b868d4c42a8be20b38d92906, + type: 3} + propertyPath: m_Name + value: Weapon_Stats_V003 + objectReference: {fileID: 0} + - target: {fileID: 1397318277702805348, guid: 703cd189b868d4c42a8be20b38d92906, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 58e9cc7346ee7d140bfe90df87afcf1c, type: 2} + - target: {fileID: 3630336498685884014, guid: 703cd189b868d4c42a8be20b38d92906, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 0559d680961420b4283f6c41b038e1c8, type: 2} + - target: {fileID: 4938214463636535541, guid: 703cd189b868d4c42a8be20b38d92906, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 0559d680961420b4283f6c41b038e1c8, type: 2} + - target: {fileID: 6913809767001870300, guid: 703cd189b868d4c42a8be20b38d92906, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 0559d680961420b4283f6c41b038e1c8, type: 2} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 703cd189b868d4c42a8be20b38d92906, type: 3} +--- !u!4 &958187019283342279 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 703cd189b868d4c42a8be20b38d92906, + type: 3} + m_PrefabInstance: {fileID: 776470133911274540} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Art3D/WeaponStats.prefab.meta b/Assets/Prefabs/Art3D/WeaponStats.prefab.meta new file mode 100644 index 0000000..2a6461a --- /dev/null +++ b/Assets/Prefabs/Art3D/WeaponStats.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3714426ac93dad3498616918a8d512e0 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/GameCanvas.prefab b/Assets/Prefabs/GameCanvas.prefab index 32eda56..7f7d798 100644 --- a/Assets/Prefabs/GameCanvas.prefab +++ b/Assets/Prefabs/GameCanvas.prefab @@ -10,7 +10,7 @@ GameObject: m_Component: - component: {fileID: 1862862063758533551} - component: {fileID: 1850279079604088768} - m_Layer: 0 + m_Layer: 5 m_Name: Spawner m_TagString: Untagged m_Icon: {fileID: 0} @@ -59,6 +59,7 @@ MonoBehaviour: k__BackingField: 2 - k__BackingField: InterfaceOff.TriviaWindow k__BackingField: 4 + k__BackingField: {fileID: 3239915826142415764} k__BackingField: 0 k__BackingField: 1 --- !u!1 &2020022267469913571 @@ -70,7 +71,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3614641596273148411} - m_Layer: 0 + m_Layer: 5 m_Name: GameCanvas m_TagString: Untagged m_Icon: {fileID: 0} @@ -131,6 +132,41 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &3239915826142415764 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1680159658511062866} + m_Layer: 5 + m_Name: Spawned + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1680159658511062866 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3239915826142415764} + 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: 834552907522022778} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3563736642392842882 GameObject: m_ObjectHideFlags: 0 @@ -261,6 +297,8 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5018153252802778155} + - {fileID: 1680159658511062866} + - {fileID: 1389147469433647468} m_Father: {fileID: 3614641596273148411} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -440,3 +478,78 @@ MonoBehaviour: m_EffectColor: {r: 0, g: 0, b: 0, a: 1} m_EffectDistance: {x: 2, y: -2} m_UseGraphicAlpha: 1 +--- !u!1 &7696438193072300722 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1389147469433647468} + - component: {fileID: 7173024211597662773} + - component: {fileID: 833602854707986350} + m_Layer: 5 + m_Name: Overlay + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1389147469433647468 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7696438193072300722} + 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: 834552907522022778} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1920, y: 1080} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7173024211597662773 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7696438193072300722} + m_CullTransparentMesh: 1 +--- !u!114 &833602854707986350 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7696438193072300722} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.5019608} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 diff --git a/Assets/Prefabs/PlayerReplayer.prefab b/Assets/Prefabs/PlayerReplayer.prefab index e2c187d..fc4333a 100644 --- a/Assets/Prefabs/PlayerReplayer.prefab +++ b/Assets/Prefabs/PlayerReplayer.prefab @@ -97,6 +97,7 @@ Transform: - {fileID: 7845453783053460798} - {fileID: 5020301824866751461} - {fileID: 8852994287323472227} + - {fileID: 8969276565425859046} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1013965729963872153 @@ -117,6 +118,7 @@ MonoBehaviour: BulletTracerEnd: {fileID: 8852994287323472227} k__BackingField: 0 DeathIndices: be000000f8000000eb0100005a0200008f020000 + ShieldBarTransform: {fileID: 0} --- !u!20 &7220179918976106526 Camera: m_ObjectHideFlags: 0 @@ -148,7 +150,7 @@ Camera: y: 0 width: 1 height: 1 - near clip plane: 0.3 + near clip plane: 0.01 far clip plane: 1000 field of view: 60 orthographic: 0 @@ -286,9 +288,7 @@ LineRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Positions: - - {x: 0, y: 0, z: 0} - - {x: 0, y: 0, z: 100} + m_Positions: [] m_Parameters: serializedVersion: 3 widthMultiplier: 1 @@ -348,3 +348,97 @@ LineRenderer: m_UseWorldSpace: 1 m_Loop: 0 m_ApplyActiveColorSpace: 1 +--- !u!1001 &2518478724410866651 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1807660236798938897} + m_Modifications: + - target: {fileID: 371116989439902891, guid: 16ff033aae936014092803accad2be58, + type: 3} + propertyPath: m_Name + value: Character + objectReference: {fileID: 0} + - target: {fileID: 6812304174526681661, guid: 16ff033aae936014092803accad2be58, + type: 3} + propertyPath: m_LocalScale.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6812304174526681661, guid: 16ff033aae936014092803accad2be58, + type: 3} + propertyPath: m_LocalScale.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6812304174526681661, guid: 16ff033aae936014092803accad2be58, + type: 3} + propertyPath: m_LocalScale.z + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6812304174526681661, guid: 16ff033aae936014092803accad2be58, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6812304174526681661, guid: 16ff033aae936014092803accad2be58, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.804 + objectReference: {fileID: 0} + - target: {fileID: 6812304174526681661, guid: 16ff033aae936014092803accad2be58, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.016 + objectReference: {fileID: 0} + - target: {fileID: 6812304174526681661, guid: 16ff033aae936014092803accad2be58, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6812304174526681661, guid: 16ff033aae936014092803accad2be58, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6812304174526681661, guid: 16ff033aae936014092803accad2be58, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6812304174526681661, guid: 16ff033aae936014092803accad2be58, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6812304174526681661, guid: 16ff033aae936014092803accad2be58, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6812304174526681661, guid: 16ff033aae936014092803accad2be58, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6812304174526681661, guid: 16ff033aae936014092803accad2be58, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6812304174526681661, guid: 16ff033aae936014092803accad2be58, + type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 16ff033aae936014092803accad2be58, type: 3} +--- !u!4 &8969276565425859046 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6812304174526681661, guid: 16ff033aae936014092803accad2be58, + type: 3} + m_PrefabInstance: {fileID: 2518478724410866651} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/ImageRegistry.asset b/Assets/Resources/ImageRegistry.asset index a7d84cf..b976e2f 100644 --- a/Assets/Resources/ImageRegistry.asset +++ b/Assets/Resources/ImageRegistry.asset @@ -43,3 +43,8 @@ MonoBehaviour: - {fileID: 1481111025, guid: 802abcc8090cc884c85eee10e5e86668, type: 3} - {fileID: 1661635705, guid: 802abcc8090cc884c85eee10e5e86668, type: 3} - {fileID: -1825452829, guid: 802abcc8090cc884c85eee10e5e86668, type: 3} + - k__BackingField: + - {fileID: -2102979285, guid: 04614744e166b5f4b8b0621ad8c3f362, type: 3} + - {fileID: 1651142211, guid: 04614744e166b5f4b8b0621ad8c3f362, type: 3} + - {fileID: 2061557561, guid: 04614744e166b5f4b8b0621ad8c3f362, type: 3} + - {fileID: -2110342779, guid: 04614744e166b5f4b8b0621ad8c3f362, type: 3} diff --git a/Assets/Scenes/WorldScene.unity b/Assets/Scenes/WorldScene.unity index 3b8c52b..38d8d65 100644 --- a/Assets/Scenes/WorldScene.unity +++ b/Assets/Scenes/WorldScene.unity @@ -334,6 +334,16 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 1013965729963872153, guid: 2b0bfd2786fee6740a799a99023f5000, + type: 3} + propertyPath: ExternalCamera + value: + objectReference: {fileID: 782229190} + - target: {fileID: 1013965729963872153, guid: 2b0bfd2786fee6740a799a99023f5000, + type: 3} + propertyPath: FrontLayerImage + value: + objectReference: {fileID: 1484681361} - target: {fileID: 1013965729963872153, guid: 2b0bfd2786fee6740a799a99023f5000, type: 3} propertyPath: ActiveWindowSpawner @@ -362,17 +372,17 @@ PrefabInstance: - target: {fileID: 1807660236798938897, guid: 2b0bfd2786fee6740a799a99023f5000, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1807660236798938897, guid: 2b0bfd2786fee6740a799a99023f5000, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1807660236798938897, guid: 2b0bfd2786fee6740a799a99023f5000, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1807660236798938897, guid: 2b0bfd2786fee6740a799a99023f5000, type: 3} @@ -399,6 +409,239 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2b0bfd2786fee6740a799a99023f5000, type: 3} +--- !u!1001 &739366992 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 782229191} + m_Modifications: + - target: {fileID: 228621501325938318, guid: c0a03ce6c4f39224299267b83719ceb7, + type: 3} + propertyPath: m_Name + value: ShieldBar + objectReference: {fileID: 0} + - target: {fileID: 582498797338587669, guid: c0a03ce6c4f39224299267b83719ceb7, + type: 3} + propertyPath: Spawner + value: + objectReference: {fileID: 447617108} + - target: {fileID: 4417313079524746681, guid: c0a03ce6c4f39224299267b83719ceb7, + type: 3} + propertyPath: m_LocalPosition.x + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4417313079524746681, guid: c0a03ce6c4f39224299267b83719ceb7, + type: 3} + propertyPath: m_LocalPosition.y + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 4417313079524746681, guid: c0a03ce6c4f39224299267b83719ceb7, + type: 3} + propertyPath: m_LocalPosition.z + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 4417313079524746681, guid: c0a03ce6c4f39224299267b83719ceb7, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 4417313079524746681, guid: c0a03ce6c4f39224299267b83719ceb7, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4417313079524746681, guid: c0a03ce6c4f39224299267b83719ceb7, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 4417313079524746681, guid: c0a03ce6c4f39224299267b83719ceb7, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4417313079524746681, guid: c0a03ce6c4f39224299267b83719ceb7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4417313079524746681, guid: c0a03ce6c4f39224299267b83719ceb7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 4417313079524746681, guid: c0a03ce6c4f39224299267b83719ceb7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5539847617648870874, guid: c0a03ce6c4f39224299267b83719ceb7, + type: 3} + propertyPath: m_LocalScale.x + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 5539847617648870874, guid: c0a03ce6c4f39224299267b83719ceb7, + type: 3} + propertyPath: m_LocalScale.z + value: 80 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c0a03ce6c4f39224299267b83719ceb7, type: 3} +--- !u!1 &782229187 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 782229191} + - component: {fileID: 782229190} + - component: {fileID: 782229189} + - component: {fileID: 782229188} + m_Layer: 0 + m_Name: ExternalCamera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &782229188 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 782229187} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 23 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 0 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_AllowHDROutput: 1 + m_UseScreenCoordOverride: 0 + m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} + m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 + m_TaaSettings: + m_Quality: 3 + m_FrameInfluence: 0.1 + m_JitterScale: 1 + m_MipBias: 0 + m_VarianceClampScale: 0.9 + m_ContrastAdaptiveSharpening: 0 +--- !u!20 &782229189 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 782229187} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 2 + m_BackGroundColor: {r: 0, g: 0, b: 0, a: 1} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!114 &782229190 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 782229187} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cfd8d92b06194cf98ee7011df76811cc, type: 3} + m_Name: + m_EditorClassIdentifier: + ExternalCam: {fileID: 782229189} +--- !u!4 &782229191 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 782229187} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 100, y: 0, z: 100} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1003288350} + - {fileID: 1557857216} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &1003288350 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4417313079524746681, guid: c0a03ce6c4f39224299267b83719ceb7, + type: 3} + m_PrefabInstance: {fileID: 739366992} + m_PrefabAsset: {fileID: 0} --- !u!4 &1004516925 stripped Transform: m_CorrespondingSourceObject: {fileID: 4872202698225962268, guid: ffc439d5d7c92f14aa90c763e1cde8d2, @@ -941,6 +1184,97 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 42603e4f95b24efa85355a04450c20e2, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &1484681361 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 833602854707986350, guid: e29ce1fe47a855c4e907d4312c9e9d6e, + type: 3} + m_PrefabInstance: {fileID: 1758685209} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &1557857215 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 782229191} + m_Modifications: + - target: {fileID: 3265567963809100238, guid: 15c9da29f34c88d4c82acf24cc874e3b, + type: 3} + propertyPath: AttachedCamera + value: + objectReference: {fileID: 782229189} + - target: {fileID: 6997620146033860791, guid: 15c9da29f34c88d4c82acf24cc874e3b, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6997620146033860791, guid: 15c9da29f34c88d4c82acf24cc874e3b, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6997620146033860791, guid: 15c9da29f34c88d4c82acf24cc874e3b, + type: 3} + propertyPath: m_LocalPosition.z + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 6997620146033860791, guid: 15c9da29f34c88d4c82acf24cc874e3b, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 6997620146033860791, guid: 15c9da29f34c88d4c82acf24cc874e3b, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6997620146033860791, guid: 15c9da29f34c88d4c82acf24cc874e3b, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 6997620146033860791, guid: 15c9da29f34c88d4c82acf24cc874e3b, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6997620146033860791, guid: 15c9da29f34c88d4c82acf24cc874e3b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6997620146033860791, guid: 15c9da29f34c88d4c82acf24cc874e3b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 6997620146033860791, guid: 15c9da29f34c88d4c82acf24cc874e3b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7563216493506774349, guid: 15c9da29f34c88d4c82acf24cc874e3b, + type: 3} + propertyPath: m_Name + value: Cursor + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 15c9da29f34c88d4c82acf24cc874e3b, type: 3} +--- !u!4 &1557857216 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6997620146033860791, guid: 15c9da29f34c88d4c82acf24cc874e3b, + type: 3} + m_PrefabInstance: {fileID: 1557857215} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1758685209 PrefabInstance: m_ObjectHideFlags: 0 @@ -949,6 +1283,11 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 1912500691838987139, guid: e29ce1fe47a855c4e907d4312c9e9d6e, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2020022267469913571, guid: e29ce1fe47a855c4e907d4312c9e9d6e, type: 3} propertyPath: m_Name @@ -1688,3 +2027,4 @@ SceneRoots: - {fileID: 1909908770} - {fileID: 1758685209} - {fileID: 193820555} + - {fileID: 782229191} diff --git a/Assets/Scripts/ExternalCamera.cs b/Assets/Scripts/ExternalCamera.cs new file mode 100644 index 0000000..c4b7fbb --- /dev/null +++ b/Assets/Scripts/ExternalCamera.cs @@ -0,0 +1,19 @@ +using System; +using UnityEngine; + +namespace InterfaceOff.WorldScene +{ + public class ExternalCamera : MonoBehaviour + { + [SerializeField] private Camera ExternalCam; + private RenderTexture RenderTexture; + + private void Awake() + { + RenderTexture = new RenderTexture(width: 1920, height: 1080, depth: 16); + ExternalCam.targetTexture = RenderTexture; + } + + public Texture GetTexture() => RenderTexture; + } +} \ No newline at end of file diff --git a/Assets/Scripts/ExternalCamera.cs.meta b/Assets/Scripts/ExternalCamera.cs.meta new file mode 100644 index 0000000..09ec17a --- /dev/null +++ b/Assets/Scripts/ExternalCamera.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: cfd8d92b06194cf98ee7011df76811cc +timeCreated: 1768912839 \ No newline at end of file diff --git a/Assets/Scripts/FakeCursor.cs b/Assets/Scripts/FakeCursor.cs new file mode 100644 index 0000000..1da1fb5 --- /dev/null +++ b/Assets/Scripts/FakeCursor.cs @@ -0,0 +1,27 @@ +using UnityEngine; + +public class FakeCursor : MonoBehaviour +{ + public Camera AttachedCamera; + + private void Start() + { + Cursor.visible = false; + } + + private void Update() + { + Vector3 absolutePosition = new() + { + x = Input.mousePosition.x / Screen.width * 1920, + y = Input.mousePosition.y / Screen.height * 1080, + z = 5f + }; + transform.position = AttachedCamera.ScreenToWorldPoint(absolutePosition); + } + + private void OnDestroy() + { + Cursor.visible = true; + } +} diff --git a/Assets/Scripts/FakeCursor.cs.meta b/Assets/Scripts/FakeCursor.cs.meta new file mode 100644 index 0000000..00bcf7c --- /dev/null +++ b/Assets/Scripts/FakeCursor.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 353f192b40556e34dada2d432a9ffa85 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/HealthBar.cs b/Assets/Scripts/HealthBar.cs new file mode 100644 index 0000000..43c1cce --- /dev/null +++ b/Assets/Scripts/HealthBar.cs @@ -0,0 +1,15 @@ +using UnityEngine; + +namespace InterfaceOff.WorldScene +{ + public class HealthBar : MonoBehaviour + { + public Transform HealthBarObject; + public WindowSpawner Spawner; + + private void Update() + { + HealthBarObject.localScale = new Vector3(100f, (20 - Spawner.SpawnedWindowCount) * 5f, 100f); + } + } +} diff --git a/Assets/Scripts/HealthBar.cs.meta b/Assets/Scripts/HealthBar.cs.meta new file mode 100644 index 0000000..fbefa03 --- /dev/null +++ b/Assets/Scripts/HealthBar.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 260819a4950a1f54d921ee3d6b3da010 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs index d78cd50..90f0c8b 100644 --- a/Assets/Scripts/PlayerController.cs +++ b/Assets/Scripts/PlayerController.cs @@ -1,6 +1,8 @@ -using System.IO; +using System; +using System.IO; using System.Linq; using UnityEngine; +using UnityEngine.UI; namespace InterfaceOff.WorldScene { @@ -8,14 +10,18 @@ namespace InterfaceOff.WorldScene { private static PlayerController Instance; private PlayerFrameInfo[] Frames; - + [SerializeField] private WindowSpawner ActiveWindowSpawner; [SerializeField] private LineRenderer BulletTracerRenderer; [SerializeField] private Transform BulletTracerStart; [SerializeField] private Transform BulletTracerEnd; [field: SerializeField] public int FrameIndex { get; private set; } [SerializeField] private int[] DeathIndices; + [SerializeField] private ExternalCamera ExternalCamera; + [SerializeField] private Image FrontLayerImage; + private const int MAX_WINDOWS = 20; + private bool PlayerAlive = true; private float LerpValue; @@ -33,7 +39,7 @@ namespace InterfaceOff.WorldScene /* Iterates the frame index */ FrameIndex = (FrameIndex + 1) % (Frames.Length - 2); - if (DeathIndices.Contains(FrameIndex) && ActiveWindowSpawner.SpawnedWindowCount > 20) + if (DeathIndices.Contains(FrameIndex) && ActiveWindowSpawner.SpawnedWindowCount > MAX_WINDOWS) { ActiveWindowSpawner.StartEndSequence(); PlayerAlive = false; @@ -64,5 +70,10 @@ namespace InterfaceOff.WorldScene BulletTracerRenderer.enabled = Frames[FrameIndex].ShootGun; } } + + private void LateUpdate() + { + FrontLayerImage.material.mainTexture = ExternalCamera.GetTexture(); + } } } \ No newline at end of file diff --git a/Assets/Scripts/WindowSpawner.cs b/Assets/Scripts/WindowSpawner.cs index d576931..0dcc41d 100644 --- a/Assets/Scripts/WindowSpawner.cs +++ b/Assets/Scripts/WindowSpawner.cs @@ -20,6 +20,7 @@ namespace InterfaceOff [field: SerializeField] private Canvas GameCanvas { get; set; } [field: SerializeField] private GameObject DeathInfo { get; set; } [field: SerializeField] private SpawnableWindowType[] WindowTypes { get; set; } + [field: SerializeField] private GameObject Parent { get; set; } private int TotalSpawnWeight { get; set; } [field: SerializeField] public int SpawnedWindowCount { get; private set; } @@ -63,7 +64,7 @@ namespace InterfaceOff private void SpawnNewRandomWindow() { /* Creates the gameobject with a random class */ - GameObject go = Instantiate(SampleChild, GameCanvas.transform); + GameObject go = Instantiate(SampleChild, Parent.transform); go.SetActive(true); Type type = GetRandomWindowType(); @@ -121,7 +122,7 @@ namespace InterfaceOff { /* Destroys all children and stops them from spawning */ AutoSpawn = false; - foreach (Transform child in GameCanvas.transform) + foreach (Transform child in Parent.transform) { WindowBase window = child.GetComponent(); if (DebugUtils.IsNotNull(window)) diff --git a/Assets/Scripts/Windows/ImageWindow.cs b/Assets/Scripts/Windows/ImageWindow.cs index 4aefd29..f1b0668 100644 --- a/Assets/Scripts/Windows/ImageWindow.cs +++ b/Assets/Scripts/Windows/ImageWindow.cs @@ -17,6 +17,9 @@ namespace InterfaceOff protected override void OnWindowInstantiation() { + /* Destroys the Window Close button to stop accidental clicking */ + Destroy(Components.CloseButtonRectTransform.gameObject); + /* Lets the player know what to do via text */ Components.InfoText.text = "Rotate"; @@ -40,8 +43,8 @@ namespace InterfaceOff Button button = go.GetComponent