Compare commits

..

1 Commits

Author SHA1 Message Date
gravitrax-bublina
54bfcf745b Fix player name UI and persist name between menu scenes 2026-05-17 12:34:22 +02:00
28 changed files with 17779 additions and 25 deletions

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 6b37670de43269e4f984694475e75510 guid: 2230bf768ecb84610af77bea6cdd7074
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}

View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 6b37670de43269e4f984694475e75510
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -193,13 +193,13 @@ Transform:
m_GameObject: {fileID: 210602716} m_GameObject: {fileID: 210602716}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -55.235718, y: 368.19595, z: -781.7374} m_LocalPosition: {x: -55.235718, y: 368.19592, z: -781.7374}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 1140131532} - {fileID: 1140131532}
- {fileID: 2102485167} - {fileID: 2102485167}
m_Father: {fileID: 1790534262} m_Father: {fileID: 1814274513}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &331729628 --- !u!1 &331729628
GameObject: GameObject:
@@ -1570,10 +1570,9 @@ RectTransform:
m_GameObject: {fileID: 1790534261} m_GameObject: {fileID: 1790534261}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 781.2808} m_LocalPosition: {x: 0, y: 0, z: 781.2808}
m_LocalScale: {x: 2.92736, y: 2.5490422, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children: []
- {fileID: 210602717}
m_Father: {fileID: 143293625} m_Father: {fileID: 143293625}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
@@ -1651,8 +1650,9 @@ RectTransform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 143293625} - {fileID: 143293625}
- {fileID: 210602717}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 34.899} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: ae701dd46572ae44faa1c08754c677a1
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: fbd0ba17ed8002141b6b82c678cd3baf
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 38f8393f8cca8f24bb21ca2ab3a28acc
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 8356cb86749a3674299ae725d58c8012
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: a007c35d1a63dc3418a3afe3c7407450
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 8b4a331c3bc0f6445a0797f99cc38604
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 87c5ee97c7d1da345978bf431113faeb
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 17fc65d1a95feae42b8815a07ea2ffef
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 3f2ca619b4f5384489cf03c1dd13a701
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1838,6 +1838,7 @@ GameObject:
- component: {fileID: 1653336031} - component: {fileID: 1653336031}
- component: {fileID: 1653336033} - component: {fileID: 1653336033}
- component: {fileID: 1653336032} - component: {fileID: 1653336032}
- component: {fileID: 1653336034}
m_Layer: 5 m_Layer: 5
m_Name: Text (TMP) m_Name: Text (TMP)
m_TagString: Untagged m_TagString: Untagged
@@ -1911,8 +1912,8 @@ MonoBehaviour:
m_faceColor: m_faceColor:
serializedVersion: 2 serializedVersion: 2
rgba: 4294967295 rgba: 4294967295
m_fontSize: 70 m_fontSize: 100
m_fontSizeBase: 70 m_fontSizeBase: 100
m_fontWeight: 400 m_fontWeight: 400
m_enableAutoSizing: 0 m_enableAutoSizing: 0
m_fontSizeMin: 18 m_fontSizeMin: 18
@@ -1963,6 +1964,20 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1653336030} m_GameObject: {fileID: 1653336030}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!114 &1653336034
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1653336030}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d39cd22434ca71a4b820d84bd8bc7e45, type: 3}
m_Name:
m_EditorClassIdentifier: '::'
target: {fileID: 0}
prefix: 'name: '
--- !u!1 &2007534635 --- !u!1 &2007534635
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@@ -188,10 +188,10 @@ MonoBehaviour:
m_ColorMultiplier: 1 m_ColorMultiplier: 1
m_FadeDuration: 0.1 m_FadeDuration: 0.1
m_SpriteState: m_SpriteState:
m_HighlightedSprite: {fileID: 0} m_HighlightedSprite: {fileID: 21300000, guid: c33d62fb60dfea044850bcf995e50edb, type: 3}
m_PressedSprite: {fileID: 21300000, guid: c33d62fb60dfea044850bcf995e50edb, type: 3} m_PressedSprite: {fileID: 21300000, guid: c33d62fb60dfea044850bcf995e50edb, type: 3}
m_SelectedSprite: {fileID: 0} m_SelectedSprite: {fileID: 21300000, guid: 109e3412929bc9f46be9a095d286a6ab, type: 3}
m_DisabledSprite: {fileID: 0} m_DisabledSprite: {fileID: 21300000, guid: 109e3412929bc9f46be9a095d286a6ab, type: 3}
m_AnimationTriggers: m_AnimationTriggers:
m_NormalTrigger: Normal m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted m_HighlightedTrigger: Highlighted
@@ -228,7 +228,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 0.4198113, b: 0.98537654, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1 m_Maskable: 1
@@ -252,7 +252,7 @@ CanvasRenderer:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 192427314} m_GameObject: {fileID: 192427314}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 0
--- !u!82 &192427319 --- !u!82 &192427319
AudioSource: AudioSource:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -568,8 +568,8 @@ MonoBehaviour:
m_faceColor: m_faceColor:
serializedVersion: 2 serializedVersion: 2
rgba: 4294967295 rgba: 4294967295
m_fontSize: 70 m_fontSize: 100
m_fontSizeBase: 70 m_fontSizeBase: 100
m_fontWeight: 400 m_fontWeight: 400
m_enableAutoSizing: 0 m_enableAutoSizing: 0
m_fontSizeMin: 18 m_fontSizeMin: 18
@@ -2068,7 +2068,7 @@ MonoBehaviour:
m_SelectOnRight: {fileID: 0} m_SelectOnRight: {fileID: 0}
m_Transition: 1 m_Transition: 1
m_Colors: m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_NormalColor: {r: 0.94305915, g: 0.2028302, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
@@ -2087,7 +2087,7 @@ MonoBehaviour:
m_SelectedTrigger: Selected m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled m_DisabledTrigger: Disabled
m_Interactable: 1 m_Interactable: 1
m_TargetGraphic: {fileID: 0} m_TargetGraphic: {fileID: 192427317}
m_TextViewport: {fileID: 0} m_TextViewport: {fileID: 0}
m_TextComponent: {fileID: 0} m_TextComponent: {fileID: 0}
m_Placeholder: {fileID: 0} m_Placeholder: {fileID: 0}

View File

@@ -1,10 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<<< HEAD:Assets/Materials.meta
guid: 2230bf768ecb84610af77bea6cdd7074
folderAsset: yes
========
guid: 15742d157dfd1e42fb34ae90434eee41 guid: 15742d157dfd1e42fb34ae90434eee41
>>>>>>>> origin/main:Assets/Scenes/MiniGame-FlappyBird.unity.meta
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}
userData: userData:

