Skip to content

Commit

Permalink
서브 스토리 추가
Browse files Browse the repository at this point in the history
짧막한 것들과 도박꾼, 정육점 추가
  • Loading branch information
miniron-v committed Jun 6, 2024
1 parent fc83940 commit c1f6003
Show file tree
Hide file tree
Showing 49 changed files with 686 additions and 1 deletion.
1 change: 0 additions & 1 deletion Assets/02. Scripts/Battle/Managers/GameManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,6 @@ public IEnumerator WinBattle()

// 배틀이 끝났음을 알린다.
DialogueManager.Instance.isBattleDone = true;
Debug.Log("전투 종료 알림 완료");
// 스토리 씬으로 넘어간다.
SwitchToStoryScene();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,9 @@ MonoBehaviour:
m_EditorClassIdentifier:
list:
- {fileID: 11400000, guid: 82bf9051293ea7b4fa11f9660e6d1098, type: 2}
- {fileID: 11400000, guid: 224a8ff005ff94148ab5b884a26f2554, type: 2}
- {fileID: 11400000, guid: 7ed4b25e781e6894b898a22cca549f36, type: 2}
- {fileID: 11400000, guid: d424aa9f057f52e49a62e871cb3e03f1, type: 2}
- {fileID: 11400000, guid: b1f1bace4e6a5144994cef8fcaf8f9db, type: 2}
- {fileID: 11400000, guid: 545d9def0f6912d478b646c0aed381dc, type: 2}
- {fileID: 11400000, guid: 8f0f4656bb587db41b500b36250244ee, type: 2}
21 changes: 21 additions & 0 deletions Assets/02. Scripts/Story/EventData SO/Events/Relation/RS1-1.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 41e3f233dbcc0434fbc8a44a7763d9bd, type: 3}
m_Name: RS1-1
m_EditorClassIdentifier:
eventID: 2
startIndex: 94
endIndex: 95
relationEvent: []
nextEvent: {fileID: 0}
addEvent:
- {fileID: 11400000, guid: 224a8ff005ff94148ab5b884a26f2554, type: 2}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions Assets/02. Scripts/Story/EventData SO/Events/Relation/RS1-2.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 41e3f233dbcc0434fbc8a44a7763d9bd, type: 3}
m_Name: RS1-2
m_EditorClassIdentifier:
eventID: 2
startIndex: 99
endIndex: 100
relationEvent: []
nextEvent: {fileID: 0}
addEvent:
- {fileID: 11400000, guid: 224a8ff005ff94148ab5b884a26f2554, type: 2}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions Assets/02. Scripts/Story/EventData SO/Events/Relation/RS1-3.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 41e3f233dbcc0434fbc8a44a7763d9bd, type: 3}
m_Name: RS1-3
m_EditorClassIdentifier:
eventID: 2
startIndex: 104
endIndex: 105
relationEvent: []
nextEvent: {fileID: 0}
addEvent:
- {fileID: 11400000, guid: 224a8ff005ff94148ab5b884a26f2554, type: 2}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions Assets/02. Scripts/Story/EventData SO/Events/Relation/RS2-1.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 41e3f233dbcc0434fbc8a44a7763d9bd, type: 3}
m_Name: RS2-1
m_EditorClassIdentifier:
eventID: 2
startIndex: 109
endIndex: 113
relationEvent: []
nextEvent: {fileID: 0}
addEvent:
- {fileID: 11400000, guid: 7ed4b25e781e6894b898a22cca549f36, type: 2}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions Assets/02. Scripts/Story/EventData SO/Events/Relation/RS2-2.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 41e3f233dbcc0434fbc8a44a7763d9bd, type: 3}
m_Name: RS2-2
m_EditorClassIdentifier:
eventID: 2
startIndex: 117
endIndex: 118
relationEvent: []
nextEvent: {fileID: 0}
addEvent:
- {fileID: 11400000, guid: 7ed4b25e781e6894b898a22cca549f36, type: 2}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions Assets/02. Scripts/Story/EventData SO/Events/Relation/RS5-1.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 41e3f233dbcc0434fbc8a44a7763d9bd, type: 3}
m_Name: RS5-1
m_EditorClassIdentifier:
eventID: 2
startIndex: 122
endIndex: 128
relationEvent: []
nextEvent: {fileID: 0}
addEvent: []

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions Assets/02. Scripts/Story/EventData SO/Events/Relation/RS5-2.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 41e3f233dbcc0434fbc8a44a7763d9bd, type: 3}
m_Name: RS5-2
m_EditorClassIdentifier:
eventID: 2
startIndex: 132
endIndex: 133
relationEvent: []
nextEvent: {fileID: 0}
addEvent: []

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions Assets/02. Scripts/Story/EventData SO/Events/Relation/RS6-1.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 41e3f233dbcc0434fbc8a44a7763d9bd, type: 3}
m_Name: RS6-1
m_EditorClassIdentifier:
eventID: 2
startIndex: 137
endIndex: 138
relationEvent: []
nextEvent: {fileID: 0}
addEvent:
- {fileID: 11400000, guid: 8f0f4656bb587db41b500b36250244ee, type: 2}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions Assets/02. Scripts/Story/EventData SO/Events/Relation/RS6-2.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 41e3f233dbcc0434fbc8a44a7763d9bd, type: 3}
m_Name: RS6-2
m_EditorClassIdentifier:
eventID: 2
startIndex: 142
endIndex: 143
relationEvent: []
nextEvent: {fileID: 0}
addEvent:
- {fileID: 11400000, guid: 8f0f4656bb587db41b500b36250244ee, type: 2}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions Assets/02. Scripts/Story/EventData SO/Events/Relation/RS7-1.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 41e3f233dbcc0434fbc8a44a7763d9bd, type: 3}
m_Name: RS7-1
m_EditorClassIdentifier:
eventID: 2
startIndex: 147
endIndex: 157
relationEvent: []
nextEvent: {fileID: 0}
addEvent: []

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions Assets/02. Scripts/Story/EventData SO/Events/Relation/RS7-2.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 41e3f233dbcc0434fbc8a44a7763d9bd, type: 3}
m_Name: RS7-2
m_EditorClassIdentifier:
eventID: 2
startIndex: 161
endIndex: 169
relationEvent: []
nextEvent: {fileID: 0}
addEvent: []

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions Assets/02. Scripts/Story/EventData SO/Events/Relation/RS7-3.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 41e3f233dbcc0434fbc8a44a7763d9bd, type: 3}
m_Name: RS7-3
m_EditorClassIdentifier:
eventID: 2
startIndex: 173
endIndex: 175
relationEvent: []
nextEvent: {fileID: 0}
addEvent: []

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit c1f6003

Please sign in to comment.