diff --git a/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity b/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity index 0110bfd..ab96d3a 100644 --- a/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity +++ b/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity @@ -1966,6 +1966,22 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 374150667840124768, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} + propertyPath: _MaxAcc + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 374150667840124768, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} + propertyPath: _MinAcc + value: -2 + objectReference: {fileID: 0} + - target: {fileID: 374150667840124768, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} + propertyPath: _AccSpeed + value: 0.25 + objectReference: {fileID: 0} + - target: {fileID: 374150667840124768, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} + propertyPath: _MaxVelocity + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} --- !u!1 &637676176 diff --git a/MuseumGame/Assets/Sprites/Artwork Sprites.meta~HEAD b/MuseumGame/Assets/Sprites/Artwork Sprites.meta~HEAD new file mode 100644 index 0000000..f6f5d66 --- /dev/null +++ b/MuseumGame/Assets/Sprites/Artwork Sprites.meta~HEAD @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9cf631f4654250d4588fc170abdb60cc +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MuseumGame/Assets/Sprites/Artwork Sprites.meta b/MuseumGame/Assets/Sprites/Artwork Sprites.meta~main similarity index 100% rename from MuseumGame/Assets/Sprites/Artwork Sprites.meta rename to MuseumGame/Assets/Sprites/Artwork Sprites.meta~main diff --git a/MuseumGame/Assets/Sprites/Artwork Sprites/Bailin-Scarecrow Pixelart.png.meta b/MuseumGame/Assets/Sprites/Artwork Sprites/Bailin-Scarecrow Pixelart.png.meta index 687c136..8e322f8 100644 --- a/MuseumGame/Assets/Sprites/Artwork Sprites/Bailin-Scarecrow Pixelart.png.meta +++ b/MuseumGame/Assets/Sprites/Artwork Sprites/Bailin-Scarecrow Pixelart.png.meta @@ -1,5 +1,9 @@ fileFormatVersion: 2 +<<<<<<< HEAD +guid: 71938390b65010447bd9357a6450359c +======= guid: a94f88a99bc4b47eab866de27ee69341 +>>>>>>> main TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/MuseumGame/Assets/Sprites/Artwork Sprites/Behrens-Strawberry Pixelart.png.meta b/MuseumGame/Assets/Sprites/Artwork Sprites/Behrens-Strawberry Pixelart.png.meta index 6596576..146df78 100644 --- a/MuseumGame/Assets/Sprites/Artwork Sprites/Behrens-Strawberry Pixelart.png.meta +++ b/MuseumGame/Assets/Sprites/Artwork Sprites/Behrens-Strawberry Pixelart.png.meta @@ -1,5 +1,9 @@ fileFormatVersion: 2 +<<<<<<< HEAD +guid: ac0a24c4b892f4e4eb667c0c22ae7490 +======= guid: 583f73bcdc6714bb494fde0e2ac57cc8 +>>>>>>> main TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/MuseumGame/Assets/Sprites/Artwork Sprites/Blackburn-Abstract#2 Pixelart.png.meta b/MuseumGame/Assets/Sprites/Artwork Sprites/Blackburn-Abstract#2 Pixelart.png.meta index 299f0d7..cb5b2e0 100644 --- a/MuseumGame/Assets/Sprites/Artwork Sprites/Blackburn-Abstract#2 Pixelart.png.meta +++ b/MuseumGame/Assets/Sprites/Artwork Sprites/Blackburn-Abstract#2 Pixelart.png.meta @@ -1,5 +1,9 @@ fileFormatVersion: 2 +<<<<<<< HEAD +guid: 7947595c5ebf72648aab3049c3c7f7bd +======= guid: 633f9d29b2bab49d481be27cf84b4ce6 +>>>>>>> main TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/MuseumGame/Assets/Sprites/Paint Projectile.png.meta b/MuseumGame/Assets/Sprites/Paint Projectile.png.meta index 12155b6..6d7ae4d 100644 --- a/MuseumGame/Assets/Sprites/Paint Projectile.png.meta +++ b/MuseumGame/Assets/Sprites/Paint Projectile.png.meta @@ -1,5 +1,9 @@ fileFormatVersion: 2 +<<<<<<< Updated upstream guid: 91aa6c120a1f8d64d942204b2b6a6952 +======= +guid: 99b222e3befa2bc4397d9c88480e9be8 +>>>>>>> Stashed changes TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/MuseumGame/UserSettings/EditorUserSettings.asset b/MuseumGame/UserSettings/EditorUserSettings.asset index 6d6be97..e231fbb 100644 --- a/MuseumGame/UserSettings/EditorUserSettings.asset +++ b/MuseumGame/UserSettings/EditorUserSettings.asset @@ -6,22 +6,22 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedScenePath-0: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1a00637edea78fce9332b25 + value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d flags: 0 RecentlyUsedScenePath-1: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1a00637edea78fce9332b25 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1d23b37efa923e7ee2e26 flags: 0 RecentlyUsedScenePath-2: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1d23b37efa923e7ee2e26 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1132eceb7414e7f133e5a92f31352d1b flags: 0 RecentlyUsedScenePath-3: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621d1224e7f27a2decee22f0 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b flags: 0 RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621d1224e7f27a2decee22f0 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a2362191c27ead43b1aedf425a7f234362820 flags: 0 RecentlyUsedScenePath-5: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a2362191c27ead43b1aedf425a7f234362820 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6 flags: 0 RecentlyUsedScenePath-6: value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d3ae9e5740be1e238eca92f31352d1b