diff --git a/3d-generation-pipeline/README.md b/3d-generation-pipeline/README.md index a7c2669e..e7754260 100644 --- a/3d-generation-pipeline/README.md +++ b/3d-generation-pipeline/README.md @@ -14,7 +14,6 @@ * kui kõik configurationid tehtud, siis midagi juhtub: uks avaneb, quest marker läheb ukse juurde, professor ütleb "thank you" * peab mängijale kuidagi selgitama, kuidas scale'ida prinditud objekte * prinditud objekti scale'imisele min ja max size limiit - * custom font arvutiekraanile * shape scanner mitte lihtsalt ontriggerenter ja -exit, sest kui mitu objekti lähevad samal ajal sisse * shape scanneris prinditud objektid mõnikord ei kao ära kui config success * archery range: @@ -29,7 +28,6 @@ * cafe: * npc võiks olla keeratud sinu poole juba kaugelt * [silence] ei tohiks ilmuda - * custom font notepadile * kasutada OnSegmentUpdated, mitte OnSegmentFinished npc'l kui ootab "yes"/"no" * spawn point panna * npc character: diff --git a/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Anton SDF.asset b/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Anton SDF.asset index 9cf711af..75b7ce82 100644 --- a/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Anton SDF.asset +++ b/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Anton SDF.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3d5cfcffff8dff4e78b27660e504f3f3c7e33bc90635f4ecea5fba734cea9076 -size 8426 +oid sha256:27b8a0cf09be3037f91a8eee3c18842a3e4b33ca11d7ff64bec223be8fd196f8 +size 2108584 diff --git a/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Bangers SDF.asset b/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Bangers SDF.asset index 703f2486..13b677bf 100644 --- a/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Bangers SDF.asset +++ b/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Bangers SDF.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cd9b73f8a66de23601f20f4ee0be0146d3bb10a3ee71549cb5df990d0b58580c -size 76143 +oid sha256:5b03910b5aa7086327212ee452f1087a63d9d0b2104fa32e3265aaff9beeda11 +size 2176050 diff --git a/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Electronic Highway Sign SDF.asset b/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Electronic Highway Sign SDF.asset index d3d2e36b..2fd05d9f 100644 --- a/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Electronic Highway Sign SDF.asset +++ b/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Electronic Highway Sign SDF.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0b91d586ea5e3b650560f7626572004d37022e69998298493bd3bbbc7458d132 -size 8542 +oid sha256:88b9b8257f42bdd2594201d098bcbabb58abb8f8578ba535422ae62a8892d6ac +size 2108080 diff --git a/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Oswald Bold SDF.asset b/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Oswald Bold SDF.asset index 7a4c27ee..78cfb5a1 100644 --- a/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Oswald Bold SDF.asset +++ b/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Oswald Bold SDF.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:87cd6656b74c1aeaca65492c12c7f13854f553643782f3c21e7be8922a6bb25e -size 69579 +oid sha256:83c38cb41a2cb6789a843d35f22b6b6901d4f470299332a38cb1066047b57831 +size 2169752 diff --git a/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Roboto-Bold SDF.asset b/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Roboto-Bold SDF.asset index efd99ccb..bd4bbe71 100644 --- a/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Roboto-Bold SDF.asset +++ b/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Roboto-Bold SDF.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:be30842c9400a3cee8e0a04837a440a13ed3987dfe7414baf3d7cc09906912da -size 688126 +oid sha256:98ba21be5410cb67f08db0df0d02809fd498a59eceb8c11939f51244f37332af +size 2788231 diff --git a/Assets/_PROJECT/Fonts.meta b/Assets/_PROJECT/Fonts.meta new file mode 100644 index 00000000..fba5cd95 --- /dev/null +++ b/Assets/_PROJECT/Fonts.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5ce7ff15787ac564489bb34cb32fcc50 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_PROJECT/Fonts/Handlee-Regular SDF.asset b/Assets/_PROJECT/Fonts/Handlee-Regular SDF.asset new file mode 100644 index 00000000..ac03e9f7 --- /dev/null +++ b/Assets/_PROJECT/Fonts/Handlee-Regular SDF.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ea165802924785ebdc7d4fe7773fe165ca72de6fa4e312fce9feaf61c6734420 +size 2474101 diff --git a/Assets/_PROJECT/Fonts/Handlee-Regular SDF.asset.meta b/Assets/_PROJECT/Fonts/Handlee-Regular SDF.asset.meta new file mode 100644 index 00000000..3cf79ce4 --- /dev/null +++ b/Assets/_PROJECT/Fonts/Handlee-Regular SDF.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 02d225d9907048f4f8320a20fb5bed34 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_PROJECT/Fonts/Handlee-Regular.ttf b/Assets/_PROJECT/Fonts/Handlee-Regular.ttf new file mode 100644 index 00000000..7984255e Binary files /dev/null and b/Assets/_PROJECT/Fonts/Handlee-Regular.ttf differ diff --git a/Assets/_PROJECT/Fonts/Handlee-Regular.ttf.meta b/Assets/_PROJECT/Fonts/Handlee-Regular.ttf.meta new file mode 100644 index 00000000..34581912 --- /dev/null +++ b/Assets/_PROJECT/Fonts/Handlee-Regular.ttf.meta @@ -0,0 +1,21 @@ +fileFormatVersion: 2 +guid: 62319ab30e63c8a46a4f0a599256141c +TrueTypeFontImporter: + externalObjects: {} + serializedVersion: 4 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 0 + characterPadding: 1 + includeFontData: 1 + fontNames: + - Handlee + fallbackFontReferences: [] + customCharacters: + fontRenderingMode: 0 + ascentCalculationMode: 1 + useLegacyBoundsCalculation: 0 + shouldRoundAdvanceValue: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_PROJECT/Fonts/Quantico-Bold SDF.asset b/Assets/_PROJECT/Fonts/Quantico-Bold SDF.asset new file mode 100644 index 00000000..1cb3b8d9 --- /dev/null +++ b/Assets/_PROJECT/Fonts/Quantico-Bold SDF.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:21bdbfbf7ff9cd5304fb588fa1f3c3ae61fae692247bcc1dc70f372dc11260af +size 2107856 diff --git a/Assets/_PROJECT/Fonts/Quantico-Bold SDF.asset.meta b/Assets/_PROJECT/Fonts/Quantico-Bold SDF.asset.meta new file mode 100644 index 00000000..03b18377 --- /dev/null +++ b/Assets/_PROJECT/Fonts/Quantico-Bold SDF.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5a2fd497c2c0d8541ba769179ba46449 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_PROJECT/Fonts/Quantico-Bold.ttf b/Assets/_PROJECT/Fonts/Quantico-Bold.ttf new file mode 100644 index 00000000..41579582 Binary files /dev/null and b/Assets/_PROJECT/Fonts/Quantico-Bold.ttf differ diff --git a/Assets/_PROJECT/Fonts/Quantico-Bold.ttf.meta b/Assets/_PROJECT/Fonts/Quantico-Bold.ttf.meta new file mode 100644 index 00000000..ca0cbe0b --- /dev/null +++ b/Assets/_PROJECT/Fonts/Quantico-Bold.ttf.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 685c611b44807844d8a7cc03f1f5286d +TrueTypeFontImporter: + externalObjects: {} + serializedVersion: 4 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 0 + characterPadding: 1 + includeFontData: 1 + fontNames: + - Quantico + fallbackFontReferences: + - {fileID: 12800000, guid: 84f61f44ada6fd8489cda837afbd512b, type: 3} + - {fileID: 12800000, guid: 174c0d73e20f1df4987a97f5340d7e57, type: 3} + customCharacters: + fontRenderingMode: 0 + ascentCalculationMode: 1 + useLegacyBoundsCalculation: 0 + shouldRoundAdvanceValue: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_PROJECT/Fonts/Quantico-Regular SDF.asset b/Assets/_PROJECT/Fonts/Quantico-Regular SDF.asset new file mode 100644 index 00000000..e2d16c45 --- /dev/null +++ b/Assets/_PROJECT/Fonts/Quantico-Regular SDF.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d5164ab1d49ccaf08e463a2d0138be724b3d86ae6c0e1623d418b26c6b79f515 +size 2107858 diff --git a/Assets/_PROJECT/Fonts/Quantico-Regular SDF.asset.meta b/Assets/_PROJECT/Fonts/Quantico-Regular SDF.asset.meta new file mode 100644 index 00000000..0f6c9da5 --- /dev/null +++ b/Assets/_PROJECT/Fonts/Quantico-Regular SDF.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d02ab956cde8c5342aa8c8e99005a615 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_PROJECT/Fonts/Quantico-Regular.ttf b/Assets/_PROJECT/Fonts/Quantico-Regular.ttf new file mode 100644 index 00000000..17c86e82 Binary files /dev/null and b/Assets/_PROJECT/Fonts/Quantico-Regular.ttf differ diff --git a/Assets/_PROJECT/Fonts/Quantico-Regular.ttf.meta b/Assets/_PROJECT/Fonts/Quantico-Regular.ttf.meta new file mode 100644 index 00000000..399d8747 --- /dev/null +++ b/Assets/_PROJECT/Fonts/Quantico-Regular.ttf.meta @@ -0,0 +1,21 @@ +fileFormatVersion: 2 +guid: 84f61f44ada6fd8489cda837afbd512b +TrueTypeFontImporter: + externalObjects: {} + serializedVersion: 4 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 0 + characterPadding: 1 + includeFontData: 1 + fontNames: + - Quantico + fallbackFontReferences: [] + customCharacters: + fontRenderingMode: 0 + ascentCalculationMode: 1 + useLegacyBoundsCalculation: 0 + shouldRoundAdvanceValue: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_PROJECT/Prefabs/ModelGeneration/Notepad.prefab b/Assets/_PROJECT/Prefabs/ModelGeneration/Notepad.prefab index 8f6ef960..62d260d2 100644 --- a/Assets/_PROJECT/Prefabs/ModelGeneration/Notepad.prefab +++ b/Assets/_PROJECT/Prefabs/ModelGeneration/Notepad.prefab @@ -38,7 +38,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: -0.0086, y: 0} - m_SizeDelta: {x: 137.33, y: 229.1} + m_SizeDelta: {x: 130, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!223 &3055257777574419390 Canvas: @@ -102,7 +102,7 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 ---- !u!1 &1355598269556734330 +--- !u!1 &6092295135411070064 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -110,47 +110,46 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1769640162034330459} - - component: {fileID: 1318497791235312194} - - component: {fileID: 7974331578630898212} - - component: {fileID: 377452077737642628} + - component: {fileID: 6901764819132890826} + - component: {fileID: 7523303981485601135} + - component: {fileID: 5732187690458924453} m_Layer: 0 - m_Name: Cube + m_Name: NotePad m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1769640162034330459 +--- !u!4 &6901764819132890826 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1355598269556734330} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.01, y: 0.25, z: 0.15} + m_GameObject: {fileID: 6092295135411070064} + m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.0016, y: 0.0083, z: -0.0001} + m_LocalScale: {x: 0.50700873, y: 0.50700873, z: 0.50700873} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 9079884296988335863} - m_RootOrder: -1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &1318497791235312194 +--- !u!33 &7523303981485601135 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1355598269556734330} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &7974331578630898212 + m_GameObject: {fileID: 6092295135411070064} + m_Mesh: {fileID: -2746142260806068395, guid: d130be5832d0d4744876e93d8be542e0, type: 3} +--- !u!23 &5732187690458924453 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1355598269556734330} + m_GameObject: {fileID: 6092295135411070064} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -164,7 +163,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: -876546973899608171, guid: d130be5832d0d4744876e93d8be542e0, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -186,27 +185,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!65 &377452077737642628 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1355598269556734330} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} --- !u!1 &6218887849178989702 GameObject: m_ObjectHideFlags: 0 @@ -235,10 +213,10 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1769640162034330459} + - {fileID: 6901764819132890826} - {fileID: 3023432705630200141} m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6851966439307972351 GameObject: @@ -276,7 +254,7 @@ RectTransform: 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: 138.6, y: 229.5} + m_SizeDelta: {x: 130, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8859962576470879954 CanvasRenderer: @@ -306,20 +284,18 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: ' - -' + m_text: a slice of pizza with chicken m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 254d33525bc3919439f569ea33703c5b, type: 2} - m_sharedMaterial: {fileID: 4369893532151414794, guid: 254d33525bc3919439f569ea33703c5b, + m_fontAsset: {fileID: 11400000, guid: 02d225d9907048f4f8320a20fb5bed34, type: 2} + m_sharedMaterial: {fileID: 2498710373105355017, guid: 02d225d9907048f4f8320a20fb5bed34, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4278196272 + m_fontColor: {r: 0.18867922, g: 0.0926579, b: 0, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: diff --git a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity index caf7373a..78b7e7c8 100644 --- a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity +++ b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0f6126d1df09c305d0fdbdb11a53313dc4308424d86c62192ef70b6145a7b527 -size 68611406 +oid sha256:b56a0124653db355857e60c43641e615095e8e2e3f5574e09959cb1cfabb24b3 +size 68612454