Skip to content

M
man-in-the-mirror
Commit 425b0e0a authored by 18신대성's avatar 18신대성
Browse files
Options

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

# Conflicts:
#	Assets/Prefabs/Objects/Mannequin/stage1_1.json
#	Assets/Prefabs/Objects/Mannequin/stage1_1.json.meta
#	Assets/Prefabs/Objects/Mannequin/stage1_2.json
#	Assets/Prefabs/Objects/Mannequin/stage1_2.json.meta
#	Assets/Prefabs/Objects/Mannequin/stage1_3.json
#	Assets/Prefabs/Objects/Mannequin/stage1_3.json.meta
#	Assets/Prefabs/Objects/Mannequin/stage1_4.json
#	Assets/Prefabs/Objects/Mannequin/stage1_4.json.meta
#	Assets/Prefabs/Objects/Mannequin/stage2_1.json
#	Assets/Prefabs/Objects/Mannequin/stage2_1.json.meta
#	Assets/Prefabs/Objects/Mannequin/stage2_2.json
#	Assets/Prefabs/Objects/Mannequin/stage2_2.json.meta
#	Assets/Prefabs/Objects/Mannequin/stage2_3.json
#	Assets/Prefabs/Objects/Mannequin/stage2_3.json.meta
#	Assets/Prefabs/Objects/Mannequin/stage2_4.json
#	Assets/Prefabs/Objects/Mannequin/stage2_4.json.meta
#	Assets/Prefabs/Objects/Mannequin/stage3_1.json
#	Assets/Prefabs/Objects/Mannequin/stage3_1.json.meta
#	Assets/Prefabs/Objects/Mannequin/stage3_2.json
#	Assets/Prefabs/Objects/Mannequin/stage3_2.json.meta
#	Assets/Prefabs/Objects/Mannequin/stage3_3.json
#	Assets/Prefabs/Objects/Mannequin/stage3_3.json.meta
#	Assets/Prefabs/Objects/Mannequin/stage3_4.json
#	Assets/Prefabs/Objects/Mannequin/stage3_4.json.meta
#	Assets/Prefabs/Objects/Mannequin/stage3_5.json
#	Assets/Prefabs/Objects/Mannequin/stage3_5.json.meta
parents 2b164633 dd4ad884
Hide whitespace changes
Inline Side-by-side
Showing with 104 additions and 0 deletions
Assets/Prefabs/Objects/Mannequin/stage1_1.json 0 → 100644
View file @ 425b0e0a
{"objects":[{"tag":0,"xPos":10.0,"yPos":0.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":0.0},{"tag":9,"xPos":0.0,"yPos":0.0},{"tag":4,"xPos":-1.0,"yPos":-1.0}],"clears":[{"type":0,"goal":1}],"cases":[],"bullets":[],"comments":null}
\ No newline at end of file
Assets/Prefabs/Objects/Mannequin/stage1_1.json.meta 0 → 100644
View file @ 425b0e0a
fileFormatVersion: 2
guid: 12961095a3be09546b45554f3003da27
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Prefabs/Objects/Mannequin/stage1_2.json 0 → 100644
View file @ 425b0e0a
{"objects":[{"tag":0,"xPos":10.0,"yPos":0.0},{"tag":2,"xPos":-1.0,"yPos":-0.5},{"tag":1,"xPos":-1.0,"yPos":0.0},{"tag":9,"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":0.0},{"tag":4,"xPos":-1.0,"yPos":-1.0}],"clears":[{"type":0,"goal":1}],"cases":[],"bullets":[],"comments":null}
\ No newline at end of file
Assets/Prefabs/Objects/Mannequin/stage1_2.json.meta 0 → 100644
View file @ 425b0e0a
fileFormatVersion: 2
guid: 81737567240b5674e936add60e072565
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Prefabs/Objects/Mannequin/stage1_3.json 0 → 100644
View file @ 425b0e0a
{"objects":[{"tag":0,"xPos":10.0,"yPos":0.0},{"tag":2,"xPos":-1.0,"yPos":-0.5},{"tag":3,"xPos":0.0,"yPos":-0.5},{"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":0.0},{"tag":9,"xPos":0.0,"yPos":0.0},{"tag":4,"xPos":-1.0,"yPos":-1.0}],"clears":[{"type":0,"goal":1}],"cases":[],"bullets":[0],"comments":null}
\ No newline at end of file
Assets/Prefabs/Objects/Mannequin/stage1_3.json.meta 0 → 100644
View file @ 425b0e0a
fileFormatVersion: 2
guid: 75b3eb3891c3bf84a850b49e8d2dd44a
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Prefabs/Objects/Mannequin/stage1_4.json 0 → 100644
View file @ 425b0e0a
{"objects":[{"tag":0,"xPos":25.0,"yPos":0.0},{"tag":2,"xPos":-1.0,"yPos":-0.5},{"tag":3,"xPos":0.0,"yPos":-0.5},{"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":0.0},{"tag":1,"xPos":1.0,"yPos":-1.0},{"tag":1,"xPos":1.0,"yPos":-2.0},{"tag":1,"xPos":1.0,"yPos":2.0},{"tag":9,"xPos":1.0,"yPos":2.0},{"tag":4,"xPos":-1.0,"yPos":-1.0}],"clears":[{"type":0,"goal":1}],"cases":[],"bullets":[1],"comments":null}
\ No newline at end of file
Assets/Prefabs/Objects/Mannequin/stage1_4.json.meta 0 → 100644
View file @ 425b0e0a
fileFormatVersion: 2
guid: b565d475fd05fb74e9491967522ded95
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Prefabs/Objects/Mannequin/stage2_1.json 0 → 100644
View file @ 425b0e0a
{"objects":[{"tag":0,"xPos":15.0,"yPos":0.0},{"tag":2,"xPos":-1.0,"yPos":0.5},{"tag":2,"xPos":0.0,"yPos":0.5},{"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":0.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":4,"xPos":-1.0,"yPos":-1.0},{"tag":5,"xPos":1.0,"yPos":0.0},{"tag":5,"xPos":-1.0,"yPos":1.0}],"clears":[{"type":2,"goal":2}],"cases":[3,3],"bullets":[],"comments":null}
\ No newline at end of file
Assets/Prefabs/Objects/Mannequin/stage2_1.json.meta 0 → 100644
View file @ 425b0e0a
fileFormatVersion: 2
guid: 4cb2a098a3b4fed4db2b5476b4ceb0d1
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Prefabs/Objects/Mannequin/stage2_2.json 0 → 100644
View file @ 425b0e0a
{"objects":[{"tag":0,"xPos":15.0,"yPos":0.0},{"tag":2,"xPos":-1.0,"yPos":0.5},{"tag":3,"xPos":0.0,"yPos":0.5},{"tag":2,"xPos":1.0,"yPos":0.5},{"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":0.0},{"tag":1,"xPos":0.0,"yPos":1.0},{"tag":1,"xPos":1.0,"yPos":1.0},{"tag":9,"xPos":1.0,"yPos":1.0},{"tag":1,"xPos":1.0,"yPos":0.0},{"tag":1,"xPos":1.0,"yPos":-1.0},{"tag":4,"xPos":-1.0,"yPos":-1.0},{"tag":5,"xPos":0.0,"yPos":-1.0}],"clears":[{"type":0,"goal":1}],"cases":[0],"bullets":[],"comments":null}
\ No newline at end of file
Assets/Prefabs/Objects/Mannequin/stage2_2.json.meta 0 → 100644
View file @ 425b0e0a
fileFormatVersion: 2
guid: c72ad0186ca59974d9f6458942036a2a
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Prefabs/Objects/Mannequin/stage2_3.json 0 → 100644
View file @ 425b0e0a
{"objects":[{"tag":0,"xPos":15.0,"yPos":0.0},{"tag":3,"xPos":0.0,"yPos":0.5},{"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":0.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":4,"xPos":-1.0,"yPos":-1.0},{"tag":5,"xPos":0.0,"yPos":-1.0},{"tag":5,"xPos":1.0,"yPos":1.0}],"clears":[{"type":2,"goal":3}],"cases":[1,3],"bullets":[],"comments":null}
\ No newline at end of file
Assets/Prefabs/Objects/Mannequin/stage2_3.json.meta 0 → 100644
View file @ 425b0e0a
fileFormatVersion: 2
guid: 9d745b08d63ab5f449c615bbb719fa2a
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Prefabs/Objects/Mannequin/stage2_4.json 0 → 100644
View file @ 425b0e0a
{"objects":[{"tag":0,"xPos":20.0,"yPos":0.0},{"tag":3,"xPos":-0.5,"yPos":0.0},{"tag":3,"xPos":0.5,"yPos":1.0},{"tag":2,"xPos":-2.0,"yPos":0.5},{"tag":2,"xPos":-1.5,"yPos":1.0},{"tag":2,"xPos":-1.0,"yPos":0.5},{"tag":2,"xPos":1.0,"yPos":0.5},{"tag":2,"xPos":-0.5,"yPos":-2.0},{"tag":1,"xPos":-2.0,"yPos":1.0},{"tag":9,"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":-2.0,"yPos":-2.0},{"tag":1,"xPos":-1.0,"yPos":-2.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":0.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":1.0,"yPos":-2.0},{"tag":1,"xPos":0.0,"yPos":-2.0},{"tag":1,"xPos":0.0,"yPos":-1.0},{"tag":4,"xPos":1.0,"yPos":-2.0},{"tag":5,"xPos":-2.0,"yPos":-1.0}],"clears":[{"type":0,"goal":1}],"cases":[0],"bullets":[1],"comments":null}
\ No newline at end of file
Assets/Prefabs/Objects/Mannequin/stage2_4.json.meta 0 → 100644
View file @ 425b0e0a
fileFormatVersion: 2
guid: a97f424e7c863524d836d0ed22ba6ec2
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Prefabs/Objects/Mannequin/stage3_1.json 0 → 100644
View file @ 425b0e0a
{"objects":[{"tag":0,"xPos":20.0,"yPos":0.0},{"tag":2,"xPos":0.5,"yPos":-1.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":-2.0,"yPos":-2.0},{"tag":1,"xPos":-1.0,"yPos":-2.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":0.0},{"tag":1,"xPos":0.0,"yPos":-1.0},{"tag":1,"xPos":0.0,"yPos":-2.0},{"tag":1,"xPos":1.0,"yPos":-2.0},{"tag":9,"xPos":1.0,"yPos":-2.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":4,"xPos":-2.0,"yPos":-2.0},{"tag":6,"xPos":0.0,"yPos":-1.0}],"clears":[{"type":0,"goal":1}],"cases":[],"bullets":[],"comments":null}
\ No newline at end of file
Assets/Prefabs/Objects/Mannequin/stage3_1.json.meta 0 → 100644
View file @ 425b0e0a
fileFormatVersion: 2
guid: 812eda7edbc366645ac43f0a141617ab
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Prefabs/Objects/Mannequin/stage3_2.json 0 → 100644
View file @ 425b0e0a
{"objects":[{"tag":0,"xPos":20.0,"yPos":0.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":-2.0,"yPos":-2.0},{"tag":1,"xPos":-1.0,"yPos":-2.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":0.0},{"tag":1,"xPos":0.0,"yPos":-1.0},{"tag":1,"xPos":0.0,"yPos":-2.0},{"tag":1,"xPos":1.0,"yPos":-2.0},{"tag":9,"xPos":1.0,"yPos":-2.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":4,"xPos":-2.0,"yPos":-2.0},{"tag":6,"xPos":0.0,"yPos":-1.0}],"clears":[{"type":0,"goal":1}],"cases":[],"bullets":[0],"comments":null}
\ No newline at end of file
Assets/Prefabs/Objects/Mannequin/stage3_2.json.meta 0 → 100644
View file @ 425b0e0a
fileFormatVersion: 2
guid: 33f36dc2a5ffdb24392cf3551b03226d
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Prefabs/Objects/Mannequin/stage3_3.json 0 → 100644
View file @ 425b0e0a
{"objects":[{"tag":0,"xPos":20.0,"yPos":0.0},{"tag":2,"xPos":-0.5,"yPos":1.0},{"tag":2,"xPos":-0.5,"yPos":-1.0},{"tag":3,"xPos":-0.5,"yPos":0.0},{"tag":1,"xPos":-2.0,"yPos":1.0},{"tag":1,"xPos":-2.0,"yPos":0.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":0.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":-1.0,"yPos":-1.0},{"tag":1,"xPos":-2.0,"yPos":-1.0},{"tag":1,"xPos":-2.0,"yPos":-2.0},{"tag":1,"xPos":-1.0,"yPos":-2.0},{"tag":1,"xPos":0.0,"yPos":-2.0},{"tag":1,"xPos":1.0,"yPos":-2.0},{"tag":4,"xPos":-2.0,"yPos":-2.0},{"tag":6,"xPos":1.0,"yPos":0.0},{"tag":5,"xPos":1.0,"yPos":1.0}],"clears":[{"type":0,"goal":0}],"cases":[3],"bullets":[1],"comments":null}
\ No newline at end of file
Assets/Prefabs/Objects/Mannequin/stage3_3.json.meta 0 → 100644
View file @ 425b0e0a
fileFormatVersion: 2
guid: 4c3a6a68b87f24443b33bce720645615
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Prefabs/Objects/Mannequin/stage3_4.json 0 → 100644
View file @ 425b0e0a
{"objects":[{"tag":0,"xPos":20.0,"yPos":0.0},{"tag":3,"xPos":-1.0,"yPos":-0.5},{"tag":2,"xPos":0.0,"yPos":-0.5},{"tag":2,"xPos":1.0,"yPos":-0.5},{"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":-2.0,"yPos":-2.0},{"tag":1,"xPos":-1.0,"yPos":-2.0},{"tag":1,"xPos":0.0,"yPos":-1.0},{"tag":1,"xPos":0.0,"yPos":0.0},{"tag":1,"xPos":0.0,"yPos":1.0},{"tag":1,"xPos":-1.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":1.0,"yPos":0.0},{"tag":1,"xPos":1.0,"yPos":-1.0},{"tag":1,"xPos":1.0,"yPos":-2.0},{"tag":1,"xPos":0.0,"yPos":-2.0},{"tag":4,"xPos":1.0,"yPos":-2.0},{"tag":6,"xPos":-2.0,"yPos":-1.0},{"tag":6,"xPos":-2.0,"yPos":-2.0}],"clears":[{"type":1,"goal":3}],"cases":[],"bullets":[0,1,0,0],"comments":null}
\ No newline at end of file
Assets/Prefabs/Objects/Mannequin/stage3_4.json.meta 0 → 100644
View file @ 425b0e0a
fileFormatVersion: 2
guid: 75450a9daac1c5e42b0f8d91ea5a6365
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Prefabs/Objects/Mannequin/stage3_5.json 0 → 100644
View file @ 425b0e0a
{"objects":[{"tag":0,"xPos":20.0,"yPos":0.0},{"tag":2,"xPos":-2.0,"yPos":-0.5},{"tag":2,"xPos":-1.0,"yPos":-0.5},{"tag":2,"xPos":0.5,"yPos":-1.0},{"tag":3,"xPos":0.0,"yPos":-0.5},{"tag":3,"xPos":1.0,"yPos":-0.5},{"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":-2.0,"yPos":-2.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":-1.0,"yPos":-2.0},{"tag":1,"xPos":0.0,"yPos":1.0},{"tag":1,"xPos":0.0,"yPos":0.0},{"tag":1,"xPos":0.0,"yPos":-1.0},{"tag":1,"xPos":0.0,"yPos":-2.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":1.0,"yPos":-2.0},{"tag":4,"xPos":-2.0,"yPos":-2.0},{"tag":6,"xPos":1.0,"yPos":-1.0},{"tag":5,"xPos":1.0,"yPos":-2.0}],"clears":[{"type":6,"goal":0}],"cases":[1],"bullets":[1],"comments":null}
\ No newline at end of file
Assets/Prefabs/Objects/Mannequin/stage3_5.json.meta 0 → 100644
View file @ 425b0e0a
fileFormatVersion: 2
guid: 28d5022bc5dd5454bbb2c04c15db97d4
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
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