Merge branch 'master' into LouDi_Quan

Assets/Scripts/Actions/ActionHelper.cs

@@ -157,8 +157,8 @@ public class ActionHelper
                         }
                     case "CameraLock":
                         {
-                            var strAction = (XMLTool.StringListAction)act;
+                            var strAction = (XMLTool.DictionaryAction)act;
-                            return CameraLockAction.Allocate(strAction.args[0], strAction.args[1]);
+                            return CameraLockAction.Allocate(strAction.args);
                         }
                     case "Video":
                         {

Assets/Scripts/Actions/CameraLockAction.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using UnityEngine;
 
 namespace QFramework
@@ -18,14 +19,14 @@ namespace QFramework
             new SimpleObjectPool<CameraLockAction>(() => new CameraLockAction(), null, 10);
         string isMove;
         string isRotate;
-        public static CameraLockAction Allocate(string isMove, string isRotate, System.Action OnFinished = null)
+        public static CameraLockAction Allocate(Dictionary<string, string> datas, System.Action OnFinished = null)
         {
             var retNode = mPool.Allocate();
             retNode.ActionID = ActionKit.ID_GENERATOR++;
             retNode.Deinited = false;
             retNode.Reset();
-            retNode.isMove = isMove;
+            retNode.isMove = datas.ContainsKey("isMove") ? datas["isMove"] : "true";
-            retNode.isRotate = isRotate;
+            retNode.isRotate = datas.ContainsKey("isRotate") ? datas["isRotate"] : "true";
             retNode.OnFinished = OnFinished;
             return retNode;
         }

Assets/Scripts/Actions/CameraSwitchAction.cs

@@ -63,7 +63,10 @@ namespace QFramework
                 data.normalPos = Utility.GetVector3FromStrArray(datas["normalPos"]);
                 data.normalRot = Utility.GetVector3FromStrArray(datas["normalRot"]);
             }
-
+            if (datas.ContainsKey("isOn"))
+            {
+                data.isOn = datas["isOn"];
+            }
             float.TryParse(datas["nearTime"], out data.nearTime);
             float.TryParse(datas["normalTime"], out data.normalTime);
 

Assets/Scripts/Item/DeviceItem.cs

@@ -46,7 +46,10 @@ public class DeviceItem : MonoBehaviour
         {
             bool isActive = true;
             bool.TryParse(obj[0], out isActive);
-            gameObject.GetComponent<HighlightTrigger>().enabled = isActive;
+            if (obj.Length == 1 || (obj.Length > 1 && obj[1] == device.Name))
+            {
+                gameObject.GetComponent<HighlightTrigger>().enabled = isActive;
+            }
         }
     }
 

Assets/Scripts/UI/UIBtns.cs

@@ -18,7 +18,6 @@ namespace QFramework.Example
         {
             mData = uiData as UIBtnsData ?? new UIBtnsData();
             // please add init code here
-            TypeEventSystem.Global.Register<StepStatusOnChange>(OnStepChanged);
             TypeEventSystem.Global.Register<OnModuleQuit>((arg) => Hide()).UnRegisterWhenGameObjectDestroyed(gameObject);
         }
 
@@ -29,6 +28,7 @@ namespace QFramework.Example
 
         protected override void OnOpen(IUIData uiData = null)
         {
+            TypeEventSystem.Global.Register<StepStatusOnChange>(OnStepChanged).UnRegisterWhenDisabled(gameObject);
             mData = uiData as UIBtnsData ?? new UIBtnsData();
             BtnContent.RemoveAllChildren();
             foreach (var item in mData.btns)

Assets/Scripts/UI/UICameraSwitch.cs

@@ -16,6 +16,7 @@ namespace QFramework.Example
         public Vector3 normalRot;
         public float nearTime;
         public float normalTime;
+        public string isOn;
 
     }
     public partial class UICameraSwitch : UIPanel
@@ -58,14 +59,28 @@ namespace QFramework.Example
         protected override void OnOpen(IUIData uiData = null)
         {
             mData = uiData as UICameraSwitchData ?? new UICameraSwitchData();
-
+            if (string.IsNullOrEmpty(mData.isOn))
-            if (Near.isOn)
             {
-                SetNear();
+                if (Near.isOn)
+                {
+                    SetNear();
+                }
+                if (Far.isOn)
+                {
+                    SetNormal();
+                }
             }
-            if (Far.isOn)
+            else
             {
-                SetNormal();
+                switch (mData.isOn)
+                {
+                    case "near":
+                        SetNear();
+                        break;
+                    case "normal":
+                        SetNormal();
+                        break;
+                }
             }
         }
 

Assets/Scripts/UI/UIHint.cs

