浏览代码

Fixing the merge

/main
Chema Damak 4 年前
当前提交
e7bcdcfd
共有 20 个文件被更改,包括 1108 次插入708 次删除
  1. 12
      UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Localization-Assets-Shared.asset
  2. 14
      UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Localization-StringTables.asset
  3. 2
      UOP1_Project/Assets/LocalizationFiles.meta
  4. 2
      UOP1_Project/Assets/LocalizationFiles/AssetTables.meta
  5. 2
      UOP1_Project/Assets/LocalizationFiles/Locales.meta
  6. 164
      UOP1_Project/Assets/Prefabs/UI/Game Screen.prefab
  7. 5
      UOP1_Project/Assets/Prefabs/UI/InteractionItem.prefab
  8. 818
      UOP1_Project/Assets/Prefabs/UI/InventoryScreen.prefab
  9. 362
      UOP1_Project/Assets/Scenes/Gameplay.unity
  10. 379
      UOP1_Project/Assets/Scenes/WIP/TestingGround.unity
  11. 8
      UOP1_Project/Assets/Inventory/Scripts.meta
  12. 8
      UOP1_Project/Assets/Localization Files.meta
  13. 8
      UOP1_Project/Assets/Localization Files/Asset Tables.meta
  14. 8
      UOP1_Project/Assets/Localization Files/Locales.meta
  15. 8
      UOP1_Project/Assets/AddressableAssetsData/Windows.meta
  16. 8
      UOP1_Project/Assets/Art/Nature/Flower.meta
  17. 8
      UOP1_Project/Assets/LocalizationFiles/AssetTables/Dialogue System/Dialogues.meta
  18. 0
      /UOP1_Project/Assets/Art/Effects/Dissolve/Dissolve.shadersubgraph
  19. 0
      /UOP1_Project/Assets/Art/Effects/Dissolve/Dissolve.shadersubgraph.meta

12
UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Localization-Assets-Shared.asset


m_SerializedLabels: []
m_MainAsset: {fileID: 0}
m_TargetAsset: {fileID: 0}
- m_GUID: 6a8afeec30be61d4bb23618ac27c2736
m_Address: Font Shared Data
m_ReadOnly: 0
m_SerializedLabels: []
m_MainAsset: {fileID: 0}
m_TargetAsset: {fileID: 0}
- m_GUID: 753c1cc38ecdc5a4b93227e74555c8d7
m_Address: Critters Shared Data
m_ReadOnly: 0
m_SerializedLabels: []
m_MainAsset: {fileID: 0}
m_TargetAsset: {fileID: 0}
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: bffab80dc16c4464b92b2e97b6a1964c, type: 2}
m_SchemaSet:

14
UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Localization-StringTables.asset


- Locale-en
m_MainAsset: {fileID: 0}
m_TargetAsset: {fileID: 0}
- m_GUID: 8d4813fc8788c4949b7fda8395a3840b
m_Address: Critters_en
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en
m_MainAsset: {fileID: 0}
m_TargetAsset: {fileID: 0}
- m_GUID: 379b9ca9db427c74bb0cd504865dea33
m_Address: Critters_fr
m_ReadOnly: 1
m_SerializedLabels:
- Locale-fr
m_MainAsset: {fileID: 0}
m_TargetAsset: {fileID: 0}
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: bffab80dc16c4464b92b2e97b6a1964c, type: 2}
m_SchemaSet:

2
UOP1_Project/Assets/LocalizationFiles.meta


fileFormatVersion: 2
guid: 7a067a060b0224eac97965278698c7d8
guid: 55a0e335e5d0745f48596921d0418126
folderAsset: yes
DefaultImporter:
externalObjects: {}

2
UOP1_Project/Assets/LocalizationFiles/AssetTables.meta


fileFormatVersion: 2
guid: 651577e4fc6124f69ace0f9d2257fe25
guid: 7e6e8df6c6501420f8db6bfcf2800dd8
folderAsset: yes
DefaultImporter:
externalObjects: {}

