浏览代码

fixed other merge conflict meta files

/main
Steven Leal 4 年前
当前提交
34ca1581
共有 26 个文件被更改,包括 226 次插入137 次删除
  1. 14
      com.unity.perception/Editor/Randomization/Editors.meta
  2. 17
      com.unity.perception/Editor/Randomization/Editors/ScenarioBaseEditor.cs.meta
  3. 14
      com.unity.perception/Editor/Randomization/PropertyDrawers.meta
  4. 17
      com.unity.perception/Editor/Randomization/PropertyDrawers/ColorHsvaDrawer.cs.meta
  5. 17
      com.unity.perception/Editor/Randomization/PropertyDrawers/ParameterDrawer.cs.meta
  6. 12
      com.unity.perception/Editor/Randomization/StaticData.cs.meta
  7. 9
      com.unity.perception/Editor/Randomization/Uss.meta
  8. 9
      com.unity.perception/Editor/Randomization/Uxml.meta
  9. 16
      com.unity.perception/Editor/Randomization/Uxml/Parameter/ParameterDrawer.uxml.meta
  10. 14
      com.unity.perception/Editor/Randomization/VisualElements.meta
  11. 9
      com.unity.perception/Editor/Randomization/VisualElements/Parameter.meta
  12. 17
      com.unity.perception/Editor/Randomization/VisualElements/Parameter/CategoricalOptionElement.cs.meta
  13. 17
      com.unity.perception/Editor/Randomization/VisualElements/Parameter/ColorHsvaField.cs.meta
  14. 17
      com.unity.perception/Editor/Randomization/VisualElements/Parameter/DrawerParameterElement.cs.meta
  15. 17
      com.unity.perception/Editor/Randomization/VisualElements/Parameter/ParameterElement.cs.meta
  16. 9
      com.unity.perception/Editor/Randomization/VisualElements/Randomizer.meta
  17. 12
      com.unity.perception/Editor/Randomization/VisualElements/Randomizer/AddRandomizerMenu.cs.meta
  18. 12
      com.unity.perception/Editor/Randomization/VisualElements/Randomizer/RandomizerElement.cs.meta
  19. 12
      com.unity.perception/Editor/Randomization/VisualElements/Randomizer/RandomizerList.cs.meta
  20. 9
      com.unity.perception/Editor/Randomization/VisualElements/Sampler.meta
  21. 17
      com.unity.perception/Editor/Randomization/VisualElements/Sampler/FloatRangeElement.cs.meta
  22. 17
      com.unity.perception/Editor/Randomization/VisualElements/Sampler/RandomSeedField.cs.meta
  23. 17
      com.unity.perception/Editor/Randomization/VisualElements/Sampler/SamplerElement.cs.meta
  24. 14
      com.unity.perception/Runtime/Randomization/Parameters/ParameterTypes/NumericParameters/ColorParameters.meta
  25. 14
      com.unity.perception/Runtime/Randomization/Randomizers.meta
  26. 14
      com.unity.perception/Tests/Runtime/Randomization/RandomizerTests.meta

14
com.unity.perception/Editor/Randomization/Editors.meta


fileFormatVersion: 2
<<<<<<< HEAD
fileFormatVersion: 2
timeCreated: 1600754567
=======
guid: 0b17046409af4c22bf74eec2a5965984
timeCreated: 1598135707
>>>>>>> 86d25d2... implemented parameter behaviours
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

17
com.unity.perception/Editor/Randomization/Editors/ScenarioBaseEditor.cs.meta


fileFormatVersion: 2
<<<<<<< HEAD
fileFormatVersion: 2
timeCreated: 1600754583
=======
guid: face5e97e23d402cbf6fafadb39fa0c3
timeCreated: 1596213301
>>>>>>> 86d25d2... implemented parameter behaviours
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

14
com.unity.perception/Editor/Randomization/PropertyDrawers.meta


fileFormatVersion: 2
<<<<<<< HEAD
fileFormatVersion: 2
timeCreated: 1600754588
=======
guid: d3107e026b2943c1868c9b3f8c6480d3
timeCreated: 1598135730
>>>>>>> 86d25d2... implemented parameter behaviours
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

17
com.unity.perception/Editor/Randomization/PropertyDrawers/ColorHsvaDrawer.cs.meta


fileFormatVersion: 2
<<<<<<< HEAD
fileFormatVersion: 2
timeCreated: 1600754588
=======
guid: 5e8094c28dd142a09fbbd38ca560164b
timeCreated: 1598250942
>>>>>>> 86d25d2... implemented parameter behaviours
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

17
com.unity.perception/Editor/Randomization/PropertyDrawers/ParameterDrawer.cs.meta


fileFormatVersion: 2
<<<<<<< HEAD
fileFormatVersion: 2
timeCreated: 1600754588
=======
guid: d389620d3aa3471ca1877eb59cdfb465
timeCreated: 1598135745
>>>>>>> 86d25d2... implemented parameter behaviours
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

12
com.unity.perception/Editor/Randomization/StaticData.cs.meta


fileFormatVersion: 2
fileFormatVersion: 2
timeCreated: 1595278931
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

9
com.unity.perception/Editor/Randomization/Uss.meta


fileFormatVersion: 2
fileFormatVersion: 2
timeCreated: 1590479034
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

9
com.unity.perception/Editor/Randomization/Uxml.meta


fileFormatVersion: 2
fileFormatVersion: 2
timeCreated: 1590479019
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

16
com.unity.perception/Editor/Randomization/Uxml/Parameter/ParameterDrawer.uxml.meta