@@ -22,7 +22,6 @@ namespace QFramework.Example
         {
             mData = uiData as UIHintData ?? new UIHintData();
             SetItem(0);
-            TypeEventSystem.Global.Register<StepStatusOnChange>(OnStepChanged);
             TypeEventSystem.Global.Register<OnModuleQuit>((arg) => Hide()).UnRegisterWhenGameObjectDestroyed(gameObject);
         }
 
@@ -32,6 +31,7 @@ namespace QFramework.Example
         }
         protected override void OnOpen(IUIData uiData = null)
         {
+            TypeEventSystem.Global.Register<StepStatusOnChange>(OnStepChanged).UnRegisterWhenDisabled(gameObject);
             mData = uiData as UIHintData ?? new UIHintData();
             if (curAction != null)
             {

Assets/Scripts/UI/UIOperationList.cs

@@ -142,7 +142,6 @@ namespace QFramework.Example
         }
         protected override void OnClose()
         {
-            TypeEventSystem.Global.UnRegister<StepStatusOnChange>(OnStepChanged);
         }
     }
 }

Assets/Scripts/UI/UIPointQuestion.cs

@@ -17,7 +17,6 @@ namespace QFramework.Example
         {
             mData = uiData as UIPointQuestionData ?? new UIPointQuestionData();
             // please add init code here
-            TypeEventSystem.Global.Register<StepStatusOnChange>(OnStepChanged);
             TypeEventSystem.Global.Register<OnModuleQuit>((arg) => Hide()).UnRegisterWhenGameObjectDestroyed(gameObject);
         }
 
@@ -28,6 +27,7 @@ namespace QFramework.Example
 
         protected override void OnOpen(IUIData uiData = null)
         {
+            TypeEventSystem.Global.Register<StepStatusOnChange>(OnStepChanged).UnRegisterWhenDisabled(gameObject);
             mData = uiData as UIPointQuestionData ?? new UIPointQuestionData();
 
             Content.RemoveAllChildren();

Assets/Scripts/UI/UIResultTip.cs

@@ -20,7 +20,6 @@ namespace QFramework.Example
             mData = uiData as UIResultTipData ?? new UIResultTipData();
             Right.gameObject.SetActive(false);
             Wrong.gameObject.SetActive(false);
-            TypeEventSystem.Global.Register<StepStatusOnChange>(OnStepChanged);
             TypeEventSystem.Global.Register<OnModuleQuit>((arg) => Hide()).UnRegisterWhenGameObjectDestroyed(gameObject);
         }
 
