Compare commits

...

2 Commits

Author SHA1 Message Date
f9618cce71 Merge branch 'Gameplay/siva-gameplay' of https://fexteamsc.com/Ashby/Ludo-3D into Gameplay/siva-gameplay
# Conflicts:
#	Assets/Prefabs/UI/Player V Player Popup.prefab
2026-02-02 18:12:31 +05:30
2dfd5ac1c0 Updated Modes prefab for better mobile visuals 2026-02-02 18:10:54 +05:30
2 changed files with 50 additions and 50 deletions

View File

@ -1109,8 +1109,8 @@ RectTransform:
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}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 7.5, y: 0}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: -15, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4851974413524974102 --- !u!222 &4851974413524974102
CanvasRenderer: CanvasRenderer:
@ -1142,8 +1142,8 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_text: "\u200B" m_text: "\u200B"
m_isRightToLeft: 0 m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_fontAsset: {fileID: 11400000, guid: 0482bbb9a4bbf48bdbd050f3c6b94af0, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 5260989334135036006, guid: 0482bbb9a4bbf48bdbd050f3c6b94af0, type: 2}
m_fontSharedMaterials: [] m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0} m_fontMaterial: {fileID: 0}
m_fontMaterials: [] m_fontMaterials: []
@ -1419,8 +1419,8 @@ RectTransform:
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}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 7.5, y: 0}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: -15, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4851974414219947399 --- !u!222 &4851974414219947399
CanvasRenderer: CanvasRenderer:
@ -1452,8 +1452,8 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_text: Player 1 m_text: Player 1
m_isRightToLeft: 0 m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_fontAsset: {fileID: 11400000, guid: 0482bbb9a4bbf48bdbd050f3c6b94af0, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 5260989334135036006, guid: 0482bbb9a4bbf48bdbd050f3c6b94af0, type: 2}
m_fontSharedMaterials: [] m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0} m_fontMaterial: {fileID: 0}
m_fontMaterials: [] m_fontMaterials: []

View File

