*misc

8 files changed, 148 insertions, 29 deletions

diff --git a/WorldlineKeepers/Assets/Scripts/Battle/Metadata/StageMetadata.cs b/WorldlineKeepers/Assets/Scripts/Battle/Metadata/StageMetadata.cs
index 80fa371..4a2afdb 100644
--- a/WorldlineKeepers/Assets/Scripts/Battle/Metadata/StageMetadata.cs
+++ b/WorldlineKeepers/Assets/Scripts/Battle/Metadata/StageMetadata.cs
@@ -6,33 +6,38 @@ using UnityEngine;
 namespace WK.Data
 {
 
+    public class EntityTransform
+    {
+        public Vector3 localPosition;
+        public Quaternion localRotation;
+        public Vector3 localScale;
+    }
+
     /// <summary>
     /// 场景要素的metadata
     /// </summary>
     public abstract class StageEntityMetadata
     {
         public string entityId; // 用来引用场景中的对象
+        public EntityTransform entityTransform;
     }
 
-    public class SceneDesc
+    public sealed class StageEntityMetadata_Background : StageEntityMetadata    
     {
-        public string name;
-        public string desc;
+        public string fileKey; // 背景图的资源名
     }
 
     /// <summary>
     /// 关卡元数据
     /// </summary>
-    public class SceneMetadata
+    public class StageMetadata
     {
-        public SceneDesc desc;
-
         public List<string> tests;
-
         public Vector3 pos;
-
         public int count;
 
+        public List<StageEntityMetadata_Background> backgrounds;
+
     }
 
 }
diff --git a/WorldlineKeepers/Assets/Scripts/Phase/GamePhase_Dojo.cs b/WorldlineKeepers/Assets/Scripts/Phase/GamePhase_Dojo.cs
index 2b7acd7..10dd785 100644
--- a/WorldlineKeepers/Assets/Scripts/Phase/GamePhase_Dojo.cs
+++ b/WorldlineKeepers/Assets/Scripts/Phase/GamePhase_Dojo.cs
@@ -20,20 +20,20 @@ namespace WK
             {
                 yield return 0f;
             }
-            SceneMetadata stage = new SceneMetadata();
-            stage.tests = new List<string>()
-            {
-                "asdas","asdasd","asdsd"
-            };
-            stage.desc = new SceneDesc();
-            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<SceneMetadata>(json);
-            Debug.Log(s.pos);
+            //SceneMetadata stage = new SceneMetadata();
+            //stage.tests = new List<string>()
+            //{
+            //    "asdas","asdasd","asdsd"
+            //};
+            //stage.desc = new SceneDesc();
+            //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<SceneMetadata>(json);
+            //Debug.Log(s.pos);
         }
 
         public override IEnumerator<float> OnEnd()
diff --git a/WorldlineKeepers/Assets/Scripts/Stage/Entites/StageEntityBase.cs b/WorldlineKeepers/Assets/Scripts/Stage/Entites/StageEntityBase.cs
index 7924840..43680f5 100644
--- a/WorldlineKeepers/Assets/Scripts/Stage/Entites/StageEntityBase.cs
+++ b/WorldlineKeepers/Assets/Scripts/Stage/Entites/StageEntityBase.cs
@@ -1,6 +1,8 @@
 using System.Collections;
 using System.Collections.Generic;
+using UnityEditorInternal;
 using UnityEngine;
