浏览代码
Merge branch 'main' into whiteboxing
Merge branch 'main' into whiteboxing
# Conflicts: # UOP1_Project/Assets/AddressableAssetsData/OSX/addressables_content_state.bin.meta # UOP1_Project/Assets/Scenes/Locations/Field_Farms.unity.meta # UOP1_Project/Assets/Scenes/WIP/TestingGround.unity # UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/FryKing.meta/main
Ciro Continisio
4 年前
当前提交
72d88c0d
共有 59 个文件被更改,包括 1986 次插入 和 308 次删除
-
7UOP1_Project/.gitignore
-
4UOP1_Project/Assets/.DS_Store
-
3UOP1_Project/Assets/AddressableAssetsData/AddressableAssetSettings.asset
-
6UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English (en).asset
-
6UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-French (fr).asset
-
5UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Italian (it).asset
-
525UOP1_Project/Assets/Art/Characters/FryKing/Animation/FryKing.controller
-
72UOP1_Project/Assets/Art/Characters/PhoenixChick/Animation/PhoenixChick.controller
-
4UOP1_Project/Assets/LocalizationFiles/AssetTables/Dialogue System/Actors/Actors Shared Data.asset
-
4UOP1_Project/Assets/LocalizationFiles/AssetTables/Dialogue System/Actors/Actors_en.asset
-
4UOP1_Project/Assets/LocalizationFiles/AssetTables/Dialogue System/Actors/Actors_fr.asset
-
4UOP1_Project/Assets/LocalizationFiles/AssetTables/QuestSystem/Questline Dialogue Shared Data.asset
-
4UOP1_Project/Assets/LocalizationFiles/AssetTables/QuestSystem/Questline Dialogue_en.asset
-
4UOP1_Project/Assets/LocalizationFiles/AssetTables/QuestSystem/Questline Dialogue_fr.asset
-
4UOP1_Project/Assets/LocalizationFiles/AssetTables/QuestSystem/Questline Dialogue_it.asset
-
135UOP1_Project/Assets/Prefabs/Characters/BardHare.prefab
-
361UOP1_Project/Assets/Prefabs/Characters/FryKing.prefab
-
137UOP1_Project/Assets/Prefabs/Characters/Townsfolk_F.prefab
-
137UOP1_Project/Assets/Prefabs/Characters/Townsfolk_M.prefab
-
317UOP1_Project/Assets/Scenes/WIP/TestingGround.unity
-
2UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/Dying.asset
-
2UOP1_Project/Assets/Scripts/Characters/NPC.cs
-
4UOP1_Project/Assets/Scripts/Dialogues/DialogueDataSO.cs
-
10UOP1_Project/Assets/Scripts/Quests/Editor/QuestEditorWindow.cs
-
2UOP1_Project/Assets/Scripts/Quests/Resources/QuestEditorWindow.uss
-
2UOP1_Project/Assets/Scripts/Quests/Resources/QuestEditorWindow.uxml
-
8UOP1_Project/Assets/Scripts/Quests/StepController.cs
-
31UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English.asset
-
8UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English.asset.meta
-
31UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-French.asset
-
8UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-French.asset.meta
-
30UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Italian.asset
-
8UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Italian.asset.meta
-
43UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-English_BundledAssetGroupSchema.asset
-
8UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-English_BundledAssetGroupSchema.asset.meta
-
16UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-English_ContentUpdateGroupSchema.asset
-
8UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-English_ContentUpdateGroupSchema.asset.meta
-
43UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-French_BundledAssetGroupSchema.asset
-
8UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-French_BundledAssetGroupSchema.asset.meta
-
16UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-French_ContentUpdateGroupSchema.asset
-
8UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-French_ContentUpdateGroupSchema.asset.meta
-
43UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-Italian_BundledAssetGroupSchema.asset
-
8UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-Italian_BundledAssetGroupSchema.asset.meta
-
16UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-Italian_ContentUpdateGroupSchema.asset
-
8UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-Italian_ContentUpdateGroupSchema.asset.meta
-
1UOP1_Project/Assets/LocalizationFiles/AssetTables/.DS_Store
-
24UOP1_Project/Assets/ScriptableObjects/Dialogue/Default-FryKing.asset
-
8UOP1_Project/Assets/ScriptableObjects/Dialogue/Default-FryKing.asset.meta
-
21UOP1_Project/Assets/ScriptableObjects/Narrative/Actors/FryKing.asset
-
8UOP1_Project/Assets/ScriptableObjects/Narrative/Actors/FryKing.asset.meta
-
8UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/FryKing.meta
-
96UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/FryKing/FryKing_TransitionTable.asset
-
8UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/FryKing/FryKing_TransitionTable.asset.meta
-
1UOP1_Project/Assets/Scripts/Quests/.DS_Store
-
1UOP1_Project/Assets/Scripts/.DS_Store
-
4.DS_Store
-
0/UOP1_Project/Assets/Scripts/Quests/Resources/DialogueUSS.uss
-
0/UOP1_Project/Assets/Scripts/Quests/Resources/DialogueUSS.uss.meta
4
UOP1_Project/Assets/.DS_Store
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
317
UOP1_Project/Assets/Scenes/WIP/TestingGround.unity
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
|
|||
%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: bbb281ee3bf0b054c82ac2347e9e782c, type: 3} |
|||
m_Name: Localization-String-Tables-English |
|||
m_EditorClassIdentifier: |
|||
m_GroupName: Localization-String-Tables-English |
|||
m_Data: |
|||
m_SerializedData: [] |
|||
m_GUID: 989d673df6cb49f488b56ae6ce01a7f4 |
|||
m_SerializeEntries: |
|||
- m_GUID: 8c990337c09944296842b163021829c8 |
|||
m_Address: Interactions_en |
|||
m_ReadOnly: 1 |
|||
m_SerializedLabels: |
|||
- Locale-en |
|||
- Preload |
|||
m_ReadOnly: 1 |
|||
m_Settings: {fileID: 11400000, guid: bffab80dc16c4464b92b2e97b6a1964c, type: 2} |
|||
m_SchemaSet: |
|||
m_Schemas: |
|||
- {fileID: 11400000, guid: 2c7ee465e974bf140b6da8373cd43f2b, type: 2} |
|||
- {fileID: 11400000, guid: e8dc6cafdd01b9f48a0eb43319b4685f, type: 2} |
|
|||
fileFormatVersion: 2 |
|||
guid: fcf8490568b5a0b47a7fe58d1033bfc3 |
|||
NativeFormatImporter: |
|||
externalObjects: {} |
|||
mainObjectFileID: 11400000 |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
|
|||
%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: bbb281ee3bf0b054c82ac2347e9e782c, type: 3} |
|||
m_Name: Localization-String-Tables-French |
|||
m_EditorClassIdentifier: |
|||
m_GroupName: Localization-String-Tables-French |
|||
m_Data: |
|||
m_SerializedData: [] |
|||
m_GUID: a03e1e4d6d832c240b67b8c65c66a59b |
|||
m_SerializeEntries: |
|||
- m_GUID: 75a54b82bfa6f4f9e8239e9940432c0d |
|||
m_Address: Interactions_fr |
|||
m_ReadOnly: 1 |
|||
m_SerializedLabels: |
|||
- Locale-fr |
|||
- Preload |
|||
m_ReadOnly: 1 |
|||
m_Settings: {fileID: 11400000, guid: bffab80dc16c4464b92b2e97b6a1964c, type: 2} |
|||
m_SchemaSet: |
|||
m_Schemas: |
|||
- {fileID: 11400000, guid: aa734b26428df8847be06964c75b5304, type: 2} |
|||
- {fileID: 11400000, guid: f2d3d7686f4ec334fbc1f4f15d25b18d, type: 2} |
|
|||
fileFormatVersion: 2 |
|||
guid: cecd62da149d34d45938fce625af29a6 |
|||
NativeFormatImporter: |
|||
externalObjects: {} |
|||
mainObjectFileID: 11400000 |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
|
|||
%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: bbb281ee3bf0b054c82ac2347e9e782c, type: 3} |
|||
m_Name: Localization-String-Tables-Italian |
|||
m_EditorClassIdentifier: |
|||
m_GroupName: Localization-String-Tables-Italian |
|||
m_Data: |
|||
m_SerializedData: [] |
|||
m_GUID: c29d8dc42aaf766429d7bec54cb6eb1e |
|||
m_SerializeEntries: |
|||
- m_GUID: 6ff28064e4e684b65b9c22aa501c01c5 |
|||
m_Address: Interactions_it |
|||
m_ReadOnly: 1 |
|||
m_SerializedLabels: |
|||
- Locale-it |
|||
m_ReadOnly: 1 |
|||
m_Settings: {fileID: 11400000, guid: bffab80dc16c4464b92b2e97b6a1964c, type: 2} |
|||
m_SchemaSet: |
|||
m_Schemas: |
|||
- {fileID: 11400000, guid: 3375e03a29e12c74db7958133e077468, type: 2} |
|||
- {fileID: 11400000, guid: a235c72ab72c9494aafb85957b596528, type: 2} |
|
|||
fileFormatVersion: 2 |
|||
guid: 38ec9971d12cc7f408261900bfc57b00 |
|||
NativeFormatImporter: |
|||
externalObjects: {} |
|||
mainObjectFileID: 11400000 |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
|
|||
%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: e5d17a21594effb4e9591490b009e7aa, type: 3} |
|||
m_Name: Localization-String-Tables-English_BundledAssetGroupSchema |
|||
m_EditorClassIdentifier: |
|||
m_Group: {fileID: 11400000, guid: fcf8490568b5a0b47a7fe58d1033bfc3, type: 2} |
|||
m_InternalBundleIdMode: 1 |
|||
m_Compression: 1 |
|||
m_IncludeAddressInCatalog: 1 |
|||
m_IncludeGUIDInCatalog: 1 |
|||
m_IncludeLabelsInCatalog: 1 |
|||
m_InternalIdNamingMode: 0 |
|||
m_CacheClearBehavior: 0 |
|||
m_IncludeInBuild: 1 |
|||
m_BundledAssetProviderType: |
|||
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null |
|||
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider |
|||
m_ForceUniqueProvider: 0 |
|||
m_UseAssetBundleCache: 1 |
|||
m_UseAssetBundleCrc: 1 |
|||
m_UseAssetBundleCrcForCachedBundles: 1 |
|||
m_Timeout: 0 |
|||
m_ChunkedTransfer: 0 |
|||
m_RedirectLimit: -1 |
|||
m_RetryCount: 0 |
|||
m_BuildPath: |
|||
m_Id: 5002d2ecf2c3647f8b6e3a264a6b45f8 |
|||
m_LoadPath: |
|||
m_Id: 343a2af8396fc47cb9e730bf77e141f0 |
|||
m_BundleMode: 0 |
|||
m_AssetBundleProviderType: |
|||
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null |
|||
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider |
|||
m_BundleNaming: 1 |
|
|||
fileFormatVersion: 2 |
|||
guid: 2c7ee465e974bf140b6da8373cd43f2b |
|||
NativeFormatImporter: |
|||
externalObjects: {} |
|||
mainObjectFileID: 11400000 |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
|
|||
%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: 5834b5087d578d24c926ce20cd31e6d6, type: 3} |
|||
m_Name: Localization-String-Tables-English_ContentUpdateGroupSchema |
|||
m_EditorClassIdentifier: |
|||
m_Group: {fileID: 11400000, guid: fcf8490568b5a0b47a7fe58d1033bfc3, type: 2} |
|||
m_StaticContent: 0 |
|
|||
fileFormatVersion: 2 |
|||
guid: e8dc6cafdd01b9f48a0eb43319b4685f |
|||
NativeFormatImporter: |
|||
externalObjects: {} |
|||
mainObjectFileID: 11400000 |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
|
|||
%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: e5d17a21594effb4e9591490b009e7aa, type: 3} |
|||
m_Name: Localization-String-Tables-French_BundledAssetGroupSchema |
|||
m_EditorClassIdentifier: |
|||
m_Group: {fileID: 11400000, guid: cecd62da149d34d45938fce625af29a6, type: 2} |
|||
m_InternalBundleIdMode: 1 |
|||
m_Compression: 1 |
|||
m_IncludeAddressInCatalog: 1 |
|||
m_IncludeGUIDInCatalog: 1 |
|||
m_IncludeLabelsInCatalog: 1 |
|||
m_InternalIdNamingMode: 0 |
|||
m_CacheClearBehavior: 0 |
|||
m_IncludeInBuild: 1 |
|||
m_BundledAssetProviderType: |
|||
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null |
|||
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider |
|||
m_ForceUniqueProvider: 0 |
|||
m_UseAssetBundleCache: 1 |
|||
m_UseAssetBundleCrc: 1 |
|||
m_UseAssetBundleCrcForCachedBundles: 1 |
|||
m_Timeout: 0 |
|||
m_ChunkedTransfer: 0 |
|||
m_RedirectLimit: -1 |
|||
m_RetryCount: 0 |
|||
m_BuildPath: |
|||
m_Id: 5002d2ecf2c3647f8b6e3a264a6b45f8 |
|||
m_LoadPath: |
|||
m_Id: 343a2af8396fc47cb9e730bf77e141f0 |
|||
m_BundleMode: 0 |
|||
m_AssetBundleProviderType: |
|||
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null |
|||
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider |
|||
m_BundleNaming: 1 |
|
|||
fileFormatVersion: 2 |
|||
guid: aa734b26428df8847be06964c75b5304 |
|||
NativeFormatImporter: |
|||
externalObjects: {} |
|||
mainObjectFileID: 11400000 |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
|
|||
%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: 5834b5087d578d24c926ce20cd31e6d6, type: 3} |
|||
m_Name: Localization-String-Tables-French_ContentUpdateGroupSchema |
|||
m_EditorClassIdentifier: |
|||
m_Group: {fileID: 11400000, guid: cecd62da149d34d45938fce625af29a6, type: 2} |
|||
m_StaticContent: 0 |
|
|||
fileFormatVersion: 2 |
|||
guid: f2d3d7686f4ec334fbc1f4f15d25b18d |
|||
NativeFormatImporter: |
|||
externalObjects: {} |
|||
mainObjectFileID: 11400000 |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
|
|||
%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: e5d17a21594effb4e9591490b009e7aa, type: 3} |
|||
m_Name: Localization-String-Tables-Italian_BundledAssetGroupSchema |
|||
m_EditorClassIdentifier: |
|||
m_Group: {fileID: 11400000, guid: 38ec9971d12cc7f408261900bfc57b00, type: 2} |
|||
m_InternalBundleIdMode: 1 |
|||
m_Compression: 1 |
|||
m_IncludeAddressInCatalog: 1 |
|||
m_IncludeGUIDInCatalog: 1 |
|||
m_IncludeLabelsInCatalog: 1 |
|||
m_InternalIdNamingMode: 0 |
|||
m_CacheClearBehavior: 0 |
|||
m_IncludeInBuild: 1 |
|||
m_BundledAssetProviderType: |
|||
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null |
|||
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider |
|||
m_ForceUniqueProvider: 0 |
|||
m_UseAssetBundleCache: 1 |
|||
m_UseAssetBundleCrc: 1 |
|||
m_UseAssetBundleCrcForCachedBundles: 1 |
|||
m_Timeout: 0 |
|||
m_ChunkedTransfer: 0 |
|||
m_RedirectLimit: -1 |
|||
m_RetryCount: 0 |
|||
m_BuildPath: |
|||
m_Id: 5002d2ecf2c3647f8b6e3a264a6b45f8 |
|||
m_LoadPath: |
|||
m_Id: 343a2af8396fc47cb9e730bf77e141f0 |
|||
m_BundleMode: 0 |
|||
m_AssetBundleProviderType: |
|||
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null |
|||
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider |
|||
m_BundleNaming: 1 |
|
|||
fileFormatVersion: 2 |
|||
guid: 3375e03a29e12c74db7958133e077468 |
|||
NativeFormatImporter: |
|||
externalObjects: {} |
|||
mainObjectFileID: 11400000 |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
|
|||
%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: 5834b5087d578d24c926ce20cd31e6d6, type: 3} |
|||
m_Name: Localization-String-Tables-Italian_ContentUpdateGroupSchema |
|||
m_EditorClassIdentifier: |
|||
m_Group: {fileID: 11400000, guid: 38ec9971d12cc7f408261900bfc57b00, type: 2} |
|||
m_StaticContent: 0 |
|
|||
fileFormatVersion: 2 |
|||
guid: a235c72ab72c9494aafb85957b596528 |
|||
NativeFormatImporter: |
|||
externalObjects: {} |
|||
mainObjectFileID: 11400000 |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
1
UOP1_Project/Assets/LocalizationFiles/AssetTables/.DS_Store
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
|
|||
%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: a0c0171b565b4074a9462307824be26c, type: 3} |
|||
m_Name: Default-FryKing |
|||
m_EditorClassIdentifier: |
|||
_actor: {fileID: 11400000, guid: 2f14ee79b2fa2574480372fff57ec101, type: 2} |
|||
_dialogueLines: |
|||
- m_TableReference: |
|||
m_TableCollectionName: Questline Dialogue |
|||
m_TableEntryReference: |
|||
m_KeyId: 0 |
|||
m_Key: L1-Default-FryKing |
|||
m_FallbackState: 0 |
|||
_choices: [] |
|||
_dialogueType: 0 |
|
|||
fileFormatVersion: 2 |
|||
guid: de0c5f70bf8e19743a163583c1b560f1 |
|||
NativeFormatImporter: |
|||
externalObjects: {} |
|||
mainObjectFileID: 11400000 |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
|
|||
%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: f991c0f5eb9677944ae00c1b61548e72, type: 3} |
|||
m_Name: FryKing |
|||
m_EditorClassIdentifier: |
|||
_actorName: |
|||
m_TableReference: |
|||
m_TableCollectionName: GUID:9c592d2d4c7fc459f94a645873569195 |
|||
m_TableEntryReference: |
|||
m_KeyId: 73168485301583872 |
|||
m_Key: |
|||
m_FallbackState: 0 |
|
|||
fileFormatVersion: 2 |
|||
guid: 2f14ee79b2fa2574480372fff57ec101 |
|||
NativeFormatImporter: |
|||
externalObjects: {} |
|||
mainObjectFileID: 11400000 |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
|
|||
fileFormatVersion: 2 |
|||
guid: d2a67910b1a3ed444a52658ef643465c |
|||
folderAsset: yes |
|||
DefaultImporter: |
|||
externalObjects: {} |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
|
|||
%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: 872cbaa965d1f6e4e98365d74e2060df, type: 3} |
|||
m_Name: FryKing_TransitionTable |
|||
m_EditorClassIdentifier: |
|||
_transitions: |
|||
- FromState: {fileID: 11400000, guid: 7aedcd9c179a4824eaf24451ab5689ba, type: 2} |
|||
ToState: {fileID: 11400000, guid: 1aad0cd7a387c6544a113d9fa8df1ce3, type: 2} |
|||
Conditions: |
|||
- ExpectedResult: 0 |
|||
Condition: {fileID: 11400000, guid: 13401f769215f3245807de4b2ea14759, type: 2} |
|||
Operator: 0 |
|||
- ExpectedResult: 0 |
|||
Condition: {fileID: 11400000, guid: 11d32529e8bdbc24e81d7b578426352c, type: 2} |
|||
Operator: 0 |
|||
- FromState: {fileID: 11400000, guid: 1aad0cd7a387c6544a113d9fa8df1ce3, type: 2} |
|||
ToState: {fileID: 11400000, guid: 7aedcd9c179a4824eaf24451ab5689ba, type: 2} |
|||
Conditions: |
|||
- ExpectedResult: 1 |
|||
Condition: {fileID: 11400000, guid: 13401f769215f3245807de4b2ea14759, type: 2} |
|||
Operator: 0 |
|||
- ExpectedResult: 0 |
|||
Condition: {fileID: 11400000, guid: 1748abd46aa04284b8bf442050ef790f, type: 2} |
|||
Operator: 1 |
|||
- ExpectedResult: 0 |
|||
Condition: {fileID: 11400000, guid: 87426477fd21a254d8cd4ff826d4ee29, type: 2} |
|||
Operator: 0 |
|||
- FromState: {fileID: 11400000, guid: 7aedcd9c179a4824eaf24451ab5689ba, type: 2} |
|||
ToState: {fileID: 11400000, guid: 3388e91c73e51e845a78aa522a2f2bda, type: 2} |
|||
Conditions: |
|||
- ExpectedResult: 0 |
|||
Condition: {fileID: 11400000, guid: f4c89ffbe6ca8fe46ae22ec9d191671a, type: 2} |
|||
Operator: 0 |
|||
- ExpectedResult: 0 |
|||
Condition: {fileID: 11400000, guid: 4f15fe7b4afb565469f360b403d50f64, type: 2} |
|||
Operator: 0 |
|||
- FromState: {fileID: 11400000, guid: 3388e91c73e51e845a78aa522a2f2bda, type: 2} |
|||
ToState: {fileID: 11400000, guid: 7aedcd9c179a4824eaf24451ab5689ba, type: 2} |
|||
Conditions: |
|||
- ExpectedResult: 1 |
|||
Condition: {fileID: 11400000, guid: f4c89ffbe6ca8fe46ae22ec9d191671a, type: 2} |
|||
Operator: 0 |
|||
- ExpectedResult: 0 |
|||
Condition: {fileID: 11400000, guid: 1748abd46aa04284b8bf442050ef790f, type: 2} |
|||
Operator: 1 |
|||
- FromState: {fileID: 11400000, guid: 1aad0cd7a387c6544a113d9fa8df1ce3, type: 2} |
|||
ToState: {fileID: 11400000, guid: 3388e91c73e51e845a78aa522a2f2bda, type: 2} |
|||
Conditions: |
|||
- ExpectedResult: 0 |
|||
Condition: {fileID: 11400000, guid: f4c89ffbe6ca8fe46ae22ec9d191671a, type: 2} |
|||
Operator: 0 |
|||
- ExpectedResult: 0 |
|||
Condition: {fileID: 11400000, guid: 4f15fe7b4afb565469f360b403d50f64, type: 2} |
|||
Operator: 0 |
|||
- FromState: {fileID: 11400000, guid: 3388e91c73e51e845a78aa522a2f2bda, type: 2} |
|||
ToState: {fileID: 11400000, guid: 1aad0cd7a387c6544a113d9fa8df1ce3, type: 2} |
|||
Conditions: |
|||
- ExpectedResult: 1 |
|||
Condition: {fileID: 11400000, guid: f4c89ffbe6ca8fe46ae22ec9d191671a, type: 2} |
|||
Operator: 0 |
|||
- ExpectedResult: 0 |
|||
Condition: {fileID: 11400000, guid: 13401f769215f3245807de4b2ea14759, type: 2} |
|||
Operator: 0 |
|||
- FromState: {fileID: 11400000, guid: 3388e91c73e51e845a78aa522a2f2bda, type: 2} |
|||
ToState: {fileID: 11400000, guid: b815b7da412ff164abfb213e11d27ace, type: 2} |
|||
Conditions: |
|||
- ExpectedResult: 0 |
|||
Condition: {fileID: 11400000, guid: dcb00df815f03384cb096d4556e5ba95, type: 2} |
|||
Operator: 0 |
|||
- FromState: {fileID: 11400000, guid: b815b7da412ff164abfb213e11d27ace, type: 2} |
|||
ToState: {fileID: 11400000, guid: 3388e91c73e51e845a78aa522a2f2bda, type: 2} |
|||
Conditions: |
|||
- ExpectedResult: 1 |
|||
Condition: {fileID: 11400000, guid: f4c89ffbe6ca8fe46ae22ec9d191671a, type: 2} |
|||
Operator: 1 |
|||
- ExpectedResult: 0 |
|||
Condition: {fileID: 11400000, guid: f7264f99aeb6a8046b637306314556da, type: 2} |
|||
Operator: 0 |
|||
- FromState: {fileID: 11400000, guid: 7aedcd9c179a4824eaf24451ab5689ba, type: 2} |
|||
ToState: {fileID: 11400000, guid: b815b7da412ff164abfb213e11d27ace, type: 2} |
|||
Conditions: |
|||
- ExpectedResult: 0 |
|||
Condition: {fileID: 11400000, guid: f4c89ffbe6ca8fe46ae22ec9d191671a, type: 2} |
|||
Operator: 0 |
|||
- ExpectedResult: 1 |
|||
Condition: {fileID: 11400000, guid: 4f15fe7b4afb565469f360b403d50f64, type: 2} |
|||
Operator: 0 |
|
|||
fileFormatVersion: 2 |
|||
guid: 820fcf3a4b0ccf04997075bbc7c589da |
|||
NativeFormatImporter: |
|||
externalObjects: {} |
|||
mainObjectFileID: 11400000 |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
1
UOP1_Project/Assets/Scripts/Quests/.DS_Store
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
1
UOP1_Project/Assets/Scripts/.DS_Store
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
4
.DS_Store
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
撰写
预览
正在加载...
取消
保存
Reference in new issue