fix：修复答题逻辑

Assets/DemoGame/GameRes/Scene/ChouXueScene.unity

@@ -38,7 +38,6 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -170,7 +169,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 958b7b56a97147e5811af8e2b102e876, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  target: {fileID: 0}
+  target: {fileID: 1891309865}
 --- !u!64 &355301132
 MeshCollider:
   m_ObjectHideFlags: 0
@@ -272,8 +271,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: afabfbcb43e24ae8af532e4d266dfb46, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Datas:
+  _datas:
-  - name: "\u5E38\u89C4\u8840\u6DB2\u4E0E\u5C3F\u6DB2\u5206\u6790\u70B9"
+  - name: "\u5E38\u89C4\u8840\u6DB2\u68C0\u67E5\u70B9"
     go: {fileID: 1194776732}
   - name: "\u5C3F\u6DB2\u53D6\u6837\u70B9"
     go: {fileID: 1191143519}
@@ -452,7 +451,7 @@ BoxCollider:
     serializedVersion: 2
     m_Bits: 0
   m_LayerOverridePriority: 0
-  m_IsTrigger: 0
+  m_IsTrigger: 1
   m_ProvidesContacts: 0
   m_Enabled: 1
   serializedVersion: 3
@@ -556,7 +555,7 @@ BoxCollider:
     serializedVersion: 2
     m_Bits: 0
   m_LayerOverridePriority: 0
-  m_IsTrigger: 0
+  m_IsTrigger: 1
   m_ProvidesContacts: 0
   m_Enabled: 1
   serializedVersion: 3
@@ -675,7 +674,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 958b7b56a97147e5811af8e2b102e876, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  target: {fileID: 0}
+  target: {fileID: 1891309865}
 --- !u!64 &1334411390
 MeshCollider:
   m_ObjectHideFlags: 0
@@ -864,94 +863,81 @@ MeshCollider:
   m_Convex: 0
   m_CookingOptions: 30
   m_Mesh: {fileID: -7553716758358721678, guid: a38545e6d570a6941833d61c7a894f15, type: 3}
---- !u!1 &1543823431
+--- !u!1001 &1891309864
-GameObject:
+PrefabInstance:
   m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1543823434}
-  - component: {fileID: 1543823433}
-  m_Layer: 0
-  m_Name: Main Camera
-  m_TagString: MainCamera
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!20 &1543823433
-Camera:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1543823431}
-  m_Enabled: 1
   serializedVersion: 2
-  m_ClearFlags: 1
+  m_Modification:
-  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
+    serializedVersion: 3
-  m_projectionMatrixMode: 1
+    m_TransformParent: {fileID: 0}
-  m_GateFitMode: 2
+    m_Modifications:
-  m_FOVAxisMode: 0
+    - target: {fileID: 129553625502292565, guid: 79fb8148c76686e419fb0484c085ed57, type: 3}
-  m_Iso: 200
+      propertyPath: m_LocalPosition.y
-  m_ShutterSpeed: 0.005
+      value: 0.653
-  m_Aperture: 16
+      objectReference: {fileID: 0}
-  m_FocusDistance: 10
+    - target: {fileID: 1272942970435915033, guid: 79fb8148c76686e419fb0484c085ed57, type: 3}
-  m_FocalLength: 50
+      propertyPath: m_Name
-  m_BladeCount: 5
+      value: Player
-  m_Curvature: {x: 2, y: 11}
+      objectReference: {fileID: 0}
-  m_BarrelClipping: 0.25
+    - target: {fileID: 4349644981020034193, guid: 79fb8148c76686e419fb0484c085ed57, type: 3}
-  m_Anamorphism: 0
+      propertyPath: m_LocalPosition.x
-  m_SensorSize: {x: 36, y: 24}
+      value: 0.572
-  m_LensShift: {x: 0, y: 0}
+      objectReference: {fileID: 0}
-  m_NormalizedViewPortRect:
+    - target: {fileID: 4349644981020034193, guid: 79fb8148c76686e419fb0484c085ed57, type: 3}
-    serializedVersion: 2
+      propertyPath: m_LocalPosition.y
-    x: 0
+      value: 0.73
-    y: 0
+      objectReference: {fileID: 0}
-    width: 1
+    - target: {fileID: 4349644981020034193, guid: 79fb8148c76686e419fb0484c085ed57, type: 3}
-    height: 1
+      propertyPath: m_LocalPosition.z
-  near clip plane: 0.3
+      value: 1.973
-  far clip plane: 1000
+      objectReference: {fileID: 0}
-  field of view: 60
+    - target: {fileID: 4349644981020034193, guid: 79fb8148c76686e419fb0484c085ed57, type: 3}
-  orthographic: 0
+      propertyPath: m_LocalRotation.w
-  orthographic size: 5
+      value: 0
-  m_Depth: -1
+      objectReference: {fileID: 0}
-  m_CullingMask:
+    - target: {fileID: 4349644981020034193, guid: 79fb8148c76686e419fb0484c085ed57, type: 3}
-    serializedVersion: 2
+      propertyPath: m_LocalRotation.x
-    m_Bits: 4294967295
+      value: 0
-  m_RenderingPath: -1
+      objectReference: {fileID: 0}
-  m_TargetTexture: {fileID: 0}
+    - target: {fileID: 4349644981020034193, guid: 79fb8148c76686e419fb0484c085ed57, type: 3}
-  m_TargetDisplay: 0
+      propertyPath: m_LocalRotation.y
-  m_TargetEye: 3
+      value: 1
-  m_HDR: 1
+      objectReference: {fileID: 0}
-  m_AllowMSAA: 1
+    - target: {fileID: 4349644981020034193, guid: 79fb8148c76686e419fb0484c085ed57, type: 3}
-  m_AllowDynamicResolution: 0
+      propertyPath: m_LocalRotation.z
-  m_ForceIntoRT: 0
+      value: 0
-  m_OcclusionCulling: 1
+      objectReference: {fileID: 0}
-  m_StereoConvergence: 10
+    - target: {fileID: 4349644981020034193, guid: 79fb8148c76686e419fb0484c085ed57, type: 3}
-  m_StereoSeparation: 0.022
+      propertyPath: m_LocalEulerAnglesHint.x
---- !u!4 &1543823434
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4349644981020034193, guid: 79fb8148c76686e419fb0484c085ed57, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 180
+      objectReference: {fileID: 0}
+    - target: {fileID: 4349644981020034193, guid: 79fb8148c76686e419fb0484c085ed57, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6529502664822504283, guid: 79fb8148c76686e419fb0484c085ed57, type: 3}
+      propertyPath: m_Height
+      value: 1.4
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 79fb8148c76686e419fb0484c085ed57, type: 3}
+--- !u!4 &1891309865 stripped
 Transform:
