diff options
author | chai <215380520@qq.com> | 2023-06-28 10:03:43 +0800 |
---|---|---|
committer | chai <215380520@qq.com> | 2023-06-28 10:03:43 +0800 |
commit | b97cddeb2c133d563aa78eac87ab3991c233b37f (patch) | |
tree | 3de2f31f7bf4b1b47460176b3b5fbaf5f486b636 | |
parent | f5eee69c3cce031a82edc1de49966c4d9ca80985 (diff) |
*misc
11 files changed, 248 insertions, 23 deletions
diff --git a/WorldlineKeepers/Assets/Bundle/stages/stage0/stage.json b/WorldlineKeepers/Assets/Bundle/stages/stage0/stage.json index 1324942..18c4b2a 100644 --- a/WorldlineKeepers/Assets/Bundle/stages/stage0/stage.json +++ b/WorldlineKeepers/Assets/Bundle/stages/stage0/stage.json @@ -1 +1 @@ -{"backgrounds":[{"fileKey":"spr_milk_bg","entityId":null,"entityName":null,"entityTransform":{"localPosition":"0,0,0","localRotation":"0,0,0","localScale":"1,1,1"}}],"colliders":[{"colliders":[{"shape":1,"type":2,"offset":"0,0","size":"3.94,8.44","radius":0.0}],"entityId":null,"entityName":null,"entityTransform":{"localPosition":"-14.99,-17.68,0","localRotation":"0,0,0","localScale":"1,1,1"}},{"colliders":[{"shape":1,"type":2,"offset":"0,0","size":"7.99,5.32","radius":0.0}],"entityId":null,"entityName":null,"entityTransform":{"localPosition":"-14.99,-17.48,0","localRotation":"0,0,0","localScale":"1,1,1"}},{"colliders":[{"shape":1,"type":2,"offset":"0,0","size":"2,2","radius":0.0}],"entityId":null,"entityName":null,"entityTransform":{"localPosition":"-7.005,-2.99,0","localRotation":"0,0,0","localScale":"1,1,1"}},{"colliders":[{"shape":1,"type":2,"offset":"0,0","size":"2,2","radius":0.0}],"entityId":null,"entityName":null,"entityTransform":{"localPosition":"1.02,-2.99,0","localRotation":"0,0,0","localScale":"1,1,1"}},{"colliders":[{"shape":1,"type":2,"offset":"0,0","size":"2,2","radius":0.0},{"shape":2,"type":0,"offset":"1,3","size":"0,0","radius":2.0}],"entityId":null,"entityName":null,"entityTransform":{"localPosition":"-15.046,-2.99,0","localRotation":"0,0,0","localScale":"1,1,1"}},{"colliders":[{"shape":1,"type":2,"offset":"0,0","size":"2,2","radius":0.0},{"shape":2,"type":0,"offset":"1,3","size":"0,0","radius":2.0}],"entityId":null,"entityName":null,"entityTransform":{"localPosition":"-3.016,-2.99,0","localRotation":"0,0,0","localScale":"1,1,1"}},{"colliders":[{"shape":1,"type":2,"offset":"0,0","size":"2,2","radius":0.0}],"entityId":null,"entityName":null,"entityTransform":{"localPosition":"-11.01,-2.99,0","localRotation":"0,0,0","localScale":"1,1,1"}},{"colliders":[{"shape":1,"type":2,"offset":"0,0","size":"2,2","radius":0.0}],"entityId":null,"entityName":null,"entityTransform":{"localPosition":"-19.035,-2.99,0","localRotation":"0,0,0","localScale":"1,1,1"}}]}
\ No newline at end of file +{"backgrounds":[{"fileKey":"spr_milk_bg","entityId":null,"entityName":null,"entityTransform":{"localPosition":"0,0,0","localRotation":"0,0,0","localScale":"1,1,1"}}],"colliders":[{"colliders":[{"shape":1,"type":2,"offset":"0,0","size":"2,2","radius":0.0}],"entityId":null,"entityName":null,"entityTransform":{"localPosition":"-22.99,-2.99,0","localRotation":"0,0,0","localScale":"1,1,1"}},{"colliders":[{"shape":1,"type":2,"offset":"0,0","size":"2,2","radius":0.0}],"entityId":null,"entityName":null,"entityTransform":{"localPosition":"-7.005,-2.99,0","localRotation":"0,0,0","localScale":"1,1,1"}},{"colliders":[{"shape":1,"type":2,"offset":"0,0","size":"2,2","radius":0.0}],"entityId":null,"entityName":null,"entityTransform":{"localPosition":"1.02,-2.99,0","localRotation":"0,0,0","localScale":"1,1,1"}},{"colliders":[{"shape":1,"type":2,"offset":"0,0","size":"2,2","radius":0.0},{"shape":2,"type":0,"offset":"1,3","size":"0,0","radius":2.0}],"entityId":null,"entityName":null,"entityTransform":{"localPosition":"-15.046,-2.99,0","localRotation":"0,0,0","localScale":"1,1,1"}},{"colliders":[{"shape":1,"type":2,"offset":"0,0","size":"7.99,5.32","radius":0.0}],"entityId":null,"entityName":null,"entityTransform":{"localPosition":"-14.99,-17.48,0","localRotation":"0,0,0","localScale":"1,1,1"}},{"colliders":[{"shape":1,"type":2,"offset":"0,0","size":"2,2","radius":0.0},{"shape":2,"type":0,"offset":"1,3","size":"0,0","radius":2.0}],"entityId":null,"entityName":null,"entityTransform":{"localPosition":"-3.016,-2.99,0","localRotation":"0,0,0","localScale":"1,1,1"}},{"colliders":[{"shape":1,"type":2,"offset":"0,0","size":"2,2","radius":0.0}],"entityId":null,"entityName":null,"entityTransform":{"localPosition":"-11.01,-2.99,0","localRotation":"0,0,0","localScale":"1,1,1"}},{"colliders":[{"shape":1,"type":2,"offset":"0,0","size":"3.94,8.44","radius":0.0}],"entityId":null,"entityName":null,"entityTransform":{"localPosition":"-14.99,-17.68,0","localRotation":"0,0,0","localScale":"1,1,1"}},{"colliders":[{"shape":1,"type":2,"offset":"0,0","size":"2,2","radius":0.0}],"entityId":null,"entityName":null,"entityTransform":{"localPosition":"-19.035,-2.99,0","localRotation":"0,0,0","localScale":"1,1,1"}}]}
\ No newline at end of file diff --git a/WorldlineKeepers/Assets/Scripts/Stage/Entites/StageEntity_Gate.cs b/WorldlineKeepers/Assets/Scripts/Stage/Entites/StageEntity_Gate.cs new file mode 100644 index 0000000..8b93104 --- /dev/null +++ b/WorldlineKeepers/Assets/Scripts/Stage/Entites/StageEntity_Gate.cs @@ -0,0 +1,10 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class StageEntity_Gate +{ + + + +} diff --git a/WorldlineKeepers/Assets/Scripts/Stage/Entites/StageEntity_Gate.cs.meta b/WorldlineKeepers/Assets/Scripts/Stage/Entites/StageEntity_Gate.cs.meta new file mode 100644 index 0000000..cafdd4c --- /dev/null +++ b/WorldlineKeepers/Assets/Scripts/Stage/Entites/StageEntity_Gate.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3e7d49d3366bdba498c23eeee86a7648 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/WorldlineKeepers/Assets/Scripts/Stage/Entites/StageEntity_Portal.cs b/WorldlineKeepers/Assets/Scripts/Stage/Entites/StageEntity_Portal.cs new file mode 100644 index 0000000..fcb454d --- /dev/null +++ b/WorldlineKeepers/Assets/Scripts/Stage/Entites/StageEntity_Portal.cs @@ -0,0 +1,10 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class StageEntity_Portal +{ + + + +} diff --git a/WorldlineKeepers/Assets/Scripts/Stage/Entites/StageEntity_Portal.cs.meta b/WorldlineKeepers/Assets/Scripts/Stage/Entites/StageEntity_Portal.cs.meta new file mode 100644 index 0000000..5063dff --- /dev/null +++ b/WorldlineKeepers/Assets/Scripts/Stage/Entites/StageEntity_Portal.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0b35825ce3b266c489a14e8ae083eccc +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/WorldlineKeepers/Assets/Scripts/Stage/Entites/StageEntity_Trigger.cs.meta b/WorldlineKeepers/Assets/Scripts/Stage/Entites/StageEntity_Trigger.cs.meta index 6f5519c..0b761f9 100644 --- a/WorldlineKeepers/Assets/Scripts/Stage/Entites/StageEntity_Trigger.cs.meta +++ b/WorldlineKeepers/Assets/Scripts/Stage/Entites/StageEntity_Trigger.cs.meta @@ -5,7 +5,7 @@ MonoImporter: serializedVersion: 2 defaultReferences: [] executionOrder: 0 - icon: {instanceID: 0} + icon: {fileID: 5132851093641282708, guid: 0000000000000000d000000000000000, type: 0} userData: assetBundleName: assetBundleVariant: diff --git a/WorldlineKeepers/Assets/Scripts/Stage/Metadata.meta b/WorldlineKeepers/Assets/Scripts/Stage/Metadata.meta new file mode 100644 index 0000000..c002f0d --- /dev/null +++ b/WorldlineKeepers/Assets/Scripts/Stage/Metadata.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 764ebdcb919a72e4aa38e8bd3fa9464a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/WorldlineKeepers/Assets/Scripts/Battle/Metadata/StageMetadata.cs b/WorldlineKeepers/Assets/Scripts/Stage/Metadata/StageMetadata.cs index 240f95b..fd5e7d0 100644 --- a/WorldlineKeepers/Assets/Scripts/Battle/Metadata/StageMetadata.cs +++ b/WorldlineKeepers/Assets/Scripts/Stage/Metadata/StageMetadata.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using Unity.VisualScripting; using UnityEngine; +// 场景中所有实体的元数据 + namespace WK.Data { @@ -42,6 +44,10 @@ namespace WK.Data public List<StageEntityMetadata_SingleCollider> colliders; } + public sealed class StageEntityMetadata_Trigger : StageEntityMetadata + { + } + /// <summary> /// 关卡元数据 /// </summary> @@ -49,6 +55,7 @@ namespace WK.Data { public List<StageEntityMetadata_Background> backgrounds = new List<StageEntityMetadata_Background>(); public List<StageEntityMetadata_Collider> colliders = new List<StageEntityMetadata_Collider>(); + public List<StageEntityMetadata_Trigger> triggers = new List<StageEntityMetadata_Trigger>(); public void Write(StageEntityMetadata meta) { @@ -60,6 +67,10 @@ namespace WK.Data { colliders.Add(meta as StageEntityMetadata_Collider); } + else if(meta is StageEntityMetadata_Trigger) + { + triggers.Add(meta as StageEntityMetadata_Trigger); + } } } diff --git a/WorldlineKeepers/Assets/Scripts/Battle/Metadata/StageMetadata.cs.meta b/WorldlineKeepers/Assets/Scripts/Stage/Metadata/StageMetadata.cs.meta index 7ff42d8..7ff42d8 100644 --- a/WorldlineKeepers/Assets/Scripts/Battle/Metadata/StageMetadata.cs.meta +++ b/WorldlineKeepers/Assets/Scripts/Stage/Metadata/StageMetadata.cs.meta diff --git a/WorldlineKeepers/Assets/Tools/LevelEditor/stages/stage0.unity b/WorldlineKeepers/Assets/Tools/LevelEditor/stages/stage_0.unity index 65214c5..e65e7b0 100644 --- a/WorldlineKeepers/Assets/Tools/LevelEditor/stages/stage0.unity +++ b/WorldlineKeepers/Assets/Tools/LevelEditor/stages/stage_0.unity @@ -123,6 +123,66 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &152071154 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 152071155} + - component: {fileID: 152071157} + - component: {fileID: 152071156} + m_Layer: 0 + m_Name: Colliders (8) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &152071155 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 152071154} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -22.99, y: -2.99, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 739010412} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &152071156 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 152071154} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 41d533f99bdb90847a0f443a0ff0b970, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &152071157 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 152071154} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 310ae84e35289454197ed61078698811, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Type: 2 + m_Offset: {x: 0, y: 0} + m_Size: {x: 2, y: 2} --- !u!1 &171571024 GameObject: m_ObjectHideFlags: 0 @@ -200,13 +260,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 171571024} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 1 + m_Father: {fileID: 2147094022} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &171571027 MonoBehaviour: @@ -251,8 +311,8 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 2 + m_Father: {fileID: 739010412} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &209558658 MonoBehaviour: @@ -311,8 +371,8 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 4 + m_Father: {fileID: 739010412} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &231168133 MonoBehaviour: @@ -414,8 +474,8 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 6 + m_Father: {fileID: 739010412} + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &446512243 GameObject: @@ -453,13 +513,53 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 446512243} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -8.56, y: 0.44, z: -0.5470367} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -8.56, y: 0.44000006, z: -0.54703665} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] + m_Father: {fileID: 2021137342} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &739010411 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 739010412} + m_Layer: 0 + m_Name: colliders + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &739010412 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 739010411} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 209558657} + - {fileID: 972227290} + - {fileID: 231168132} + - {fileID: 1636484682} + - {fileID: 244913515} + - {fileID: 1306754751} + - {fileID: 971699329} + - {fileID: 1419431918} + - {fileID: 152071155} m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &971699326 GameObject: @@ -518,8 +618,8 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 8 + m_Father: {fileID: 739010412} + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &972227289 GameObject: @@ -552,8 +652,8 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 3 + m_Father: {fileID: 739010412} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &972227291 MonoBehaviour: @@ -654,8 +754,8 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 7 + m_Father: {fileID: 739010412} + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1419431915 GameObject: @@ -714,8 +814,8 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 9 + m_Father: {fileID: 739010412} + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1497381753 GameObject: @@ -892,6 +992,70 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] + m_Father: {fileID: 739010412} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2021137341 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2021137342} + m_Layer: 0 + m_Name: triggers + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2021137342 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2021137341} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 446512245} m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2147094021 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2147094022} + m_Layer: 0 + m_Name: backgrounds + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2147094022 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2147094021} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 171571026} + m_Father: {fileID: 0} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/WorldlineKeepers/Assets/Tools/LevelEditor/stages/stage0.unity.meta b/WorldlineKeepers/Assets/Tools/LevelEditor/stages/stage_0.unity.meta index a754534..a754534 100644 --- a/WorldlineKeepers/Assets/Tools/LevelEditor/stages/stage0.unity.meta +++ b/WorldlineKeepers/Assets/Tools/LevelEditor/stages/stage_0.unity.meta |