Merge branch 'Jake'

2026-01-29 12:56:29 +00:00
parent 42113c9ff5 060245d14d
commit 913945b68b
49 changed files with 5405 additions and 17 deletions
--- a/Assets/Scenes/WorldScene.unity
+++ b/Assets/Scenes/WorldScene.unity
@@ -943,9 +943,9 @@ MonoBehaviour:
    m_PersistentCalls:
      m_Calls: []
  m_FontData:
-    m_Font: {fileID: 12800000, guid: 842200c58a6fb22469773202c51f3f56, type: 3}
+    m_Font: {fileID: 12800000, guid: 76f1829e461ec70459be88ac25ce8be0, type: 3}
    m_FontSize: 60
-    m_FontStyle: 0
+    m_FontStyle: 1
    m_BestFit: 0
    m_MinSize: 0
    m_MaxSize: 90
@@ -1170,22 +1170,22 @@ PrefabInstance:
    serializedVersion: 3
    m_TransformParent: {fileID: 0}
    m_Modifications:
-    - target: {fileID: 1912500691838987139, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
+    - target: {fileID: 1615029340372784444, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
+        type: 3}
+      propertyPath: m_FontData.m_Font
+      value: 
+      objectReference: {fileID: 12800000, guid: 0330587379e7d0241862502879e12a14,
        type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
    - target: {fileID: 2020022267469913571, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
        type: 3}
      propertyPath: m_Name
      value: GameCanvas
      objectReference: {fileID: 0}
-    - target: {fileID: 2347158115666318496, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
-        type: 3}
-      propertyPath: m_Sprite
-      value: 
-      objectReference: {fileID: 21300000, guid: 9646e64abbfa4094a8921eac54f39b3a,
+    - target: {fileID: 2058749420242249500, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 2433458770277224157, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
        type: 3}
      propertyPath: m_AnchorMax.x
@@ -1206,6 +1206,11 @@ PrefabInstance:
      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
      value: 
      objectReference: {fileID: 880466090}
+    - target: {fileID: 3006133537337724145, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 3614641596273148411, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
        type: 3}
      propertyPath: m_LocalPosition.x
@@ -1266,21 +1271,81 @@ PrefabInstance:
      propertyPath: m_AnchorMax.y
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 4507381690284583189, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
+        type: 3}
+      propertyPath: m_FontData.m_Font
+      value: 
+      objectReference: {fileID: 12800000, guid: 0330587379e7d0241862502879e12a14,
+        type: 3}
+    - target: {fileID: 4507381690284583189, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
+        type: 3}
+      propertyPath: m_FontData.m_FontStyle
+      value: 2
+      objectReference: {fileID: 0}
    - target: {fileID: 4797822364417701868, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
        type: 3}
      propertyPath: m_OnDidEndEdit.m_PersistentCalls.m_Calls.Array.data[0].m_Target
      value: 
      objectReference: {fileID: 880466090}
+    - target: {fileID: 6436671234165154367, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
+        type: 3}
+      propertyPath: m_Text
+      value: Your armour ran out of shield!
+      objectReference: {fileID: 0}
+    - target: {fileID: 6436671234165154367, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
+        type: 3}
+      propertyPath: m_FontData.m_Font
+      value: 
+      objectReference: {fileID: 12800000, guid: 0330587379e7d0241862502879e12a14,
+        type: 3}
+    - target: {fileID: 6436671234165154367, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
+        type: 3}
+      propertyPath: m_FontData.m_FontStyle
+      value: 2
+      objectReference: {fileID: 0}
    - target: {fileID: 6456657860247816393, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
        type: 3}
      propertyPath: m_IsActive
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 6524590693600647859, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
+    - target: {fileID: 7754510385818033532, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
        type: 3}
-      propertyPath: HittyThingThatSkyDidntWantMeToNameItLikeThisAndInsteadNameItPropely
+      propertyPath: m_FontData.m_Font
      value: 
-      objectReference: {fileID: 112955761}
+      objectReference: {fileID: 12800000, guid: 0330587379e7d0241862502879e12a14,
+        type: 3}
+    - target: {fileID: 7754510385818033532, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
+        type: 3}
+      propertyPath: m_FontData.m_Alignment
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8261609717126338231, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
+        type: 3}
+      propertyPath: m_FontData.m_Font
+      value: 
+      objectReference: {fileID: 12800000, guid: 23083100b5ae4944fa609bceebf28322,
+        type: 3}
+    - target: {fileID: 8522275853895335114, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
+        type: 3}
+      propertyPath: m_FontData.m_Font
+      value: 
+      objectReference: {fileID: 12800000, guid: 0330587379e7d0241862502879e12a14,
+        type: 3}
+    - target: {fileID: 8522275853895335114, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
+        type: 3}
+      propertyPath: m_FontData.m_FontStyle
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9220167798849807280, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: -19
+      objectReference: {fileID: 0}
+    - target: {fileID: 9220167798849807280, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -25.5
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
@@ -1541,6 +1606,74 @@ Transform:
    type: 3}
  m_PrefabInstance: {fileID: 2100813708}
  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &1942437364649785504
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 3606230097239223999, guid: b87370a6b9ab9b94992e4015520ed2ee,
+        type: 3}
+      propertyPath: m_Name
+      value: Wall_Light
+      objectReference: {fileID: 0}
+    - target: {fileID: 4125358308124292101, guid: b87370a6b9ab9b94992e4015520ed2ee,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -9
+      objectReference: {fileID: 0}
+    - target: {fileID: 4125358308124292101, guid: b87370a6b9ab9b94992e4015520ed2ee,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 1.76
+      objectReference: {fileID: 0}
+    - target: {fileID: 4125358308124292101, guid: b87370a6b9ab9b94992e4015520ed2ee,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -18.665821
+      objectReference: {fileID: 0}
+    - target: {fileID: 4125358308124292101, guid: b87370a6b9ab9b94992e4015520ed2ee,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.49999964
+      objectReference: {fileID: 0}
+    - target: {fileID: 4125358308124292101, guid: b87370a6b9ab9b94992e4015520ed2ee,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0.50000006
+      objectReference: {fileID: 0}
+    - target: {fileID: 4125358308124292101, guid: b87370a6b9ab9b94992e4015520ed2ee,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0.5000002
+      objectReference: {fileID: 0}
+    - target: {fileID: 4125358308124292101, guid: b87370a6b9ab9b94992e4015520ed2ee,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0.5000002
+      objectReference: {fileID: 0}
+    - target: {fileID: 4125358308124292101, guid: b87370a6b9ab9b94992e4015520ed2ee,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4125358308124292101, guid: b87370a6b9ab9b94992e4015520ed2ee,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: -90
+      objectReference: {fileID: 0}
+    - target: {fileID: 4125358308124292101, guid: b87370a6b9ab9b94992e4015520ed2ee,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: -90
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: b87370a6b9ab9b94992e4015520ed2ee, type: 3}
 --- !u!1001 &8020063586600593708
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -2097,3 +2230,4 @@ SceneRoots:
  - {fileID: 1758685209}
  - {fileID: 193820555}
  - {fileID: 782229191}
+  - {fileID: 1942437364649785504}