-  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 4349644981020034193, guid: 79fb8148c76686e419fb0484c085ed57, type: 3}
-  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 1891309864}
-  m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1543823431}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0.9972773, z: -0.073743, w: 0}
-  m_LocalPosition: {x: 0.023, y: 1.076, z: 0.806}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 8.458, y: 180, z: 0}
 --- !u!1660057539 &9223372036854775807
 SceneRoots:
   m_ObjectHideFlags: 0
   m_Roots:
-  - {fileID: 1543823434}
   - {fileID: 731266092}
   - {fileID: 1438550273}
   - {fileID: 368766239}
+  - {fileID: 1891309864}

Assets/DemoGame/GameRes/Scene/HuShiTaiScene.unity

@@ -38,7 +38,6 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -171,7 +170,7 @@ BoxCollider:
     serializedVersion: 2
     m_Bits: 0
   m_LayerOverridePriority: 0
-  m_IsTrigger: 0
+  m_IsTrigger: 1
   m_ProvidesContacts: 0
   m_Enabled: 1
   serializedVersion: 3
@@ -384,7 +383,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 958b7b56a97147e5811af8e2b102e876, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  target: {fileID: 0}
+  target: {fileID: 3847979677484416899}
 --- !u!64 &1355950663
 MeshCollider:
   m_ObjectHideFlags: 0
@@ -640,7 +639,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: afabfbcb43e24ae8af532e4d266dfb46, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Datas:
+  _datas:
   - name: "\u5E38\u89C4\u8840\u6DB2\u4E0E\u5C3F\u6DB2\u5206\u6790\u70B9"
     go: {fileID: 459317342}
 --- !u!4 &2057956788
@@ -717,6 +716,11 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 79fb8148c76686e419fb0484c085ed57, type: 3}
+--- !u!4 &3847979677484416899 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 4349644981020034193, guid: 79fb8148c76686e419fb0484c085ed57, type: 3}
+  m_PrefabInstance: {fileID: 3847979677484416898}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1660057539 &9223372036854775807
 SceneRoots:
   m_ObjectHideFlags: 0

Assets/DemoGame/GameRes/Scene/LiaoTianScene.unity

@@ -38,7 +38,6 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -491,7 +490,6 @@ GameObject:
   m_Component:
   - component: {fileID: 2057956788}
   - component: {fileID: 2057956787}
-  - component: {fileID: 2057956789}
   m_Layer: 0
   m_Name: SceneBuinding
   m_TagString: Untagged
@@ -511,7 +509,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: afabfbcb43e24ae8af532e4d266dfb46, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Datas:
+  _datas:
   - name: "\u8001\u4EBA"
     go: {fileID: 1553281160}
 --- !u!4 &2057956788