2
UOP1_Project/Assets/LocalizationFiles/Locales.meta


fileFormatVersion: 2
guid: 86b71319e99c748b5bfc5006e056485c
guid: a3943d98bae6445bf9675c526dc25682
folderAsset: yes
DefaultImporter:
externalObjects: {}

164
UOP1_Project/Assets/Prefabs/UI/Game Screen.prefab


m_Script: {fileID: 11500000, guid: 8f5450ac502f84bd89a993767b4d01e0, type: 3}
m_Name:
m_EditorClassIdentifier:
listInteractions:
- {fileID: 11400000, guid: 5cbae6c9eb2234189b57465fc303296b, type: 2}
- {fileID: 11400000, guid: be11dea017adc4146bebe7603a32ac65, type: 2}
_listInteractions:
interactionItem: {fileID: 1190722457586240764}
- {fileID: 11400000, guid: be11dea017adc4146bebe7603a32ac65, type: 2}
- {fileID: 11400000, guid: 5cbae6c9eb2234189b57465fc303296b, type: 2}
_interactionItem: {fileID: 1190722457586240764}
--- !u!1001 &2656605275679865762
PrefabInstance:
m_ObjectHideFlags: 0

m_Modifications:
- target: {fileID: 7833966164169029321, guid: db08b77f6847f4a8eb29ee9db04444e9,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
propertyPath: m_Pivot.x
value: 0.5
propertyPath: m_LocalPosition.y
value: 0
propertyPath: m_Pivot.y
value: 0.5
propertyPath: m_LocalPosition.z
propertyPath: m_RootOrder
propertyPath: m_LocalRotation.x
propertyPath: m_AnchorMax.x
propertyPath: m_LocalRotation.y
value: 0
propertyPath: m_AnchorMax.y
value: 1
propertyPath: m_LocalRotation.z
propertyPath: m_AnchorMin.x
propertyPath: m_LocalRotation.w
propertyPath: m_AnchorMin.y
propertyPath: m_RootOrder
value: 0
propertyPath: m_SizeDelta.x
value: 417.40002
propertyPath: m_LocalEulerAnglesHint.x
value: 0
propertyPath: m_SizeDelta.y
value: 75
propertyPath: m_LocalEulerAnglesHint.y
propertyPath: m_LocalPosition.x
propertyPath: m_LocalEulerAnglesHint.z
propertyPath: m_LocalPosition.y
propertyPath: m_AnchoredPosition.x
value: 218.70001
propertyPath: m_LocalPosition.z
value: 0
propertyPath: m_AnchoredPosition.y
value: -70.20001
propertyPath: m_LocalRotation.w
value: 1
propertyPath: m_SizeDelta.x
value: 417.40002
propertyPath: m_LocalRotation.x
value: 0
propertyPath: m_SizeDelta.y
value: 75
propertyPath: m_LocalRotation.y
value: 0
propertyPath: m_AnchorMin.x
propertyPath: m_LocalRotation.z
propertyPath: m_AnchorMin.y
value: 1
propertyPath: m_AnchoredPosition.x
value: 218.70001
propertyPath: m_AnchorMax.x
value: 0
propertyPath: m_AnchoredPosition.y
value: -70.20001
propertyPath: m_AnchorMax.y
value: 1
propertyPath: m_LocalEulerAnglesHint.x
value: 0
propertyPath: m_Pivot.x
value: 0.5
propertyPath: m_LocalEulerAnglesHint.y
value: 0
propertyPath: m_Pivot.y
value: 0.5
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9211289335331061973, guid: db08b77f6847f4a8eb29ee9db04444e9,
type: 3}

