diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-Assets-Shared.asset b/Assets/AddressableAssetsData/AssetGroups/Localization-Assets-Shared.asset index cfef65b..9cda9ad 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Localization-Assets-Shared.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Localization-Assets-Shared.asset @@ -16,7 +16,13 @@ MonoBehaviour: m_Data: m_SerializedData: [] m_GUID: 1040aa312d4f02443b5e508db1e56754 - m_SerializeEntries: [] + m_SerializeEntries: + - m_GUID: 2fefaa175576a0e48bf5b28cb5260137 + m_Address: Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Configuration/Localization/New + Table Shared Data.asset + m_ReadOnly: 1 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 m_ReadOnly: 1 m_Settings: {fileID: 11400000, guid: 45bcaa0f9119bdc44b426e7814210719, type: 2} m_SchemaSet: diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English (en).asset b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English (en).asset index 46ec820..4b803e5 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English (en).asset +++ b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English (en).asset @@ -16,7 +16,13 @@ MonoBehaviour: m_Data: m_SerializedData: [] m_GUID: 3cd2dd60838011f4889bda962aee86d4 - m_SerializeEntries: [] + m_SerializeEntries: + - m_GUID: b116f7f945ba841459985a93b349b0db + m_Address: New Table_en + m_ReadOnly: 1 + m_SerializedLabels: + - Locale-en + FlaggedDuringContentUpdateRestriction: 0 m_ReadOnly: 1 m_Settings: {fileID: 11400000, guid: 45bcaa0f9119bdc44b426e7814210719, type: 2} m_SchemaSet: diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Japanese (ja).asset b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Japanese (ja).asset index 1fb1bd3..7f2166c 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Japanese (ja).asset +++ b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Japanese (ja).asset @@ -16,7 +16,13 @@ MonoBehaviour: m_Data: m_SerializedData: [] m_GUID: 299b8fcb43493c24dab08422c770f08d - m_SerializeEntries: [] + m_SerializeEntries: + - m_GUID: daf8da3f04f5bbb4e9ea7ce90731c0f8 + m_Address: New Table_ja + m_ReadOnly: 1 + m_SerializedLabels: + - Locale-ja + FlaggedDuringContentUpdateRestriction: 0 m_ReadOnly: 1 m_Settings: {fileID: 11400000, guid: 45bcaa0f9119bdc44b426e7814210719, type: 2} m_SchemaSet: diff --git a/Assets/AddressableAssetsData/ProfileDataSourceSettings.asset b/Assets/AddressableAssetsData/ProfileDataSourceSettings.asset new file mode 100644 index 0000000..588fc4c --- /dev/null +++ b/Assets/AddressableAssetsData/ProfileDataSourceSettings.asset @@ -0,0 +1,34 @@ +%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: 7e3976da977cb49238499ea3b4c237ae, type: 3} + m_Name: ProfileDataSourceSettings + m_EditorClassIdentifier: + profileGroupTypes: + - m_GroupTypePrefix: Built-In + m_Variables: + - m_Suffix: BuildPath + m_Value: '[UnityEngine.AddressableAssets.Addressables.BuildPath]/[BuildTarget]' + - m_Suffix: LoadPath + m_Value: '{UnityEngine.AddressableAssets.Addressables.RuntimePath}/[BuildTarget]' + - m_GroupTypePrefix: Editor Hosted + m_Variables: + - m_Suffix: BuildPath + m_Value: ServerData/[BuildTarget] + - m_Suffix: LoadPath + m_Value: http://[PrivateIpAddress]:[HostingServicePort] + environments: [] + currentEnvironment: + id: + projectId: + projectGenesisId: + name: + isDefault: 0 diff --git a/Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Configuration/Localization/String Table 1_en.asset.meta b/Assets/AddressableAssetsData/ProfileDataSourceSettings.asset.meta similarity index 79% rename from Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Configuration/Localization/String Table 1_en.asset.meta rename to Assets/AddressableAssetsData/ProfileDataSourceSettings.asset.meta index 7e25393..0314d5d 100644 --- a/Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Configuration/Localization/String Table 1_en.asset.meta +++ b/Assets/AddressableAssetsData/ProfileDataSourceSettings.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7bbc00478bb37d140a48433f55e4e6f6 +guid: 58390bf63d851d2438c085b5fa958eae NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/AddressableAssetsData/Windows.meta b/Assets/AddressableAssetsData/Windows.meta new file mode 100644 index 0000000..0b30db6 --- /dev/null +++ b/Assets/AddressableAssetsData/Windows.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: db151198c09bebc46ace9ef4c428ec54 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Packages/com.studio23.ss2.dialoguesystem/Runtime/Core/DialogueSystem.cs b/Assets/Packages/com.studio23.ss2.dialoguesystem/Runtime/Core/DialogueSystem.cs index c258d65..f005858 100644 --- a/Assets/Packages/com.studio23.ss2.dialoguesystem/Runtime/Core/DialogueSystem.cs +++ b/Assets/Packages/com.studio23.ss2.dialoguesystem/Runtime/Core/DialogueSystem.cs @@ -64,6 +64,11 @@ public void StartDialogue(DialogueGraph graph) PlayDialogue(graph); } + public void StartDialogue() + { + PlayDialogue(_currentGraph); + } + public async UniTask PlayDialogue(DialogueGraph graph) { _currentGraph = graph; @@ -82,7 +87,7 @@ public async UniTask PlayDialogue(DialogueGraph graph) } _currentGraph.HandleDialogueEnded(); - OnDialogueEnded?.Invoke(_currentGraph); + OnDialogueEnded?.Invoke(_currentGraph); Debug.Log($"{graph} dialogue completed"); } diff --git a/Assets/Packages/com.studio23.ss2.dialoguesystem/Runtime/Data/xNode/Node/DialogueLineNodeBase.cs b/Assets/Packages/com.studio23.ss2.dialoguesystem/Runtime/Data/xNode/Node/DialogueLineNodeBase.cs index 752f148..4ada38d 100644 --- a/Assets/Packages/com.studio23.ss2.dialoguesystem/Runtime/Data/xNode/Node/DialogueLineNodeBase.cs +++ b/Assets/Packages/com.studio23.ss2.dialoguesystem/Runtime/Data/xNode/Node/DialogueLineNodeBase.cs @@ -38,16 +38,17 @@ public virtual void InvokePostPlayEvents() { if (eventNodeConnection.node is EventNode eventNode) { - eventNode.Event.Invoke(); + Debug.Log($"Invoke event {eventNode} on {this}", this); + eventNode.Invoke(); } else { - Debug.LogWarning($"{this} Events port no {i} is connected to {eventNodeConnection.node} but it's not an event node"); + Debug.LogWarning($"{this} Events port no {i} is connected to {eventNodeConnection.node} but it's not an event node", this); } } else { - Debug.LogWarning($"{this} Events port no {i} is connected to {eventNodeConnection} but connection null"); + Debug.LogWarning($"{this} Events port no {i} is connected to {eventNodeConnection} but connection null", this); } } } diff --git a/Assets/Packages/com.studio23.ss2.dialoguesystem/Runtime/Data/xNode/Node/EventNode.cs b/Assets/Packages/com.studio23.ss2.dialoguesystem/Runtime/Data/xNode/Node/EventNode.cs index ce605f0..0fe51a3 100644 --- a/Assets/Packages/com.studio23.ss2.dialoguesystem/Runtime/Data/xNode/Node/EventNode.cs +++ b/Assets/Packages/com.studio23.ss2.dialoguesystem/Runtime/Data/xNode/Node/EventNode.cs @@ -1,3 +1,4 @@ +using UnityEngine; using UnityEngine.Events; using XNode; @@ -9,7 +10,12 @@ public class EventNode : DialogueGraphNodeBase [Input] public int Entry; - public UnityEvent Event; + [SerializeField] UnityEvent Event; + + public void Invoke() + { + Event.Invoke(); + } public override void Initialize() { //do nothing diff --git a/Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Configuration/Localization/String Table 1 Shared Data.asset b/Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Configuration/Localization/New Table Shared Data.asset similarity index 58% rename from Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Configuration/Localization/String Table 1 Shared Data.asset rename to Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Configuration/Localization/New Table Shared Data.asset index f8fb185..a657aed 100644 --- a/Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Configuration/Localization/String Table 1 Shared Data.asset +++ b/Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Configuration/Localization/New Table Shared Data.asset @@ -10,59 +10,59 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5b11a58205ec3474ca216360e9fa74a8, type: 3} - m_Name: String Table 1 Shared Data + m_Name: New Table Shared Data m_EditorClassIdentifier: - m_TableCollectionName: String Table 1 - m_TableCollectionNameGuidString: 86a08eccdabf3a24e812720793183e8e + m_TableCollectionName: New Table + m_TableCollectionNameGuidString: 2fefaa175576a0e48bf5b28cb5260137 m_Entries: - - m_Id: 48421580800 - m_Key: Ehe + - m_Id: 57598717952 + m_Key: Start m_Metadata: m_Items: [] - - m_Id: 5198200614912 - m_Key: YAMATE KUDASTOP + - m_Id: 162359848960 + m_Key: next line m_Metadata: m_Items: [] - - m_Id: 5591559221248 - m_Key: hehe + - m_Id: 297877811200 + m_Key: before choice m_Metadata: m_Items: [] - - m_Id: 5729732177920 - m_Key: OH NOES + - m_Id: 379343777792 + m_Key: Choice 1 m_Metadata: m_Items: [] - - m_Id: 41327062855680 - m_Key: INFINITE LOOP + - m_Id: 714133123072 + m_Key: YAMETEKUDASTOP m_Metadata: m_Items: [] - - m_Id: 41376861827072 - m_Key: TOHOO + - m_Id: 819397570560 + m_Key: Choice 2 m_Metadata: m_Items: [] - - m_Id: 41524757180416 - m_Key: BOOL IS ON + - m_Id: 1000310484992 + m_Key: Ehe m_Metadata: m_Items: [] - - m_Id: 41708056653824 - m_Key: START + - m_Id: 1087413596160 + m_Key: Bool test m_Metadata: m_Items: [] - - m_Id: 41751006326784 - m_Key: HEHEHEHEHEHE + - m_Id: 1245450776576 + m_Key: Loop convesation m_Metadata: m_Items: [] - - m_Id: 41789728141312 - m_Key: HOHOHO + - m_Id: 1312790327296 + m_Key: STAND BACK m_Metadata: m_Items: [] m_Metadata: m_Items: [] m_KeyGenerator: - rid: 4806151239593623577 + rid: 4806151557843517450 references: version: 2 RefIds: - - rid: 4806151239593623577 + - rid: 4806151557843517450 type: {class: DistributedUIDGenerator, ns: UnityEngine.Localization.Tables, asm: Unity.Localization} data: - m_CustomEpoch: 1704355215275 + m_CustomEpoch: 1705566415762 diff --git a/Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Configuration/Localization/String Table 1 Shared Data.asset.meta b/Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Configuration/Localization/New Table Shared Data.asset.meta similarity index 79% rename from Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Configuration/Localization/String Table 1 Shared Data.asset.meta rename to Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Configuration/Localization/New Table Shared Data.asset.meta index dcaec81..5b91154 100644 --- a/Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Configuration/Localization/String Table 1 Shared Data.asset.meta +++ b/Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Configuration/Localization/New Table Shared Data.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6e97d173561d5834cbe9ecb3aa5665c4 +guid: 2fefaa175576a0e48bf5b28cb5260137 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Configuration/Localization/String Table 1.asset b/Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Configuration/Localization/New Table.asset similarity index 67% rename from Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Configuration/Localization/String Table 1.asset rename to Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Configuration/Localization/New Table.asset index 9b99a07..7344f44 100644 --- a/Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Configuration/Localization/String Table 1.asset +++ b/Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Configuration/Localization/New Table.asset @@ -10,12 +10,12 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5be51871efa6c3e4eae1703925c8f5ac, type: 3} - m_Name: String Table 1 + m_Name: New Table m_EditorClassIdentifier: - m_SharedTableData: {fileID: 11400000, guid: 86a08eccdabf3a24e812720793183e8e, type: 2} + m_SharedTableData: {fileID: 11400000, guid: 2fefaa175576a0e48bf5b28cb5260137, type: 2} m_Tables: - - {fileID: 11400000, guid: d4da86ebffb58044493a4c0cb8f68e1f, type: 2} - - {fileID: 11400000, guid: b7ac3b9cc332a4d489a6248958a7992c, type: 2} + - {fileID: 11400000, guid: b116f7f945ba841459985a93b349b0db, type: 2} + - {fileID: 11400000, guid: daf8da3f04f5bbb4e9ea7ce90731c0f8, type: 2} m_Extensions: [] m_Group: String Table references: diff --git a/Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Configuration/Localization/String Table 1_ja.asset.meta b/Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Configuration/Localization/New Table.asset.meta similarity index 79% rename from Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Configuration/Localization/String Table 1_ja.asset.meta rename to Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Configuration/Localization/New Table.asset.meta index 55dfc65..9fb945d 100644 --- a/Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Configuration/Localization/String Table 1_ja.asset.meta +++ b/Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Configuration/Localization/New Table.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d31f4cf47b8a60e43bff8d291879fcc4 +guid: 28130bc6e73be4d4b9fb89bf63f61dd5 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Configuration/Localization/String Table 1_en.asset b/Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Configuration/Localization/New Table_en.asset similarity index 57% rename from Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Configuration/Localization/String Table 1_en.asset rename to Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Configuration/Localization/New Table_en.asset index fac72fe..28450a4 100644 --- a/Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Configuration/Localization/String Table 1_en.asset +++ b/Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Configuration/Localization/New Table_en.asset @@ -10,52 +10,52 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e9620f8c34305754d8cc9a7e49e852d9, type: 3} - m_Name: String Table 1_en + m_Name: New Table_en m_EditorClassIdentifier: m_LocaleId: m_Code: en - m_SharedData: {fileID: 11400000, guid: 86a08eccdabf3a24e812720793183e8e, type: 2} + m_SharedData: {fileID: 11400000, guid: 2fefaa175576a0e48bf5b28cb5260137, type: 2} m_Metadata: m_Items: [] m_TableData: - - m_Id: 48421580800 - m_Localized: Ehe + - m_Id: 57598717952 + m_Localized: Start m_Metadata: m_Items: [] - - m_Id: 5198200614912 - m_Localized: YAMATE KUDASTOP + - m_Id: 162359848960 + m_Localized: next line m_Metadata: m_Items: [] - - m_Id: 5591559221248 - m_Localized: hehe + - m_Id: 297877811200 + m_Localized: before choice m_Metadata: m_Items: [] - - m_Id: 5729732177920 - m_Localized: OH NOES + - m_Id: 379343777792 + m_Localized: Choice 1 m_Metadata: m_Items: [] - - m_Id: 41327062855680 - m_Localized: INFINITE LOOP + - m_Id: 714133123072 + m_Localized: YAMETEKUDASTOP m_Metadata: m_Items: [] - - m_Id: 41376861827072 - m_Localized: TOHOO + - m_Id: 819397570560 + m_Localized: Choice 2 m_Metadata: m_Items: [] - - m_Id: 41524757180416 - m_Localized: BOOL IS ON + - m_Id: 1000310484992 + m_Localized: Ehe m_Metadata: m_Items: [] - - m_Id: 41708056653824 - m_Localized: START + - m_Id: 1087413596160 + m_Localized: Shown if bool is on m_Metadata: m_Items: [] - - m_Id: 41751006326784 - m_Localized: HEHEHEHEHEHE + - m_Id: 1245450776576 + m_Localized: Loop convesation m_Metadata: m_Items: [] - - m_Id: 41789728141312 - m_Localized: HOHOHO + - m_Id: 1312790327296 + m_Localized: STAND BACK I'M ABOUT TO LOOP m_Metadata: m_Items: [] references: diff --git a/Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Configuration/Localization/String Table 1.asset.meta b/Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Configuration/Localization/New Table_en.asset.meta similarity index 79% rename from Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Configuration/Localization/String Table 1.asset.meta rename to Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Configuration/Localization/New Table_en.asset.meta index 10bc052..2f509bb 100644 --- a/Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Configuration/Localization/String Table 1.asset.meta +++ b/Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Configuration/Localization/New Table_en.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: dd25a1c91af88c5488f67fb80418e031 +guid: b116f7f945ba841459985a93b349b0db NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Configuration/Localization/String Table 1_ja.asset b/Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Configuration/Localization/New Table_ja.asset similarity index 57% rename from Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Configuration/Localization/String Table 1_ja.asset rename to Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Configuration/Localization/New Table_ja.asset index 20a42e5..f623ce7 100644 --- a/Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Configuration/Localization/String Table 1_ja.asset +++ b/Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Configuration/Localization/New Table_ja.asset @@ -10,52 +10,52 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e9620f8c34305754d8cc9a7e49e852d9, type: 3} - m_Name: String Table 1_ja + m_Name: New Table_ja m_EditorClassIdentifier: m_LocaleId: m_Code: ja - m_SharedData: {fileID: 11400000, guid: 86a08eccdabf3a24e812720793183e8e, type: 2} + m_SharedData: {fileID: 11400000, guid: 2fefaa175576a0e48bf5b28cb5260137, type: 2} m_Metadata: m_Items: [] m_TableData: - - m_Id: 48421580800 - m_Localized: Ehe + - m_Id: 57598717952 + m_Localized: Start m_Metadata: m_Items: [] - - m_Id: 5198200614912 - m_Localized: YAMATE KUDASTOP + - m_Id: 162359848960 + m_Localized: next line m_Metadata: m_Items: [] - - m_Id: 5591559221248 - m_Localized: hehe + - m_Id: 297877811200 + m_Localized: before choice m_Metadata: m_Items: [] - - m_Id: 5729732177920 - m_Localized: OH NOES + - m_Id: 379343777792 + m_Localized: Choice 1 m_Metadata: m_Items: [] - - m_Id: 41327062855680 - m_Localized: INFINITE LOOP + - m_Id: 714133123072 + m_Localized: YAMETEKUDASTOP m_Metadata: m_Items: [] - - m_Id: 41376861827072 - m_Localized: TOHOO + - m_Id: 819397570560 + m_Localized: Choice 2 m_Metadata: m_Items: [] - - m_Id: 41524757180416 - m_Localized: BOOL IS ON + - m_Id: 1000310484992 + m_Localized: Ehe m_Metadata: m_Items: [] - - m_Id: 41708056653824 - m_Localized: START + - m_Id: 1087413596160 + m_Localized: Shown if bool is on m_Metadata: m_Items: [] - - m_Id: 41751006326784 - m_Localized: HEHEHEHEHEHE + - m_Id: 1245450776576 + m_Localized: Loop convesation m_Metadata: m_Items: [] - - m_Id: 41789728141312 - m_Localized: HOHOHO + - m_Id: 1312790327296 + m_Localized: STAND BACK I'M ABOUT TO LOOP m_Metadata: m_Items: [] references: diff --git a/Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Configuration/Localization/New Table_ja.asset.meta b/Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Configuration/Localization/New Table_ja.asset.meta new file mode 100644 index 0000000..9bcbe29 --- /dev/null +++ b/Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Configuration/Localization/New Table_ja.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: daf8da3f04f5bbb4e9ea7ce90731c0f8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Resources/DialogueSystem/Graphs/Dialogue Graph 1.asset b/Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Resources/DialogueSystem/Graphs/Dialogue Graph 1.asset index 52a0875..c289047 100644 --- a/Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Resources/DialogueSystem/Graphs/Dialogue Graph 1.asset +++ b/Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Resources/DialogueSystem/Graphs/Dialogue Graph 1.asset @@ -52,9 +52,9 @@ MonoBehaviour: _dynamic: 0 DialogueLocalizedString: m_TableReference: - m_TableCollectionName: GUID:86a08eccdabf3a24e812720793183e8e + m_TableCollectionName: GUID:2fefaa175576a0e48bf5b28cb5260137 m_TableEntryReference: - m_KeyId: 41524757180416 + m_KeyId: 1087413596160 m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 @@ -129,9 +129,9 @@ MonoBehaviour: _dynamic: 0 DialogueLocalizedString: m_TableReference: - m_TableCollectionName: GUID:86a08eccdabf3a24e812720793183e8e + m_TableCollectionName: GUID:2fefaa175576a0e48bf5b28cb5260137 m_TableEntryReference: - m_KeyId: 41327062855680 + m_KeyId: 1312790327296 m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 @@ -200,9 +200,9 @@ MonoBehaviour: _dynamic: 0 DialogueLocalizedString: m_TableReference: - m_TableCollectionName: GUID:86a08eccdabf3a24e812720793183e8e + m_TableCollectionName: GUID:2fefaa175576a0e48bf5b28cb5260137 m_TableEntryReference: - m_KeyId: 41789728141312 + m_KeyId: 297877811200 m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 @@ -271,9 +271,9 @@ MonoBehaviour: _dynamic: 0 DialogueLocalizedString: m_TableReference: - m_TableCollectionName: GUID:86a08eccdabf3a24e812720793183e8e + m_TableCollectionName: GUID:2fefaa175576a0e48bf5b28cb5260137 m_TableEntryReference: - m_KeyId: 48421580800 + m_KeyId: 379343777792 m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 @@ -343,9 +343,9 @@ MonoBehaviour: _dynamic: 0 DialogueLocalizedString: m_TableReference: - m_TableCollectionName: GUID:86a08eccdabf3a24e812720793183e8e + m_TableCollectionName: GUID:2fefaa175576a0e48bf5b28cb5260137 m_TableEntryReference: - m_KeyId: 41751006326784 + m_KeyId: 162359848960 m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 @@ -377,6 +377,7 @@ MonoBehaviour: keys: - Exit - Events + - Events 0 values: - _fieldName: Exit _node: {fileID: -1822135301059774123} @@ -399,11 +400,23 @@ MonoBehaviour: _connectionType: 0 _typeConstraint: 0 _dynamic: 0 + - _fieldName: Events 0 + _node: {fileID: -1822135301059774123} + _typeQualifiedName: System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 + connections: + - fieldName: Entry + node: {fileID: 5592580153945411639} + reroutePoints: [] + _direction: 1 + _connectionType: 0 + _typeConstraint: 0 + _dynamic: 1 DialogueLocalizedString: m_TableReference: - m_TableCollectionName: GUID:86a08eccdabf3a24e812720793183e8e + m_TableCollectionName: GUID:2fefaa175576a0e48bf5b28cb5260137 m_TableEntryReference: - m_KeyId: 41708056653824 + m_KeyId: 57598717952 m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 @@ -436,11 +449,11 @@ MonoBehaviour: - {fileID: 8111244045218751293} - {fileID: -6489933969369151722} - {fileID: -7258830810515598621} - - {fileID: 401710227361937087} - {fileID: 8927815714544073783} - {fileID: 1247732052999767825} - {fileID: 7322660833987517088} - {fileID: -2988117806070830359} + - {fileID: 5592580153945411639} SkippableDialogue: 0 _startNode: {fileID: -1822135301059774123} _conditions: [] @@ -456,15 +469,15 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ec49cc29eabb402cb2c82d97a8fd32c9, type: 3} + m_Script: {fileID: 11500000, guid: 3f654240b01e3904ab62127b6101a775, type: 3} m_Name: Test Bool m_EditorClassIdentifier: graph: {fileID: 11400000} - position: {x: -1144, y: 376} + position: {x: 0, y: 0} ports: keys: [] values: [] - IsTrue: 1 + IsTrue: 0 --- !u!114 &1247732052999767825 MonoBehaviour: m_ObjectHideFlags: 0 @@ -520,9 +533,9 @@ MonoBehaviour: _dynamic: 0 DialogueLocalizedString: m_TableReference: - m_TableCollectionName: GUID:86a08eccdabf3a24e812720793183e8e + m_TableCollectionName: GUID:2fefaa175576a0e48bf5b28cb5260137 m_TableEntryReference: - m_KeyId: 41376861827072 + m_KeyId: 1245450776576 m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 @@ -589,9 +602,9 @@ MonoBehaviour: _dynamic: 0 DialogueLocalizedString: m_TableReference: - m_TableCollectionName: GUID:86a08eccdabf3a24e812720793183e8e + m_TableCollectionName: GUID:2fefaa175576a0e48bf5b28cb5260137 m_TableEntryReference: - m_KeyId: 5198200614912 + m_KeyId: 714133123072 m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 @@ -605,6 +618,40 @@ MonoBehaviour: references: version: 2 RefIds: [] +--- !u!114 &5592580153945411639 +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: 15f374202db79ae42ac267b0047a95ef, type: 3} + m_Name: Event + m_EditorClassIdentifier: + graph: {fileID: 11400000} + position: {x: -1960, y: 440} + ports: + keys: + - Entry + values: + - _fieldName: Entry + _node: {fileID: 5592580153945411639} + _typeQualifiedName: System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 + connections: + - fieldName: Events 0 + node: {fileID: -1822135301059774123} + reroutePoints: [] + _direction: 0 + _connectionType: 0 + _typeConstraint: 0 + _dynamic: 0 + Entry: 0 + Event: + m_PersistentCalls: + m_Calls: [] --- !u!114 &7322660833987517088 MonoBehaviour: m_ObjectHideFlags: 0 @@ -618,7 +665,7 @@ MonoBehaviour: m_Name: Dialogue Choice m_EditorClassIdentifier: graph: {fileID: 11400000} - position: {x: -648, y: 8} + position: {x: -520, y: 40} ports: keys: - Entry @@ -660,9 +707,9 @@ MonoBehaviour: _dynamic: 0 DialogueLocalizedString: m_TableReference: - m_TableCollectionName: GUID:86a08eccdabf3a24e812720793183e8e + m_TableCollectionName: GUID:2fefaa175576a0e48bf5b28cb5260137 m_TableEntryReference: - m_KeyId: 5591559221248 + m_KeyId: 819397570560 m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 @@ -690,7 +737,7 @@ MonoBehaviour: m_Name: Bi Way Dialogue m_EditorClassIdentifier: graph: {fileID: 11400000} - position: {x: -136, y: 24} + position: {x: -120, y: 56} ports: keys: - Entry @@ -729,9 +776,9 @@ MonoBehaviour: _dynamic: 0 DialogueLocalizedString: m_TableReference: - m_TableCollectionName: GUID:86a08eccdabf3a24e812720793183e8e + m_TableCollectionName: GUID:2fefaa175576a0e48bf5b28cb5260137 m_TableEntryReference: - m_KeyId: 5729732177920 + m_KeyId: 1000310484992 m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 @@ -758,7 +805,7 @@ MonoBehaviour: m_Name: Dialogue Choices m_EditorClassIdentifier: graph: {fileID: 11400000} - position: {x: -1192, y: -40} + position: {x: -1080, y: 136} ports: keys: - Entry diff --git a/Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Scene/SampleScene.unity b/Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Scene/SampleScene.unity index 041de4d..57efd34 100644 --- a/Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Scene/SampleScene.unity +++ b/Assets/Packages/com.studio23.ss2.dialoguesystem/Samples/DialogueChoiceDemo/Scene/SampleScene.unity @@ -230,7 +230,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e4ea025ed7d24ba45bbd001f88df602b, type: 3} m_Name: m_EditorClassIdentifier: - _currentGraph: {fileID: 11400000, guid: 3febf9daccac3fa4a81a0212ac8e782c, type: 2} + _currentGraph: {fileID: 11400000, guid: a52bd472061ea824089a21ac012b405b, type: 2} _curNode: {fileID: 0} --- !u!114 &956320142 MonoBehaviour: @@ -986,10 +986,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c008de1dc3854a46936dcfdfb971d6e8, type: 3} m_Name: m_EditorClassIdentifier: - _sortedChoices: [] - _buttonContainer: {fileID: 1126433870} - _buttonPrefab: {fileID: 8035196018851654212, guid: 8354b9d00f13f0b4ca2dcd08bcd44152, type: 3} - _spawnedButtons: [] --- !u!1 &1456424668 GameObject: m_ObjectHideFlags: 0 @@ -1050,12 +1046,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fc09cb0cd50138a4797efe998aeea794, type: 3} m_Name: m_EditorClassIdentifier: - DialogueTMP: {fileID: 1838186516} - TextLocalizer: {fileID: 1838186517} - BackgroundImage: {fileID: 381729576} - UIRoot: {fileID: 1456424668} - CharacterTable: {fileID: 11400000, guid: b8c5304e45a3b1c40b83014cb17fade9, type: 2} - _config: {fileID: 11400000, guid: af1672c5418360342a7f541ba08250ba, type: 2} --- !u!1 &1813981465 GameObject: m_ObjectHideFlags: 0 @@ -1272,8 +1262,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0d7ad9dc974fe9f47a9f4913e7ed1959, type: 3} m_Name: m_EditorClassIdentifier: - tmpTarget: {fileID: 1838186516} - localizer: {fileID: 1838186518} --- !u!114 &1838186518 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Packages/com.studio23.ss2.dialoguesystem/package.json b/Assets/Packages/com.studio23.ss2.dialoguesystem/package.json index f10e8c5..9ec32c8 100644 --- a/Assets/Packages/com.studio23.ss2.dialoguesystem/package.json +++ b/Assets/Packages/com.studio23.ss2.dialoguesystem/package.json @@ -29,7 +29,7 @@ { "displayName": "Subtitle Demo", "description": "A small sample to demonstrate how to use the library for showing subtitiles", - "path": "Samples/SubtitleDemo" + "path": "Samples~/SubtitleDemo" } ], diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 8f4a842..bdbb69d 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -7,4 +7,4 @@ EditorBuildSettings: m_Scenes: [] m_configObjects: com.unity.addressableassets: {fileID: 11400000, guid: 83bd880b80a26a34283ea7b2c593b118, type: 2} - com.unity.localization.settings: {fileID: 11400000, guid: f974dd27755df9f4f963bcf48cf0767c, type: 2} + com.unity.localization.settings: {fileID: 11400000, guid: 590f6a8252de3aa4abf62a829397124d, type: 2} diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index 7b7658d..8d0bce7 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -6,7 +6,7 @@ QualitySettings: serializedVersion: 5 m_CurrentQuality: 5 m_QualitySettings: - - serializedVersion: 2 + - serializedVersion: 3 name: Very Low pixelLightCount: 0 shadows: 0 @@ -18,17 +18,21 @@ QualitySettings: shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 0 - blendWeights: 1 - textureQuality: 1 + skinWeights: 1 + globalTextureMipmapLimit: 1 + textureMipmapLimitSettings: [] anisotropicTextures: 0 antiAliasing: 0 softParticles: 0 softVegetation: 0 realtimeReflectionProbes: 0 billboardsFaceCameraPosition: 0 + useLegacyDetailDistribution: 1 vSyncCount: 0 + realtimeGICPUUsage: 25 lodBias: 0.3 maximumLODLevel: 0 + enableLODCrossFade: 1 streamingMipmapsActive: 0 streamingMipmapsAddAllCameras: 1 streamingMipmapsMemoryBudget: 512 @@ -40,8 +44,18 @@ QualitySettings: asyncUploadBufferSize: 16 asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 + customRenderPipeline: {fileID: 0} + terrainQualityOverrides: 0 + terrainPixelError: 1 + terrainDetailDensityScale: 1 + terrainBasemapDistance: 1000 + terrainDetailDistance: 80 + terrainTreeDistance: 5000 + terrainBillboardStart: 50 + terrainFadeLength: 5 + terrainMaxTrees: 50 excludedTargetPlatforms: [] - - serializedVersion: 2 + - serializedVersion: 3 name: Low pixelLightCount: 0 shadows: 0 @@ -53,17 +67,21 @@ QualitySettings: shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 0 - blendWeights: 2 - textureQuality: 0 + skinWeights: 2 + globalTextureMipmapLimit: 0 + textureMipmapLimitSettings: [] anisotropicTextures: 0 antiAliasing: 0 softParticles: 0 softVegetation: 0 realtimeReflectionProbes: 0 billboardsFaceCameraPosition: 0 + useLegacyDetailDistribution: 1 vSyncCount: 0 + realtimeGICPUUsage: 25 lodBias: 0.4 maximumLODLevel: 0 + enableLODCrossFade: 1 streamingMipmapsActive: 0 streamingMipmapsAddAllCameras: 1 streamingMipmapsMemoryBudget: 512 @@ -75,8 +93,18 @@ QualitySettings: asyncUploadBufferSize: 16 asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 + customRenderPipeline: {fileID: 0} + terrainQualityOverrides: 0 + terrainPixelError: 1 + terrainDetailDensityScale: 1 + terrainBasemapDistance: 1000 + terrainDetailDistance: 80 + terrainTreeDistance: 5000 + terrainBillboardStart: 50 + terrainFadeLength: 5 + terrainMaxTrees: 50 excludedTargetPlatforms: [] - - serializedVersion: 2 + - serializedVersion: 3 name: Medium pixelLightCount: 1 shadows: 1 @@ -88,17 +116,21 @@ QualitySettings: shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 0 - blendWeights: 2 - textureQuality: 0 + skinWeights: 2 + globalTextureMipmapLimit: 0 + textureMipmapLimitSettings: [] anisotropicTextures: 1 antiAliasing: 0 softParticles: 0 softVegetation: 0 realtimeReflectionProbes: 0 billboardsFaceCameraPosition: 0 + useLegacyDetailDistribution: 1 vSyncCount: 1 + realtimeGICPUUsage: 25 lodBias: 0.7 maximumLODLevel: 0 + enableLODCrossFade: 1 streamingMipmapsActive: 0 streamingMipmapsAddAllCameras: 1 streamingMipmapsMemoryBudget: 512 @@ -110,8 +142,18 @@ QualitySettings: asyncUploadBufferSize: 16 asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 + customRenderPipeline: {fileID: 0} + terrainQualityOverrides: 0 + terrainPixelError: 1 + terrainDetailDensityScale: 1 + terrainBasemapDistance: 1000 + terrainDetailDistance: 80 + terrainTreeDistance: 5000 + terrainBillboardStart: 50 + terrainFadeLength: 5 + terrainMaxTrees: 50 excludedTargetPlatforms: [] - - serializedVersion: 2 + - serializedVersion: 3 name: High pixelLightCount: 2 shadows: 2 @@ -123,17 +165,21 @@ QualitySettings: shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 1 - blendWeights: 2 - textureQuality: 0 + skinWeights: 2 + globalTextureMipmapLimit: 0 + textureMipmapLimitSettings: [] anisotropicTextures: 1 antiAliasing: 0 softParticles: 0 softVegetation: 1 realtimeReflectionProbes: 1 billboardsFaceCameraPosition: 1 + useLegacyDetailDistribution: 1 vSyncCount: 1 + realtimeGICPUUsage: 50 lodBias: 1 maximumLODLevel: 0 + enableLODCrossFade: 1 streamingMipmapsActive: 0 streamingMipmapsAddAllCameras: 1 streamingMipmapsMemoryBudget: 512 @@ -145,8 +191,18 @@ QualitySettings: asyncUploadBufferSize: 16 asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 + customRenderPipeline: {fileID: 0} + terrainQualityOverrides: 0 + terrainPixelError: 1 + terrainDetailDensityScale: 1 + terrainBasemapDistance: 1000 + terrainDetailDistance: 80 + terrainTreeDistance: 5000 + terrainBillboardStart: 50 + terrainFadeLength: 5 + terrainMaxTrees: 50 excludedTargetPlatforms: [] - - serializedVersion: 2 + - serializedVersion: 3 name: Very High pixelLightCount: 3 shadows: 2 @@ -158,17 +214,21 @@ QualitySettings: shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 1 - blendWeights: 4 - textureQuality: 0 + skinWeights: 4 + globalTextureMipmapLimit: 0 + textureMipmapLimitSettings: [] anisotropicTextures: 2 antiAliasing: 2 softParticles: 1 softVegetation: 1 realtimeReflectionProbes: 1 billboardsFaceCameraPosition: 1 + useLegacyDetailDistribution: 1 vSyncCount: 1 + realtimeGICPUUsage: 50 lodBias: 1.5 maximumLODLevel: 0 + enableLODCrossFade: 1 streamingMipmapsActive: 0 streamingMipmapsAddAllCameras: 1 streamingMipmapsMemoryBudget: 512 @@ -180,8 +240,18 @@ QualitySettings: asyncUploadBufferSize: 16 asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 + customRenderPipeline: {fileID: 0} + terrainQualityOverrides: 0 + terrainPixelError: 1 + terrainDetailDensityScale: 1 + terrainBasemapDistance: 1000 + terrainDetailDistance: 80 + terrainTreeDistance: 5000 + terrainBillboardStart: 50 + terrainFadeLength: 5 + terrainMaxTrees: 50 excludedTargetPlatforms: [] - - serializedVersion: 2 + - serializedVersion: 3 name: Ultra pixelLightCount: 4 shadows: 2 @@ -193,17 +263,21 @@ QualitySettings: shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 1 - blendWeights: 4 - textureQuality: 0 + skinWeights: 4 + globalTextureMipmapLimit: 0 + textureMipmapLimitSettings: [] anisotropicTextures: 2 antiAliasing: 2 softParticles: 1 softVegetation: 1 realtimeReflectionProbes: 1 billboardsFaceCameraPosition: 1 + useLegacyDetailDistribution: 1 vSyncCount: 1 + realtimeGICPUUsage: 100 lodBias: 2 maximumLODLevel: 0 + enableLODCrossFade: 1 streamingMipmapsActive: 0 streamingMipmapsAddAllCameras: 1 streamingMipmapsMemoryBudget: 512 @@ -215,7 +289,18 @@ QualitySettings: asyncUploadBufferSize: 16 asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 + customRenderPipeline: {fileID: 0} + terrainQualityOverrides: 0 + terrainPixelError: 1 + terrainDetailDensityScale: 1 + terrainBasemapDistance: 1000 + terrainDetailDistance: 80 + terrainTreeDistance: 5000 + terrainBillboardStart: 50 + terrainFadeLength: 5 + terrainMaxTrees: 50 excludedTargetPlatforms: [] + m_TextureMipmapLimitGroupNames: [] m_PerPlatformDefaultQuality: Android: 2 Lumin: 5 @@ -223,6 +308,7 @@ QualitySettings: Nintendo Switch: 5 PS4: 5 PSP2: 2 + Server: 0 Stadia: 5 Standalone: 5 WebGL: 3 diff --git a/ProjectSettings/ScriptableBuildPipeline.json b/ProjectSettings/ScriptableBuildPipeline.json new file mode 100644 index 0000000..e6738dc --- /dev/null +++ b/ProjectSettings/ScriptableBuildPipeline.json @@ -0,0 +1,13 @@ +{ + "useBuildCacheServer": false, + "cacheServerHost": "", + "cacheServerPort": 8126, + "threadedArchiving": true, + "logCacheMiss": false, + "slimWriteResults": true, + "maximumCacheSize": 20, + "useDetailedBuildLog": false, + "useV2Hasher": true, + "fileIDHashSeed": 0, + "prefabPackedHeaderSize": 2 +} \ No newline at end of file