Merge branch '3DBody' of http://git.zxkedu.com:33769/JiNan/VirtualFramework into 3DBody

Assets/Draw/Scripts/ScreenShotPainter.cs

@@ -700,7 +700,12 @@ public class ScreenShotPainter : MonoBehaviour
                             RectFactory();
                             break;
                         case Status.Circle:
-                            var dis = Vector2.Distance(_lastPoint, Input.mousePosition) * 2;
+                            Vector2 last;
+                            Vector2 mouse;
+                            RectTransformUtility.ScreenPointToLocalPointInRectangle(circleImg.rectTransform.parent as RectTransform, _lastPoint, null, out last);
+                            RectTransformUtility.ScreenPointToLocalPointInRectangle(circleImg.rectTransform.parent as RectTransform, Input.mousePosition, null, out mouse);
+
+                            var dis = Vector2.Distance(last, mouse) * 2;
                             circleImg.rectTransform.sizeDelta = new Vector2(dis, dis);
                             break;
                         case Status.Arrow:
@@ -821,7 +826,7 @@ public class ScreenShotPainter : MonoBehaviour
     {
         if (lineStart != default)
         {
-            var points = GenerateArrowPoints(lineStart, Input.mousePosition,0.1f);
+            var points = GenerateArrowPoints(lineStart, Input.mousePosition, 0.1f);
             _lastPoint = lineStart;
             Paint(_eraserFlag, lineStart);
             LerpPaint(Input.mousePosition, _eraserFlag);
@@ -1038,10 +1043,6 @@ public class ScreenShotPainter : MonoBehaviour
         yield return new WaitForEndOfFrame();
         float width = _rightUpConnerPoint.x - _leftDownConnerPoint.x;
         float height = _rightUpConnerPoint.y - _leftDownConnerPoint.y;
-        Debug.Log(_leftDownConnerPoint.x.ToString("0.00"));
-        Debug.Log(_leftDownConnerPoint.y.ToString("0.00"));
-        Debug.Log("width:" + width);
-        Debug.Log("width:" + height);
         Rect rect = new Rect(_leftDownConnerPoint.x, _leftDownConnerPoint.y, width, height); //坑爹啊 如果是开携程在WaitForEndOfFrame时候截图，那么他的坐标系换了。。rect起始点要设置在左下角
 
 

Assets/Scripts/Controller/Body3DController.cs

@@ -213,6 +213,12 @@ public class Body3DController : MonoSingleton<Body3DController>
             {
                 Parser(item.Value);
             }
+
+            if (body.isLineModeItem)
+            {
+                GameObject obj = Utility.FindObj(body.Path);
+                obj.GetOrAddComponent<LineModeItem>().Init(body);
+            }
         }
         else
         {
@@ -221,6 +227,7 @@ public class Body3DController : MonoSingleton<Body3DController>
             //if (obj != null) { Debug.Log("????" + body.Path + "????"); };
             var bodyObjItem = obj.GetOrAddComponent<Body3DObjItem>();
             bodyObjItem.Init(body);
+            var lineModeItem = obj.GetOrAddComponent<LineModeItem>().Init(body);
             objs.Add(obj, bodyObjItem);
         }
     }

Assets/Scripts/Item/Body3DObjItem.cs

@@ -19,12 +19,10 @@ public class Body3DObjItem : MonoBehaviour
     private float lastClickTime;
     // 双击的时间间隔阈值
     private const float doubleClickTimeThreshold = 0.3f;
-    Shader shader;
 
     private void Awake()
     {
-        shader = GetComponent<Renderer>()?.material.shader;
+
-        TypeEventSystem.Global.Register<OnChangeMat>(OnChangeMatEvent).UnRegisterWhenGameObjectDestroyed(this);
 #if VR
 #if Turing
 
@@ -75,25 +73,11 @@ public class Body3DObjItem : MonoBehaviour
         }
     }
 #endif
