[FIX] Fixed duck IDs and other small fixes

2019-08-28 01:53:18 +02:00
parent c52392eacd
commit bb4b5afb18
31 changed files with 38 additions and 32 deletions
--- a/Assets/BadeendGoGameManager.cs
+++ b/Assets/BadeendGoGameManager.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using Boo.Lang;
 using Mapbox.Map;
 using UnityEngine;
 using UnityEngine.Serialization;
--- a/Assets/CollectableDuckData.cs
+++ b/Assets/CollectableDuckData.cs
@@ -3,7 +3,7 @@ using System.Globalization;
 using EasyButtons;
 using Mapbox.Unity.Utilities;
 using Mapbox.Utils;
-using Unity.Collections;
+using UnityEditor;
 using UnityEngine;
 using UnityEngine.Serialization;

@@ -11,8 +11,7 @@ using UnityEngine.Serialization;
 public class CollectableDuckData: ScriptableObject
 {
    [SerializeField]
-    [ReadOnly]
-    private string _id = System.Guid.NewGuid().ToString();
+    private string _id = Guid.NewGuid().ToString();
    
    [SerializeField]
    [Geocode]
@@ -50,10 +49,12 @@ public class CollectableDuckData: ScriptableObject

    public DuckStickerData StickerData => stickerData;
    
-    
+    #if UNITY_EDITOR
    [Button]
    public void RegenerateId()
    {
        _id = Guid.NewGuid().ToString();
+        EditorUtility.SetDirty(this);
    }
+    #endif
 }
--- a/Assets/DuckStickerData.cs
+++ b/Assets/DuckStickerData.cs
@@ -1,6 +1,7 @@
 using System;
 using EasyButtons;
 using Unity.Collections;
+using UnityEditor;
 using UnityEngine;
 using UnityEngine.UIElements;

@@ -9,7 +10,6 @@ using UnityEngine.UIElements;
 public class DuckStickerData: ScriptableObject
 {
    [SerializeField]
-    [ReadOnly]
    private string _id = System.Guid.NewGuid().ToString();
    
    [SerializeField]
@@ -24,9 +24,12 @@ public class DuckStickerData: ScriptableObject

    public Sprite StickerSprite => _stickerSprite;

+    #if UNITY_EDITOR
    [Button]
    public void RegenerateId()
    {
        _id = Guid.NewGuid().ToString();
+        EditorUtility.SetDirty(this);
    }
+    #endif
 }
--- a/Assets/Ducks/collectibles/BasHuis.asset
+++ b/Assets/Ducks/collectibles/BasHuis.asset
@@ -12,7 +12,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 23dc111528fe0454bac5f74d89046aae, type: 3}
  m_Name: BasHuis
  m_EditorClassIdentifier: 
-  _id: 57bb8b90-30b2-45cd-82e8-ecdd75b7af6f
+  _id: 8037ddbb-dfcd-4a1d-8f53-9d4e849a15fe
  _latitudeLongitude: 51.998985, 4.380584
  _modelPrefab: {fileID: 4296518137834665065, guid: bb1edfc992b196748be6b1db268f4815,
    type: 3}
--- a/Assets/Ducks/collectibles/BasWerk.asset
+++ b/Assets/Ducks/collectibles/BasWerk.asset
@@ -12,7 +12,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 23dc111528fe0454bac5f74d89046aae, type: 3}
  m_Name: BasWerk
  m_EditorClassIdentifier: 
-  _id: ec870c90-efeb-4de4-9d69-892200e2504b
+  _id: c51c3171-bbf3-479f-b5e7-c84ea0dc9468
  _latitudeLongitude: 52.017326, 4.346669
  _modelPrefab: {fileID: 4296518137834665065, guid: bb1edfc992b196748be6b1db268f4815,
    type: 3}
--- a/Assets/Ducks/collectibles/Disney.asset
+++ b/Assets/Ducks/collectibles/Disney.asset
@@ -12,7 +12,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 23dc111528fe0454bac5f74d89046aae, type: 3}
  m_Name: Disney
  m_EditorClassIdentifier: 
