diff options
| -rw-r--r-- | WorldlineKeepers/Assets/Bundle/stages/stage0/stage.json | 124 | ||||
| -rw-r--r-- | WorldlineKeepers/Assets/Scripts/Stage/StageBuilder.cs | 6 | ||||
| -rw-r--r-- | WorldlineKeepers/Assets/Tools/LevelEditor/Editor.meta | 8 | ||||
| -rw-r--r-- | WorldlineKeepers/Assets/Tools/LevelEditor/Editor/LevelEditor.cs (renamed from WorldlineKeepers/Assets/Tools/LevelEditor/LevelEditor.cs) | 0 | ||||
| -rw-r--r-- | WorldlineKeepers/Assets/Tools/LevelEditor/Editor/LevelEditor.cs.meta (renamed from WorldlineKeepers/Assets/Tools/LevelEditor/LevelEditor.cs.meta) | 0 | ||||
| -rw-r--r-- | WorldlineKeepers/Assets/Tools/LevelEditor/stages.meta | 8 | ||||
| -rw-r--r-- | WorldlineKeepers/Assets/Tools/LevelEditor/stages/stage0.unity (renamed from WorldlineKeepers/Assets/Tools/LevelEditor/level_editor_scene.unity) | 120 | ||||
| -rw-r--r-- | WorldlineKeepers/Assets/Tools/LevelEditor/stages/stage0.unity.meta (renamed from WorldlineKeepers/Assets/Tools/LevelEditor/level_editor_scene.unity.meta) | 0 |
8 files changed, 143 insertions, 123 deletions
diff --git a/WorldlineKeepers/Assets/Bundle/stages/stage0/stage.json b/WorldlineKeepers/Assets/Bundle/stages/stage0/stage.json index 2e60efe..1324942 100644 --- a/WorldlineKeepers/Assets/Bundle/stages/stage0/stage.json +++ b/WorldlineKeepers/Assets/Bundle/stages/stage0/stage.json @@ -1,123 +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": "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 - } - ], - "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" - } - }, { - "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": "-3.016,-2.99,0", - "localRotation": "0,0,0", - "localScale": "1,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 diff --git a/WorldlineKeepers/Assets/Scripts/Stage/StageBuilder.cs b/WorldlineKeepers/Assets/Scripts/Stage/StageBuilder.cs index d117779..7b68181 100644 --- a/WorldlineKeepers/Assets/Scripts/Stage/StageBuilder.cs +++ b/WorldlineKeepers/Assets/Scripts/Stage/StageBuilder.cs @@ -12,6 +12,12 @@ using WK.Data; public class StageBuilder : Singleton<StageBuilder> { + /// <summary> + /// Òì²½¹¹½¨¹Ø¿¨ + /// </summary> + /// <param name="metadata"></param> + /// <param name="root"></param> + /// <returns></returns> public CoroutineHandle AsyncBuildStage(StageMetadata metadata, Transform root = null) { return Timing.Instance.RunCoroutineOnInstance(CoBuildStage(metadata, root)); diff --git a/WorldlineKeepers/Assets/Tools/LevelEditor/Editor.meta b/WorldlineKeepers/Assets/Tools/LevelEditor/Editor.meta new file mode 100644 index 0000000..b8739cb --- /dev/null +++ b/WorldlineKeepers/Assets/Tools/LevelEditor/Editor.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 40defe46bc00fb2479dda9cb126c887a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/WorldlineKeepers/Assets/Tools/LevelEditor/LevelEditor.cs b/WorldlineKeepers/Assets/Tools/LevelEditor/Editor/LevelEditor.cs index b9609a5..b9609a5 100644 --- a/WorldlineKeepers/Assets/Tools/LevelEditor/LevelEditor.cs +++ b/WorldlineKeepers/Assets/Tools/LevelEditor/Editor/LevelEditor.cs diff --git a/WorldlineKeepers/Assets/Tools/LevelEditor/LevelEditor.cs.meta b/WorldlineKeepers/Assets/Tools/LevelEditor/Editor/LevelEditor.cs.meta index 75397a4..75397a4 100644 --- a/WorldlineKeepers/Assets/Tools/LevelEditor/LevelEditor.cs.meta +++ b/WorldlineKeepers/Assets/Tools/LevelEditor/Editor/LevelEditor.cs.meta diff --git a/WorldlineKeepers/Assets/Tools/LevelEditor/stages.meta b/WorldlineKeepers/Assets/Tools/LevelEditor/stages.meta new file mode 100644 index 0000000..5b45130 --- /dev/null +++ b/WorldlineKeepers/Assets/Tools/LevelEditor/stages.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 72903fd26af74c840afc645aadca9be6 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/WorldlineKeepers/Assets/Tools/LevelEditor/level_editor_scene.unity b/WorldlineKeepers/Assets/Tools/LevelEditor/stages/stage0.unity index 10bf66d..65214c5 100644 --- a/WorldlineKeepers/Assets/Tools/LevelEditor/level_editor_scene.unity +++ b/WorldlineKeepers/Assets/Tools/LevelEditor/stages/stage0.unity @@ -459,6 +459,66 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} + m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &971699326 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 971699329} + - component: {fileID: 971699328} + - component: {fileID: 971699327} + m_Layer: 0 + m_Name: Colliders (6) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &971699327 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 971699326} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 41d533f99bdb90847a0f443a0ff0b970, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &971699328 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 971699326} + 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: 7.99, y: 5.32} +--- !u!4 &971699329 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 971699326} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -14.99, y: -17.48, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &972227289 @@ -597,6 +657,66 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1419431915 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1419431918} + - component: {fileID: 1419431917} + - component: {fileID: 1419431916} + m_Layer: 0 + m_Name: Colliders (7) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1419431916 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1419431915} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 41d533f99bdb90847a0f443a0ff0b970, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1419431917 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1419431915} + 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: 3.94, y: 8.44} +--- !u!4 &1419431918 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1419431915} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -14.99, y: -17.68, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1497381753 GameObject: m_ObjectHideFlags: 0 diff --git a/WorldlineKeepers/Assets/Tools/LevelEditor/level_editor_scene.unity.meta b/WorldlineKeepers/Assets/Tools/LevelEditor/stages/stage0.unity.meta index a754534..a754534 100644 --- a/WorldlineKeepers/Assets/Tools/LevelEditor/level_editor_scene.unity.meta +++ b/WorldlineKeepers/Assets/Tools/LevelEditor/stages/stage0.unity.meta |