fileFormatVersion: 2
<<<<<<< HEAD
fileFormatVersion: 2
timeCreated: 1600754588
=======
guid: 6a4bb3efae29429292ccdfa63e661872
timeCreated: 1598240583
>>>>>>> 86d25d2... implemented parameter behaviours
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}

14
com.unity.perception/Editor/Randomization/VisualElements.meta


fileFormatVersion: 2
<<<<<<< HEAD
fileFormatVersion: 2
timeCreated: 1600754567
=======
guid: 7f8f95a1bb144a96b9310164f5560387
timeCreated: 1598135666
>>>>>>> 86d25d2... implemented parameter behaviours
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

9
com.unity.perception/Editor/Randomization/VisualElements/Parameter.meta


fileFormatVersion: 2
fileFormatVersion: 2
timeCreated: 1601669088
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

17
com.unity.perception/Editor/Randomization/VisualElements/Parameter/CategoricalOptionElement.cs.meta


fileFormatVersion: 2
<<<<<<< HEAD
fileFormatVersion: 2
timeCreated: 1600754567
=======
guid: 3066f77d411047baafb6cc454adc6e37
timeCreated: 1595535184
>>>>>>> 86d25d2... implemented parameter behaviours
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

17
com.unity.perception/Editor/Randomization/VisualElements/Parameter/ColorHsvaField.cs.meta


fileFormatVersion: 2
<<<<<<< HEAD
fileFormatVersion: 2
timeCreated: 1600754567
=======
guid: 103b163a2467415ab86b0df8175b12a6
timeCreated: 1598254290
>>>>>>> 86d25d2... implemented parameter behaviours
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

17
com.unity.perception/Editor/Randomization/VisualElements/Parameter/DrawerParameterElement.cs.meta


fileFormatVersion: 2
<<<<<<< HEAD
fileFormatVersion: 2
timeCreated: 1600754567
=======
guid: e2eb905ca8c14b5cbe43e48418948be0
timeCreated: 1598255728
>>>>>>> 86d25d2... implemented parameter behaviours
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

17
com.unity.perception/Editor/Randomization/VisualElements/Parameter/ParameterElement.cs.meta


fileFormatVersion: 2
<<<<<<< HEAD
fileFormatVersion: 2
timeCreated: 1600754567
=======
guid: ea72d77c64d1447aa195e2068f02cf74
timeCreated: 1595279847
>>>>>>> 86d25d2... implemented parameter behaviours
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

9
com.unity.perception/Editor/Randomization/VisualElements/Randomizer.meta


fileFormatVersion: 2
fileFormatVersion: 2
timeCreated: 1601054944
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

12
com.unity.perception/Editor/Randomization/VisualElements/Randomizer/AddRandomizerMenu.cs.meta


fileFormatVersion: 2
fileFormatVersion: 2
timeCreated: 1600836688
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

12
com.unity.perception/Editor/Randomization/VisualElements/Randomizer/RandomizerElement.cs.meta


fileFormatVersion: 2
fileFormatVersion: 2
timeCreated: 1600290125
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

12
com.unity.perception/Editor/Randomization/VisualElements/Randomizer/RandomizerList.cs.meta


fileFormatVersion: 2
fileFormatVersion: 2
timeCreated: 1600366159
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

9
com.unity.perception/Editor/Randomization/VisualElements/Sampler.meta


fileFormatVersion: 2
fileFormatVersion: 2
timeCreated: 1601669132
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

17
com.unity.perception/Editor/Randomization/VisualElements/Sampler/FloatRangeElement.cs.meta


fileFormatVersion: 2
<<<<<<< HEAD
fileFormatVersion: 2
timeCreated: 1600754567
=======
guid: e37f169c618d471d8ed9614a41096437
timeCreated: 1595281335
>>>>>>> 86d25d2... implemented parameter behaviours
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

17
com.unity.perception/Editor/Randomization/VisualElements/Sampler/RandomSeedField.cs.meta


fileFormatVersion: 2
<<<<<<< HEAD
fileFormatVersion: 2
timeCreated: 1600754567
=======
guid: b4fa54f5ed5d4d67a278fa8b42dc55cb
timeCreated: 1596171029
>>>>>>> 86d25d2... implemented parameter behaviours
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

17
com.unity.perception/Editor/Randomization/VisualElements/Sampler/SamplerElement.cs.meta


fileFormatVersion: 2
<<<<<<< HEAD
fileFormatVersion: 2
timeCreated: 1600754567
=======
guid: b367f8f2cb8e465ca2d60ccbd5414a14
timeCreated: 1595277943
>>>>>>> 86d25d2... implemented parameter behaviours
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

14
com.unity.perception/Runtime/Randomization/Parameters/ParameterTypes/NumericParameters/ColorParameters.meta


fileFormatVersion: 2
<<<<<<< HEAD
fileFormatVersion: 2
timeCreated: 1600754588
=======
guid: ce91e289cdaa4ccc849a0c287aefd34d
timeCreated: 1598326361
>>>>>>> 50f2c39... Added xml documentation
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

14
com.unity.perception/Runtime/Randomization/Randomizers.meta


fileFormatVersion: 2
<<<<<<< HEAD
fileFormatVersion: 2
timeCreated: 1600754588
=======
guid: ae6aad06c0e14f67aa7a9ad9004a1828
timeCreated: 1600274594
>>>>>>> c653d18... Implemented randomizer class. Ran into SerializeReference issue 1193322.
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

14
com.unity.perception/Tests/Runtime/Randomization/RandomizerTests.meta


fileFormatVersion: 2
<<<<<<< HEAD
fileFormatVersion: 2
timeCreated: 1600754588
=======
guid: f9e02c502b7845229d26d377a0d871f1
timeCreated: 1600744200
>>>>>>> cb407fb... added randomizer tests
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
正在加载...
取消
保存