From 7b1337fb7c3778e2fc41ed303712495cc540ab33 Mon Sep 17 00:00:00 2001 From: zxl Date: Tue, 3 Dec 2024 11:30:31 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E7=AD=94?= =?UTF-8?q?=E9=A2=98=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DemoGame/GameRes/UIPanel/UIAnswer.prefab | 980 +++++++++++------- .../常规血液与尿液分析Procedure.cs | 15 +- .../Hotfix/Procedure/Logic/首页Procedure.cs | 1 + .../GameScript/Hotfix/UI/Logic/AnswerUI.cs | 138 ++- 4 files changed, 722 insertions(+), 412 deletions(-) diff --git a/Assets/DemoGame/GameRes/UIPanel/UIAnswer.prefab b/Assets/DemoGame/GameRes/UIPanel/UIAnswer.prefab index 72e3f31..b2dddf5 100644 --- a/Assets/DemoGame/GameRes/UIPanel/UIAnswer.prefab +++ b/Assets/DemoGame/GameRes/UIPanel/UIAnswer.prefab @@ -25,7 +25,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 327864267624296097} - 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 @@ -34,8 +34,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 960.01227, y: -713.22797} - m_SizeDelta: {x: 1653.9, y: 51.1369} + m_AnchoredPosition: {x: 702.4207, y: -522.75085} + m_SizeDelta: {x: 1370, y: 51.1369} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5178070547149628102 CanvasRenderer: @@ -157,19 +157,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 415659832177555462} - 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 m_Children: - - {fileID: 7529453089749374306} - {fileID: 759490471788483218} m_Father: {fileID: 213512176724731907} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 960.01227, y: -827.0807} - m_SizeDelta: {x: 1653.9, y: 151.29828} + m_AnchoredPosition: {x: 702.3218, y: -633.9685} + m_SizeDelta: {x: 1370, y: 151.2983} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &663519475900671380 GameObject: @@ -347,19 +346,19 @@ MonoBehaviour: - name: tog_Option0 go: {fileID: 3532858936118367886} - name: txt_Label0 - go: {fileID: 3444754026178090077} + go: {fileID: 5113731302474293094} - name: tog_Option1 go: {fileID: 1970333461947389192} - name: txt_Label1 - go: {fileID: 2251045885423557584} + go: {fileID: 4466720517247577235} - name: tog_Option2 go: {fileID: 1356248942192795211} - name: txt_Label2 - go: {fileID: 7982017077170158247} + go: {fileID: 4716153804824262478} - name: tog_Option3 go: {fileID: 1835470347797471876} - name: txt_Label3 - go: {fileID: 6467479594135000718} + go: {fileID: 4903535373688324741} - name: txt_TrueOption go: {fileID: 327864267624296097} - name: txt_JXContent @@ -624,13 +623,13 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6032167282962533658} - - {fileID: 5904519026786673764} + - {fileID: 2812876343964044892} m_Father: {fileID: 1006049418372502532} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1653.9, y: 100} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 685, y: -200} + m_SizeDelta: {x: 1370, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5988190424262515608 MonoBehaviour: @@ -839,7 +838,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1446025969362002077} - 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 @@ -848,8 +847,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 960, y: -157} - m_SizeDelta: {x: 1653.8755, y: 203.77527} + m_AnchoredPosition: {x: 702.4207, y: -78.409} + m_SizeDelta: {x: 1370, y: 136.818} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &330896853263210472 CanvasRenderer: @@ -978,13 +977,13 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3597914359011568832} - - {fileID: 6136395236967175666} + - {fileID: 3479310080562544518} m_Father: {fileID: 1006049418372502532} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1653.9, y: 100} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 685, y: -280} + m_SizeDelta: {x: 1370, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &7085363328433681828 MonoBehaviour: @@ -1064,13 +1063,13 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5964997223637209942} - - {fileID: 4952413150758628842} + - {fileID: 7724754733161869130} m_Father: {fileID: 1006049418372502532} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1653.9, y: 100} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 685, y: -120} + m_SizeDelta: {x: 1370, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &8573232584544108190 MonoBehaviour: @@ -1120,85 +1119,6 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_IsOn: 0 ---- !u!1 &2251045885423557584 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4952413150758628842} - - component: {fileID: 8226511332785221110} - - component: {fileID: 3694472002067382921} - m_Layer: 5 - m_Name: txt_Label1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4952413150758628842 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2251045885423557584} - 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: 3882497733084813627} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 41.13208, y: -0.5} - m_SizeDelta: {x: -92.2642, y: -3} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8226511332785221110 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2251045885423557584} - m_CullTransparentMesh: 1 ---- !u!114 &3694472002067382921 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2251045885423557584} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: 6a1f25bbc53cb45489a3b8984a6a1cbc, type: 3} - m_FontSize: 36 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Toggle --- !u!1 &2759364698640047434 GameObject: m_ObjectHideFlags: 0 @@ -1236,7 +1156,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} m_AnchoredPosition: {x: -104.03308, y: 0} - m_SizeDelta: {x: 208.06616, y: 87.5308} + m_SizeDelta: {x: 208.06616, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6554755532169340532 CanvasRenderer: @@ -1548,12 +1468,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 3986139158853414265} + m_Father: {fileID: 759490471788483218} 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: 52.99402} - m_SizeDelta: {x: 1653.9, y: 45.3103} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 22.65503} + m_SizeDelta: {x: -0.00012207031, y: 45.310303} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8590042354985795716 CanvasRenderer: @@ -1715,85 +1635,6 @@ MonoBehaviour: m_Spacing: {x: 0, y: 0} m_Constraint: 0 m_ConstraintCount: 2 ---- !u!1 &3444754026178090077 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5536372233752925475} - - component: {fileID: 8066423015837930145} - - component: {fileID: 2780800573820911199} - m_Layer: 5 - m_Name: txt_Label0 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5536372233752925475 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3444754026178090077} - 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: 9147011923895509353} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 41.13208, y: -0.5} - m_SizeDelta: {x: -92.2642, y: -3} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8066423015837930145 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3444754026178090077} - m_CullTransparentMesh: 1 ---- !u!114 &2780800573820911199 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3444754026178090077} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: 6a1f25bbc53cb45489a3b8984a6a1cbc, type: 3} - m_FontSize: 36 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Toggle --- !u!1 &3532858936118367886 GameObject: m_ObjectHideFlags: 0 @@ -1824,13 +1665,13 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6968650884660081960} - - {fileID: 5536372233752925475} + - {fileID: 4904281579791258578} m_Father: {fileID: 1006049418372502532} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1653.9, y: 100} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 685, y: -40} + m_SizeDelta: {x: 1370, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5251691709297437820 MonoBehaviour: @@ -2043,13 +1884,14 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 7529453089749374306} m_Father: {fileID: 3986139158853414265} 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: -22.656} - m_SizeDelta: {x: 1653.9, y: 105.99} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -98.656} + m_SizeDelta: {x: 0.00012207, y: 105.99} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4148214764750997141 CanvasRenderer: @@ -2248,7 +2090,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3776331439593135551} - 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 @@ -2260,8 +2102,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: -609.6538, y: -211.3466} + m_AnchoredPosition: {x: -0.000061035156, y: -58} + m_SizeDelta: {x: -519.8086, y: -260.79218} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3887768658889455771 CanvasRenderer: @@ -2301,6 +2143,140 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &4466720517247577235 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7724754733161869130} + - component: {fileID: 5607692755501032132} + - component: {fileID: 6400159561819787353} + m_Layer: 5 + m_Name: txt_Label1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7724754733161869130 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4466720517247577235} + 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: 3882497733084813627} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 733.0972, y: 0} + m_SizeDelta: {x: 1273.8057, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5607692755501032132 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4466720517247577235} + m_CullTransparentMesh: 1 +--- !u!114 &6400159561819787353 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4466720517247577235} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: New Text + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: abc67234d32ea1245953cb5fd5b92b8c, type: 2} + m_sharedMaterial: {fileID: -6470419919974777511, guid: abc67234d32ea1245953cb5fd5b92b8c, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 32 + m_fontSizeBase: 32 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &4552126516710317335 GameObject: m_ObjectHideFlags: 0 @@ -2510,6 +2486,140 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &4716153804824262478 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2812876343964044892} + - component: {fileID: 8583794194374363325} + - component: {fileID: 2961987959488320074} + m_Layer: 5 + m_Name: txt_Label2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2812876343964044892 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4716153804824262478} + 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: 3606887867703492517} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 690.2043, y: 0} + m_SizeDelta: {x: 1188.0195, y: -3} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8583794194374363325 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4716153804824262478} + m_CullTransparentMesh: 1 +--- !u!114 &2961987959488320074 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4716153804824262478} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: New Text + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: abc67234d32ea1245953cb5fd5b92b8c, type: 2} + m_sharedMaterial: {fileID: -6470419919974777511, guid: abc67234d32ea1245953cb5fd5b92b8c, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 32 + m_fontSizeBase: 32 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &4744901011118942868 GameObject: m_ObjectHideFlags: 0 @@ -2681,7 +2791,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 208.06616, y: 87.5308} + m_SizeDelta: {x: 208.06616, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7112629038494958077 CanvasRenderer: @@ -2765,6 +2875,140 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!1 &4903535373688324741 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3479310080562544518} + - component: {fileID: 2677437597097857029} + - component: {fileID: 7243191379752378038} + m_Layer: 5 + m_Name: txt_Label3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3479310080562544518 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4903535373688324741} + 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: 3612330232990046696} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 733.0972, y: 0} + m_SizeDelta: {x: 1273.8057, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2677437597097857029 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4903535373688324741} + m_CullTransparentMesh: 1 +--- !u!114 &7243191379752378038 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4903535373688324741} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: New Text + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: abc67234d32ea1245953cb5fd5b92b8c, type: 2} + m_sharedMaterial: {fileID: -6470419919974777511, guid: abc67234d32ea1245953cb5fd5b92b8c, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 32 + m_fontSizeBase: 32 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &5051477814356763958 GameObject: m_ObjectHideFlags: 0 @@ -2788,7 +3032,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5051477814356763958} - 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 @@ -2798,11 +3042,145 @@ RectTransform: - {fileID: 5161765971972522999} m_Father: {fileID: 213512176724731907} 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.0023193, y: -439} - m_SizeDelta: {x: 1653.9, y: 87.5308} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 697.4755, y: -759.6176} + m_SizeDelta: {x: 1370, y: 80} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &5113731302474293094 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4904281579791258578} + - component: {fileID: 1946306853984746092} + - component: {fileID: 3966640923254242903} + m_Layer: 5 + m_Name: txt_Label0 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4904281579791258578 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5113731302474293094} + 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: 9147011923895509353} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 733.0972, y: 0} + m_SizeDelta: {x: 1273.8057, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1946306853984746092 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5113731302474293094} + m_CullTransparentMesh: 1 +--- !u!114 &3966640923254242903 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5113731302474293094} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: New Text + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: abc67234d32ea1245953cb5fd5b92b8c, type: 2} + m_sharedMaterial: {fileID: -6470419919974777511, guid: abc67234d32ea1245953cb5fd5b92b8c, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 32 + m_fontSizeBase: 32 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &5653060167755241844 GameObject: m_ObjectHideFlags: 0 @@ -2830,7 +3208,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5653060167755241844} - 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 @@ -2843,8 +3221,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 960, y: -475.07147} - m_SizeDelta: {x: 1653.9, y: 400} + m_AnchoredPosition: {x: 702.4207, y: -322.00018} + m_SizeDelta: {x: 1370, y: 330.3644} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8329000484209887088 CanvasRenderer: @@ -2891,7 +3269,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5653060167755241844} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} m_Name: @@ -2903,8 +3281,8 @@ MonoBehaviour: m_Bottom: 0 m_ChildAlignment: 0 m_Spacing: 0 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 1 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 m_ChildControlHeight: 0 m_ChildScaleWidth: 0 @@ -3062,7 +3440,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &4083531706651130740 RectTransform: m_ObjectHideFlags: 0 @@ -3165,85 +3543,6 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] ---- !u!1 &6467479594135000718 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6136395236967175666} - - component: {fileID: 7894997606484796452} - - component: {fileID: 5654667393694648944} - m_Layer: 5 - m_Name: txt_Label3 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6136395236967175666 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6467479594135000718} - 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: 3612330232990046696} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 41.13208, y: -0.5} - m_SizeDelta: {x: -92.2642, y: -3} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7894997606484796452 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6467479594135000718} - m_CullTransparentMesh: 1 ---- !u!114 &5654667393694648944 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6467479594135000718} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: 6a1f25bbc53cb45489a3b8984a6a1cbc, type: 3} - m_FontSize: 36 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Toggle --- !u!1 &6698834807322447615 GameObject: m_ObjectHideFlags: 0 @@ -3688,7 +3987,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7743956870191892156} - 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 @@ -3702,8 +4001,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: -0.000061035156, y: -58} + m_SizeDelta: {x: -519.8086, y: -260.79218} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2579158918124584893 CanvasRenderer: @@ -3743,85 +4042,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &7982017077170158247 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5904519026786673764} - - component: {fileID: 4121854993297359300} - - component: {fileID: 8828896250448713196} - m_Layer: 5 - m_Name: txt_Label2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5904519026786673764 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7982017077170158247} - 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: 3606887867703492517} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 41.13208, y: -0.5} - m_SizeDelta: {x: -92.2642, y: -3} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4121854993297359300 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7982017077170158247} - m_CullTransparentMesh: 1 ---- !u!114 &8828896250448713196 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7982017077170158247} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: 6a1f25bbc53cb45489a3b8984a6a1cbc, type: 3} - m_FontSize: 36 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Toggle --- !u!1 &8110955654797702090 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/DemoGame/GameScript/Hotfix/Procedure/Logic/常规血液与尿液分析Procedure.cs b/Assets/DemoGame/GameScript/Hotfix/Procedure/Logic/常规血液与尿液分析Procedure.cs index 67b65ba..c734197 100644 --- a/Assets/DemoGame/GameScript/Hotfix/Procedure/Logic/常规血液与尿液分析Procedure.cs +++ b/Assets/DemoGame/GameScript/Hotfix/Procedure/Logic/常规血液与尿液分析Procedure.cs @@ -36,9 +36,9 @@ namespace ZC private void MinTipsUI_Callback() { Global.UIManager.CloseLast(); - var bigTipsUI = (BigTipsUI)Global.UIManager.ShowOnlyUI(UIType.BigTipsUI); + var bigTipsUI = (BigTipsUI)Global.UIManager.ShowUI(UIType.BigTipsUI); bigTipsUI.SetData("移动到护士身边进行常规血液检查"); - var minTipsUI = (MinTipsUI)Global.UIManager.ShowOnlyUI(UIType.MinTipsUI); + var minTipsUI = (MinTipsUI)Global.UIManager.ShowUI(UIType.MinTipsUI); minTipsUI.SetData("知识点讲解1", "常规血液与尿液分析知识点讲解——设备认知之后的1", () => { Global.UIManager.HideUI(UIType.MinTipsUI); }); @@ -55,7 +55,7 @@ namespace ZC triggerEvent.Dispose(); // 播放抽血动画 - var minTipsUI = (MinTipsUI)Global.UIManager.ShowOnlyUI(UIType.MinTipsUI); + var minTipsUI = (MinTipsUI)Global.UIManager.ShowUI(UIType.MinTipsUI); minTipsUI.SetData("知识点讲解2", "常规血液与尿液分析知识点讲解——设备认知之后的2 ----------- 播放抽血动画", () => { Global.UIManager.HideUI(UIType.MinTipsUI); @@ -70,8 +70,9 @@ namespace ZC var bigTipsUI = (BigTipsUI)Global.UIManager.ShowUI(UIType.BigTipsUI); bigTipsUI.SetData("根据箭头指引让老人去进行尿液取样"); - var gameObject = binding.GetValue("尿液取样点"); - triggerEvent = gameObject.GetOrAddComponent(); + GameObject go_NiaoYe; + go_NiaoYe = binding.GetValue("尿液取样点"); + triggerEvent = go_NiaoYe.GetOrAddComponent(); triggerEvent.SetData(PlayerMoveToPoint1); } @@ -81,13 +82,13 @@ namespace ZC async UniTask RunAsync() { Global.UIManager.HideUI(UIType.BigTipsUI); - triggerEvent.Dispose(); + await UniTask.Delay(3000); var urineSamplingUI = (UrineSamplingUI)Global.UIManager.ShowUI(UIType.UrineSamplingUI); urineSamplingUI.SetData(UrineSamplingUI_Callback); - await UniTask.Delay(3000); } + triggerEvent.Dispose(); RunAsync().Forget(); } diff --git a/Assets/DemoGame/GameScript/Hotfix/Procedure/Logic/首页Procedure.cs b/Assets/DemoGame/GameScript/Hotfix/Procedure/Logic/首页Procedure.cs index f5f8918..64cd73c 100644 --- a/Assets/DemoGame/GameScript/Hotfix/Procedure/Logic/首页Procedure.cs +++ b/Assets/DemoGame/GameScript/Hotfix/Procedure/Logic/首页Procedure.cs @@ -1,5 +1,6 @@ using Cysharp.Threading.Tasks; using Unity.Loader; +using UnityEngine; namespace ZC { diff --git a/Assets/DemoGame/GameScript/Hotfix/UI/Logic/AnswerUI.cs b/Assets/DemoGame/GameScript/Hotfix/UI/Logic/AnswerUI.cs index 4d02f23..87a014a 100644 --- a/Assets/DemoGame/GameScript/Hotfix/UI/Logic/AnswerUI.cs +++ b/Assets/DemoGame/GameScript/Hotfix/UI/Logic/AnswerUI.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using TMPro; using UnityEngine; using UnityEngine.UI; @@ -70,9 +71,42 @@ namespace ZC btn_Last.onClick.AddListener(ClickLastButton); btn_Submit.onClick.AddListener(ClickSubmitButton); btn_Next.onClick.AddListener(ClickNextButton); + btn_TryAgain.onClick.AddListener(ClickTryAgainButton); + btn_Finish.onClick.AddListener(ClickFinishButton); + + tog_Option0.onValueChanged.AddListener(Option0_onValueChanged); + tog_Option1.onValueChanged.AddListener(Option1_onValueChanged); + tog_Option2.onValueChanged.AddListener(Option2_onValueChanged); + tog_Option3.onValueChanged.AddListener(Option3_onValueChanged); // 读取题库 - _bankData = new QuestionBankData(); + _bankData = ResourcesLocalComponent.Instance.LoadAssetSync(AssetConst + .Assets_DemoGame_GameRes_Config_QuestionBank_asset); + ResetAnswer(); + } + + private void Option0_onValueChanged(bool arg0) + { + if (arg0) + currentChooseStr[currentIndex] = "A"; + } + + private void Option1_onValueChanged(bool arg0) + { + if (arg0) + currentChooseStr[currentIndex] = "B"; + } + + private void Option2_onValueChanged(bool arg0) + { + if (arg0) + currentChooseStr[currentIndex] = "C"; + } + + private void Option3_onValueChanged(bool arg0) + { + if (arg0) + currentChooseStr[currentIndex] = "D"; } public override void Dispose() @@ -89,15 +123,31 @@ namespace ZC isSubmit = false; } + void CheckIsShowJX() + { + if (!txt_TrueOption.gameObject.activeSelf) + { + txt_TrueOption.gameObject.SetActive(true); + txt_JXContent.gameObject.SetActive(true); + } + else + { + if (currentIndex >= _bankData.AnswerDatas.Count - 1) + return; + currentIndex++; + SetUIContent(_bankData.AnswerDatas[currentIndex]); + } + } + private void ClickNextButton() { - currentIndex++; - SetUIContent(_bankData.AnswerDatas[currentIndex]); + CheckIsShowJX(); } private void ClickSubmitButton() { isSubmit = true; + ShowResult(); } private void ClickLastButton() @@ -106,16 +156,13 @@ namespace ZC SetUIContent(_bankData.AnswerDatas[currentIndex]); } + // 当前选择结果 + private string[] currentChooseStr; + public void SetQuestionBankData(QuestionBankData bankData) { this._bankData = bankData; - InitAnswer(); - } - - private void InitAnswer() - { - currentIndex = 0; - SetUIContent(_bankData.AnswerDatas[currentIndex]); + ResetAnswer(); } private void SetUIContent(AnswerData data) @@ -126,7 +173,7 @@ namespace ZC txt_Label1.text = data.options[1].content; txt_Label2.text = data.options[2].content; txt_Label3.text = data.options[3].content; - txt_TrueOption.text = data.trueOption; + txt_TrueOption.text = $"正确答案：{data.trueOption}"; txt_JXContent.text = data.analyze; txt_TrueOption.gameObject.SetActive(false); txt_JXContent.gameObject.SetActive(false); @@ -136,29 +183,70 @@ namespace ZC tog_Option2.isOn = false; tog_Option3.isOn = false; - if (currentIndex >= _bankData.AnswerDatas.Count - 1) // 最后一题 - { - btn_Next.gameObject.SetActive(false); - // 提交按钮显示 - } - else if (currentIndex <= 0) // 第一题 - { - btn_Last.gameObject.SetActive(false); - } - else - { - btn_Last.gameObject.SetActive(true); - btn_Next.gameObject.SetActive(true); - } + // if (currentIndex >= _bankData.AnswerDatas.Count - 1) // 最后一题 + // { + // btn_Next.gameObject.SetActive(false); + // // 提交按钮显示 + // } + // else if (currentIndex <= 0) // 第一题 + // { + // btn_Last.gameObject.SetActive(false); + // } + // else + // { + // // btn_Last.gameObject.SetActive(true); + // btn_Next.gameObject.SetActive(true); + // } } void ResetAnswer() { + panel_Answer.gameObject.SetActive(true); + panel_Result.gameObject.SetActive(false); + currentChooseStr = new string[_bankData.AnswerDatas.Count]; + + currentIndex = 0; + SetUIContent(_bankData.AnswerDatas[currentIndex]); } public void SetData(Action callback) { this.callback = callback; } + + #region Result + + void ShowResult() + { + panel_Answer.gameObject.SetActive(false); + panel_Result.gameObject.SetActive(true); + + var answerDatas = _bankData.AnswerDatas; + int trueCount = 0; + int falseCount = 0; + for (var i = 0; i < currentChooseStr.Length; i++) + { + if (answerDatas[i].trueOption == currentChooseStr[i]) + trueCount++; + else + falseCount++; + } + + txt_TrueCount.text = trueCount.ToString(); + txt_FalseCount.text = falseCount.ToString(); + txt_ScoreCount.text = $"{trueCount}分"; + } + + private void ClickFinishButton() + { + callback?.Invoke(); + } + + private void ClickTryAgainButton() + { + ResetAnswer(); + } + + #endregion } } \ No newline at end of file