*misc

13 files changed, 83 insertions, 95 deletions

diff --git a/Documents/TD.xlsx b/Documents/TD.xlsx
index 2b80abb..72bd91c 100644
--- a/Documents/TD.xlsx
+++ b/Documents/TD.xlsx
diff --git a/Documents/图片/cowboy.jpg b/Documents/图片/cowboy.jpg
new file mode 100644
index 0000000..271e557
--- /dev/null
+++ b/Documents/图片/cowboy.jpg
diff --git a/Documents/图片/knight5.jpg b/Documents/图片/knight5.jpg
new file mode 100644
index 0000000..fb370ee
--- /dev/null
+++ b/Documents/图片/knight5.jpg
diff --git a/Documents/图片/ronin.jpg b/Documents/图片/ronin.jpg
new file mode 100644
index 0000000..28ca225
--- /dev/null
+++ b/Documents/图片/ronin.jpg
diff --git a/Documents/设定.xlsx b/Documents/设定.xlsx
index 0a0005a..89e9686 100644
--- a/Documents/设定.xlsx
+++ b/Documents/设定.xlsx
diff --git a/RogueKnights/RogueKnights/Assets/Scenes/TestWaypoint.unity b/RogueKnights/RogueKnights/Assets/Scenes/TestWaypoint.unity
index b1fa6ab..30228a4 100644
--- a/RogueKnights/RogueKnights/Assets/Scenes/TestWaypoint.unity
+++ b/RogueKnights/RogueKnights/Assets/Scenes/TestWaypoint.unity
@@ -5453,7 +5453,7 @@ PrefabInstance:
     - target: {fileID: 7515380527247858703, guid: a798b86c72677f141bf91a4821571748,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 5.49
+      value: 3.525
       objectReference: {fileID: 0}
     - target: {fileID: 7515380527247858703, guid: a798b86c72677f141bf91a4821571748,
         type: 3}
@@ -5463,12 +5463,12 @@ PrefabInstance:
     - target: {fileID: 7515380527247858703, guid: a798b86c72677f141bf91a4821571748,
         type: 3}
       propertyPath: m_LocalPosition.z
-      value: 8.54
+      value: 3.866
       objectReference: {fileID: 0}
     - target: {fileID: 7515380527247858703, guid: a798b86c72677f141bf91a4821571748,
         type: 3}
       propertyPath: m_LocalRotation.w
-      value: 1
+      value: 0.44248912
       objectReference: {fileID: 0}
     - target: {fileID: 7515380527247858703, guid: a798b86c72677f141bf91a4821571748,
         type: 3}
@@ -5478,7 +5478,7 @@ PrefabInstance:
     - target: {fileID: 7515380527247858703, guid: a798b86c72677f141bf91a4821571748,
         type: 3}
       propertyPath: m_LocalRotation.y
-      value: -0
+      value: -0.8967738
       objectReference: {fileID: 0}
     - target: {fileID: 7515380527247858703, guid: a798b86c72677f141bf91a4821571748,
         type: 3}
@@ -5493,7 +5493,7 @@ PrefabInstance:
     - target: {fileID: 7515380527247858703, guid: a798b86c72677f141bf91a4821571748,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
+      value: -127.474
       objectReference: {fileID: 0}
     - target: {fileID: 7515380527247858703, guid: a798b86c72677f141bf91a4821571748,
         type: 3}
@@ -11021,93 +11021,6 @@ MonoBehaviour:
   - {fileID: 367270132}
   - {fileID: 1260062959}
   - {fileID: 219260935}
---- !u!1001 &1325101932
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 2128252351}
-    m_Modifications:
-    - target: {fileID: 100040, guid: ffaf641b210f5ea41952cf36f1379d66, type: 3}
-      propertyPath: m_Name
-      value: knight (1)
-      objectReference: {fileID: 0}
-    - target: {fileID: 400040, guid: ffaf641b210f5ea41952cf36f1379d66, type: 3}
-      propertyPath: m_LocalScale.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 400040, guid: ffaf641b210f5ea41952cf36f1379d66, type: 3}
-      propertyPath: m_LocalScale.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 400040, guid: ffaf641b210f5ea41952cf36f1379d66, type: 3}
-      propertyPath: m_LocalScale.z
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 400040, guid: ffaf641b210f5ea41952cf36f1379d66, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 3.716
-      objectReference: {fileID: 0}
-    - target: {fileID: 400040, guid: ffaf641b210f5ea41952cf36f1379d66, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0.484
-      objectReference: {fileID: 0}
-    - target: {fileID: 400040, guid: ffaf641b210f5ea41952cf36f1379d66, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 3.98
-      objectReference: {fileID: 0}
-    - target: {fileID: 400040, guid: ffaf641b210f5ea41952cf36f1379d66, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0.7199467
-      objectReference: {fileID: 0}
-    - target: {fileID: 400040, guid: ffaf641b210f5ea41952cf36f1379d66, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 400040, guid: ffaf641b210f5ea41952cf36f1379d66, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0.69402945
-      objectReference: {fileID: 0}
-    - target: {fileID: 400040, guid: ffaf641b210f5ea41952cf36f1379d66, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 400040, guid: ffaf641b210f5ea41952cf36f1379d66, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 400040, guid: ffaf641b210f5ea41952cf36f1379d66, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 87.9
-      objectReference: {fileID: 0}
-    - target: {fileID: 400040, guid: ffaf641b210f5ea41952cf36f1379d66, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 13700002, guid: ffaf641b210f5ea41952cf36f1379d66, type: 3}
-      propertyPath: m_Materials.Array.size
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 13700002, guid: ffaf641b210f5ea41952cf36f1379d66, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: e4429ace2b4fc99419d1bc8468cb3172, type: 2}
-    - target: {fileID: 13700002, guid: ffaf641b210f5ea41952cf36f1379d66, type: 3}
-      propertyPath: m_Materials.Array.data[1]
-      value: 
-      objectReference: {fileID: 2100000, guid: e4429ace2b4fc99419d1bc8468cb3172, type: 2}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: ffaf641b210f5ea41952cf36f1379d66, type: 3}
---- !u!4 &1325101933 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 400040, guid: ffaf641b210f5ea41952cf36f1379d66,
-    type: 3}
-  m_PrefabInstance: {fileID: 1325101932}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1350917286
 GameObject:
   m_ObjectHideFlags: 0
@@ -17145,7 +17058,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 2128252351}
-  m_Layer: 0
+  m_Layer: 31
   m_Name: CHAR_ROOT
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -17193,7 +17106,6 @@ Transform:
   - {fileID: 2145489436}
   - {fileID: 867872543}
   - {fileID: 288924801}
-  - {fileID: 1325101933}
   - {fileID: 632149262}
   - {fileID: 1561954721}
   - {fileID: 1638605983}
diff --git a/RogueKnights/RogueKnights/Assets/Tools.meta b/RogueKnights/RogueKnights/Assets/Tools.meta
new file mode 100644
index 0000000..ce47b65
--- /dev/null
+++ b/RogueKnights/RogueKnights/Assets/Tools.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ecb9e1d431afa044aa53d812a991e230
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/RogueKnights/RogueKnights/Assets/Tools/Editor.meta b/RogueKnights/RogueKnights/Assets/Tools/Editor.meta
new file mode 100644
index 0000000..966a4c0
--- /dev/null
+++ b/RogueKnights/RogueKnights/Assets/Tools/Editor.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: cd12289bc3610bc469d41e6a29140998
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/RogueKnights/RogueKnights/Assets/Tools/Editor/ImmoveableGameObjectEditor.cs b/RogueKnights/RogueKnights/Assets/Tools/Editor/ImmoveableGameObjectEditor.cs
new file mode 100644
index 0000000..0ef1e6e
--- /dev/null
+++ b/RogueKnights/RogueKnights/Assets/Tools/Editor/ImmoveableGameObjectEditor.cs
@@ -0,0 +1,30 @@
+using UnityEditor;
+using UnityEditor.EditorTools;
+
+[CanEditMultipleObjects]
+[CustomEditor(typeof(ImmoveableGameObject))]
+public class ImmoveableGameObjectEditor : Editor
+{
+    private Tool lastTool = Tool.None;
+
+    private void OnEnable()
+    {
+        lastTool = Tools.current;
+        HandleToolChange();
+        ToolManager.activeToolChanged += HandleToolChange;
+    }
+
+    private void OnDestroy()
+    {
+        Tools.hidden = false;
+        if (Tools.current == Tool.None)
+            Tools.current = lastTool;
+        ToolManager.activeToolChanged -= HandleToolChange;
+    }
+
+    private void HandleToolChange()
+    {
+        if (Tools.current == Tool.Move) Tools.hidden = true;
+        else Tools.hidden = false;
+    }
+}
diff --git a/RogueKnights/RogueKnights/Assets/Tools/Editor/ImmoveableGameObjectEditor.cs.meta b/RogueKnights/RogueKnights/Assets/Tools/Editor/ImmoveableGameObjectEditor.cs.meta
new file mode 100644
index 0000000..4ec0910
--- /dev/null
+++ b/RogueKnights/RogueKnights/Assets/Tools/Editor/ImmoveableGameObjectEditor.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 963067cc81afae145acce82254730667
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/RogueKnights/RogueKnights/Assets/Tools/ImmoveableGameObject.cs b/RogueKnights/RogueKnights/Assets/Tools/ImmoveableGameObject.cs
new file mode 100644
index 0000000..b3ee795
--- /dev/null
+++ b/RogueKnights/RogueKnights/Assets/Tools/ImmoveableGameObject.cs
@@ -0,0 +1,8 @@
+using UnityEngine;
+public class ImmoveableGameObject : MonoBehaviour
+{
+    void Awake()
+    {
+        transform.hideFlags = HideFlags.NotEditable;
+    }
+}
diff --git a/RogueKnights/RogueKnights/Assets/Tools/ImmoveableGameObject.cs.meta b/RogueKnights/RogueKnights/Assets/Tools/ImmoveableGameObject.cs.meta
new file mode 100644
index 0000000..fc22ec5
--- /dev/null
+++ b/RogueKnights/RogueKnights/Assets/Tools/ImmoveableGameObject.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7550a03d6dbf42647ac1450fd403a0a6
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/RogueKnights/RogueKnights/ProjectSettings/TagManager.asset b/RogueKnights/RogueKnights/ProjectSettings/TagManager.asset
index 966957e..19d01d2 100644
--- a/RogueKnights/RogueKnights/ProjectSettings/TagManager.asset
+++ b/RogueKnights/RogueKnights/ProjectSettings/TagManager.asset
@@ -36,7 +36,7 @@ TagManager:
   - 
   - 
   - 
-  - 
+  - Locked
   m_SortingLayers:
   - name: Default
     uniqueID: 0