m_Modifications:
- target: {fileID: 184241180236232933, guid: b01383ebcda1049008a325f2ca7e6aca,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
propertyPath: m_Pivot.x
value: 1
propertyPath: m_LocalPosition.y
value: 0
propertyPath: m_Pivot.y
value: 0.5
propertyPath: m_LocalPosition.z
propertyPath: m_RootOrder
propertyPath: m_LocalRotation.x
value: -0
propertyPath: m_AnchorMax.x
value: 1
propertyPath: m_LocalRotation.y
value: -0
propertyPath: m_AnchorMax.y
value: 0.5
propertyPath: m_LocalRotation.z
value: -0
propertyPath: m_AnchorMin.x
value: 1
propertyPath: m_LocalRotation.w
value: 1
propertyPath: m_AnchorMin.y
value: 0.5
propertyPath: m_RootOrder
value: 0
propertyPath: m_SizeDelta.x
value: 160
propertyPath: m_LocalEulerAnglesHint.x
value: 0
propertyPath: m_SizeDelta.y
value: 50
propertyPath: m_LocalEulerAnglesHint.y
propertyPath: m_LocalPosition.x
propertyPath: m_LocalEulerAnglesHint.z
propertyPath: m_LocalPosition.y
propertyPath: m_AnchoredPosition.x
value: -30
propertyPath: m_LocalPosition.z
value: 0
propertyPath: m_AnchoredPosition.y
value: 0
propertyPath: m_LocalRotation.w
value: 1
propertyPath: m_SizeDelta.x
value: 160
propertyPath: m_LocalRotation.x
value: -0
propertyPath: m_SizeDelta.y
value: 50
propertyPath: m_LocalRotation.y
value: -0
propertyPath: m_AnchorMin.x
value: 1
propertyPath: m_LocalRotation.z
value: -0
propertyPath: m_AnchorMin.y
value: 0.5
propertyPath: m_AnchoredPosition.x
value: -30
propertyPath: m_AnchorMax.x
value: 1
propertyPath: m_AnchoredPosition.y
value: 0
propertyPath: m_AnchorMax.y
value: 0.5
propertyPath: m_LocalEulerAnglesHint.x
value: 0
propertyPath: m_Pivot.x
value: 1
propertyPath: m_LocalEulerAnglesHint.y
value: 0
propertyPath: m_Pivot.y
value: 0.5
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 657795093660955452, guid: b01383ebcda1049008a325f2ca7e6aca,
type: 3}

objectReference: {fileID: 0}
- target: {fileID: 3451373362961513096, guid: b01383ebcda1049008a325f2ca7e6aca,
type: 3}
propertyPath: m_StringReference.m_TableReference.m_TableCollectionName
value: GUID:7e97a5d681d6e4480b18b504a66e69b2
propertyPath: m_StringReference.m_TableEntryReference.m_KeyId
value: 8945393664
propertyPath: m_StringReference.m_TableEntryReference.m_KeyId
value: 8945393664
propertyPath: m_StringReference.m_TableReference.m_TableCollectionName
value: GUID:7e97a5d681d6e4480b18b504a66e69b2
objectReference: {fileID: 0}
- target: {fileID: 5795051186182416585, guid: b01383ebcda1049008a325f2ca7e6aca,
type: 3}

5
UOP1_Project/Assets/Prefabs/UI/InteractionItem.prefab


m_TableEntryReference:
m_KeyId: 214189465600
m_Key:
m_FallbackState: 0
m_FormatArguments: []
m_UpdateString:
m_PersistentCalls:

m_Script: {fileID: 11500000, guid: 349da538f36aa4586bea2dabc1823587, type: 3}
m_Name:
m_EditorClassIdentifier:
interactionName: {fileID: 5827123645950163235}
interactionKeyButton: {fileID: 7011926376560294723}
_interactionName: {fileID: 5827123645950163235}
_interactionKeyButton: {fileID: 7011926376560294723}

818
UOP1_Project/Assets/Prefabs/UI/InventoryScreen.prefab
文件差异内容过多而无法显示
查看文件

362
UOP1_Project/Assets/Scenes/Gameplay.unity


objectReference: {fileID: 0}
- target: {fileID: 1395789391861871574, guid: acaae42dd59e9664faee318857afc823,
type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1395789391861871574, guid: acaae42dd59e9664faee318857afc823,
type: 3}
propertyPath: m_LocalPosition.x
value: 553.7176
objectReference: {fileID: 0}

