Commit f4ec1461 authored by 15박보승's avatar 15박보승

mergescene 빠진부분 작업, EdgeEffect 수정

parent ea3eab31
......@@ -286,7 +286,7 @@ ParticleSystem:
startSize:
serializedVersion: 2
minMaxState: 0
scalar: 0.1
scalar: 0.3
minScalar: 1
maxCurve:
serializedVersion: 2
......
......@@ -1958,8 +1958,6 @@ MonoBehaviour:
m_EditorClassIdentifier:
levelList:
- {fileID: 11400000, guid: ccbc7c89d2b01a9469123e252cc2ecd6, type: 2}
- {fileID: 0}
- {fileID: 0}
ForwardNoteObject: {fileID: 8354046899824507576, guid: a13dadc44404fcd4f8cfb986339b1507,
type: 3}
EdgeNoteObjects:
......@@ -1972,6 +1970,8 @@ MonoBehaviour:
- {fileID: 5999576302179210679, guid: 39e07a022f545624db4f9f7a8480a8d3, type: 3}
- {fileID: 5740315542072016546, guid: e640eeafa4d7b8645b26c885d7eba308, type: 3}
- {fileID: 6174125659501725093, guid: b8ffb5b84b254524abff419289c5adfd, type: 3}
edgeHitEffectPrefab: {fileID: 4885439205028740642, guid: 5fea3dd5a73f8574aa47be477618f7ff,
type: 3}
gunSfx: {fileID: 8300000, guid: 7eb98e62c3fbe5344aa72ecad87ce5cc, type: 3}
explosion: {fileID: 0}
fire:
......
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