iwnc2020/CapersProject
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
hho210 2025-01-16 20:07:16 +09:00
commit 3790861a5d
7 changed files with 209373 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

208592
Assets/01.Scenes/05.DialogueTest.unity Normal file
View File

File diff suppressed because it is too large Load Diff

7
Assets/01.Scenes/05.DialogueTest.unity.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 1852fbfc45417d44ea9fb675ddea79b8
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

2
Assets/02.Scripts/PlayerInputKeyManager.cs
View File

@ -88,7 +88,7 @@ namespace BlueWater
{
SwitchCurrentActionMap(InputActionMaps.TycoonUi);
}
else if (currentSceneName == SceneName.Tycoon || currentSceneName == SceneName.TycoonTest)
else if (currentSceneName == SceneName.Tycoon || currentSceneName == SceneName.TycoonTest || currentSceneName == SceneName.DialogueTest)
{
SwitchCurrentActionMap(InputActionMaps.Tycoon);
}

1
Assets/02.Scripts/SceneController.cs
View File

@ -14,6 +14,7 @@ namespace BlueWater
public static string Tycoon = "01.Tycoon";
public static string Combat = "02.Combat";
public static string TycoonTest = "04.TycoonTest";
public static string DialogueTest = "05.DialogueTest";
}
public class SceneController : Singleton<SceneController>

810
Assets/BlueWater (Auto-Backup).asset
View File