objectReference: {fileID: 0}
- target: {fileID: 1395789391861871574, guid: acaae42dd59e9664faee318857afc823,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1395789391861871574, guid: acaae42dd59e9664faee318857afc823,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}

objectReference: {fileID: 0}
- target: {fileID: 1395789391861871574, guid: acaae42dd59e9664faee318857afc823,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1395789391861871574, guid: acaae42dd59e9664faee318857afc823,
type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1395789391861871574, guid: acaae42dd59e9664faee318857afc823,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}

m_Modifications:
- target: {fileID: 1970466629595806505, guid: 9e5d964358f2bcc4db1c7e33aace9d8d,
type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1970466629595806505, guid: 9e5d964358f2bcc4db1c7e33aace9d8d,
type: 3}
propertyPath: m_LocalPosition.x
value: -0.475743
objectReference: {fileID: 0}

objectReference: {fileID: 0}
- target: {fileID: 1970466629595806505, guid: 9e5d964358f2bcc4db1c7e33aace9d8d,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1970466629595806505, guid: 9e5d964358f2bcc4db1c7e33aace9d8d,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}

objectReference: {fileID: 0}
- target: {fileID: 1970466629595806505, guid: 9e5d964358f2bcc4db1c7e33aace9d8d,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1970466629595806505, guid: 9e5d964358f2bcc4db1c7e33aace9d8d,
type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1970466629595806505, guid: 9e5d964358f2bcc4db1c7e33aace9d8d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}

