From 7b7653875938c0e7744d008b8751851f6df429dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krist=C3=BDna=20Janovsk=C3=A1?= <janovkri@fit.cvut.cz>
Date: Thu, 19 Jan 2023 18:42:20 +0100
Subject: [PATCH] fix font

---
 Assets/SZZ/Code/Scripts/NPCScripts/NPCDying.cs  |  2 +-
 .../SZZ/Code/Scripts/Player/PlayerInteract.cs   |  2 ++
 Assets/SZZ/Level/Scenes/building a.unity        | 17 +++++++++++++++++
 ...=> Bohemian typewriter SDF - Fallback.asset} |  2 +-
 ...hemian typewriter SDF - Fallback.asset.meta} |  0
 .../Bohemian typewriter SDF.asset               |  3 ++-
 6 files changed, 23 insertions(+), 3 deletions(-)
 rename Assets/TextMesh Pro/Resources/Fonts & Materials/{Bohemian typewriter SDF2.asset => Bohemian typewriter SDF - Fallback.asset} (99%)
 rename Assets/TextMesh Pro/Resources/Fonts & Materials/{Bohemian typewriter SDF2.asset.meta => Bohemian typewriter SDF - Fallback.asset.meta} (100%)

diff --git a/Assets/SZZ/Code/Scripts/NPCScripts/NPCDying.cs b/Assets/SZZ/Code/Scripts/NPCScripts/NPCDying.cs
index a64c928..473084d 100644
--- a/Assets/SZZ/Code/Scripts/NPCScripts/NPCDying.cs
+++ b/Assets/SZZ/Code/Scripts/NPCScripts/NPCDying.cs
@@ -29,7 +29,7 @@ private void Awake() {
     }
     
     public void Interact(){
-        timer = GameObject.FindWithTag("Timer").GetComponent<TimerScript>();
+        Debug.Log("Interact with dying character");
         int rand = r.Next(0, 100);
         if(rand <= dropChance && timer.TimerOn && level.playerLevel == 1 && !hasTried){
                 Instantiate(pagePrefab, new Vector3(transform.position.x + 1f, transform.position.y - 0.01f, transform.position.z + 0.1f), Quaternion.identity);
diff --git a/Assets/SZZ/Code/Scripts/Player/PlayerInteract.cs b/Assets/SZZ/Code/Scripts/Player/PlayerInteract.cs
index 8c24d62..60dca85 100644
--- a/Assets/SZZ/Code/Scripts/Player/PlayerInteract.cs
+++ b/Assets/SZZ/Code/Scripts/Player/PlayerInteract.cs
@@ -24,9 +24,11 @@ void Start() {
         AvailableMistakes = 0;
         StartCoroutine(InteractWait());
         imageContainer.enabled = false;
+        Debug.Log("PlayerInteract start");
     }
 
     void Update() {
+        Debug.Log("PlayerInteract update");
         if (level.playerLevel == 1) {
             CheatTxt.text = "Zvednuté taháky: ";
             if (CheatsAmount > 0) imageContainer.enabled = true;
diff --git a/Assets/SZZ/Level/Scenes/building a.unity b/Assets/SZZ/Level/Scenes/building a.unity
index 86a0159..6fef187 100644
--- a/Assets/SZZ/Level/Scenes/building a.unity	
+++ b/Assets/SZZ/Level/Scenes/building a.unity	
@@ -54291,6 +54291,23 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6909880373761857717, guid: 39967ec940f6f104eabe57a2974f7ab0,
+        type: 3}
+      propertyPath: m_text
+      value: "Zvednut\xE9 tah\xE1ky:"
+      objectReference: {fileID: 0}
+    - target: {fileID: 6909880373761857717, guid: 39967ec940f6f104eabe57a2974f7ab0,
+        type: 3}
+      propertyPath: m_fontAsset
+      value: 
+      objectReference: {fileID: 11400000, guid: 6eed2a89ac900a14b939500fdced8c08,
+        type: 2}
+    - target: {fileID: 6909880373761857717, guid: 39967ec940f6f104eabe57a2974f7ab0,
+        type: 3}
+      propertyPath: m_sharedMaterial
+      value: 
+      objectReference: {fileID: 3561134238486093195, guid: 6eed2a89ac900a14b939500fdced8c08,
+        type: 2}
     - target: {fileID: 7629961867817803925, guid: 39967ec940f6f104eabe57a2974f7ab0,
         type: 3}
       propertyPath: m_LocalPosition.x
diff --git a/Assets/TextMesh Pro/Resources/Fonts & Materials/Bohemian typewriter SDF2.asset b/Assets/TextMesh Pro/Resources/Fonts & Materials/Bohemian typewriter SDF - Fallback.asset
similarity index 99%
rename from Assets/TextMesh Pro/Resources/Fonts & Materials/Bohemian typewriter SDF2.asset
rename to Assets/TextMesh Pro/Resources/Fonts & Materials/Bohemian typewriter SDF - Fallback.asset
index ac9ca23..cd807bb 100644
--- a/Assets/TextMesh Pro/Resources/Fonts & Materials/Bohemian typewriter SDF2.asset	
+++ b/Assets/TextMesh Pro/Resources/Fonts & Materials/Bohemian typewriter SDF - Fallback.asset	
@@ -115,7 +115,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 71c1514a6bd24e1e882cebbe1904ce04, type: 3}
-  m_Name: Bohemian typewriter SDF2
+  m_Name: Bohemian typewriter SDF - Fallback
   m_EditorClassIdentifier: 
   hashCode: 914477183
   material: {fileID: -7399275077386991506}
diff --git a/Assets/TextMesh Pro/Resources/Fonts & Materials/Bohemian typewriter SDF2.asset.meta b/Assets/TextMesh Pro/Resources/Fonts & Materials/Bohemian typewriter SDF - Fallback.asset.meta
similarity index 100%
rename from Assets/TextMesh Pro/Resources/Fonts & Materials/Bohemian typewriter SDF2.asset.meta
rename to Assets/TextMesh Pro/Resources/Fonts & Materials/Bohemian typewriter SDF - Fallback.asset.meta
diff --git a/Assets/TextMesh Pro/Resources/Fonts & Materials/Bohemian typewriter SDF.asset b/Assets/TextMesh Pro/Resources/Fonts & Materials/Bohemian typewriter SDF.asset
index a9cc4a8..e629e27 100644
--- a/Assets/TextMesh Pro/Resources/Fonts & Materials/Bohemian typewriter SDF.asset	
+++ b/Assets/TextMesh Pro/Resources/Fonts & Materials/Bohemian typewriter SDF.asset	
@@ -4794,7 +4794,8 @@ MonoBehaviour:
   m_FontFeatureTable:
     m_GlyphPairAdjustmentRecords: []
   fallbackFontAssets: []
-  m_FallbackFontAssetTable: []
+  m_FallbackFontAssetTable:
+  - {fileID: 11400000, guid: efc13830c75dbf2469baf67842dfa585, type: 2}
   m_CreationSettings:
     sourceFontFileName: 
     sourceFontFileGUID: 2eb7580efa663bf43be3f6961aa980c0
-- 
GitLab