@ -40,13 +40,13 @@ MonoBehaviour:
- title: Name
value: TycoonPlayer
type: 0
typeString:
typeString: CustomFieldType_Text
- title: Pictures
value: '[]'
type: 3
typeString: CustomFieldType_Files
- title: Description
value: "\uD0C0\uC774\uCFE4 \uD50C\uB808\uC774\uC5B4"
value: "\uC8FC\uC778\uACF5"
type: 0
typeString: CustomFieldType_Text
- title: IsPlayer
@ -54,11 +54,11 @@ MonoBehaviour:
type: 2
typeString: CustomFieldType_Boolean
- title: Display Name
value: "\uB098"
value: "\uC8FC\uC778\uACF5"
type: 0
typeString:
typeString: CustomFieldType_Text
portrait: {fileID: 0}
spritePortrait: {fileID: 0}
spritePortrait: {fileID: 21300000, guid: 1629d87f32b5e1140ad0cad875010aa8, type: 3}
alternatePortraits: []
spritePortraits: []
- id: 2
@ -87,6 +87,32 @@ MonoBehaviour:
spritePortrait: {fileID: 0}
alternatePortraits: []
spritePortraits: []
- id: 3
fields:
- title: Name
value: FavorabilityNpc1
type: 0
typeString: CustomFieldType_Text
- title: Pictures
value: '[]'
type: 3
typeString: CustomFieldType_Files
- title: Description
value: "\uD638\uAC10\uB3C4\uCE90\uB9AD\uD1301"
type: 0
typeString: CustomFieldType_Text
- title: IsPlayer
value: False
type: 2
typeString: CustomFieldType_Boolean
- title: Display Name
value: "\uD638\uAC10\uB3C4\uCE90\uB9AD\uD1301"
type: 0
typeString: CustomFieldType_Text
portrait: {fileID: 0}
spritePortrait: {fileID: 21300000, guid: fa7e704f15fcd844eac9cbd56284cfe8, type: 3}
alternatePortraits: []
spritePortraits: []
items: []
locations: []
variables:
@ -234,7 +260,7 @@ MonoBehaviour:
isConnector: 0
priority: 2
conditionsString:
userScript: 'local randomValue = math.random(1, 3)
userScript: 'local randomValue = math.random(1, 5)
Variable["RandomChoice"]
= randomValue'
@ -243,8 +269,8 @@ MonoBehaviour:
m_Calls: []
canvasRect:
serializedVersion: 2
x: 289
y: 49
x: 496
y: 50
width: 160
height: 30
- id: 1
@ -341,8 +367,8 @@ MonoBehaviour:
m_Calls: []
canvasRect:
serializedVersion: 2
x: 293.59998
y: 132.39998
x: 288
y: 134
width: 160
height: 30
- id: 3
@ -432,15 +458,15 @@ MonoBehaviour:
falseConditionAction: Block
conditionPriority: 2
outgoingLinks: []
conditionsString:
conditionsString: Variable["RandomChoice"] == 4
userScript:
onExecute:
m_PersistentCalls:
m_Calls: []
canvasRect:
serializedVersion: 2
x: 100.99997
y: 264.80002
x: 704
y: 134
width: 160
height: 30
- id: 5
@ -481,15 +507,15 @@ MonoBehaviour:
falseConditionAction: Block
conditionPriority: 2
outgoingLinks: []
conditionsString:
conditionsString: Variable["RandomChoice"] == 5
userScript:
onExecute:
m_PersistentCalls:
m_Calls: []
canvasRect:
serializedVersion: 2
x: 455.40002
y: 265.6
x: 912
y: 134
width: 160
height: 30
entryGroups: []
@ -604,7 +630,7 @@ MonoBehaviour:
isConnector: 0
priority: 2
conditionsString:
userScript: 'local randomValue = math.random(1, 3)
userScript: 'local randomValue = math.random(1, 4)
Variable["RandomChoice"]
= randomValue'
@ -613,8 +639,8 @@ MonoBehaviour:
m_Calls: []
canvasRect:
serializedVersion: 2
x: 353
y: 67
x: 392
y: 50
width: 160
height: 30
- id: 1
@ -662,8 +688,8 @@ MonoBehaviour:
m_Calls: []
canvasRect:
serializedVersion: 2
x: 129
y: 172
x: 80
y: 134
width: 160
height: 30
- id: 2
@ -711,8 +737,8 @@ MonoBehaviour:
m_Calls: []
canvasRect:
serializedVersion: 2
x: 332
y: 170
x: 288
y: 134
width: 160
height: 30
- id: 3
@ -760,8 +786,8 @@ MonoBehaviour:
m_Calls: []
canvasRect:
serializedVersion: 2
x: 551
y: 170
x: 496
y: 134
width: 160
height: 30
- id: 4
@ -803,15 +829,15 @@ MonoBehaviour:
falseConditionAction: Block
conditionPriority: 2
outgoingLinks: []
conditionsString:
conditionsString: Variable["RandomChoice"] == 4
userScript:
onExecute:
m_PersistentCalls:
m_Calls: []
canvasRect:
serializedVersion: 2
x: 433.8
y: 244.99998
x: 704
y: 134
width: 160
height: 30
entryGroups: []
@ -929,8 +955,8 @@ MonoBehaviour:
m_Calls: []
canvasRect:
serializedVersion: 2
x: 428
y: 117
x: 288
y: 50
width: 160
height: 30
- id: 1
@ -978,8 +1004,8 @@ MonoBehaviour:
m_Calls: []
canvasRect:
serializedVersion: 2
x: 219
y: 260
x: 80
y: 134
width: 160
height: 30
- id: 2
@ -1027,8 +1053,8 @@ MonoBehaviour:
m_Calls: []
canvasRect:
serializedVersion: 2
x: 462
y: 256
x: 288
y: 134
width: 160
height: 30
- id: 3
@ -1076,8 +1102,8 @@ MonoBehaviour:
m_Calls: []
canvasRect:
serializedVersion: 2
x: 717
y: 253
x: 496
y: 134
width: 160
height: 30
entryGroups: []
@ -1752,7 +1778,7 @@ MonoBehaviour:
type: 5
typeString: CustomFieldType_Actor
- title: Conversant
value: 2
value: -1
type: 5
typeString: CustomFieldType_Actor
- title: Menu Text
@ -1801,7 +1827,7 @@ MonoBehaviour:
type: 5
typeString: CustomFieldType_Actor
- title: Conversant
value: 2
value: -1
type: 5
typeString: CustomFieldType_Actor
- title: Menu Text
@ -1850,7 +1876,7 @@ MonoBehaviour:
type: 5
typeString: CustomFieldType_Actor
- title: Conversant
value: 2
value: -1
type: 5
typeString: CustomFieldType_Actor
- title: Menu Text
@ -1899,7 +1925,7 @@ MonoBehaviour:
type: 5
typeString: CustomFieldType_Actor
- title: Conversant
value: 2
value: -1
type: 5
typeString: CustomFieldType_Actor
- title: Menu Text
@ -1936,6 +1962,710 @@ MonoBehaviour:
entryGroups: []
canvasScrollPosition: {x: 0, y: 0}
canvasZoom: 1
- id: 8
fields:
- title: Title
value: FavorabilityTest
type: 0
typeString:
- title: Description
value:
type: 0
typeString:
- title: Actor
value: 1
type: 5
typeString: CustomFieldType_Actor
- title: Conversant
value: 3
type: 5
typeString: CustomFieldType_Actor
overrideSettings:
useOverrides: 0
overrideSubtitleSettings: 0
showNPCSubtitlesDuringLine: 1
showNPCSubtitlesWithResponses: 1
showPCSubtitlesDuringLine: 0
skipPCSubtitleAfterResponseMenu: 0
subtitleCharsPerSecond: 30
minSubtitleSeconds: 2
continueButton: 0
overrideSequenceSettings: 0
defaultSequence:
defaultPlayerSequence:
defaultResponseMenuSequence:
overrideInputSettings: 0
alwaysForceResponseMenu: 1
includeInvalidEntries: 0
responseTimeout: 0
emTagForOldResponses: 0
emTagForInvalidResponses: 0
cancelSubtitle:
key: 27
buttonName:
cancelConversation:
key: 27
buttonName:
nodeColor:
dialogueEntries:
- id: 0
fields:
- title: Title
value: START
type: 0
typeString:
- title: Description
value:
type: 0
typeString:
- title: Actor
value: 1
type: 5
typeString: CustomFieldType_Actor
- title: Conversant
value: 3
type: 5
typeString: CustomFieldType_Actor
- title: Menu Text
value:
type: 0
typeString:
- title: Dialogue Text
value:
type: 0
typeString:
- title: Sequence
value: None()
type: 0
typeString:
conversationID: 8
isRoot: 0
isGroup: 0
nodeColor:
delaySimStatus: 0
falseConditionAction: Block
conditionPriority: 2
outgoingLinks:
- originConversationID: 8
originDialogueID: 0
destinationConversationID: 8
destinationDialogueID: 1
isConnector: 0
priority: 2
- originConversationID: 8
originDialogueID: 0
destinationConversationID: 8
destinationDialogueID: 6
isConnector: 0
priority: 2
- originConversationID: 8
originDialogueID: 0
destinationConversationID: 8
destinationDialogueID: 7
isConnector: 0
priority: 2
conditionsString:
userScript:
onExecute:
m_PersistentCalls:
m_Calls: []
canvasRect:
serializedVersion: 2
x: 334.4
y: 26.000008
width: 160
height: 30
- id: 1
fields:
- title: Title
value:
type: 0
typeString: CustomFieldType_Text
- title: Description
value:
type: 0
typeString: CustomFieldType_Text
- title: Actor
value: 1
type: 5
typeString: CustomFieldType_Actor
- title: Conversant
value: 3
type: 5
typeString: CustomFieldType_Actor
- title: Menu Text
value:
type: 0
typeString: CustomFieldType_Text
- title: Dialogue Text
value: "\uC548\uB155?"
type: 0
typeString: CustomFieldType_Text
- title: Sequence
value:
type: 0
typeString: CustomFieldType_Text
conversationID: 8
isRoot: 0
isGroup: 0
nodeColor:
delaySimStatus: 0
falseConditionAction: Block
conditionPriority: 2
outgoingLinks:
- originConversationID: 8
originDialogueID: 1
destinationConversationID: 8
destinationDialogueID: 2
isConnector: 0
priority: 2
conditionsString:
userScript:
onExecute:
m_PersistentCalls:
m_Calls: []
canvasRect:
serializedVersion: 2
x: 149.79999
y: 124.19998
width: 160
height: 30
- id: 2
fields:
- title: Title
value:
type: 0
typeString: CustomFieldType_Text
- title: Description
value:
type: 0
typeString: CustomFieldType_Text
- title: Actor
value: 3
type: 5
typeString: CustomFieldType_Actor
- title: Conversant
value: 1
type: 5
typeString: CustomFieldType_Actor
- title: Menu Text
value:
type: 0
typeString: CustomFieldType_Text
- title: Dialogue Text
value: "\uBC18\uAC00\uC6CC!.\\n<color=red>\uD14C\uC2A4\uD2B8 \uC911\uC774\uC57C</color>"
type: 0
typeString: CustomFieldType_Text
- title: Sequence
value:
type: 0
typeString: CustomFieldType_Text
conversationID: 8
isRoot: 0
isGroup: 0
nodeColor:
delaySimStatus: 0
falseConditionAction: Block
conditionPriority: 2
outgoingLinks:
- originConversationID: 8
originDialogueID: 2
destinationConversationID: 8
destinationDialogueID: 4
isConnector: 0
priority: 2
conditionsString:
userScript:
onExecute:
m_PersistentCalls:
m_Calls: []
canvasRect:
serializedVersion: 2
x: 148.79999
y: 179.60002
width: 160
height: 30
- id: 4
fields:
- title: Title
value:
type: 0
typeString: CustomFieldType_Text
- title: Description
value:
type: 0
typeString: CustomFieldType_Text
- title: Actor
value: 3
type: 5
typeString: CustomFieldType_Actor
- title: Conversant
value: 1
type: 5
typeString: CustomFieldType_Actor
- title: Menu Text
value:
type: 0
typeString: CustomFieldType_Text
- title: Dialogue Text
value: "123456789\\n\uAC00\uB098\uB2E4\uB77C\uB9C8\uBC14\uC0AC"
type: 0
typeString: CustomFieldType_Text
- title: Sequence
value:
type: 0
typeString: CustomFieldType_Text
conversationID: 8
isRoot: 0
isGroup: 0
nodeColor:
delaySimStatus: 0
falseConditionAction: Block
conditionPriority: 2
outgoingLinks:
- originConversationID: 8
originDialogueID: 4
destinationConversationID: 8
destinationDialogueID: 5
isConnector: 0
priority: 2
conditionsString:
userScript:
onExecute:
m_PersistentCalls:
m_Calls: []
canvasRect:
serializedVersion: 2
x: 146.39998
y: 237.20001
width: 160
height: 30
- id: 5
fields:
- title: Title
value:
type: 0
typeString: CustomFieldType_Text
- title: Description
value:
type: 0
typeString: CustomFieldType_Text
- title: Actor
value: 3
type: 5
typeString: CustomFieldType_Actor
- title: Conversant
value: 1
type: 5
typeString: CustomFieldType_Actor
- title: Menu Text
value:
type: 0
typeString: CustomFieldType_Text
- title: Dialogue Text
value: "\uD14D\uC2A4\uD2B8 \uAE38\uC774 \uD14C\uC2A4\uD2B8\\n\u3134\u3141\u3147\uB77C\u3150\u3148\u3137\uCC28\u3150\u3134\u3147\u3134\u3141\uC78E\u3148\u3137\uCE20"
type: 0
typeString: CustomFieldType_Text
- title: Sequence
value:
type: 0
typeString: CustomFieldType_Text
conversationID: 8
isRoot: 0
isGroup: 0
nodeColor:
delaySimStatus: 0
falseConditionAction: Block
conditionPriority: 2
outgoingLinks: []
conditionsString:
userScript:
onExecute:
m_PersistentCalls:
m_Calls: []
canvasRect:
serializedVersion: 2
x: 146.39998
y: 286.40002
width: 160
height: 30
- id: 6
fields:
- title: Title
value:
type: 0
typeString: CustomFieldType_Text
- title: Description
value:
type: 0
typeString: CustomFieldType_Text
- title: Actor
value: 1
type: 5
typeString: CustomFieldType_Actor
- title: Conversant
value: 3
type: 5
typeString: CustomFieldType_Actor
- title: Menu Text
value:
type: 0
typeString: CustomFieldType_Text
- title: Dialogue Text
value: "\uD50C\uB808\uC774\uC5B4 \uC120\uD0DD\uC9C0 \uC5C6\uB294 \uB300\uD654
\uD14C\uC2A4\uD2B8"
type: 0
typeString: CustomFieldType_Text
- title: Sequence
value:
type: 0
typeString: CustomFieldType_Text
conversationID: 8
isRoot: 0
isGroup: 0
nodeColor:
delaySimStatus: 0
falseConditionAction: Block
conditionPriority: 2
outgoingLinks:
- originConversationID: 8
originDialogueID: 6
destinationConversationID: 8
destinationDialogueID: 8
isConnector: 0
priority: 2
conditionsString:
userScript:
onExecute:
m_PersistentCalls:
m_Calls: []
canvasRect:
serializedVersion: 2
x: 419.2
y: 121.6
width: 160
height: 30
- id: 7
fields:
- title: Title
value:
type: 0
typeString:
- title: Description
value:
type: 0
typeString:
- title: Actor
value: 1
type: 5
typeString: CustomFieldType_Actor
- title: Conversant
value: 3
type: 5
typeString: CustomFieldType_Actor
- title: Menu Text
value:
type: 0
typeString:
- title: Dialogue Text
value: "\uD14D\uC2A4\uD2B8 \uC560\uB2C8\uBA54\uC774\uC158 \uD14C\uC2A4\uD2B8"
type: 0
typeString:
- title: Sequence
value:
type: 0
typeString:
conversationID: 8
isRoot: 0
isGroup: 0
nodeColor:
delaySimStatus: 0
falseConditionAction: Block
conditionPriority: 2
outgoingLinks:
- originConversationID: 8
originDialogueID: 7
destinationConversationID: 8
destinationDialogueID: 11
isConnector: 0
priority: 2
conditionsString:
userScript:
onExecute:
m_PersistentCalls:
m_Calls: []
canvasRect:
serializedVersion: 2
x: 677.6
y: 123.2
width: 160
height: 30
- id: 8
fields:
- title: Title
value:
type: 0
typeString: CustomFieldType_Text
- title: Description
value:
type: 0
typeString: CustomFieldType_Text
- title: Actor
value: 3
type: 5
typeString: CustomFieldType_Actor
- title: Conversant
value: 1
type: 5
typeString: CustomFieldType_Actor
- title: Menu Text
value:
type: 0
typeString: CustomFieldType_Text
- title: Dialogue Text
value: "\uC548\uB155? \uC798 \uC9C0\uB0C8\uC5B4?"
type: 0
typeString: CustomFieldType_Text
- title: Sequence
value:
type: 0
typeString: CustomFieldType_Text
conversationID: 8
isRoot: 0
isGroup: 0
nodeColor:
delaySimStatus: 0
falseConditionAction: Block
conditionPriority: 2
outgoingLinks:
- originConversationID: 8
originDialogueID: 8
destinationConversationID: 8
destinationDialogueID: 9
isConnector: 0
priority: 2
conditionsString:
userScript:
onExecute:
m_PersistentCalls:
m_Calls: []
canvasRect:
serializedVersion: 2
x: 419.2
y: 171.6
width: 160
height: 30
- id: 9
fields:
- title: Title
value:
type: 0
typeString: CustomFieldType_Text
- title: Description
value:
type: 0
typeString: CustomFieldType_Text
- title: Actor
value: 1
type: 5
typeString: CustomFieldType_Actor
- title: Conversant
value: 3
type: 5
typeString: CustomFieldType_Actor
- title: Menu Text
value:
type: 0
typeString: CustomFieldType_Text
- title: Dialogue Text
value: "\uC751 \uC798 \uC9C0\uB0C8\uC5B4."
type: 0
typeString: CustomFieldType_Text
- title: Sequence
value:
type: 0
typeString: CustomFieldType_Text
conversationID: 8
isRoot: 0
isGroup: 0
nodeColor:
delaySimStatus: 0
falseConditionAction: Block
conditionPriority: 2
outgoingLinks:
- originConversationID: 8
originDialogueID: 9
destinationConversationID: 8
destinationDialogueID: 10
isConnector: 0
priority: 2
conditionsString:
userScript:
onExecute:
m_PersistentCalls:
m_Calls: []
canvasRect:
serializedVersion: 2
x: 419.2
y: 221.6
width: 160
height: 30
- id: 10
fields:
- title: Title
value:
type: 0
typeString:
- title: Description
value:
type: 0
typeString:
- title: Actor
value: 3
type: 5
typeString: CustomFieldType_Actor
- title: Conversant
value: 1
type: 5
typeString: CustomFieldType_Actor
- title: Menu Text
value:
type: 0
typeString:
- title: Dialogue Text
value: "\uB2E4\uD589\uC774\uB2E4."
type: 0
typeString:
- title: Sequence
value:
type: 0
typeString:
conversationID: 8
isRoot: 0
isGroup: 0
nodeColor:
delaySimStatus: 0
falseConditionAction: Block
conditionPriority: 2
outgoingLinks: []
conditionsString:
userScript:
onExecute:
m_PersistentCalls:
m_Calls: []
canvasRect:
serializedVersion: 2
x: 419.2
y: 271.6
width: 160
height: 30
- id: 11
fields:
- title: Title
value:
type: 0
typeString:
- title: Description
value:
type: 0
typeString:
- title: Actor
value: 3
type: 5
typeString: CustomFieldType_Actor
- title: Conversant
value: 1
type: 5
typeString: CustomFieldType_Actor
- title: Menu Text
value: "<rainb>\uBB34\uC9C0\uAC1C\uBE5B \uBC18\uC0AC</rainb>"
type: 0
typeString:
- title: Dialogue Text
value:
type: 0
typeString:
- title: Sequence
value:
type: 0
typeString:
conversationID: 8
isRoot: 0
isGroup: 0
nodeColor:
delaySimStatus: 0
falseConditionAction: Block
conditionPriority: 2
outgoingLinks:
- originConversationID: 8
originDialogueID: 11
destinationConversationID: 8
destinationDialogueID: 12
isConnector: 0
priority: 2
conditionsString:
userScript:
onExecute:
m_PersistentCalls:
m_Calls: []
canvasRect:
serializedVersion: 2
x: 677.6
y: 173.2
width: 160
height: 30
- id: 12
fields:
- title: Title
value:
type: 0
typeString:
- title: Description
value:
type: 0
typeString:
- title: Actor
value: 3
type: 5
typeString: CustomFieldType_Actor
- title: Conversant
value: 1
type: 5
typeString: CustomFieldType_Actor
- title: Menu Text
value:
type: 0
typeString:
- title: Dialogue Text
value: "<wiggle><color=red>\uC704\uAE00</color><color=blue>\uC704\uAE00</color><color=green>\uC704\uAE00</color></wiggle>"
type: 0
typeString:
- title: Sequence
value:
type: 0
typeString:
conversationID: 8
isRoot: 0
isGroup: 0
nodeColor:
delaySimStatus: 0
falseConditionAction: Block
conditionPriority: 2
outgoingLinks: []
conditionsString:
userScript:
onExecute:
m_PersistentCalls:
m_Calls: []
canvasRect:
serializedVersion: 2
x: 677.6
y: 223.2
width: 160
height: 30
entryGroups: []
canvasScrollPosition: {x: 4.25531, y: 11.063843}
canvasZoom: 0.94000006
syncInfo:
syncActors: 0
syncItems: 0

2
Assets/BlueWater (Auto-Backup).asset.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 9269b5fa2f423d74d9aca1bc0dec95ee
guid: 1cc6bebf238bcbf4f8f68d0fc975ed30
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000

2
ProjectSettings/ProjectSettings.asset
View File

@ -140,7 +140,7 @@ PlayerSettings:
loadStoreDebugModeEnabled: 0
visionOSBundleVersion: 1.0
tvOSBundleVersion: 1.0
bundleVersion: 0.1.0.0
bundleVersion: 0.1.0.2
preloadedAssets:
- {fileID: -944628639613478452, guid: 4ed6540e2f7ce234888adf8deff1f241, type: 3}
- {fileID: 11400000, guid: 112e4950c7d9b7a429feb9bb058a93a7, type: 2}