@ -154,10 +154,10 @@ RectTransform:
m_Father: {fileID: 8065952317557671492} m_Father: {fileID: 8065952317557671492}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.075, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0.8895791, y: 0.74074084} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 7.5, y: 0}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: -15, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8065952316381639394 --- !u!222 &8065952316381639394
CanvasRenderer: CanvasRenderer:
@ -222,7 +222,7 @@ MonoBehaviour:
m_fontSizeMax: 72 m_fontSizeMax: 72
m_fontStyle: 0 m_fontStyle: 0
m_HorizontalAlignment: 1 m_HorizontalAlignment: 1
m_VerticalAlignment: 256 m_VerticalAlignment: 512
m_textAlignment: 65535 m_textAlignment: 65535
m_characterSpacing: 10 m_characterSpacing: 10
m_wordSpacing: 5 m_wordSpacing: 5
@ -290,10 +290,10 @@ RectTransform:
m_Father: {fileID: 8065952318230211716} m_Father: {fileID: 8065952318230211716}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.075, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0.8895791, y: 0.74074084} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 7.5, y: 0}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: -15, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8065952316393416988 --- !u!222 &8065952316393416988
CanvasRenderer: CanvasRenderer:
@ -358,7 +358,7 @@ MonoBehaviour:
m_fontSizeMax: 72 m_fontSizeMax: 72
m_fontStyle: 0 m_fontStyle: 0
m_HorizontalAlignment: 1 m_HorizontalAlignment: 1
m_VerticalAlignment: 256 m_VerticalAlignment: 512
m_textAlignment: 65535 m_textAlignment: 65535
m_characterSpacing: 10 m_characterSpacing: 10
m_wordSpacing: 5 m_wordSpacing: 5
@ -2248,10 +2248,10 @@ RectTransform:
m_Father: {fileID: 8065952317367001092} m_Father: {fileID: 8065952317367001092}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.075, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0.8895791, y: 0.74074084} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 7.5, y: 0}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: -15, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8065952317200164022 --- !u!222 &8065952317200164022
CanvasRenderer: CanvasRenderer:
@ -2316,7 +2316,7 @@ MonoBehaviour:
m_fontSizeMax: 72 m_fontSizeMax: 72
m_fontStyle: 0 m_fontStyle: 0
m_HorizontalAlignment: 1 m_HorizontalAlignment: 1
m_VerticalAlignment: 256 m_VerticalAlignment: 512
m_textAlignment: 65535 m_textAlignment: 65535
m_characterSpacing: 10 m_characterSpacing: 10
m_wordSpacing: 5 m_wordSpacing: 5
@ -2790,10 +2790,10 @@ RectTransform:
m_Father: {fileID: 8065952318230211716} m_Father: {fileID: 8065952318230211716}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.075, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0.8895791, y: 0.74074084} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 7.5, y: 0}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: -15, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8065952317479054003 --- !u!222 &8065952317479054003
CanvasRenderer: CanvasRenderer:
@ -2858,7 +2858,7 @@ MonoBehaviour:
m_fontSizeMax: 72 m_fontSizeMax: 72
m_fontStyle: 0 m_fontStyle: 0
m_HorizontalAlignment: 1 m_HorizontalAlignment: 1
m_VerticalAlignment: 256 m_VerticalAlignment: 512
m_textAlignment: 65535 m_textAlignment: 65535
m_characterSpacing: 10 m_characterSpacing: 10
m_wordSpacing: 5 m_wordSpacing: 5
@ -2993,8 +2993,8 @@ RectTransform:
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}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -1.5141983, y: -6.390499} m_AnchoredPosition: {x: -7.1925, y: -6.390499}
m_SizeDelta: {x: -39.6845, y: -26.9604} m_SizeDelta: {x: -51.041, y: -26.9604}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &8065952317557671493 --- !u!114 &8065952317557671493
MonoBehaviour: MonoBehaviour:
@ -3651,10 +3651,10 @@ RectTransform:
m_Father: {fileID: 8065952316553408495} m_Father: {fileID: 8065952316553408495}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.075, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0.8895791, y: 0.74074084} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 7.5, y: 0}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: -15, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8065952318084561725 --- !u!222 &8065952318084561725
CanvasRenderer: CanvasRenderer:
@ -3719,7 +3719,7 @@ MonoBehaviour:
m_fontSizeMax: 72 m_fontSizeMax: 72
m_fontStyle: 0 m_fontStyle: 0
m_HorizontalAlignment: 1 m_HorizontalAlignment: 1
m_VerticalAlignment: 256 m_VerticalAlignment: 512
m_textAlignment: 65535 m_textAlignment: 65535
m_characterSpacing: 10 m_characterSpacing: 10
m_wordSpacing: 5 m_wordSpacing: 5
@ -3786,10 +3786,10 @@ RectTransform:
m_Father: {fileID: 8065952317367001092} m_Father: {fileID: 8065952317367001092}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.075, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0.8895791, y: 0.74074084} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 7.5, y: 0}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: -15, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8065952318100279455 --- !u!222 &8065952318100279455
CanvasRenderer: CanvasRenderer:
@ -3854,7 +3854,7 @@ MonoBehaviour:
m_fontSizeMax: 72 m_fontSizeMax: 72
m_fontStyle: 0 m_fontStyle: 0
m_HorizontalAlignment: 1 m_HorizontalAlignment: 1
m_VerticalAlignment: 256 m_VerticalAlignment: 512
m_textAlignment: 65535 m_textAlignment: 65535
m_characterSpacing: 10 m_characterSpacing: 10
m_wordSpacing: 5 m_wordSpacing: 5
@ -3922,10 +3922,10 @@ RectTransform:
m_Father: {fileID: 8065952316553408495} m_Father: {fileID: 8065952316553408495}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.075, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0.8895791, y: 0.74074084} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 7.5, y: 0}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: -15, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8065952318180437445 --- !u!222 &8065952318180437445
CanvasRenderer: CanvasRenderer:
@ -3990,7 +3990,7 @@ MonoBehaviour:
m_fontSizeMax: 72 m_fontSizeMax: 72
m_fontStyle: 0 m_fontStyle: 0
m_HorizontalAlignment: 1 m_HorizontalAlignment: 1
m_VerticalAlignment: 256 m_VerticalAlignment: 512
m_textAlignment: 65535 m_textAlignment: 65535
m_characterSpacing: 10 m_characterSpacing: 10
m_wordSpacing: 5 m_wordSpacing: 5
@ -4196,10 +4196,10 @@ RectTransform:
m_Father: {fileID: 8065952317557671492} m_Father: {fileID: 8065952317557671492}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.075, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0.8895791, y: 0.74074084} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 7.5, y: 0}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: -15, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8065952318280379820 --- !u!222 &8065952318280379820
CanvasRenderer: CanvasRenderer:
@ -4264,7 +4264,7 @@ MonoBehaviour:
m_fontSizeMax: 72 m_fontSizeMax: 72
m_fontStyle: 0 m_fontStyle: 0
m_HorizontalAlignment: 1 m_HorizontalAlignment: 1
m_VerticalAlignment: 256 m_VerticalAlignment: 512
m_textAlignment: 65535 m_textAlignment: 65535
m_characterSpacing: 10 m_characterSpacing: 10
m_wordSpacing: 5 m_wordSpacing: 5