-  _id: 7276d911-e122-431c-9a5e-86e808ad8676
+  _id: cc193cde-a9b9-40c4-86f3-e45906077ea6
  _latitudeLongitude: 48.872798, 2.776514
  _modelPrefab: {fileID: 4296518137834665065, guid: bb1edfc992b196748be6b1db268f4815,
    type: 3}
--- a/Assets/Ducks/collectibles/EstherHuis.asset
+++ b/Assets/Ducks/collectibles/EstherHuis.asset
@@ -12,7 +12,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 23dc111528fe0454bac5f74d89046aae, type: 3}
  m_Name: EstherHuis
  m_EditorClassIdentifier: 
-  _id: ec870c90-efeb-4de4-9d69-892200e2504b
+  _id: af9856cf-8b3f-4315-8d93-c9e5d08827c8
  _latitudeLongitude: 51.890640, 4.512395
  _modelPrefab: {fileID: 4296518137834665065, guid: bb1edfc992b196748be6b1db268f4815,
    type: 3}
--- a/Assets/Ducks/collectibles/EstherWerk.asset
+++ b/Assets/Ducks/collectibles/EstherWerk.asset
@@ -12,7 +12,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 23dc111528fe0454bac5f74d89046aae, type: 3}
  m_Name: EstherWerk
  m_EditorClassIdentifier: 
-  _id: ec870c90-efeb-4de4-9d69-892200e2504b
+  _id: faf348c8-3ca5-41d9-b7b2-1dc3cfc602ba
  _latitudeLongitude: 52.040012, 4.382789
  _modelPrefab: {fileID: 4296518137834665065, guid: bb1edfc992b196748be6b1db268f4815,
    type: 3}
--- a/Assets/Ducks/collectibles/Highway.asset
+++ b/Assets/Ducks/collectibles/Highway.asset
@@ -12,7 +12,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 23dc111528fe0454bac5f74d89046aae, type: 3}
  m_Name: Highway
  m_EditorClassIdentifier: 
-  _id: 7276d911-e122-431c-9a5e-86e808ad8676
+  _id: e85c8b55-8332-48c9-9e01-79ccb4d73634
  _latitudeLongitude: 51.994912, 4.382137
  _modelPrefab: {fileID: 4296518137834665065, guid: bb1edfc992b196748be6b1db268f4815,
    type: 3}
--- a/Assets/Ducks/collectibles/Kerk1.asset
+++ b/Assets/Ducks/collectibles/Kerk1.asset
@@ -12,7 +12,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 23dc111528fe0454bac5f74d89046aae, type: 3}
  m_Name: Kerk1
  m_EditorClassIdentifier: 
-  _id: 7276d911-e122-431c-9a5e-86e808ad8676
+  _id: 81be342b-2e42-42ff-a22b-9d3ee24b00f8
  _latitudeLongitude: 52.011988, 4.359926
  _modelPrefab: {fileID: 4296518137834665065, guid: bb1edfc992b196748be6b1db268f4815,
    type: 3}
--- a/Assets/Ducks/collectibles/Kerk2.asset
+++ b/Assets/Ducks/collectibles/Kerk2.asset
@@ -12,7 +12,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 23dc111528fe0454bac5f74d89046aae, type: 3}
  m_Name: Kerk2
  m_EditorClassIdentifier: 
-  _id: 7276d911-e122-431c-9a5e-86e808ad8676
+  _id: 7e8a8d12-e850-430b-a538-d156601a968d
  _latitudeLongitude: 52.012497, 4.355312
  _modelPrefab: {fileID: 4296518137834665065, guid: bb1edfc992b196748be6b1db268f4815,
    type: 3}
--- a/Assets/Ducks/collectibles/Lelie1.asset
+++ b/Assets/Ducks/collectibles/Lelie1.asset
@@ -12,7 +12,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 23dc111528fe0454bac5f74d89046aae, type: 3}
  m_Name: Lelie1
  m_EditorClassIdentifier: 
