Commit 173a851c authored by mohamed20047's avatar mohamed20047

make all result menus look like each other

parent b1508c50
...@@ -393,7 +393,7 @@ GameObject: ...@@ -393,7 +393,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!224 &2715841031609213817 --- !u!224 &2715841031609213817
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -1527,10 +1527,10 @@ RectTransform: ...@@ -1527,10 +1527,10 @@ RectTransform:
m_Children: [] m_Children: []
m_Father: {fileID: 1868296225662172060} m_Father: {fileID: 1868296225662172060}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 22.572838, y: -25.96685} m_AnchoredPosition: {x: 22.572838, y: 0}
m_SizeDelta: {x: 0, y: 51.9337} m_SizeDelta: {x: 51.9337, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5599785267463442964 --- !u!222 &5599785267463442964
CanvasRenderer: CanvasRenderer:
...@@ -1969,10 +1969,10 @@ RectTransform: ...@@ -1969,10 +1969,10 @@ RectTransform:
m_Children: [] m_Children: []
m_Father: {fileID: 1868296225662172060} m_Father: {fileID: 1868296225662172060}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 267.15555, y: -25.96685} m_AnchoredPosition: {x: 267.15555, y: 0}
m_SizeDelta: {x: 0, y: 51.9337} m_SizeDelta: {x: 51.9337, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5340325998096306428 --- !u!222 &5340325998096306428
CanvasRenderer: CanvasRenderer:
...@@ -2331,7 +2331,7 @@ GameObject: ...@@ -2331,7 +2331,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!224 &2826639575804227870 --- !u!224 &2826639575804227870
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -2988,10 +2988,10 @@ RectTransform: ...@@ -2988,10 +2988,10 @@ RectTransform:
m_Children: [] m_Children: []
m_Father: {fileID: 1868296225662172060} m_Father: {fileID: 1868296225662172060}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 206.00986, y: -25.96685} m_AnchoredPosition: {x: 206.00986, y: 0}
m_SizeDelta: {x: 0, y: 51.9337} m_SizeDelta: {x: 51.9337, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4280031676036218401 --- !u!222 &4280031676036218401
CanvasRenderer: CanvasRenderer:
...@@ -3386,10 +3386,10 @@ RectTransform: ...@@ -3386,10 +3386,10 @@ RectTransform:
m_Children: [] m_Children: []
m_Father: {fileID: 1868296225662172060} m_Father: {fileID: 1868296225662172060}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 144.8642, y: -25.96685} m_AnchoredPosition: {x: 144.8642, y: 0}
m_SizeDelta: {x: 0, y: 51.9337} m_SizeDelta: {x: 51.9337, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3352223824432655738 --- !u!222 &3352223824432655738
CanvasRenderer: CanvasRenderer:
...@@ -3663,10 +3663,10 @@ RectTransform: ...@@ -3663,10 +3663,10 @@ RectTransform:
m_Children: [] m_Children: []
m_Father: {fileID: 1868296225662172060} m_Father: {fileID: 1868296225662172060}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 83.71851, y: -25.96685} m_AnchoredPosition: {x: 83.71851, y: 0}
m_SizeDelta: {x: 0, y: 51.9337} m_SizeDelta: {x: 51.9337, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2582842219960060486 --- !u!222 &2582842219960060486
CanvasRenderer: CanvasRenderer:
......
...@@ -301,7 +301,7 @@ GameObject: ...@@ -301,7 +301,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!224 &6665374314385109476 --- !u!224 &6665374314385109476
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -794,100 +794,6 @@ MonoBehaviour: ...@@ -794,100 +794,6 @@ MonoBehaviour:
clickColor: {r: 0.2, g: 0.5, b: 1, a: 0.6} clickColor: {r: 0.2, g: 0.5, b: 1, a: 0.6}
fadeDuration: 0.25 fadeDuration: 0.25
hoverColor: {r: 0.2, g: 0.5, b: 1, a: 0.1} hoverColor: {r: 0.2, g: 0.5, b: 1, a: 0.1}
--- !u!1 &1437751116684873155
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 466041325833673174}
- component: {fileID: 5787313049574172434}
- component: {fileID: 6964101224245115265}
m_Layer: 5
m_Name: WrongNumber
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &466041325833673174
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1437751116684873155}
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
m_Children: []
m_Father: {fileID: 4090891222954775928}
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: 234, y: -78}
m_SizeDelta: {x: 190.7614, y: 59.655}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5787313049574172434
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1437751116684873155}
m_CullTransparentMesh: 1
--- !u!114 &6964101224245115265
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1437751116684873155}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: beaa34cb0e58d624bb3a264b28600785, type: 3}
m_Name:
m_EditorClassIdentifier: LightSide.UniText::LightSide.UniText
m_Material: {fileID: 0}
m_Color: {r: 0.764151, g: 0.764151, b: 0.764151, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
text: "\u062E\u0637\u0623 :"
fontStack: {fileID: 11400000, guid: 0029e5efb4c7a12f1ac9136de794e6dc, type: 2}
appearance: {fileID: 11400000, guid: 3a559cf5d653f05ea807e1be5655df92, type: 2}
fontSize: 45
baseDirection: 2
wordWrap: 1
horizontalAlignment: 0
verticalAlignment: 1
overEdge: 0
underEdge: 0
leadingDistribution: 0
autoSize: 0
minFontSize: 10
maxFontSize: 72
modRegisters:
items: []
modRegisterConfigs:
items: []
highlighter:
rid: 8615661558259515749
references:
version: 2
RefIds:
- rid: 8615661558259515749
type: {class: DefaultTextHighlighter, ns: LightSide, asm: LightSide.UniText}
data:
clickColor: {r: 0.2, g: 0.5, b: 1, a: 0.6}
fadeDuration: 0.25
hoverColor: {r: 0.2, g: 0.5, b: 1, a: 0.1}
--- !u!1 &1452979321105238883 --- !u!1 &1452979321105238883
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -1017,9 +923,7 @@ RectTransform: ...@@ -1017,9 +923,7 @@ RectTransform:
- {fileID: 7893267134766960679} - {fileID: 7893267134766960679}
- {fileID: 1858121317405461547} - {fileID: 1858121317405461547}
- {fileID: 6665374314385109476} - {fileID: 6665374314385109476}
- {fileID: 466041325833673174} - {fileID: 6503689708425524358}
- {fileID: 584722959338064093}
- {fileID: 5838117729657600764}
- {fileID: 7024705223255188543} - {fileID: 7024705223255188543}
- {fileID: 3019273015595343900} - {fileID: 3019273015595343900}
- {fileID: 7907087451173574209} - {fileID: 7907087451173574209}
...@@ -1116,10 +1020,10 @@ RectTransform: ...@@ -1116,10 +1020,10 @@ RectTransform:
m_Children: [] m_Children: []
m_Father: {fileID: 5665338920870028329} m_Father: {fileID: 5665338920870028329}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 22.572838, y: -25.96685} m_AnchoredPosition: {x: 22.572838, y: 0}
m_SizeDelta: {x: 0, y: 51.9337} m_SizeDelta: {x: 51.9337, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1367268893384981932 --- !u!222 &1367268893384981932
CanvasRenderer: CanvasRenderer:
...@@ -2104,14 +2008,14 @@ MonoBehaviour: ...@@ -2104,14 +2008,14 @@ MonoBehaviour:
_inactivePointColor: {r: 0.99607843, g: 0.8431373, b: 0, a: 0.57254905} _inactivePointColor: {r: 0.99607843, g: 0.8431373, b: 0, a: 0.57254905}
_resultTitle: {fileID: 7932104573269687284} _resultTitle: {fileID: 7932104573269687284}
_resultScore: {fileID: 8584734869575415088} _resultScore: {fileID: 8584734869575415088}
_resultCorrect: {fileID: 2439187917061100090} _resultStats: {fileID: 5416287310417636475}
_resultWrong: {fileID: 6964101224245115265} _resultWrong: {fileID: 0}
_resultStreak: {fileID: 6699384586306408176} _resultStreak: {fileID: 0}
_resultRestartBtn: {fileID: 2494426054718784794} _resultRestartBtn: {fileID: 2494426054718784794}
_backToMenuBtn: {fileID: 4697922675548219590} _backToMenuBtn: {fileID: 4697922675548219590}
_progressSlider: {fileID: 0} _progressSlider: {fileID: 0}
_winIcon: {fileID: 8739688839750597525} _winIcon: {fileID: 0}
_loseIcon: {fileID: 2274111195539645854} _loseIcon: {fileID: 0}
onRestartClicked: onRestartClicked:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
...@@ -2133,7 +2037,7 @@ GameObject: ...@@ -2133,7 +2037,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!224 &1858121317405461547 --- !u!224 &1858121317405461547
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -3446,10 +3350,10 @@ RectTransform: ...@@ -3446,10 +3350,10 @@ RectTransform:
m_Children: [] m_Children: []
m_Father: {fileID: 5665338920870028329} m_Father: {fileID: 5665338920870028329}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 83.71851, y: -25.96685} m_AnchoredPosition: {x: 83.71851, y: 0}
m_SizeDelta: {x: 0, y: 51.9337} m_SizeDelta: {x: 51.9337, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6044436298841298018 --- !u!222 &6044436298841298018
CanvasRenderer: CanvasRenderer:
...@@ -3503,100 +3407,6 @@ MonoBehaviour: ...@@ -3503,100 +3407,6 @@ MonoBehaviour:
m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.AspectRatioFitter m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.AspectRatioFitter
m_AspectMode: 2 m_AspectMode: 2
m_AspectRatio: 1 m_AspectRatio: 1
--- !u!1 &6074728633410476206
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5838117729657600764}
- component: {fileID: 287387686997376877}
- component: {fileID: 6699384586306408176}
m_Layer: 5
m_Name: BestStreak
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5838117729657600764
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6074728633410476206}
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
m_Children: []
m_Father: {fileID: 4090891222954775928}
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: 119.935425, y: -213.74219}
m_SizeDelta: {x: 418.8957, y: 59.615}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &287387686997376877
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6074728633410476206}
m_CullTransparentMesh: 1
--- !u!114 &6699384586306408176
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6074728633410476206}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: beaa34cb0e58d624bb3a264b28600785, type: 3}
m_Name:
m_EditorClassIdentifier: LightSide.UniText::LightSide.UniText
m_Material: {fileID: 0}
m_Color: {r: 0.764151, g: 0.764151, b: 0.764151, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
text: "\u0627\u0639\u0644\u064A \u0633\u0644\u0633\u0644\u0629 :"
fontStack: {fileID: 11400000, guid: 0029e5efb4c7a12f1ac9136de794e6dc, type: 2}
appearance: {fileID: 11400000, guid: 3a559cf5d653f05ea807e1be5655df92, type: 2}
fontSize: 45
baseDirection: 2
wordWrap: 1
horizontalAlignment: 0
verticalAlignment: 1
overEdge: 0
underEdge: 0
leadingDistribution: 0
autoSize: 0
minFontSize: 10
maxFontSize: 72
modRegisters:
items: []
modRegisterConfigs:
items: []
highlighter:
rid: 8615661558259516071
references:
version: 2
RefIds:
- rid: 8615661558259516071
type: {class: DefaultTextHighlighter, ns: LightSide, asm: LightSide.UniText}
data:
clickColor: {r: 0.2, g: 0.5, b: 1, a: 0.6}
fadeDuration: 0.25
hoverColor: {r: 0.2, g: 0.5, b: 1, a: 0.1}
--- !u!1 &6220926847383365392 --- !u!1 &6220926847383365392
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -3630,10 +3440,10 @@ RectTransform: ...@@ -3630,10 +3440,10 @@ RectTransform:
m_Children: [] m_Children: []
m_Father: {fileID: 5665338920870028329} m_Father: {fileID: 5665338920870028329}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 267.15555, y: -25.96685} m_AnchoredPosition: {x: 267.15555, y: 0}
m_SizeDelta: {x: 0, y: 51.9337} m_SizeDelta: {x: 51.9337, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7681831561278972478 --- !u!222 &7681831561278972478
CanvasRenderer: CanvasRenderer:
...@@ -3762,7 +3572,7 @@ MonoBehaviour: ...@@ -3762,7 +3572,7 @@ MonoBehaviour:
m_FillOrigin: 0 m_FillOrigin: 0
m_UseSpriteMesh: 0 m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 20 m_PixelsPerUnitMultiplier: 20
--- !u!1 &6318540975440034586 --- !u!1 &6388543803935085755
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
...@@ -3770,24 +3580,24 @@ GameObject: ...@@ -3770,24 +3580,24 @@ GameObject:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 584722959338064093} - component: {fileID: 8233577126054186490}
- component: {fileID: 6046051282906857558} - component: {fileID: 5214438989617781278}
- component: {fileID: 2439187917061100090} - component: {fileID: 5865633513621925713}
m_Layer: 5 m_Layer: 5
m_Name: CorrectNumber m_Name: WrongIcon
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!224 &584722959338064093 --- !u!224 &8233577126054186490
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6318540975440034586} m_GameObject: {fileID: 6388543803935085755}
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_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
...@@ -3796,67 +3606,48 @@ RectTransform: ...@@ -3796,67 +3606,48 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 206.45404, y: -146.02893} m_AnchoredPosition: {x: -4.951111, y: -96}
m_SizeDelta: {x: 245.8574, y: 59.6549} m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6046051282906857558 --- !u!222 &5214438989617781278
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6318540975440034586} m_GameObject: {fileID: 6388543803935085755}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!114 &2439187917061100090 --- !u!114 &5865633513621925713
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6318540975440034586} m_GameObject: {fileID: 6388543803935085755}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: beaa34cb0e58d624bb3a264b28600785, type: 3} m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: LightSide.UniText::LightSide.UniText m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 0.764151, g: 0.764151, b: 0.764151, a: 1} m_Color: {r: 0.81568635, g: 0.15294118, b: 0.15294118, 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
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
text: "\u0635\u062D\u064A\u062D :" m_Sprite: {fileID: 21300000, guid: 4d2a4136ebef6f041b43fdca42412caa, type: 3}
fontStack: {fileID: 11400000, guid: 0029e5efb4c7a12f1ac9136de794e6dc, type: 2} m_Type: 0
appearance: {fileID: 11400000, guid: 3a559cf5d653f05ea807e1be5655df92, type: 2} m_PreserveAspect: 0
fontSize: 45 m_FillCenter: 1
baseDirection: 2 m_FillMethod: 4
wordWrap: 1 m_FillAmount: 1
horizontalAlignment: 0 m_FillClockwise: 1
verticalAlignment: 1 m_FillOrigin: 0
overEdge: 0 m_UseSpriteMesh: 0
underEdge: 0 m_PixelsPerUnitMultiplier: 1
leadingDistribution: 0 --- !u!1 &6724620776399621006
autoSize: 0
minFontSize: 10
maxFontSize: 72
modRegisters:
items: []
modRegisterConfigs:
items: []
highlighter:
rid: 8615661558259515578
references:
version: 2
RefIds:
- rid: 8615661558259515578
type: {class: DefaultTextHighlighter, ns: LightSide, asm: LightSide.UniText}
data:
clickColor: {r: 0.2, g: 0.5, b: 1, a: 0.6}
fadeDuration: 0.25
hoverColor: {r: 0.2, g: 0.5, b: 1, a: 0.1}
--- !u!1 &6388543803935085755
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
...@@ -3864,73 +3655,92 @@ GameObject: ...@@ -3864,73 +3655,92 @@ GameObject:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 8233577126054186490} - component: {fileID: 6503689708425524358}
- component: {fileID: 5214438989617781278} - component: {fileID: 4052203293794247519}
- component: {fileID: 5865633513621925713} - component: {fileID: 5416287310417636475}
m_Layer: 5 m_Layer: 0
m_Name: WrongIcon m_Name: Stats
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 0 m_IsActive: 1
--- !u!224 &8233577126054186490 --- !u!224 &6503689708425524358
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6388543803935085755} m_GameObject: {fileID: 6724620776399621006}
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_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 0.89443, y: 0.89443, z: 0.89443}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 4090891222954775928} m_Father: {fileID: 4090891222954775928}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -4.951111, y: -96} m_AnchoredPosition: {x: 0, y: -166}
m_SizeDelta: {x: 50, y: 50} m_SizeDelta: {x: 947.7757, y: 96.5558}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5214438989617781278 --- !u!222 &4052203293794247519
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6388543803935085755} m_GameObject: {fileID: 6724620776399621006}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!114 &5865633513621925713 --- !u!114 &5416287310417636475
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6388543803935085755} m_GameObject: {fileID: 6724620776399621006}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Script: {fileID: 11500000, guid: beaa34cb0e58d624bb3a264b28600785, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image m_EditorClassIdentifier: LightSide.UniText::LightSide.UniText
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 0.81568635, g: 0.15294118, b: 0.15294118, a: 1} m_Color: {r: 1, g: 1, b: 1, 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
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 21300000, guid: 4d2a4136ebef6f041b43fdca42412caa, type: 3} text: "\u0635\u062D: 6 | \u062E\u0637\u0623: 3"
m_Type: 0 fontStack: {fileID: 11400000, guid: 0029e5efb4c7a12f1ac9136de794e6dc, type: 2}
m_PreserveAspect: 0 appearance: {fileID: 11400000, guid: 3a559cf5d653f05ea807e1be5655df92, type: 2}
m_FillCenter: 1 fontSize: 36
m_FillMethod: 4 baseDirection: 2
m_FillAmount: 1 wordWrap: 1
m_FillClockwise: 1 horizontalAlignment: 1
m_FillOrigin: 0 verticalAlignment: 1
m_UseSpriteMesh: 0 overEdge: 0
m_PixelsPerUnitMultiplier: 1 underEdge: 0
leadingDistribution: 0
autoSize: 0
minFontSize: 10
maxFontSize: 72
modRegisters:
items: []
modRegisterConfigs:
items: []
highlighter:
rid: 8615661527403593818
references:
version: 2
RefIds:
- rid: 8615661527403593818
type: {class: DefaultTextHighlighter, ns: LightSide, asm: LightSide.UniText}
data:
clickColor: {r: 0.2, g: 0.5, b: 1, a: 0.6}
fadeDuration: 0.25
hoverColor: {r: 0.2, g: 0.5, b: 1, a: 0.1}
--- !u!1 &6884823118201866167 --- !u!1 &6884823118201866167
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -4092,10 +3902,10 @@ RectTransform: ...@@ -4092,10 +3902,10 @@ RectTransform:
m_Children: [] m_Children: []
m_Father: {fileID: 5665338920870028329} m_Father: {fileID: 5665338920870028329}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 206.00986, y: -25.96685} m_AnchoredPosition: {x: 206.00986, y: 0}
m_SizeDelta: {x: 0, y: 51.9337} m_SizeDelta: {x: 51.9337, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8749602556167845090 --- !u!222 &8749602556167845090
CanvasRenderer: CanvasRenderer:
...@@ -4257,10 +4067,10 @@ RectTransform: ...@@ -4257,10 +4067,10 @@ RectTransform:
m_Children: [] m_Children: []
m_Father: {fileID: 5665338920870028329} m_Father: {fileID: 5665338920870028329}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 144.8642, y: -25.96685} m_AnchoredPosition: {x: 144.8642, y: 0}
m_SizeDelta: {x: 0, y: 51.9337} m_SizeDelta: {x: 51.9337, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8187631058268110602 --- !u!222 &8187631058268110602
CanvasRenderer: CanvasRenderer:
......
...@@ -1100,7 +1100,7 @@ GameObject: ...@@ -1100,7 +1100,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!224 &686057142080516293 --- !u!224 &686057142080516293
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -2421,7 +2421,7 @@ GameObject: ...@@ -2421,7 +2421,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!224 &1678379179440431643 --- !u!224 &1678379179440431643
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
......
...@@ -342,7 +342,7 @@ namespace com.al_arcade.cs ...@@ -342,7 +342,7 @@ namespace com.al_arcade.cs
if (uiManager != null) if (uiManager != null)
{ {
uiManager.ShowFeedback($"ممتاز! {points}+", true); uiManager.ShowFeedback($"ممتاز!", true);
uiManager.SetStreak(_streak); uiManager.SetStreak(_streak);
} }
......
...@@ -480,9 +480,8 @@ namespace com.al_arcade.cs ...@@ -480,9 +480,8 @@ namespace com.al_arcade.cs
_resultTitle.Text = win ? pct >= 70 ? "أحسنت!" : "عمل جيد!" : "حظ اوفر"; _resultTitle.Text = win ? pct >= 70 ? "أحسنت!" : "عمل جيد!" : "حظ اوفر";
if (_resultScore != null) _resultScore.Text = score.ToString("N0"); if (_resultScore != null) _resultScore.Text = score.ToString("N0");
if (_resultStats != null) if (_resultStats != null)
_resultStats.Text = $"صحيح: {correct} / {total} | " + _resultStats.Text = $"صحيح: {correct} | " +
$"المحاولات الخاطئة: {wrong} | " + $"المحاولات الخاطئة: {wrong} ";
$"أعلى سلسلة: {bestStreak}";
var seq = DOTween.Sequence(); var seq = DOTween.Sequence();
seq.Append(_resultsUI.DOFade(1f, 0.5f)); seq.Append(_resultsUI.DOFade(1f, 0.5f));
......
...@@ -571,10 +571,12 @@ namespace com.al_arcade.mcq ...@@ -571,10 +571,12 @@ namespace com.al_arcade.mcq
{ {
if (uiManager != null) if (uiManager != null)
{ {
string msg = _streak >= streakBonusThreshold
? $"ممتاز! +{points} (سلسلة {_streak}×)" //string msg = _streak >= streakBonusThreshold
: $"صحيح! +{points}"; // ? $"ممتاز! +{points} (سلسلة {_streak}×)"
uiManager.ShowFeedback(msg, true); // : $"صحيح! +{points}";
uiManager.ShowFeedback($"ممتاز!", true);
} }
foreach (var g in _activeGates) foreach (var g in _activeGates)
...@@ -595,7 +597,7 @@ namespace com.al_arcade.mcq ...@@ -595,7 +597,7 @@ namespace com.al_arcade.mcq
private void ShowWrongFeedback() private void ShowWrongFeedback()
{ {
if (uiManager != null) uiManager.ShowFeedback("خطأ!", false); if (uiManager != null) uiManager.ShowFeedback("حاول مرة أخرى", false);
foreach (var g in _activeGates) foreach (var g in _activeGates)
{ {
......
...@@ -46,10 +46,10 @@ namespace com.al_arcade.mcq ...@@ -46,10 +46,10 @@ namespace com.al_arcade.mcq
[Header("Results UI")] [Header("Results UI")]
[SerializeField] private UniText _resultTitle; [SerializeField] private UniText _resultTitle;
[SerializeField] private UniText _resultScore; [SerializeField] private UniText _resultScore;//
[SerializeField] private UniText _resultCorrect; [SerializeField] private UniText _resultStats;
[SerializeField] private UniText _resultWrong; [SerializeField] private UniText _resultWrong;//
[SerializeField] private UniText _resultStreak; [SerializeField] private UniText _resultStreak;//
[SerializeField] private Button _resultRestartBtn; [SerializeField] private Button _resultRestartBtn;
[SerializeField] private Button _backToMenuBtn; [SerializeField] private Button _backToMenuBtn;
[SerializeField] private Slider _progressSlider; [SerializeField] private Slider _progressSlider;
...@@ -289,20 +289,19 @@ namespace com.al_arcade.mcq ...@@ -289,20 +289,19 @@ namespace com.al_arcade.mcq
// ─── Results ────────────────────────────────────────────────────────── // ─── Results ──────────────────────────────────────────────────────────
public void ShowResults(int score, int correct, int wrong, public void ShowResults(int score, int correct, int wrong, int total, int bestStreak, bool win = true)
int bestStreak, int total, bool won)
{ {
_resultsUI.gameObject.SetActive(true); _resultsUI.gameObject.SetActive(true);
_resultsUI.alpha = 0; _resultsUI.alpha = 0;
if (_resultTitle != null) _resultTitle.Text = won ? "أحسنت!" : "حظ أوفر!"; if (_resultTitle != null) _resultTitle.Text = win ? "أحسنت!" : "حظ أوفر!";
if (_resultScore != null) _resultScore.Text = score.ToString("N0"); if (_resultScore != null) _resultScore.Text = score.ToString("N0");
if (_resultCorrect != null) _resultCorrect.Text = $"صحيح: {correct}"; if (_resultStats != null)
if (_resultWrong != null) _resultWrong.Text = $"خطأ: {wrong}"; _resultStats.Text = $"صحيح: {correct} | " +
if (_resultStreak != null) _resultStreak.Text = $"أعلى سلسلة: {bestStreak}"; $"المحاولات الخاطئة: {wrong} " ;
if (_winIcon != null) _winIcon.SetActive(won); if (_winIcon != null) _winIcon.SetActive(win);
if (_loseIcon != null) _loseIcon.SetActive(!won); if (_loseIcon != null) _loseIcon.SetActive(!win);
var seq = DOTween.Sequence(); var seq = DOTween.Sequence();
seq.Append(_resultsUI.DOFade(1f, 0.5f)); seq.Append(_resultsUI.DOFade(1f, 0.5f));
......
...@@ -214,7 +214,7 @@ namespace com.al_arcade.tf ...@@ -214,7 +214,7 @@ namespace com.al_arcade.tf
if (productionLine != null) yield return productionLine.MoveForward(stepDistance); if (productionLine != null) yield return productionLine.MoveForward(stepDistance);
if (questionScreen != null) questionScreen.ShowFeedback(true, _streak); if (questionScreen != null) questionScreen.ShowFeedback(true, _streak);
if (uiManager != null) uiManager.ShowFeedback($"ممتاز! {points}+", true); if (uiManager != null) uiManager.ShowFeedback($"ممتاز!", true);
var audio = SSAudioManager.Instance; var audio = SSAudioManager.Instance;
if (audio != null) if (audio != null)
...@@ -305,7 +305,7 @@ namespace com.al_arcade.tf ...@@ -305,7 +305,7 @@ namespace com.al_arcade.tf
protected override IEnumerator NoChallengeLoseSequence() protected override IEnumerator NoChallengeLoseSequence()
{ {
yield return new WaitForSeconds(1f); yield return new WaitForSeconds(1f);
uiManager?.ShowResults(_score, _correctCount, _wrongCount, false); uiManager?.ShowResults(_score, _correctCount, _wrongCount,_questions.Length, _streak, false);
onGameOver?.Invoke(); onGameOver?.Invoke();
} }
...@@ -327,7 +327,7 @@ namespace com.al_arcade.tf ...@@ -327,7 +327,7 @@ namespace com.al_arcade.tf
protected override IEnumerator NoChallengeVictorySequence() protected override IEnumerator NoChallengeVictorySequence()
{ {
yield return new WaitForSeconds(1.5f); yield return new WaitForSeconds(1.5f);
uiManager?.ShowResults(_score, _correctCount, _wrongCount, true); uiManager?.ShowResults(_score, _correctCount, _wrongCount,_questions.Length ,_streak);
onGameComplete?.Invoke(); onGameComplete?.Invoke();
} }
......
...@@ -229,14 +229,16 @@ namespace com.al_arcade.tf ...@@ -229,14 +229,16 @@ namespace com.al_arcade.tf
// ─── Results ────────────────────────────────────────────────────────── // ─── Results ──────────────────────────────────────────────────────────
public void ShowResults(int score, int correct, int wrong, bool won) public void ShowResults(int score, int correct, int wrong, int total, int bestStreak, bool win = true)
{ {
_resultsUI.gameObject.SetActive(true); _resultsUI.gameObject.SetActive(true);
_resultsUI.alpha = 0; _resultsUI.alpha = 0;
if (_resultTitle != null) _resultTitle.Text = won ? "نجحت المهمة" : "حاول مجدداً"; if (_resultTitle != null) _resultTitle.Text = win ? "نجحت المهمة" : "حاول مجدداً";
if (_resultScore != null) _resultScore.Text = score.ToString("N0"); if (_resultScore != null) _resultScore.Text = score.ToString("N0");
if (_resultStats != null) _resultStats.Text = $"صح: {correct} | خطأ: {wrong}"; if (_resultStats != null)
_resultStats.Text = $"صحيح: {correct} | " +
$"المحاولات الخاطئة: {wrong} " ;
var seq = DOTween.Sequence(); var seq = DOTween.Sequence();
seq.Append(_resultsUI.DOFade(1, 0.4f)); seq.Append(_resultsUI.DOFade(1, 0.4f));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment