Merge pull request #10 from Chen-Yulin/DT

Add DT
Chen-Yulin · Jun 2, 2024 · 8c272d6 · 8c272d6
2 parents 600038e + 9be1814
commit 8c272d6
Show file tree

Hide file tree

Showing 63 changed files with 19,760 additions and 863 deletions.
diff --git a/Assets/Editor/MeasureToolSettings.asset b/Assets/Editor/MeasureToolSettings.asset
@@ -0,0 +1,24 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e2305b64eca01f242a846e72381b866c, type: 3}
+  m_Name: MeasureToolSettings
+  m_EditorClassIdentifier: 
+  mode: 0
+  unit: 0
+  scale: 0
+  lineColor: {r: 0, g: 0, b: 0, a: 1}
+  handlesSize: 0.01
+  handlesColor: {r: 1, g: 1, b: 1, a: 1}
+  textSize: 16
+  textColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
+  offset: 0.03
+  lineThickness: 4
diff --git a/Assets/Editor/MeasureToolSettings.asset.meta b/Assets/Editor/MeasureToolSettings.asset.meta
diff --git a/Assets/Import.meta b/Assets/Import.meta
diff --git a/Assets/Import/export(1).FBX b/Assets/Import/export(1).FBX
diff --git a/Assets/Import/export(1).FBX.meta b/Assets/Import/export(1).FBX.meta
diff --git a/Assets/Import/robotarm2.FBX b/Assets/Import/robotarm2.FBX
diff --git a/Assets/Import/robotarm2.FBX.meta b/Assets/Import/robotarm2.FBX.meta
diff --git a/Assets/Import/zhuanjieban.FBX b/Assets/Import/zhuanjieban.FBX
diff --git a/Assets/Import/zhuanjieban.FBX.meta b/Assets/Import/zhuanjieban.FBX.meta
diff --git a/Assets/Material/Mesh/PulseMesh.mat b/Assets/Material/Mesh/PulseMesh.mat
@@ -2,14 +2,17 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: PulseMesh
   m_Shader: {fileID: 4800000, guid: 328d97e479ecdff41a40e36724da6158, type: 3}
-  m_ShaderKeywords: _AUTO_PULSE__ON _PULSE_ENABLED__ON
+  m_ValidKeywords: []
+  m_InvalidKeywords:
+  - _AUTO_PULSE__ON
+  - _PULSE_ENABLED__ON
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -59,6 +62,7 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - _Auto_Pulse_: 1
     - _BlendOp: 0