@@ -530,18 +528,6 @@ Transform:
   - {fileID: 1553281163}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &2057956789
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2057956786}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: cfde219640219834cbab1c9a25f4e1c6, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1001 &5843770857933138729
 PrefabInstance:
   m_ObjectHideFlags: 0

Assets/DemoGame/GameRes/UIPanel/UIModelDisplay.prefab

@@ -963,6 +963,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 3671245186100896506}
   - {fileID: 4749853075195230020}
   - {fileID: 2143427376660997177}
   - {fileID: 1179718432570443799}
@@ -1424,6 +1425,81 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!1 &5985600935483776999
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3671245186100896506}
+  - component: {fileID: 7683623794063520565}
+  - component: {fileID: 3864785127278932516}
+  m_Layer: 5
+  m_Name: Panel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3671245186100896506
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5985600935483776999}
+  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: 4933003019792527182}
+  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_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7683623794063520565
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5985600935483776999}
+  m_CullTransparentMesh: 1
+--- !u!114 &3864785127278932516
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5985600935483776999}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.48235294}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &6574151432076934515
 GameObject:
   m_ObjectHideFlags: 0

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("尿液取样点");
+            GameObject go_NiaoYe;
-            triggerEvent = gameObject.GetOrAddComponent<TriggerEvent>();
+            go_NiaoYe = binding.GetValue("尿液取样点");
+            triggerEvent = go_NiaoYe.GetOrAddComponent<TriggerEvent>();
             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();
         }
 

Assets/DemoGame/GameScript/Hotfix/Procedure/Logic/首页Procedure.cs

@@ -1,5 +1,6 @@
 using Cysharp.Threading.Tasks;
 using Unity.Loader;
+using UnityEngine;
 
 namespace ZC
 {

Assets/DemoGame/GameScript/Hotfix/UI/BindingBase.cs

@@ -0,0 +1,87 @@
+using System;
+using System.Collections.Generic;
+using Sirenix.OdinInspector;
+using UnityEngine;
+
+namespace ZC
+{
+    public abstract class BindingBase : MonoBehaviour
+    {
+        [SerializeField] private List<GameObjectBindingData> _datas = new List<GameObjectBindingData>();
+
+        public IReadOnlyList<GameObjectBindingData> Datas => _datas;
+
+        public GameObject GetValue(string nameStr)
+        {
+            foreach (var data in _datas)
+            {
+                if (data.name == nameStr)
+                {
+                    return data.go;
+                }
+            }
+
+            throw new NullReferenceException($"没有找到绑定这个名字的物体，name：{nameStr}，物体名字：{gameObject.name}");
+        }
+
+        public T GetValue<T>(string nameStr) where T : Component
+        {
+            foreach (var data in _datas)
+            {
+                if (data.name == nameStr)
+                {
+                    return data.go.GetComponent<T>();
+                }
+            }
+
+            throw new NullReferenceException($"没有找到绑定这个名字的物体，name：{nameStr}，物体名字：{gameObject.name}");
+        }
+
+#if UNITY_EDITOR
+        [Button("刷新键值对数据")]
+        void Refresh()
+        {
+            foreach (var bindingData in _datas)
+            {
+                bindingData.name = bindingData.go.name;
+            }
+        }
+
+        public void ClearValue()
+        {
+            _datas.Clear();
+        }
+
+        public void AddValue(Transform trans)
+        {
+            foreach (var data in _datas)
+            {
+                if (data.name == trans.name)
+                {
+                    throw new ArgumentException($"重复添加了, {trans.name}");
+                }
+            }
+
+            _datas.Add(new GameObjectBindingData() { name = trans.name, go = trans.gameObject });
+        }
+#endif
+    }
+    
+    [System.Serializable]
+    public class GameObjectBindingData
+    {
+        [HorizontalGroup("aaa")] [LabelText("k"), LabelWidth(10)]
+        public string name;
+
+        [HorizontalGroup("aaa")] [LabelText("v"), LabelWidth(10)] [OnValueChanged(nameof(OnValueChanged))]
+        public GameObject go;
+
+        private void OnValueChanged()
+        {
+            if (go != null)
+                name = go.name;
+            else
+                name = string.Empty;
+        }
+    }
+}

Assets/DemoGame/GameScript/Hotfix/UI/BindingBase.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: f9e38adf52464545b07aa2be617682d1
+timeCreated: 1733148426

Assets/DemoGame/GameScript/Hotfix/UI/Logic/AnalysisReportUI.cs

@@ -29,7 +29,6 @@ namespace ZC
         {
             EventManager.Instance.FireNow(this, new UIHideOrShowEventArgs(UIType.AnalysisReportUI));
             closeAction?.Invoke();
-            closeAction = null;
         }
 
         public void SetData(string title, Sprite sprite, string content, Action callback = null)

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<QuestionBankData>(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++;
+            CheckIsShowJX();
-            SetUIContent(_bankData.AnswerDatas[currentIndex]);
         }
 
         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();
+            ResetAnswer();
-        }
-
-        private void InitAnswer()
-        {
-            currentIndex = 0;
-            SetUIContent(_bankData.AnswerDatas[currentIndex]);
         }
 
         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) // 最后一题