objectReference: {fileID: 0}
- target: {fileID: 3687453176568796422, guid: 0ac9fcac72b964a9181545df5e543b03,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
propertyPath: m_Pivot.x
value: 0.5
propertyPath: m_LocalPosition.y
propertyPath: m_Pivot.y
propertyPath: m_LocalPosition.z
propertyPath: m_RootOrder
propertyPath: m_LocalRotation.x
value: -0
propertyPath: m_AnchorMax.x
value: 1
propertyPath: m_LocalRotation.y
value: -0
propertyPath: m_AnchorMax.y
value: 0.2
propertyPath: m_LocalRotation.z
value: -0
propertyPath: m_AnchorMin.x
value: 0
propertyPath: m_LocalRotation.w
value: 1
propertyPath: m_AnchorMin.y
value: 0
propertyPath: m_RootOrder
value: 0
propertyPath: m_SizeDelta.x
value: 300
propertyPath: m_LocalEulerAnglesHint.x
value: 0
propertyPath: m_SizeDelta.y
value: 40
propertyPath: m_LocalEulerAnglesHint.y
propertyPath: m_LocalPosition.x
propertyPath: m_LocalEulerAnglesHint.z
propertyPath: m_LocalPosition.y
propertyPath: m_AnchoredPosition.x
propertyPath: m_LocalPosition.z
propertyPath: m_AnchoredPosition.y
value: 0
propertyPath: m_LocalRotation.w
value: 1
propertyPath: m_SizeDelta.x
value: 300
propertyPath: m_LocalRotation.x
value: -0
propertyPath: m_SizeDelta.y
value: 40
propertyPath: m_LocalRotation.y
value: -0
propertyPath: m_AnchorMin.x
value: 0
propertyPath: m_LocalRotation.z
value: -0
propertyPath: m_AnchorMin.y
propertyPath: m_AnchoredPosition.x
propertyPath: m_AnchorMax.x
value: 1
propertyPath: m_AnchoredPosition.y
value: 0
propertyPath: m_AnchorMax.y
value: 0.2
propertyPath: m_LocalEulerAnglesHint.x
value: 0
propertyPath: m_Pivot.x
value: 0.5
propertyPath: m_LocalEulerAnglesHint.y
value: 0
propertyPath: m_Pivot.y
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []

m_Modification:
m_TransformParent: {fileID: 1869732381}
m_Modifications:
- target: {fileID: 1798069423737873425, guid: 1d09c349511c34e2d8b16f139aadb731,
type: 3}
propertyPath: _interactionItem
value:
objectReference: {fileID: 6822594372875662428}
- target: {fileID: 1798069423737873425, guid: 1d09c349511c34e2d8b16f139aadb731,
type: 3}
propertyPath: _listInteractions.Array.size
value: 3
objectReference: {fileID: 0}
- target: {fileID: 1798069423737873425, guid: 1d09c349511c34e2d8b16f139aadb731,
type: 3}
propertyPath: _listInteractions.Array.data[0]
value:
objectReference: {fileID: 11400000, guid: 34232253270b147a4ac05a42a1882cd7,
type: 2}
- target: {fileID: 1798069423737873425, guid: 1d09c349511c34e2d8b16f139aadb731,
type: 3}
propertyPath: _listInteractions.Array.data[1]
value:
objectReference: {fileID: 11400000, guid: be11dea017adc4146bebe7603a32ac65,
type: 2}
- target: {fileID: 1798069423737873425, guid: 1d09c349511c34e2d8b16f139aadb731,
type: 3}
propertyPath: _listInteractions.Array.data[2]
value:
objectReference: {fileID: 11400000, guid: 5cbae6c9eb2234189b57465fc303296b,
type: 2}
propertyPath: m_LocalPosition.x
value: 0
propertyPath: m_Pivot.x
value: 0.5
propertyPath: m_LocalPosition.y
value: 0
propertyPath: m_Pivot.y
value: 0.5
propertyPath: m_LocalPosition.z
value: 0
propertyPath: m_RootOrder
value: 1
propertyPath: m_LocalRotation.x
value: 0
propertyPath: m_AnchorMax.x
value: 1
propertyPath: m_LocalRotation.y
value: 0
propertyPath: m_AnchorMax.y
value: 1
propertyPath: m_LocalRotation.z
propertyPath: m_AnchorMin.x
propertyPath: m_LocalRotation.w
value: 1
propertyPath: m_AnchorMin.y
value: 0
propertyPath: m_RootOrder
value: 1
propertyPath: m_SizeDelta.x
value: 0
propertyPath: m_LocalEulerAnglesHint.x
propertyPath: m_SizeDelta.y
propertyPath: m_LocalEulerAnglesHint.y
propertyPath: m_LocalPosition.x
propertyPath: m_LocalEulerAnglesHint.z
propertyPath: m_LocalPosition.y
propertyPath: m_AnchoredPosition.x
propertyPath: m_LocalPosition.z
propertyPath: m_AnchoredPosition.y
value: 0
propertyPath: m_LocalRotation.w
value: 1
propertyPath: m_SizeDelta.x
propertyPath: m_LocalRotation.x
propertyPath: m_SizeDelta.y
propertyPath: m_LocalRotation.y
propertyPath: m_AnchorMin.x
propertyPath: m_LocalRotation.z
propertyPath: m_AnchorMin.y
propertyPath: m_AnchoredPosition.x
propertyPath: m_AnchorMax.x
value: 1
propertyPath: m_AnchoredPosition.y
value: 0
propertyPath: m_AnchorMax.y
value: 1
propertyPath: m_LocalEulerAnglesHint.x
value: 0
propertyPath: m_Pivot.x
value: 0.5
propertyPath: m_LocalEulerAnglesHint.y
value: 0
propertyPath: m_Pivot.y
value: 0.5
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6822594373627009031, guid: 1d09c349511c34e2d8b16f139aadb731,
type: 3}

m_Script: {fileID: 11500000, guid: 8f5450ac502f84bd89a993767b4d01e0, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &6822594372875662428 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1190722457586240764, guid: 1d09c349511c34e2d8b16f139aadb731,
type: 3}
m_PrefabInstance: {fileID: 6822594372875662426}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 349da538f36aa4586bea2dabc1823587, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &8313085415731550940
PrefabInstance:
m_ObjectHideFlags: 0