-    private void OnChangeMatEvent(OnChangeMat t)
-    {
 
-        if (t.shader != null)
-        {
-            GetComponent<Renderer>().material.shader = t.shader;
-        }
-        else
-        {
-
-            GetComponent<Renderer>().material.shader = this.shader;
-        }
-
-    }
 
     public void Init(Body3D.Body body)
     {
         this.body = body;
-
         if (body.subBody == null || body.subBody.Count == 0)
         {
             if (body.toggle != null)

Assets/Scripts/Item/LineModeItem.cs

@@ -0,0 +1,38 @@
+using QFramework;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using XMLTool;
+
+public class LineModeItem : MonoBehaviour
+{
+    Shader shader;
+    public Body3D.Body body;
+    public LineModeItem Init(Body3D.Body body)
+    {
+        this.body = body;
+        shader = GetComponent<Renderer>()?.material.shader;
+        TypeEventSystem.Global.Register<OnChangeMat>(OnChangeMatEvent).UnRegisterWhenGameObjectDestroyed(this);
+        return this;
+    }
+
+
+    private void OnChangeMatEvent(OnChangeMat t)
+    {
+        if (t.shader != null)
+        {
+            GetComponent<Renderer>().material.shader = t.shader;
+            if (body.lineModeWidth != 0)
+            {
+                GetComponent<Renderer>().material.SetFloat("_OutlineWidth", body.lineModeWidth);
+            }
+        }
+        else
+        {
+
+            GetComponent<Renderer>().material.shader = this.shader;
+        }
+
+    }
+
+}

Assets/Scripts/Item/LineModeItem.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c29f8a68d4de741499c43ccf8a9d6bf0
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Item/ObjectColorToggle.cs

@@ -18,7 +18,8 @@ public class ObjectColorToggle : MonoBehaviour
     private void Awake()
     {
         mesh = gameObject.GetComponent<MeshRenderer>();
-        isOffColor =  mesh.material.color;
+        isOffColor = mesh.material.color;
+        savedTexture = mesh.material.mainTexture as Texture2D;
     }
 
     public void SetColor(State state)
@@ -28,7 +29,6 @@ public class ObjectColorToggle : MonoBehaviour
         {
             case State.On:
                 isOnColor.a = alpha;
-                savedTexture = mesh.material.mainTexture as Texture2D;
                 mesh.material.mainTexture = null;
                 mesh.material.color = isOnColor;
                 break;
@@ -39,7 +39,6 @@ public class ObjectColorToggle : MonoBehaviour
                 break;
             case State.Hover:
                 isHoverColor.a = alpha;
-                savedTexture = mesh.material.mainTexture as Texture2D;
                 mesh.material.mainTexture = null;
                 mesh.material.color = isHoverColor;
                 break;

Assets/Scripts/Xml/XmlParser.cs

@@ -186,6 +186,8 @@ namespace XMLTool
             public Dictionary<string, Body> subBody { get; set; } = new Dictionary<string, Body>();
 
             public Body parent;
+            public float lineModeWidth = 0;
+            public bool isLineModeItem = false;
             //public Dictionary<string, Body> bodyList { get; set; } = new Dictionary<string, Body>();
         }
 
@@ -440,6 +442,20 @@ namespace XMLTool
                 body.subBody.Add(subBody.Name, subBody);
             }
             body.parent = parent;
+
+            var lineModeWidth = bodyElement.Attribute("lineModeWidth");
+            if (lineModeWidth != null)
+            {
+                float.TryParse(lineModeWidth.Value, out body.lineModeWidth);
+            }
+
+
+            var isLineModeItem = bodyElement.Attribute("isLineModeItem");
+            if (isLineModeItem != null)
+            {
+                bool.TryParse(isLineModeItem.Value, out body.isLineModeItem);
+            }
+
             return body;
         }
 

Data/Xml/3DJiePao.xml

@@ -11432,7 +11432,7 @@
           <Body name="下呼吸道" tip="" path="Ren_NEW/SM_QiGuan/Respiratory_system/Lower_respiratory_tract">
 
 
-            <Body name="气管" tip="" path="Ren_NEW/SM_QiGuan/Respiratory_system/Lower_respiratory_tract/Trachea">
+            <Body name="气管" tip="" path="Ren_NEW/SM_QiGuan/Respiratory_system/Lower_respiratory_tract/Trachea" isLineModeItem="true">
 
               <Body name="气管软骨环" englishName="Cartilaginous rings of trachea" tip="范围：喉以下部分，包括气管、支气管及肺内分支。
 功能：气体交换通道，纤毛清除异物。
@@ -12198,7 +12198,9 @@
 
                   </Body>
 
-                  <Body name="胸内侧神经" englishName="Medial pectoral (C08,T01)" tip="胸内侧神经：发自臂丛内侧束，常与胸外侧神经分支联合，分布于胸小肌和部分胸大肌的神经。" path="Ren_NEW/SM_ShenJing/SM_nerve/SM_brachial_plexus/SM_left_brachial_plexus_and_its_branches/SM_branches_of_left_subclavian/SM_branches_of_left_medial_cord/XiongNeiCeShenJing">
+                  <Body name="胸内侧神经" englishName="Medial pectoral (C08,T01)" tip="胸内侧神经：发自臂丛内侧束，常与胸外侧神经分支联合，分布于胸小肌和部分胸大肌的神经。" path="Ren_NEW/SM_ShenJing/SM_nerve/SM_brachial_plexus/SM_left_brachial_plexus_and_its_branches/SM_branches_of_left_subclavian/SM_branches_of_left_medial_cord/XiongNeiCeShenJing"
+						lineModeWidth="0.000003"
+						>