From db644274ae95a6fd0a3224d0dc848702615ff309 Mon Sep 17 00:00:00 2001
From: chai <215380520@qq.com>
Date: Wed, 31 May 2023 19:14:04 +0800
Subject: *misc

---
 .../Assets/Scripts/Battle/EntitySpawner.cs         | 13 ++++++++
 .../Assets/Scripts/Battle/EntitySpawner.cs.meta    | 11 +++++++
 .../Assets/Scripts/Battle/Metadata.meta            |  8 +++++
 .../Scripts/Battle/Metadata/StageMetadata.cs       | 38 ++++++++++++++++++++++
 .../Scripts/Battle/Metadata/StageMetadata.cs.meta  | 11 +++++++
 .../Assets/Scripts/Data/Metadata/StageMetadata.cs  | 17 ----------
 .../Scripts/Data/Metadata/StageMetadata.cs.meta    | 11 -------
 .../Assets/Scripts/Stages/GameStage_Dojo.cs        | 16 +++++++++
 8 files changed, 97 insertions(+), 28 deletions(-)
 create mode 100644 WorldlineKeepers/Assets/Scripts/Battle/EntitySpawner.cs
 create mode 100644 WorldlineKeepers/Assets/Scripts/Battle/EntitySpawner.cs.meta
 create mode 100644 WorldlineKeepers/Assets/Scripts/Battle/Metadata.meta
 create mode 100644 WorldlineKeepers/Assets/Scripts/Battle/Metadata/StageMetadata.cs
 create mode 100644 WorldlineKeepers/Assets/Scripts/Battle/Metadata/StageMetadata.cs.meta
 delete mode 100644 WorldlineKeepers/Assets/Scripts/Data/Metadata/StageMetadata.cs
 delete mode 100644 WorldlineKeepers/Assets/Scripts/Data/Metadata/StageMetadata.cs.meta

(limited to 'WorldlineKeepers/Assets/Scripts')

diff --git a/WorldlineKeepers/Assets/Scripts/Battle/EntitySpawner.cs b/WorldlineKeepers/Assets/Scripts/Battle/EntitySpawner.cs
new file mode 100644
index 0000000..ef9d8e7
--- /dev/null
+++ b/WorldlineKeepers/Assets/Scripts/Battle/EntitySpawner.cs
@@ -0,0 +1,13 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace WK
+{
+
+    public class EntitySpawner
+    {
+
+    }
+
+}
diff --git a/WorldlineKeepers/Assets/Scripts/Battle/EntitySpawner.cs.meta b/WorldlineKeepers/Assets/Scripts/Battle/EntitySpawner.cs.meta
new file mode 100644
index 0000000..cf99e88
--- /dev/null
+++ b/WorldlineKeepers/Assets/Scripts/Battle/EntitySpawner.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e8b574067dd46554c89f6a288ab0014b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/WorldlineKeepers/Assets/Scripts/Battle/Metadata.meta b/WorldlineKeepers/Assets/Scripts/Battle/Metadata.meta
new file mode 100644
index 0000000..4f3eb65
--- /dev/null
+++ b/WorldlineKeepers/Assets/Scripts/Battle/Metadata.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 12e48a5aa634134439f65610809a20a6
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/WorldlineKeepers/Assets/Scripts/Battle/Metadata/StageMetadata.cs b/WorldlineKeepers/Assets/Scripts/Battle/Metadata/StageMetadata.cs
new file mode 100644
index 0000000..b530390
--- /dev/null
+++ b/WorldlineKeepers/Assets/Scripts/Battle/Metadata/StageMetadata.cs
@@ -0,0 +1,38 @@
+using System.Collections;
+using System.Collections.Generic;
+using Unity.VisualScripting;
+using UnityEngine;
+
+namespace WK.Data
+{
+
+    /// <summary>
+    /// 场景要素的metadata
+    /// </summary>
+    public abstract class StageEntityMetadatas
+    {
+        public string entityId;
+    }
+
+    public class StageDesc
+    {
+        public string name;
+        public string desc;
+    }
+
+    /// <summary>
+    /// 关卡元数据
+    /// </summary>
+    public class StageMetadata
+    {
+        public StageDesc desc;
+
+        public List<string> tests;
+
+        public Vector3 pos;
+
+        public int count;
+
+    }
+
+}
diff --git a/WorldlineKeepers/Assets/Scripts/Battle/Metadata/StageMetadata.cs.meta b/WorldlineKeepers/Assets/Scripts/Battle/Metadata/StageMetadata.cs.meta
new file mode 100644
index 0000000..7ff42d8
--- /dev/null
+++ b/WorldlineKeepers/Assets/Scripts/Battle/Metadata/StageMetadata.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7e2e7c43d0f01fe4799d8284e9982627
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/WorldlineKeepers/Assets/Scripts/Data/Metadata/StageMetadata.cs b/WorldlineKeepers/Assets/Scripts/Data/Metadata/StageMetadata.cs
deleted file mode 100644
index ed7b1cb..0000000
--- a/WorldlineKeepers/Assets/Scripts/Data/Metadata/StageMetadata.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-namespace WK.Data
-{
-    /// <summary>
-    /// 关卡元数据
-    /// </summary>
-    public class StageMetadata
-    {
-
-
-
-    }
-
-}
diff --git a/WorldlineKeepers/Assets/Scripts/Data/Metadata/StageMetadata.cs.meta b/WorldlineKeepers/Assets/Scripts/Data/Metadata/StageMetadata.cs.meta
deleted file mode 100644
index 7ff42d8..0000000
--- a/WorldlineKeepers/Assets/Scripts/Data/Metadata/StageMetadata.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 7e2e7c43d0f01fe4799d8284e9982627
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/WorldlineKeepers/Assets/Scripts/Stages/GameStage_Dojo.cs b/WorldlineKeepers/Assets/Scripts/Stages/GameStage_Dojo.cs
index 846938e..c492c5d 100644
--- a/WorldlineKeepers/Assets/Scripts/Stages/GameStage_Dojo.cs
+++ b/WorldlineKeepers/Assets/Scripts/Stages/GameStage_Dojo.cs
@@ -1,6 +1,8 @@
+using LitJson;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using WK.Data;
 
 namespace WK
 {
@@ -18,6 +20,20 @@ namespace WK
             {
                 yield return 0f;
             }
+            StageMetadata stage = new StageMetadata();
+            stage.tests = new List<string>()
+            {
+                "asdas","asdasd","asdsd"
+            };
+            stage.desc = new StageDesc();
+            stage.desc.name = "namestage";
+            stage.desc.desc = "descddd";
+            stage.pos = new Vector3(1, 2, 3);
+            stage.count = 233;
+            string json = JsonMapper.ToJson(stage);
+            LogHelper.Log(json);
+            var s = JsonMapper.ToObject<StageMetadata>(json);
+            Debug.Log(s.pos);
         }
 
         public override IEnumerator<float> OnEnd()
-- 
cgit v1.1-26-g67d0