Skip to content

M
man-in-the-mirror
You need to sign in or sign up before continuing.
Commit ae8295b9 authored by 18신대성's avatar 18신대성
Browse files
Options

Merge remote-tracking branch 'origin/player' into polish 

# Conflicts:
#	Assets/Resources/stages/stage6_5.json.meta
parents 5a4c0456 50bbbee9
Show whitespace changes
Inline Side-by-side
Showing with 19 additions and 0 deletions
Assets/Resources/stages/stage6_5.json 0 → 100644
View file @ ae8295b9
{"objects":[{"tag":0,"xPos":45.0,"yPos":0.0},{"tag":3,"xPos":-3.0,"yPos":0.5},{"tag":3,"xPos":-3.5,"yPos":0.0},{"tag":3,"xPos":-3.0,"yPos":-0.5},{"tag":3,"xPos":-2.5,"yPos":0.0},{"tag":3,"xPos":0.0,"yPos":-2.5},{"tag":2,"xPos":-0.5,"yPos":-3.0},{"tag":2,"xPos":0.5,"yPos":-3.0},{"tag":2,"xPos":1.5,"yPos":-2.0},{"tag":2,"xPos":1.5,"yPos":-3.0},{"tag":2,"xPos":1.5,"yPos":-4.0},{"tag":2,"xPos":2.0,"yPos":-4.5},{"tag":2,"xPos":3.0,"yPos":-4.5},{"tag":2,"xPos":4.0,"yPos":-4.5},{"tag":2,"xPos":4.5,"yPos":-4.0},{"tag":2,"xPos":4.5,"yPos":-3.0},{"tag":2,"xPos":4.5,"yPos":-2.0},{"tag":2,"xPos":2.0,"yPos":-1.5},{"tag":2,"xPos":4.0,"yPos":-1.5},{"tag":2,"xPos":1.0,"yPos":-1.5},{"tag":2,"xPos":1.5,"yPos":-1.0},{"tag":2,"xPos":-1.0,"yPos":-1.5},{"tag":2,"xPos":-1.5,"yPos":-1.0},{"tag":2,"xPos":-1.5,"yPos":0.0},{"tag":2,"xPos":-1.5,"yPos":1.0},{"tag":2,"xPos":-1.0,"yPos":1.5},{"tag":2,"xPos":1.0,"yPos":1.5},{"tag":2,"xPos":1.5,"yPos":1.0},{"tag":2,"xPos":0.0,"yPos":0.5},{"tag":2,"xPos":-0.5,"yPos":0.0},{"tag":2,"xPos":0.0,"yPos":-0.5},{"tag":2,"xPos":0.5,"yPos":0.0},{"tag":2,"xPos":-4.0,"yPos":-1.5},{"tag":2,"xPos":-4.5,"yPos":-2.0},{"tag":2,"xPos":-4.5,"yPos":-3.0},{"tag":2,"xPos":-4.5,"yPos":-4.0},{"tag":2,"xPos":-4.0,"yPos":-4.5},{"tag":2,"xPos":-3.0,"yPos":-4.5},{"tag":2,"xPos":-2.0,"yPos":-4.5},{"tag":2,"xPos":-1.5,"yPos":-4.0},{"tag":2,"xPos":-1.5,"yPos":-2.0},{"tag":2,"xPos":-2.0,"yPos":-1.5},{"tag":3,"xPos":-1.5,"yPos":-3.0},{"tag":3,"xPos":0.0,"yPos":-1.5},{"tag":3,"xPos":1.5,"yPos":0.0},{"tag":3,"xPos":0.0,"yPos":1.5},{"tag":2,"xPos":2.0,"yPos":1.5},{"tag":2,"xPos":4.0,"yPos":1.5},{"tag":2,"xPos":1.5,"yPos":4.0},{"tag":2,"xPos":1.5,"yPos":3.0},{"tag":2,"xPos":1.5,"yPos":2.0},{"tag":2,"xPos":-4.0,"yPos":1.5},{"tag":2,"xPos":-4.5,"yPos":2.0},{"tag":2,"xPos":-4.5,"yPos":3.0},{"tag":2,"xPos":-4.5,"yPos":4.0},{"tag":2,"xPos":-4.0,"yPos":4.5},{"tag":3,"xPos":-1.5,"yPos":4.0},{"tag":2,"xPos":-1.5,"yPos":3.0},{"tag":2,"xPos":-1.5,"yPos":2.0},{"tag":2,"xPos":-3.0,"yPos":4.5},{"tag":2,"xPos":-2.0,"yPos":4.5},{"tag":2,"xPos":-2.0,"yPos":1.5},{"tag":1,"xPos":-4.0,"yPos":4.0},{"tag":1,"xPos":-4.0,"yPos":3.0},{"tag":1,"xPos":-4.0,"yPos":2.0},{"tag":1,"xPos":-3.0,"yPos":4.0},{"tag":1,"xPos":0.0,"yPos":0.0},{"tag":9,"xPos":0.0,"yPos":0.0},{"tag":1,"xPos":-3.0,"yPos":2.0},{"tag":1,"xPos":-3.0,"yPos":3.0},{"tag":1,"xPos":-2.0,"yPos":4.0},{"tag":1,"xPos":-2.0,"yPos":3.0},{"tag":1,"xPos":-2.0,"yPos":2.0},{"tag":1,"xPos":-4.0,"yPos":-2.0},{"tag":1,"xPos":-4.0,"yPos":-3.0},{"tag":1,"xPos":-4.0,"yPos":-4.0},{"tag":1,"xPos":-3.0,"yPos":-2.0},{"tag":1,"xPos":-3.0,"yPos":-3.0},{"tag":1,"xPos":-3.0,"yPos":-4.0},{"tag":1,"xPos":-2.0,"yPos":-2.0},{"tag":1,"xPos":-2.0,"yPos":-3.0},{"tag":1,"xPos":-2.0,"yPos":-4.0},{"tag":1,"xPos":-1.0,"yPos":-3.0},{"tag":1,"xPos":-1.0,"yPos":-2.0},{"tag":1,"xPos":-1.0,"yPos":-4.0},{"tag":1,"xPos":0.0,"yPos":-2.0},{"tag":1,"xPos":0.0,"yPos":-3.0},{"tag":1,"xPos":0.0,"yPos":-4.0},{"tag":1,"xPos":1.0,"yPos":-2.0},{"tag":1,"xPos":1.0,"yPos":-3.0},{"tag":1,"xPos":1.0,"yPos":-4.0},{"tag":1,"xPos":-1.0,"yPos":1.0},{"tag":1,"xPos":-1.0,"yPos":0.0},{"tag":1,"xPos":-1.0,"yPos":-1.0},{"tag":1,"xPos":0.0,"yPos":1.0},{"tag":1,"xPos":0.0,"yPos":-1.0},{"tag":1,"xPos":1.0,"yPos":1.0},{"tag":1,"xPos":1.0,"yPos":0.0},{"tag":1,"xPos":1.0,"yPos":-1.0},{"tag":1,"xPos":2.0,"yPos":-2.0},{"tag":1,"xPos":2.0,"yPos":-3.0},{"tag":1,"xPos":2.0,"yPos":-4.0},{"tag":1,"xPos":3.0,"yPos":-2.0},{"tag":1,"xPos":3.0,"yPos":-3.0},{"tag":1,"xPos":3.0,"yPos":-4.0},{"tag":1,"xPos":4.0,"yPos":-2.0},{"tag":1,"xPos":4.0,"yPos":-3.0},{"tag":1,"xPos":4.0,"yPos":-4.0},{"tag":1,"xPos":2.0,"yPos":1.0},{"tag":1,"xPos":2.0,"yPos":0.0},{"tag":1,"xPos":2.0,"yPos":-1.0},{"tag":1,"xPos":3.0,"yPos":1.0},{"tag":1,"xPos":3.0,"yPos":0.0},{"tag":1,"xPos":4.0,"yPos":1.0},{"tag":1,"xPos":4.0,"yPos":0.0},{"tag":1,"xPos":4.0,"yPos":-1.0},{"tag":1,"xPos":3.0,"yPos":-1.0},{"tag":1,"xPos":-1.0,"yPos":4.0},{"tag":1,"xPos":-1.0,"yPos":3.0},{"tag":1,"xPos":-1.0,"yPos":2.0},{"tag":1,"xPos":0.0,"yPos":4.0},{"tag":1,"xPos":0.0,"yPos":3.0},{"tag":1,"xPos":0.0,"yPos":2.0},{"tag":1,"xPos":1.0,"yPos":4.0},{"tag":1,"xPos":1.0,"yPos":3.0},{"tag":1,"xPos":1.0,"yPos":2.0},{"tag":1,"xPos":2.0,"yPos":4.0},{"tag":1,"xPos":2.0,"yPos":3.0},{"tag":1,"xPos":2.0,"yPos":2.0},{"tag":1,"xPos":3.0,"yPos":4.0},{"tag":1,"xPos":3.0,"yPos":3.0},{"tag":1,"xPos":3.0,"yPos":2.0},{"tag":1,"xPos":4.0,"yPos":4.0},{"tag":1,"xPos":4.0,"yPos":3.0},{"tag":1,"xPos":4.0,"yPos":2.0},{"tag":1,"xPos":-3.0,"yPos":0.0},{"tag":4,"xPos":-1.0,"yPos":-1.0},{"tag":8,"xPos":-3.0,"yPos":0.0},{"tag":7,"xPos":3.0,"yPos":-3.0},{"tag":5,"xPos":0.0,"yPos":-3.0},{"tag":5,"xPos":0.0,"yPos":2.0},{"tag":6,"xPos":1.0,"yPos":1.0},{"tag":6,"xPos":3.0,"yPos":3.0},{"tag":5,"xPos":4.0,"yPos":4.0},{"tag":5,"xPos":-2.0,"yPos":4.0},{"tag":5,"xPos":-2.0,"yPos":-4.0},{"tag":5,"xPos":-4.0,"yPos":2.0},{"tag":8,"xPos":-3.0,"yPos":3.0},{"tag":5,"xPos":-3.0,"yPos":-3.0},{"tag":5,"xPos":-4.0,"yPos":-2.0}],"clears":[{"type":0,"goal":1},{"type":8,"goal":1},{"type":1,"goal":2}],"cases":[0,2,0,0,1,1,0,1],"bullets":[0,1],"comments":null}
\ No newline at end of file
Assets/Resources/stages/stage6_5.json.meta 0 → 100644
View file @ ae8295b9
fileFormatVersion: 2
guid: e2a1d9dfa6af1f741baf74e581c155e4
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Scenes/MapEditor.unity
View file @ ae8295b9
......@@ -492,6 +492,12 @@ PrefabInstance:
propertyPath: asd
value:
objectReference: {fileID: 4900000, guid: c4865e9602e96b54b89d9ecb0d3e6d1c, type: 3}
- target: {fileID: 3268100033343711389, guid: 11285456de5f1854d947bea83275646f,
type: 3}
propertyPath: mannequin
value:
objectReference: {fileID: 87051754405567689, guid: 2a2831d520acdd3408d8a04673423e2a,
type: 3}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 11285456de5f1854d947bea83275646f, type: 3}
--- !u!1001 &1046587609
......
Assets/Scenes/SelectStage.unity
View file @ ae8295b9
......@@ -477,6 +477,11 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5996849666618765155, guid: 8115fd4d1a1025b4fb05e45fc5fa6578,
type: 3}
propertyPath: categoryCounts.Array.data[5]
value: 5
objectReference: {fileID: 0}
- target: {fileID: 5087174722634247129, guid: 8115fd4d1a1025b4fb05e45fc5fa6578,
type: 3}
propertyPath: m_AnchorMax.x
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment