Merge remote-tracking branch 'origin/master' into LouDi_Pig

Assets/Scripts/Actions/ActionHelper.cs

@@ -3,6 +3,7 @@ using QFramework.Example;
 using System;
 using System.Collections.Generic;
 using UnityEngine;
+using XMLTool;
 
 
 public class ActionHelper
@@ -118,7 +119,8 @@ public class ActionHelper
                     case "PointQuestion":
                         return PointQuestionAction.Allocate(act.Value);
                     case "Point3DQuestion":
-                        return Point3DQuestionAction.Allocate(act.Value);
+                        var point3d = (Point3DQuestion)act;
+                        return Point3DQuestionAction.Allocate(point3d.datas);
                     case "TextQuestion":
                         {
                             var strAction = (XMLTool.DictionaryAction)act;

Assets/Scripts/Actions/Point3DQuestionAction.cs

@@ -41,6 +41,7 @@ namespace QFramework
                 GameObject obj = GameObject.Instantiate(Resources.Load("PointQuestion/Point3D")) as GameObject;
                 obj.GetOrAddComponent<Point3DItem>().Init(item);
             }
+            this.Finish();
 
         }
 
@@ -64,6 +65,8 @@ namespace QFramework
         {
             if (!Deinited)
             {
+                datas.Clear();
+                datas = null;
                 OnFinished = null;
                 Deinited = true;
                 mPool.Recycle(this);

Assets/Scripts/Conditions/ObjClickCondition.cs

@@ -43,9 +43,13 @@ namespace QFramework
                 else
                 {
                     obj = DeviceController.Instance.GetDeviceObj(deviceName);
+                    if (obj == null)
+                    {
+                        Debug.LogError($"没有找到 path:{path} deviceName:{deviceName}");
                     }
                 }
-            if (obj != null && Input.GetMouseButtonUp(0) && EventSystem.current.IsPointerOverGameObject() == false)
+            }
+            if (Input.GetMouseButtonUp(0) && EventSystem.current.IsPointerOverGameObject() == false)
             {
                 Vector3 mousePos = Input.mousePosition;
                 Ray ray = Camera.main.ScreenPointToRay(mousePos);
@@ -62,6 +66,8 @@ namespace QFramework
                     }
                 }
             }
+
+
             return false;
         }
         public bool Paused { get; set; }

Assets/Scripts/Item/Point3DItem.cs

@@ -4,7 +4,6 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using XMLTool;
-using static UnityEditor.Progress;
 
 public class Point3DItem : MonoBehaviour
 {
@@ -15,6 +14,10 @@ public class Point3DItem : MonoBehaviour
     public void Init(Point3DQuestion.Data data)
     {
         this.data = data;
+        if (string.IsNullOrEmpty(data.name) == false)
+        {
+            gameObject.name = data.name;
+        }
         if (string.IsNullOrEmpty(data.deviceName))
         {
             gameObject.transform.position = data.pos;
@@ -25,6 +28,11 @@ public class Point3DItem : MonoBehaviour
         {
             GameObject device = DeviceController.Instance.GetDeviceObj(data.deviceName);
             gameObject.transform.parent = device.transform;
+            gameObject.transform.localPosition = Vector3.zero;
+            gameObject.transform.localEulerAngles = Vector3.zero;
+            gameObject.transform.localScale = Vector3.one;
+
+
         }
         rotSpeed = data.rotateSpeed;
         TypeEventSystem.Global.Register<OnPoint3DQuestionDestroy>(OnObjDestroy).UnRegisterWhenGameObjectDestroyed(gameObject);

Assets/Scripts/Xml/XmlParser.cs

@@ -1092,9 +1092,18 @@ namespace XMLTool
                         {
                             Point3DQuestion.Data data = new Point3DQuestion.Data();
                             data.name = item.Attribute("name")?.Value;
+                            XAttribute atr = item.Attribute("deviceName");
+                            if (atr!=null)
+                            {
+                                data.deviceName = item.Attribute("deviceName").Value;
+                            }
+                            else
+                            {
                                 data.pos = Utility.GetVector3FromStrArray(item.Attribute("position")?.Value);
                                 data.rotate = Utility.GetVector3FromStrArray(item.Attribute("rotate")?.Value);
                                 data.scale = Utility.GetVector3FromStrArray(item.Attribute("scale")?.Value);
+                            }
+                            float.TryParse(item.Attribute("rotateSpeed")?.Value, out data.rotateSpeed);
                             data.clickEvent = item.Attribute("clickEvent")?.Value;
                             act.datas.Add(data);
                         }

Doc/Xml配置文档.xml

@@ -34,6 +34,23 @@
 
 	<!--物体点位选择 物体的中心点-->
 	<Action type="PointQuestion" value="路径1,路径2"></Action>
+	<!--物体点位选择 3D版
+	 position坐标
+	 rotate 旋转角度
+	 scale 缩放
+	 如果deviceName存在 则不需要写坐标旋转和缩放，是参照把deviceName的物体作为父物体
+	 rotateSpeed="180" 点图标旋转速度
+	 clickEvent是点击后发送的字符串配合StrEvent
+	-->
+	<Action type="Point3DQuestion">
+		<Data deviceName="Point1" clickEvent="点1"></Data>
+		<Data position="0,0,0" rotate="0,0,0" scale="1,1,1" clickEvent="点1" rotateSpeed="360"></Data>
+		<Data deviceName="Point2" clickEvent="点2"></Data>
+		<Data deviceName="Point3" clickEvent="点3"></Data>
+	</Action>
+
+
+
 	<!--文字选择题 scoreName="分数名"  
 	rightScore="5" 可以是正确加分  
 	wrongScore="-5" 也可以是错误减分
@@ -138,6 +155,8 @@
 	<!--弹窗 btns可支持多个按钮-->
 	<Action type="TipWindow" value="恭喜你完成当前模块" btns="确定,取消" audio=""></Action>
 
+
+
 	<!--预加载模块 要在app.xml的Data标签内-->
 	<PreLoad>
 		<Action type="Parallel">
@@ -156,8 +175,8 @@
 		<Name>模块1</Name>
 
 		<Descript>
-这里是实训描述内容.....
-巴拉巴拉....
+			这里是实训描述内容.....
+			巴拉巴拉....
 		</Descript>
 		<Device>
 			<Name>组织钳</Name>