+using WK.Data;
 
 namespace WK
 {
@@ -11,9 +13,17 @@ namespace WK
     public abstract class StageEntityBase : MonoBehaviour
     {
 
-        public abstract void OnSerialize();
+        public abstract StageEntityMetadata OnSerialize();
 
-        public abstract void OnDeserialize();
+        public abstract void OnDeserialize(StageEntityMetadata metadata);
+
+        protected void SaveTransform(out EntityTransform entityTransform) 
+        {
+            entityTransform = new EntityTransform(); 
+            entityTransform.localPosition = transform.localPosition;
+            entityTransform.localRotation = transform.localRotation;
+            entityTransform.localScale = transform.localScale;
+        }   
 
     }
 
diff --git a/WorldlineKeepers/Assets/Scripts/Stage/Entites/StageEntity_Background.cs b/WorldlineKeepers/Assets/Scripts/Stage/Entites/StageEntity_Background.cs
index 53c2081..9eae6ab 100644
--- a/WorldlineKeepers/Assets/Scripts/Stage/Entites/StageEntity_Background.cs
+++ b/WorldlineKeepers/Assets/Scripts/Stage/Entites/StageEntity_Background.cs
@@ -2,16 +2,23 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using WK;
+using WK.Data;
 
+[RequireComponent(typeof(SpriteRenderer))]
 public class StageEntity_Background : StageEntityBase
 {
-    public override void OnDeserialize()
+
+    public override StageEntityMetadata OnSerialize()
     {
-        throw new System.NotImplementedException();
+        StageEntityMetadata_Background bg = new StageEntityMetadata_Background();
+
+        SaveTransform(out bg.entityTransform);
+
+        return bg;
     }
 
-    public override void OnSerialize()
+    public override void OnDeserialize(StageEntityMetadata metadata)
     {
-        throw new System.NotImplementedException();
     }
+
 }
diff --git a/WorldlineKeepers/Assets/Scripts/Stage/Entites/StageEntity_Collider.cs b/WorldlineKeepers/Assets/Scripts/Stage/Entites/StageEntity_Collider.cs
new file mode 100644
index 0000000..0065562
--- /dev/null
+++ b/WorldlineKeepers/Assets/Scripts/Stage/Entites/StageEntity_Collider.cs
@@ -0,0 +1,39 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using WK;
+using WK.Data;
+
+public class StageEntity_Collider : StageEntityBase
+{
+    public override void OnDeserialize(StageEntityMetadata metadata)
+    {
+        throw new System.NotImplementedException();
+    }
+
+    public override StageEntityMetadata OnSerialize()
+    {
+        throw new System.NotImplementedException();
+    }
+    #region 搴忓垪鍖�
+
+    #endregion
+
+    #region 鍏叡瀛楁
+
+    #endregion
+
+    #region 绉佹湁瀛楁
+
+    #endregion
+
+    private void Awake() 
+	{
+		// 绉佹湁瀛楁璧嬪��
+		
+		// 鍏叡瀛楁璧嬪��
+		
+		// 鍒濆鍖�
+	}
+
+}
diff --git a/WorldlineKeepers/Assets/Scripts/Stage/Entites/StageEntity_Collider.cs.meta b/WorldlineKeepers/Assets/Scripts/Stage/Entites/StageEntity_Collider.cs.meta
new file mode 100644
index 0000000..6a55d78
--- /dev/null
+++ b/WorldlineKeepers/Assets/Scripts/Stage/Entites/StageEntity_Collider.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 41d533f99bdb90847a0f443a0ff0b970
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/WorldlineKeepers/Assets/Scripts/Unit/Characters/Flashpoint.meta b/WorldlineKeepers/Assets/Scripts/Unit/Characters/Flashpoint.meta
new file mode 100644
index 0000000..721f77a
--- /dev/null
+++ b/WorldlineKeepers/Assets/Scripts/Unit/Characters/Flashpoint.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2059d956b1057144997265efe7842539
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/WorldlineKeepers/Assets/Tools/LevelEditor/level_editor_scene.unity b/WorldlineKeepers/Assets/Tools/LevelEditor/level_editor_scene.unity
index 5d06fd3..0f8d70a 100644
--- a/WorldlineKeepers/Assets/Tools/LevelEditor/level_editor_scene.unity
+++ b/WorldlineKeepers/Assets/Tools/LevelEditor/level_editor_scene.unity
@@ -233,6 +233,7 @@ GameObject:
   m_Component:
   - component: {fileID: 209558657}
   - component: {fileID: 209558658}
+  - component: {fileID: 209558659}
   m_Layer: 0
   m_Name: Colliders
   m_TagString: Untagged
@@ -270,6 +271,18 @@ MonoBehaviour:
   m_Type: 2
   m_Offset: {x: 0, y: 0}
   m_Size: {x: 2, y: 2}
+--- !u!114 &209558659
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 209558656}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 41d533f99bdb90847a0f443a0ff0b970, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &231168131
 GameObject:
   m_ObjectHideFlags: 0
@@ -280,6 +293,7 @@ GameObject:
   m_Component:
   - component: {fileID: 231168132}
   - component: {fileID: 231168133}
+  - component: {fileID: 231168134}
   m_Layer: 0
   m_Name: Colliders (2)
   m_TagString: Untagged
@@ -317,6 +331,18 @@ MonoBehaviour:
   m_Type: 2
   m_Offset: {x: 0, y: 0}
   m_Size: {x: 2, y: 2}
+--- !u!114 &231168134
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 231168131}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 41d533f99bdb90847a0f443a0ff0b970, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &972227289
 GameObject:
   m_ObjectHideFlags: 0
@@ -327,6 +353,7 @@ GameObject:
   m_Component:
   - component: {fileID: 972227290}
   - component: {fileID: 972227291}
+  - component: {fileID: 972227292}
   m_Layer: 0
   m_Name: Colliders (1)
   m_TagString: Untagged
@@ -342,7 +369,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 972227289}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -2.94, y: -2.99, z: 0}
+  m_LocalPosition: {x: -3.016, y: -2.99, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -364,6 +391,18 @@ MonoBehaviour:
   m_Type: 2
   m_Offset: {x: 0, y: 0}
   m_Size: {x: 2, y: 2}
+--- !u!114 &972227292
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 972227289}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 41d533f99bdb90847a0f443a0ff0b970, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &1497381753
 GameObject:
   m_ObjectHideFlags: 0