m_Modifications:
- target: {fileID: 8313085416397863404, guid: 2af68f4e6b94140cfbcdee05fcc28ce3,
type: 3}
propertyPath: m_RootOrder
value: 4
objectReference: {fileID: 0}
- target: {fileID: 8313085416397863404, guid: 2af68f4e6b94140cfbcdee05fcc28ce3,
type: 3}
propertyPath: m_LocalPosition.x
value: 553.7176
objectReference: {fileID: 0}

objectReference: {fileID: 0}
- target: {fileID: 8313085416397863404, guid: 2af68f4e6b94140cfbcdee05fcc28ce3,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8313085416397863404, guid: 2af68f4e6b94140cfbcdee05fcc28ce3,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}

objectReference: {fileID: 0}
- target: {fileID: 8313085416397863404, guid: 2af68f4e6b94140cfbcdee05fcc28ce3,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8313085416397863404, guid: 2af68f4e6b94140cfbcdee05fcc28ce3,
type: 3}
propertyPath: m_RootOrder
value: 4
objectReference: {fileID: 0}
- target: {fileID: 8313085416397863404, guid: 2af68f4e6b94140cfbcdee05fcc28ce3,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}

objectReference: {fileID: 0}
- target: {fileID: 8313085416397863411, guid: 2af68f4e6b94140cfbcdee05fcc28ce3,
type: 3}
propertyPath: dialogueController
value:
objectReference: {fileID: 1540519756}
- target: {fileID: 8313085416397863411, guid: 2af68f4e6b94140cfbcdee05fcc28ce3,
type: 3}
propertyPath: inventoryPanel
value:
objectReference: {fileID: 1172743538}

value:
objectReference: {fileID: 6822594372875662427}
- target: {fileID: 8313085416397863411, guid: 2af68f4e6b94140cfbcdee05fcc28ce3,
type: 3}
propertyPath: dialogueController
value:
objectReference: {fileID: 1540519756}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2af68f4e6b94140cfbcdee05fcc28ce3, type: 3}
--- !u!1001 &8957403574244887918

m_Modifications:
- target: {fileID: 8957403575277752757, guid: 021ad8df909ac4147aa545c01f5ad8db,
type: 3}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 8957403575277752757, guid: 021ad8df909ac4147aa545c01f5ad8db,
type: 3}
propertyPath: m_LocalPosition.x
value: 1690.5188
objectReference: {fileID: 0}

type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8957403575277752757, guid: 021ad8df909ac4147aa545c01f5ad8db,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8957403575277752757, guid: 021ad8df909ac4147aa545c01f5ad8db,
type: 3}

objectReference: {fileID: 0}
- target: {fileID: 8957403575277752757, guid: 021ad8df909ac4147aa545c01f5ad8db,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8957403575277752757, guid: 021ad8df909ac4147aa545c01f5ad8db,
type: 3}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 8957403575277752757, guid: 021ad8df909ac4147aa545c01f5ad8db,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}

m_Modifications:
- target: {fileID: 8980297398607076177, guid: ccad748453924ff4092fe3e5b978d8e5,
type: 3}
propertyPath: m_RootOrder
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8980297398607076177, guid: ccad748453924ff4092fe3e5b978d8e5,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}

objectReference: {fileID: 0}
- target: {fileID: 8980297398607076177, guid: ccad748453924ff4092fe3e5b978d8e5,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8980297398607076177, guid: ccad748453924ff4092fe3e5b978d8e5,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}

objectReference: {fileID: 0}
- target: {fileID: 8980297398607076177, guid: ccad748453924ff4092fe3e5b978d8e5,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8980297398607076177, guid: ccad748453924ff4092fe3e5b978d8e5,
type: 3}
propertyPath: m_RootOrder
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8980297398607076177, guid: ccad748453924ff4092fe3e5b978d8e5,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}