@@ -30,6 +29,7 @@ namespace QFramework.Example
         }
         protected override void OnOpen(IUIData uiData = null)
         {
+            TypeEventSystem.Global.Register<StepStatusOnChange>(OnStepChanged).UnRegisterWhenDisabled(gameObject);
             Right.gameObject.SetActive(false);
             Wrong.gameObject.SetActive(false);
             mData = uiData as UIResultTipData ?? new UIResultTipData();

Assets/Scripts/UI/UITextQuestion.cs

@@ -34,7 +34,6 @@ namespace QFramework.Example
         {
             mData = uiData as UITextQuestionData ?? new UITextQuestionData();
             // please add init code here
-            TypeEventSystem.Global.Register<StepStatusOnChange>(OnStepChanged);
             TypeEventSystem.Global.Register<OnModuleQuit>((arg) => Hide()).UnRegisterWhenGameObjectDestroyed(gameObject);
         }
 
@@ -44,6 +43,7 @@ namespace QFramework.Example
         }
         protected override void OnOpen(IUIData uiData = null)
         {
+            TypeEventSystem.Global.Register<StepStatusOnChange>(OnStepChanged).UnRegisterWhenDisabled(gameObject);
             mData = uiData as UITextQuestionData ?? new UITextQuestionData();
             Title.text = mData.title;
             OptionContent.transform.RemoveAllChildren();

Assets/Scripts/UI/UITextTip.cs

@@ -22,8 +22,6 @@ namespace QFramework.Example
         {
 
             mData = uiData as UITextTipData ?? new UITextTipData();
-            TypeEventSystem.Global.Register<StepStatusOnChange>(OnStepChanged).UnRegisterWhenGameObjectDestroyed(this);
-
             TypeEventSystem.Global.Register<OnModuleQuit>((arg) => Hide()).UnRegisterWhenGameObjectDestroyed(gameObject);
         }
 
@@ -34,6 +32,7 @@ namespace QFramework.Example
 
         protected override void OnOpen(IUIData uiData = null)
         {
+            TypeEventSystem.Global.Register<StepStatusOnChange>(OnStepChanged).UnRegisterWhenDisabled(gameObject);
             mData = uiData as UITextTipData ?? new UITextTipData();
             Des.text = Regex.Replace(mData.text, @"\\n", "\n");
             BtnContent.RemoveAllChildren();

Assets/Scripts/UI/UITipWindow.cs

@@ -27,7 +27,6 @@ namespace QFramework.Example
             mData = uiData as UITipWindowData ?? new UITipWindowData();
             // please add init code here
 
-            TypeEventSystem.Global.Register<StepStatusOnChange>(OnStepChanged);
             TypeEventSystem.Global.Register<OnModuleQuit>((arg) => Hide()).UnRegisterWhenGameObjectDestroyed(gameObject);
         }
 
@@ -39,6 +38,7 @@ namespace QFramework.Example
         protected override void OnOpen(IUIData uiData = null)
         {
             mData = uiData as UITipWindowData ?? new UITipWindowData();
+            TypeEventSystem.Global.Register<StepStatusOnChange>(OnStepChanged).UnRegisterWhenDisabled(gameObject);
             Label.text = mData.txt;
             BtnContent.RemoveAllChildren();
             if (mData != null)

Assets/Scripts/UI/UITools.cs

@@ -30,7 +30,6 @@ namespace QFramework.Example
         {
             mData = uiData as UIToolsData ?? new UIToolsData();
             // please add init code here
-            TypeEventSystem.Global.Register<StepStatusOnChange>(OnStepChanged);
             TypeEventSystem.Global.Register<OnModuleQuit>(OnModuleQuit).UnRegisterWhenGameObjectDestroyed(gameObject);
         }
 
@@ -41,6 +40,7 @@ namespace QFramework.Example
 
         protected override void OnOpen(IUIData uiData = null)
         {
+            TypeEventSystem.Global.Register<StepStatusOnChange>(OnStepChanged).UnRegisterWhenDisabled(gameObject);
             mResLoader = ResLoader.Allocate();
             mData = uiData as UIToolsData ?? new UIToolsData();
             if (string.IsNullOrEmpty(mData.answer) == false)

Assets/Scripts/Xml/XmlParser.cs

@@ -666,29 +666,26 @@ namespace XMLTool
                         {
                             act.args.Add("normalTime", "0");
                         }
+                        XAttribute isOn = action.Attribute("isOn");
+                        if (isOn != null)
+                        {
+                            act.args.Add("isOn", isOn.Value);
+                        }
                         newAction = act;
                     }
                     break;
                 case "CameraLock":
                     {
-                        var act = new StringListAction();
+                        var act = new DictionaryAction();
                         XAttribute isMove = action.Attribute("isMove");
                         if (isMove != null)
                         {
-                            act.args.Add(isMove.Value);
+                            act.args.Add("isMove", isMove.Value);
-                        }
-                        else
-                        {
-                            act.args.Add("true");
                         }
                         XAttribute isRotate = action.Attribute("isRotate");
                         if (isRotate != null)
                         {
-                            act.args.Add(isRotate.Value);
+                            act.args.Add("isRotate", isRotate.Value);
-                        }
-                        else
-                        {
-                            act.args.Add("true");
                         }
                         newAction = act;
                     }

Doc/Xml配置文档.xml

@@ -51,8 +51,9 @@
 	<Action type="SetScore" name="步骤名字" value="1"></Action>
 	<!--镜头切换 近距离和默认 如果有了nearDevice就可以不用nearPos和nearRot了  按照device的坐标和旋转来处理镜头 normalDevice同理
 	只设置坐标 不执行镜头切换 是否执行要根据UI的按钮操作来
+	isOn: near或者normal 作为强制选择一个镜头
 	-->
-	<Action type="CameraSwitch" nearDevice="肠钳" normalDevice="组织钳"  nearPos="-3.942,3.24,-4.319" nearRot="16.42331,180,0" nearTime="1" normalPos="-3.942,3.24,-3.946" normalRot="16.42331,180,-5.305351E-14" normalTime="1"></Action>
+	<Action type="CameraSwitch" nearDevice="肠钳" normalDevice="组织钳"  nearPos="-3.942,3.24,-4.319" nearRot="16.42331,180,0" nearTime="1" normalPos="-3.942,3.24,-3.946" normalRot="16.42331,180,-5.305351E-14" normalTime="1" isOn="near"></Action>
 	<!--文字弹窗 按钮可以多个 点击事件使用UIClick-->
 	<Action type="TextTip" value="这里是文字描述" audio="q001.mp3" btns="确定,取消"/>
 	<!--锁定镜头 true为开启 false为锁定   isMove是移动镜头 isRotate是旋转镜头-->
@@ -128,7 +129,7 @@
 
 	<!--通用事件通知
 	
-	HighLightTrigger：value=false 关闭device悬浮高亮 value=true 开启
+	HighLightTrigger：value=false 关闭device悬浮高亮 value=true 开启 false   value=false,deviceName 后面的参数是可以写设备名字 不写就是全部设备
 	
 	-->
 	<Action type="StrEvent" name="HighLightTrigger" value="false"></Action>