+            // if (currentIndex >= _bankData.AnswerDatas.Count - 1) // 最后一题
-            {
+            // {
-                btn_Next.gameObject.SetActive(false);
+            //     btn_Next.gameObject.SetActive(false);
-                // 提交按钮显示
+            //     // 提交按钮显示
-            }
+            // }
-            else if (currentIndex <= 0) // 第一题
+            // else if (currentIndex <= 0) // 第一题
-            {
+            // {
-                btn_Last.gameObject.SetActive(false);
+            //     btn_Last.gameObject.SetActive(false);
-            }
+            // }
-            else
+            // else
-            {
+            // {
-                btn_Last.gameObject.SetActive(true);
+            //     // btn_Last.gameObject.SetActive(true);
-                btn_Next.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
     }
 }

Assets/DemoGame/GameScript/Hotfix/UI/Logic/IntroduceUI.cs

@@ -27,7 +27,6 @@ namespace ZC
         {
             EventManager.Instance.FireNow(this, new UIHideOrShowEventArgs(UIType.IntroduceUI));
             closeAction?.Invoke();
-            closeAction = null;
         }
 
         public void SetData(string title, string content, Action callback = null)

Assets/DemoGame/GameScript/Hotfix/UI/Logic/MainUI.cs

@@ -50,7 +50,6 @@ namespace ZC
         {
             btn_Start.transform.localScale = Vector3.zero;
             _action?.Invoke();
-            _action = null;
         }
 
         public void SetData(Action action)

Assets/DemoGame/GameScript/Hotfix/UI/Logic/MinTipsUI.cs

@@ -26,7 +26,6 @@ namespace ZC
         {
             EventManager.Instance.FireNow(this, new UIHideOrShowEventArgs(UIType.MinTipsUI));
             closeAction?.Invoke();
-            closeAction = null;
         }
 
         public void SetData(string title, string content, Action callback = null)

Assets/DemoGame/GameScript/Hotfix/UI/Logic/ModelDisplayUI.cs

@@ -64,6 +64,16 @@ namespace ZC
                 binding.GetValue<TMP_Text>("txt_EquipItemName").text = tran.name;
                 _listObj.Add(tran);
             }
+
+            {
+                foreach (var transform1 in _listObj)
+                {
+                    transform1.gameObject.SetActive(false);
+                }
+
+                txt_Name.text = _listObj[0].name;
+                _listObj[0].gameObject.SetActive(true);
+            }
         }
 
         public void SetData(Action callback)

Assets/DemoGame/GameScript/Hotfix/UI/SceneGameObjectBinding.cs

@@ -4,33 +4,7 @@ using UnityEngine;
 
 namespace ZC
 {
-    public class SceneGameObjectBinding : MonoBehaviour
+    public class SceneGameObjectBinding : BindingBase
     {
-        [SerializeField] private List<GameObjectBindingData> Datas = new List<GameObjectBindingData>();
-
-        public GameObject GetValue(string nameStr)
-        {
-            foreach (var data in Datas)
-            {
-                if (data.name == nameStr)
-                {
-                    return data.go;
-                }
-            }
-
-            throw new NullReferenceException($"没有找到绑定这个名字的物体，name：{nameStr}");
-        }
-        public T GetValue<T>(string nameStr)where T: Component
-        {
-            foreach (var data in Datas)
-            {
-                if (data.name == nameStr)
-                {
-                    return data.go.GetComponent<T>();
-                }
-            }
-
-            throw new NullReferenceException($"没有找到绑定这个名字的物体，name：{nameStr}");
-        }
     }
 }

Assets/DemoGame/GameScript/Loader/MonoBehaviour/GameObjectBinding.cs

@@ -58,21 +58,4 @@ namespace ZC
         }
     }
 
-    [System.Serializable]
-    public class GameObjectBindingData
-    {
-        [HorizontalGroup("aaa")] [LabelText("k"), LabelWidth(10)]
-        public string name;
-
-        [HorizontalGroup("aaa")] [LabelText("v"), LabelWidth(10)] [OnValueChanged(nameof(OnValueChanged))]
-        public GameObject go;
-
-        private void OnValueChanged()
-        {
-            if (go != null)
-                name = go.name;
-            else
-                name = string.Empty;
-        }
-    }
 }