-  _id: 7276d911-e122-431c-9a5e-86e808ad8676
+  _id: d4efd9d9-e588-4ee7-b43f-26e1ec3ecb6f
  _latitudeLongitude: 52.013018, 4.356594
  _modelPrefab: {fileID: 4296518137834665065, guid: bb1edfc992b196748be6b1db268f4815,
    type: 3}
--- a/Assets/Ducks/collectibles/Lelie2.asset
+++ b/Assets/Ducks/collectibles/Lelie2.asset
@@ -12,7 +12,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 23dc111528fe0454bac5f74d89046aae, type: 3}
  m_Name: Lelie2
  m_EditorClassIdentifier: 
-  _id: 7276d911-e122-431c-9a5e-86e808ad8676
+  _id: 1532dc52-7c91-4ef4-abec-c678fb860cc0
  _latitudeLongitude: 52.009667, 4.363467
  _modelPrefab: {fileID: 4296518137834665065, guid: bb1edfc992b196748be6b1db268f4815,
    type: 3}
--- a/Assets/Ducks/collectibles/RestFijn.asset
+++ b/Assets/Ducks/collectibles/RestFijn.asset
@@ -12,7 +12,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 23dc111528fe0454bac5f74d89046aae, type: 3}
  m_Name: RestFijn
  m_EditorClassIdentifier: 
-  _id: ee3d67af-84d5-4680-99ae-0ae4cb4ea005
+  _id: 85375e0b-4ae7-4051-9bc8-05ebd8edbb7d
  _latitudeLongitude: 52.010973, 4.360892
  _modelPrefab: {fileID: 4296518137834665065, guid: bb1edfc992b196748be6b1db268f4815,
    type: 3}
--- a/Assets/Ducks/collectibles/RestHeindeEnVer.asset
+++ b/Assets/Ducks/collectibles/RestHeindeEnVer.asset
@@ -12,7 +12,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 23dc111528fe0454bac5f74d89046aae, type: 3}
  m_Name: RestHeindeEnVer
  m_EditorClassIdentifier: 
-  _id: ee3d67af-84d5-4680-99ae-0ae4cb4ea005
+  _id: f9b44c53-efa4-4876-8c89-1056a19684a8
  _latitudeLongitude: 52.016068, 4.345697
  _modelPrefab: {fileID: 4296518137834665065, guid: bb1edfc992b196748be6b1db268f4815,
    type: 3}
--- a/Assets/Ducks/collectibles/RestJans.asset
+++ b/Assets/Ducks/collectibles/RestJans.asset
@@ -12,7 +12,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 23dc111528fe0454bac5f74d89046aae, type: 3}
  m_Name: RestJans
  m_EditorClassIdentifier: 
-  _id: ee3d67af-84d5-4680-99ae-0ae4cb4ea005
+  _id: fad2b37f-6f71-41b8-a2f6-334fd41f9207
  _latitudeLongitude: 52.010652, 4.360272
  _modelPrefab: {fileID: 4296518137834665065, guid: bb1edfc992b196748be6b1db268f4815,
    type: 3}
--- a/Assets/Ducks/collectibles/RestKek.asset
+++ b/Assets/Ducks/collectibles/RestKek.asset
@@ -12,7 +12,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 23dc111528fe0454bac5f74d89046aae, type: 3}
  m_Name: RestKek
  m_EditorClassIdentifier: 
-  _id: ee3d67af-84d5-4680-99ae-0ae4cb4ea005
+  _id: d735345b-72f2-44a3-9f02-624838b60b12
  _latitudeLongitude: 52.012537, 4.360013
  _modelPrefab: {fileID: 4296518137834665065, guid: bb1edfc992b196748be6b1db268f4815,
    type: 3}
--- a/Assets/Ducks/collectibles/RestWildgroei.asset
+++ b/Assets/Ducks/collectibles/RestWildgroei.asset
@@ -12,7 +12,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 23dc111528fe0454bac5f74d89046aae, type: 3}
  m_Name: RestWildgroei
  m_EditorClassIdentifier: 