m_Modification:
m_TransformParent: {fileID: 1869732381}
m_Modifications:
- target: {fileID: 1711649698, guid: 42ed5ae1f90714c4488cfabda2298591, type: 3}
propertyPath: m_AnchoredPosition.y
value: -20
objectReference: {fileID: 0}
propertyPath: m_LocalPosition.x
value: 0
propertyPath: m_Pivot.x
value: 0.5
propertyPath: m_LocalPosition.y
value: 0
propertyPath: m_Pivot.y
value: 0.5
propertyPath: m_LocalPosition.z
value: 0
propertyPath: m_RootOrder
value: 2
propertyPath: m_LocalRotation.x
value: 0
propertyPath: m_AnchorMax.x
value: 0.95
propertyPath: m_LocalRotation.y
value: 0
propertyPath: m_AnchorMax.y
value: 0.95
propertyPath: m_LocalRotation.z
value: 0
propertyPath: m_AnchorMin.x
value: 0.05
propertyPath: m_LocalRotation.w
value: 1
propertyPath: m_AnchorMin.y
value: 0.05
propertyPath: m_RootOrder
value: 2
propertyPath: m_SizeDelta.x
value: 0
propertyPath: m_LocalEulerAnglesHint.x
propertyPath: m_SizeDelta.y
propertyPath: m_LocalEulerAnglesHint.y
propertyPath: m_LocalPosition.x
propertyPath: m_LocalEulerAnglesHint.z
propertyPath: m_LocalPosition.y
propertyPath: m_AnchoredPosition.x
propertyPath: m_LocalPosition.z
propertyPath: m_AnchoredPosition.y
value: 0
propertyPath: m_LocalRotation.w
value: 1
propertyPath: m_SizeDelta.x
propertyPath: m_LocalRotation.x
propertyPath: m_SizeDelta.y
propertyPath: m_LocalRotation.y
propertyPath: m_AnchorMin.x
value: 0.05
propertyPath: m_LocalRotation.z
value: 0
propertyPath: m_AnchorMin.y
value: 0.05
propertyPath: m_AnchoredPosition.x
value: 0
propertyPath: m_AnchorMax.x
value: 0.95
propertyPath: m_AnchoredPosition.y
value: 0
propertyPath: m_AnchorMax.y
value: 0.95
propertyPath: m_LocalEulerAnglesHint.x
value: 0
propertyPath: m_Pivot.x
value: 0.5
propertyPath: m_LocalEulerAnglesHint.y
value: 0
propertyPath: m_Pivot.y
value: 0.5
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9125883718042355531, guid: 42ed5ae1f90714c4488cfabda2298591,
type: 3}

379
UOP1_Project/Assets/Scenes/WIP/TestingGround.unity
文件差异内容过多而无法显示
查看文件

8
UOP1_Project/Assets/Inventory/Scripts.meta


fileFormatVersion: 2
guid: ae042d26dee93eb4ea906e8b3335ca9d
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
UOP1_Project/Assets/Localization Files.meta


fileFormatVersion: 2
guid: 7a067a060b0224eac97965278698c7d8
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
UOP1_Project/Assets/Localization Files/Asset Tables.meta


fileFormatVersion: 2
guid: 651577e4fc6124f69ace0f9d2257fe25
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
UOP1_Project/Assets/Localization Files/Locales.meta


fileFormatVersion: 2
guid: 86b71319e99c748b5bfc5006e056485c
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
UOP1_Project/Assets/AddressableAssetsData/Windows.meta


fileFormatVersion: 2
guid: 3ddc14681058dc44aa382f6dccfc6651
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
UOP1_Project/Assets/Art/Nature/Flower.meta


fileFormatVersion: 2
guid: 71cb940d0f0bc124f96087ccd5004b93
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
UOP1_Project/Assets/LocalizationFiles/AssetTables/Dialogue System/Dialogues.meta


fileFormatVersion: 2
guid: f0e7e6342659c41c2a19353e01081eaa
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

/UOP1_Project/Assets/Shaders/SubGraphs/Dissolve.shadersubgraph → /UOP1_Project/Assets/Art/Effects/Dissolve/Dissolve.shadersubgraph

/UOP1_Project/Assets/Shaders/SubGraphs/Dissolve.shadersubgraph.meta → /UOP1_Project/Assets/Art/Effects/Dissolve/Dissolve.shadersubgraph.meta

正在加载...
取消
保存