Merge branch 'Gameplay/main-gameplay' into Gameplay/ashby-gameplay

This commit is contained in:
Ashby Issac 2026-02-02 19:27:52 +05:30
commit f93ba98ef3
2 changed files with 84 additions and 82 deletions

View File

@ -870,7 +870,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -180}
m_SizeDelta: {x: 250, y: 40}
m_SizeDelta: {x: 250, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &4851974413369432202
MonoBehaviour:
@ -936,7 +936,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 250, y: 40}
m_SizeDelta: {x: 250, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4851974413496445146
CanvasRenderer:
@ -1109,8 +1109,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchoredPosition: {x: 7.5, y: 0}
m_SizeDelta: {x: -15, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4851974413524974102
CanvasRenderer:
@ -1142,8 +1142,8 @@ MonoBehaviour:
m_Calls: []
m_text: "\u200B"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_fontAsset: {fileID: 11400000, guid: 0482bbb9a4bbf48bdbd050f3c6b94af0, type: 2}
m_sharedMaterial: {fileID: 5260989334135036006, guid: 0482bbb9a4bbf48bdbd050f3c6b94af0, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@ -1245,8 +1245,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -5.457, y: -4}
m_SizeDelta: {x: -55.863, y: -13}
m_AnchoredPosition: {x: -7.3499, y: -6.271304}
m_SizeDelta: {x: -62.677, y: -29.6562}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &4851974413693272400
MonoBehaviour:
@ -1419,8 +1419,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchoredPosition: {x: 7.5, y: 0}
m_SizeDelta: {x: -15, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4851974414219947399
CanvasRenderer:
@ -1452,8 +1452,8 @@ MonoBehaviour:
m_Calls: []
m_text: Player 1
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_fontAsset: {fileID: 11400000, guid: 0482bbb9a4bbf48bdbd050f3c6b94af0, type: 2}
m_sharedMaterial: {fileID: 5260989334135036006, guid: 0482bbb9a4bbf48bdbd050f3c6b94af0, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@ -1948,7 +1948,7 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4851974414659941538}
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: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@ -1996,6 +1996,8 @@ MonoBehaviour:
popupScalerType: 1
canvasGroup: {fileID: 0}
fadeDuration: 0
playerBtnNormalColor: {r: 1, g: 1, b: 1, a: 0.78431374}
playerBtnSelectedColor: {r: 1, g: 1, b: 1, a: 1}
twoPlayerBtn: {fileID: 4851974412826801781}
threePlayerBtn: {fileID: 4851974413821998362}
fourPlayerBtn: {fileID: 4851974412818057105}

View File

@ -154,10 +154,10 @@ RectTransform:
m_Father: {fileID: 8065952317557671492}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.075, y: 0}
m_AnchorMax: {x: 0.8895791, y: 0.74074084}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 7.5, y: 0}
m_SizeDelta: {x: -15, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8065952316381639394
CanvasRenderer:
@ -222,7 +222,7 @@ MonoBehaviour:
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 1
m_VerticalAlignment: 256
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 10
m_wordSpacing: 5
@ -290,10 +290,10 @@ RectTransform:
m_Father: {fileID: 8065952318230211716}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.075, y: 0}
m_AnchorMax: {x: 0.8895791, y: 0.74074084}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 7.5, y: 0}
m_SizeDelta: {x: -15, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8065952316393416988
CanvasRenderer:
@ -358,7 +358,7 @@ MonoBehaviour:
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 1
m_VerticalAlignment: 256
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 10
m_wordSpacing: 5
@ -448,8 +448,8 @@ RectTransform:
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: -152}
m_SizeDelta: {x: 560, y: 90.7286}
m_AnchoredPosition: {x: 0, y: -136.96222}
m_SizeDelta: {x: 560, y: 120.8041}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &8065952316424197285
MonoBehaviour:
@ -566,11 +566,11 @@ MonoBehaviour:
playerTwoPlaceholder: {fileID: 8065952316393416991}
playerThreePlaceholder: {fileID: 8065952317200164017}
playerFourPlaceholder: {fileID: 8065952318180437444}
rows:
- {fileID: 8065952316585861709}
- {fileID: 8065952316852223932}
- {fileID: 8065952317184179899}
- {fileID: 8065952318019617086}
inputFields:
- {fileID: 8065952316677608095}
- {fileID: 8065952316882128052}
- {fileID: 8065952317181319405}
- {fileID: 8065952316906327149}
--- !u!1 &8065952316512053289
GameObject:
m_ObjectHideFlags: 0
@ -684,8 +684,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -0.5}
m_SizeDelta: {x: -20, y: -13}
m_AnchoredPosition: {x: -6.435402, y: -5.587503}
m_SizeDelta: {x: -52.5552, y: -29.2317}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &8065952316553408492
MonoBehaviour:
@ -738,7 +738,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 250, y: 30}
m_SizeDelta: {x: 250, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &8065952316585861699
MonoBehaviour:
@ -925,7 +925,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 210, y: 40}
m_SizeDelta: {x: 210, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8065952316677608093
CanvasRenderer:
@ -1099,7 +1099,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 30, y: 30}
m_SizeDelta: {x: 40, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8065952316688146259
CanvasRenderer:
@ -1175,7 +1175,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 30, y: 30}
m_SizeDelta: {x: 40, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8065952316742462309
CanvasRenderer:
@ -1373,7 +1373,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 250, y: 30}
m_SizeDelta: {x: 250, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &8065952316852223922
MonoBehaviour:
@ -1439,7 +1439,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 210, y: 40}
m_SizeDelta: {x: 210, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8065952316882128042
CanvasRenderer:
@ -1615,7 +1615,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 210, y: 40}
m_SizeDelta: {x: 210, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8065952316906327139
CanvasRenderer:
@ -1934,7 +1934,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 210, y: 40}
m_SizeDelta: {x: 210, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8065952317181319395
CanvasRenderer:
@ -2109,7 +2109,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 250, y: 30}
m_SizeDelta: {x: 250, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &8065952317184179897
MonoBehaviour:
@ -2248,10 +2248,10 @@ RectTransform:
m_Father: {fileID: 8065952317367001092}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.075, y: 0}
m_AnchorMax: {x: 0.8895791, y: 0.74074084}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 7.5, y: 0}
m_SizeDelta: {x: -15, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8065952317200164022
CanvasRenderer:
@ -2316,7 +2316,7 @@ MonoBehaviour:
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 1
m_VerticalAlignment: 256
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 10
m_wordSpacing: 5
@ -2543,8 +2543,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -0.5}
m_SizeDelta: {x: -20, y: -13}
m_AnchoredPosition: {x: -5.2997, y: -5.6334}
m_SizeDelta: {x: -50.2838, y: -28.4746}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &8065952317367001093
MonoBehaviour:
@ -2790,10 +2790,10 @@ RectTransform:
m_Father: {fileID: 8065952318230211716}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.075, y: 0}
m_AnchorMax: {x: 0.8895791, y: 0.74074084}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 7.5, y: 0}
m_SizeDelta: {x: -15, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8065952317479054003
CanvasRenderer:
@ -2858,7 +2858,7 @@ MonoBehaviour:
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 1
m_VerticalAlignment: 256
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 10
m_wordSpacing: 5
@ -2929,7 +2929,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 560, y: 30}
m_SizeDelta: {x: 560, y: 50.40205}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &8065952317550618935
MonoBehaviour:
@ -2993,8 +2993,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -0.5}
m_SizeDelta: {x: -20, y: -13}
m_AnchoredPosition: {x: -7.1925, y: -6.390499}
m_SizeDelta: {x: -51.041, y: -26.9604}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &8065952317557671493
MonoBehaviour:
@ -3046,7 +3046,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 30, y: 30}
m_SizeDelta: {x: 40, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8065952317611268384
CanvasRenderer:
@ -3257,7 +3257,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 30, y: 30}
m_SizeDelta: {x: 40, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8065952317875960123
CanvasRenderer:
@ -3590,7 +3590,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 250, y: 30}
m_SizeDelta: {x: 250, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &8065952318019617084
MonoBehaviour:
@ -3651,10 +3651,10 @@ RectTransform:
m_Father: {fileID: 8065952316553408495}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.075, y: 0}
m_AnchorMax: {x: 0.8895791, y: 0.74074084}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 7.5, y: 0}
m_SizeDelta: {x: -15, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8065952318084561725
CanvasRenderer:
@ -3719,7 +3719,7 @@ MonoBehaviour:
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 1
m_VerticalAlignment: 256
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 10
m_wordSpacing: 5
@ -3786,10 +3786,10 @@ RectTransform:
m_Father: {fileID: 8065952317367001092}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.075, y: 0}
m_AnchorMax: {x: 0.8895791, y: 0.74074084}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 7.5, y: 0}
m_SizeDelta: {x: -15, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8065952318100279455
CanvasRenderer:
@ -3854,7 +3854,7 @@ MonoBehaviour:
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 1
m_VerticalAlignment: 256
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 10
m_wordSpacing: 5
@ -3922,10 +3922,10 @@ RectTransform:
m_Father: {fileID: 8065952316553408495}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.075, y: 0}
m_AnchorMax: {x: 0.8895791, y: 0.74074084}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 7.5, y: 0}
m_SizeDelta: {x: -15, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8065952318180437445
CanvasRenderer:
@ -3990,7 +3990,7 @@ MonoBehaviour:
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 1
m_VerticalAlignment: 256
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 10
m_wordSpacing: 5
@ -4080,8 +4080,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -0.5}
m_SizeDelta: {x: -20, y: -13}
m_AnchoredPosition: {x: -6.814, y: -6.3446016}
m_SizeDelta: {x: -53.3123, y: -27.7175}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &8065952318230211717
MonoBehaviour:
@ -4134,7 +4134,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 560, y: 30}
m_SizeDelta: {x: 560, y: 70.402054}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &8065952318264672222
MonoBehaviour:
@ -4196,10 +4196,10 @@ RectTransform:
m_Father: {fileID: 8065952317557671492}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.075, y: 0}
m_AnchorMax: {x: 0.8895791, y: 0.74074084}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 7.5, y: 0}
m_SizeDelta: {x: -15, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8065952318280379820
CanvasRenderer:
@ -4264,7 +4264,7 @@ MonoBehaviour:
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 1
m_VerticalAlignment: 256
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 10
m_wordSpacing: 5