-  _id: ee3d67af-84d5-4680-99ae-0ae4cb4ea005
+  _id: 361cb932-e8ca-41e2-9506-50dbb17108b0
  _latitudeLongitude: 52.012810, 4.355383
  _modelPrefab: {fileID: 4296518137834665065, guid: bb1edfc992b196748be6b1db268f4815,
    type: 3}
--- a/Assets/Ducks/collectibles/Scheveningen.asset
+++ b/Assets/Ducks/collectibles/Scheveningen.asset
@@ -12,7 +12,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 23dc111528fe0454bac5f74d89046aae, type: 3}
  m_Name: Scheveningen
  m_EditorClassIdentifier: 
-  _id: 7276d911-e122-431c-9a5e-86e808ad8676
+  _id: 4dea14c2-7b78-4d3d-b188-1566ce71ba5a
  _latitudeLongitude: 52.114007, 4.278786
  _modelPrefab: {fileID: 4296518137834665065, guid: bb1edfc992b196748be6b1db268f4815,
    type: 3}
--- a/Assets/Ducks/collectibles/Speldorado.asset
+++ b/Assets/Ducks/collectibles/Speldorado.asset
@@ -12,7 +12,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 23dc111528fe0454bac5f74d89046aae, type: 3}
  m_Name: Speldorado
  m_EditorClassIdentifier: 
-  _id: 7276d911-e122-431c-9a5e-86e808ad8676
+  _id: ff7d6cda-94bf-4064-a27a-dbe3f443128a
  _latitudeLongitude: 52.012028, 4.357055
  _modelPrefab: {fileID: 4296518137834665065, guid: bb1edfc992b196748be6b1db268f4815,
    type: 3}
--- a/Assets/Ducks/stickers/cook.asset
+++ b/Assets/Ducks/stickers/cook.asset
@@ -12,5 +12,6 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 7d3768bc9b4537545bf3c5ae5663e033, type: 3}
  m_Name: cook
  m_EditorClassIdentifier: 
+  _id: 521c0096-5d13-4fc5-8eb9-31818b9de10f
  _label: De kok
  _stickerSprite: {fileID: 21300000, guid: f0f142ae6fc17e04782ba2876a052baa, type: 3}
--- a/Assets/Ducks/stickers/driver.asset
+++ b/Assets/Ducks/stickers/driver.asset
@@ -12,6 +12,6 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 7d3768bc9b4537545bf3c5ae5663e033, type: 3}
  m_Name: driver
  m_EditorClassIdentifier: 
-  _id: ca9c7499-a3ae-4bb5-8c54-0c0d6275ba2a
+  _id: ed868b7e-d33a-43fa-91fe-38037afec922
  _label: De chauffeur
  _stickerSprite: {fileID: 21300000, guid: ddb49abf7bf805e4d8ff02013d431b75, type: 3}
--- a/Assets/Ducks/stickers/french.asset
+++ b/Assets/Ducks/stickers/french.asset
@@ -12,6 +12,6 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 7d3768bc9b4537545bf3c5ae5663e033, type: 3}
  m_Name: french
  m_EditorClassIdentifier: 
-  _id: 50c2d884-e7e7-434b-9d60-6f3e839798b1
+  _id: 6f747941-b9f9-4e4f-bba5-90259a09cd83
  _label: De fransman
  _stickerSprite: {fileID: 21300000, guid: 6548d657c349d214487c9cb85103ff8b, type: 3}
--- a/Assets/Ducks/stickers/heart.asset
+++ b/Assets/Ducks/stickers/heart.asset
@@ -12,6 +12,6 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 7d3768bc9b4537545bf3c5ae5663e033, type: 3}
  m_Name: heart
  m_EditorClassIdentifier: 
-  _id: 25686344-8c71-4bea-8aa3-11de2fd12887
+  _id: c7125016-1651-49b2-9a3a-58862a9c63b6
  _label: Het torteleendje
  _stickerSprite: {fileID: 21300000, guid: b0b9923bdf99a4343ae003860ebe7497, type: 3}