View File

@@ -31,7 +31,7 @@ public class PlayerNameInput : MonoBehaviour
// Keep / ensure background Image // Keep / ensure background Image
var img = nameGO.GetComponent<Image>(); var img = nameGO.GetComponent<Image>();
if (img == null) img = nameGO.AddComponent<Image>(); if (img == null) img = nameGO.AddComponent<Image>();
img.color = new Color(0.08f, 0.10f, 0.20f, 0.92f); img.color = Color.white;
// Build viewport > (Placeholder + Text) child hierarchy required by TMP_InputField // Build viewport > (Placeholder + Text) child hierarchy required by TMP_InputField
var viewportRT = MakeChild("Text Area", rt); var viewportRT = MakeChild("Text Area", rt);

View File

@@ -0,0 +1,22 @@
using UnityEngine;
using TMPro;
public class ukazmeno : MonoBehaviour
{
[SerializeField] private TMP_Text target;
[SerializeField] private string prefix = "name: ";
void Start()
{
if (target == null)
target = GetComponent<TMP_Text>();
string saved = PlayerPrefs.GetString("PlayerName", "");
if (string.IsNullOrWhiteSpace(saved) && GameManager.Instance != null)
saved = GameManager.Instance.displayName;
if (target != null)
target.text = string.IsNullOrWhiteSpace(saved) ? prefix : prefix + saved;
}
}

View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: d39cd22434ca71a4b820d84bd8bc7e45