--- a/Assets/Ducks/stickers/king.asset
+++ b/Assets/Ducks/stickers/king.asset
@@ -12,5 +12,6 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 7d3768bc9b4537545bf3c5ae5663e033, type: 3}
  m_Name: king
  m_EditorClassIdentifier: 
+  _id: 539ed991-3443-4bcb-a20a-0f7a2edaa5ba
  _label: De koning
  _stickerSprite: {fileID: 21300000, guid: 869d7ef4bd2317d4e974b6a69247e9bb, type: 3}
--- a/Assets/Ducks/stickers/knight.asset
+++ b/Assets/Ducks/stickers/knight.asset
@@ -12,6 +12,6 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 7d3768bc9b4537545bf3c5ae5663e033, type: 3}
  m_Name: knight
  m_EditorClassIdentifier: 
-  _id: 7e6bbbaa-905e-432c-acd8-1ab4663fc5bd
+  _id: 44fb97f2-6c36-4785-b5de-09ec7eb3ceb1
  _label: De ridder
  _stickerSprite: {fileID: 21300000, guid: ecf41b5bfb585cb4cb03fa54afd6ef86, type: 3}
--- a/Assets/Ducks/stickers/milka.asset
+++ b/Assets/Ducks/stickers/milka.asset
@@ -12,6 +12,6 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 7d3768bc9b4537545bf3c5ae5663e033, type: 3}
  m_Name: milka
  m_EditorClassIdentifier: 
-  _id: 7e6bbbaa-905e-432c-acd8-1ab4663fc5bd
+  _id: 8b96402a-60f8-47d8-a706-971b0e06851b
  _label: De milka eend
  _stickerSprite: {fileID: 21300000, guid: 9863746f34f03174f9089ea00ef010a8, type: 3}
--- a/Assets/Ducks/stickers/nerd.asset
+++ b/Assets/Ducks/stickers/nerd.asset
@@ -12,6 +12,6 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 7d3768bc9b4537545bf3c5ae5663e033, type: 3}
  m_Name: nerd
  m_EditorClassIdentifier: 
-  _id: 75ad3ee9-8249-49fe-95ca-9eff9117708f
+  _id: 1a9a500e-b2a2-4001-8f38-56f4d2b55c56
  _label: De nerd
  _stickerSprite: {fileID: 21300000, guid: d17110e5fdc9957438ee42f1922ad98b, type: 3}
--- a/Assets/Ducks/stickers/rockstar.asset
+++ b/Assets/Ducks/stickers/rockstar.asset
@@ -12,6 +12,6 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 7d3768bc9b4537545bf3c5ae5663e033, type: 3}
  m_Name: rockstar
  m_EditorClassIdentifier: 
-  _id: 75ad3ee9-8249-49fe-95ca-9eff9117708f
+  _id: b556e0f0-049a-4573-b237-7ed97337344d
  _label: De rockster
  _stickerSprite: {fileID: 21300000, guid: 7a94547668159b44988ecbae3984aa06, type: 3}
--- a/ProjectSettings/EditorSettings.asset
+++ b/ProjectSettings/EditorSettings.asset
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -8,7 +8,7 @@ PlayerSettings:
  AndroidProfiler: 0
  AndroidFilterTouchesWhenObscured: 0
  AndroidEnableSustainedPerformanceMode: 0
-  defaultScreenOrientation: 4
+  defaultScreenOrientation: 0
  targetDevice: 2
  useOnDemandResources: 0
  accelerometerFrequency: 60
@@ -651,7 +651,8 @@ PlayerSettings:
  platformArchitecture: {}
  scriptingBackend: {}
  il2cppCompilerConfiguration: {}
-  managedStrippingLevel: {}
+  managedStrippingLevel:
+    Android: 2
  incrementalIl2cppBuild: {}
  allowUnsafeCode: 0
  additionalIl2CppArgs: