Merge pull request #58 from w1n7er87/new-disk

new disk
Alexejhero · Apr 23, 2024 · 2e7520e · 2e7520e
2 parents cbbc264 + 314fb33
commit 2e7520e
Show file tree

Hide file tree

Showing 39 changed files with 6,040 additions and 20 deletions.
diff --git a/SCHIZO/Resources/AssetBundles/Assets.cs b/SCHIZO/Resources/AssetBundles/Assets.cs
@@ -12,7 +12,7 @@ namespace SCHIZO.Resources;
 
 public static class Assets
 {
-    private const int _rnd = 488613676;
+    private const int _rnd = -474431403;
 
     private static readonly UnityEngine.AssetBundle _a = ResourceManager.GetAssetBundle("assets");
 

diff --git a/SCHIZO/Resources/AssetBundles/assets b/SCHIZO/Resources/AssetBundles/assets
diff --git a/Unity/Assets/Mod/Jukebox/Creep (evil).asset b/Unity/Assets/Mod/Jukebox/Creep (evil).asset
@@ -22,8 +22,9 @@ MonoBehaviour:
   overrideTrackLabel: 0
   trackLabel: Evil Neuro - Creep (cover)
   unlockedOnStart: 0
-  diskPrefab: {fileID: 0}
+  diskPrefab: {fileID: 6492233284419335816, guid: d22ec62c611ee7545b0126d2a612b118,
+    type: 3}
   diskSpawnLocation:
     position: {x: -206.1, y: -274.68, z: -740.5}
-    rotation: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 90, z: 0}
   unlockFmodEvent: 
diff --git a/Unity/Assets/Mod/Jukebox/Death of the Law (evil).asset b/Unity/Assets/Mod/Jukebox/Death of the Law (evil).asset
@@ -22,8 +22,9 @@ MonoBehaviour:
   overrideTrackLabel: 0
   trackLabel: Evil Neuro - Death of the Law (cover)
   unlockedOnStart: 0
-  diskPrefab: {fileID: 0}
+  diskPrefab: {fileID: 6492233284419335816, guid: d22ec62c611ee7545b0126d2a612b118,
+    type: 3}
   diskSpawnLocation:
     position: {x: -59.4, y: 28.69, z: 545.45}
-    rotation: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 180, z: 0}
   unlockFmodEvent: 
diff --git a/Unity/Assets/Mod/Jukebox/Francium.asset b/Unity/Assets/Mod/Jukebox/Francium.asset
@@ -22,8 +22,9 @@ MonoBehaviour:
   overrideTrackLabel: 0
   trackLabel: Neuro-sama - Francium (cover)
   unlockedOnStart: 0
-  diskPrefab: {fileID: 0}
+  diskPrefab: {fileID: 6492233284419335816, guid: d22ec62c611ee7545b0126d2a612b118,
+    type: 3}
   diskSpawnLocation:
     position: {x: -251.636, y: 41.455, z: -790.693}
-    rotation: {x: 44, y: 0, z: 75}
+    rotation: {x: -4, y: 20, z: 80}
   unlockFmodEvent: 
diff --git a/Unity/Assets/Mod/Jukebox/Mechanical Heartbeat.asset b/Unity/Assets/Mod/Jukebox/Mechanical Heartbeat.asset
@@ -22,8 +22,9 @@ MonoBehaviour:
   overrideTrackLabel: 0
   trackLabel: Neuro & Evil - Mechanical Heartbeat (cover)
   unlockedOnStart: 0
-  diskPrefab: {fileID: 0}
+  diskPrefab: {fileID: 6492233284419335816, guid: d22ec62c611ee7545b0126d2a612b118,
+    type: 3}
   diskSpawnLocation:
     position: {x: -1185, y: 18.19, z: -713}
-    rotation: {x: 342, y: 329, z: 355}
+    rotation: {x: -15, y: -65, z: 9}
   unlockFmodEvent: 
diff --git a/Unity/Assets/Mod/Jukebox/Neuro Neuro.asset b/Unity/Assets/Mod/Jukebox/Neuro Neuro.asset
@@ -22,8 +22,9 @@ MonoBehaviour:
   overrideTrackLabel: 0
   trackLabel: Neuro-sama - Miku (cover)
   unlockedOnStart: 0
-  diskPrefab: {fileID: 0}
+  diskPrefab: {fileID: 6492233284419335816, guid: d22ec62c611ee7545b0126d2a612b118,
+    type: 3}
   diskSpawnLocation:
     position: {x: 77.49, y: -377.09, z: -914.05}
-    rotation: {x: 2, y: 231, z: 332}
+    rotation: {x: 0, y: 50, z: 20}
   unlockFmodEvent: 
diff --git a/Unity/Assets/Mod/Jukebox/Ocean Man.asset b/Unity/Assets/Mod/Jukebox/Ocean Man.asset
@@ -22,8 +22,9 @@ MonoBehaviour:
   overrideTrackLabel: 0
   trackLabel: Neuro-sama - Ocean Man (cover)
   unlockedOnStart: 0
-  diskPrefab: {fileID: 0}
+  diskPrefab: {fileID: 6492233284419335816, guid: d22ec62c611ee7545b0126d2a612b118,
+    type: 3}
   diskSpawnLocation:
-    position: {x: -82.53, y: -344.26, z: -1396.69}
-    rotation: {x: 10, y: 45, z: 0}
+    position: {x: -82.53, y: -344.28, z: -1396.69}
+    rotation: {x: -2, y: 135, z: 0}
   unlockFmodEvent: 
diff --git a/Unity/Assets/Mod/Jukebox/Sweater Weather.asset b/Unity/Assets/Mod/Jukebox/Sweater Weather.asset
@@ -22,8 +22,9 @@ MonoBehaviour:
   overrideTrackLabel: 0
   trackLabel: Evil Neuro - Sweater Weather (cover)
   unlockedOnStart: 0
-  diskPrefab: {fileID: 0}
+  diskPrefab: {fileID: 6492233284419335816, guid: d22ec62c611ee7545b0126d2a612b118,
+    type: 3}
   diskSpawnLocation:
     position: {x: -768, y: 50.1, z: 689.9}
-    rotation: {x: 358, y: 294, z: 49}
+    rotation: {x: -10, y: -66, z: 49}
   unlockFmodEvent: 
diff --git a/Unity/Assets/Mod/Jukebox/TruckersFM/TruckersFM.asset b/Unity/Assets/Mod/Jukebox/TruckersFM/TruckersFM.asset
@@ -15,7 +15,7 @@ MonoBehaviour:
   identifier: TruckersFM
   source: 2
   audioClip: {fileID: 0}
-  fmodEvent:
+  fmodEvent: 
   url: http://radio.truckers.fm
   isStream: 1
   streamLabelFormat: '<align=center><size=75%>TruckersFM</size></align>
@@ -24,7 +24,8 @@ MonoBehaviour:
   overrideTrackLabel: 0
   trackLabel: TruckersFM
   unlockedOnStart: 0
-  diskPrefab: {fileID: 0}
+  diskPrefab: {fileID: 38736133463817561, guid: b451605680c7d0247a76ac6cc7b8be9a,
+    type: 3}
   diskSpawnLocation:
     position: {x: -369.3, y: -174.6, z: -319.7}
     rotation: {x: 9.7, y: 7.5, z: 9.4}

diff --git a/Unity/Assets/Mod/Jukebox/TruckersFM/cog disk truckersfm.prefab b/Unity/Assets/Mod/Jukebox/TruckersFM/cog disk truckersfm.prefab
@@ -0,0 +1,76 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &6525880274626874321
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4691052849724364637, guid: d22ec62c611ee7545b0126d2a612b118,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 68c4bf79f01ae85468c245feb1519c49, type: 2}
+    - target: {fileID: 5859987316805233714, guid: d22ec62c611ee7545b0126d2a612b118,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5859987316805233714, guid: d22ec62c611ee7545b0126d2a612b118,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5859987316805233714, guid: d22ec62c611ee7545b0126d2a612b118,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5859987316805233714, guid: d22ec62c611ee7545b0126d2a612b118,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5859987316805233714, guid: d22ec62c611ee7545b0126d2a612b118,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 5859987316805233714, guid: d22ec62c611ee7545b0126d2a612b118,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 5859987316805233714, guid: d22ec62c611ee7545b0126d2a612b118,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 5859987316805233714, guid: d22ec62c611ee7545b0126d2a612b118,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 5859987316805233714, guid: d22ec62c611ee7545b0126d2a612b118,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -90
+      objectReference: {fileID: 0}
+    - target: {fileID: 5859987316805233714, guid: d22ec62c611ee7545b0126d2a612b118,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5859987316805233714, guid: d22ec62c611ee7545b0126d2a612b118,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: -90
+      objectReference: {fileID: 0}
+    - target: {fileID: 6492233284419335816, guid: d22ec62c611ee7545b0126d2a612b118,
+        type: 3}
+      propertyPath: m_Name
+      value: cog disk
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: d22ec62c611ee7545b0126d2a612b118, type: 3}
diff --git a/Unity/Assets/Mod/Jukebox/TruckersFM/cog disk truckersfm.prefab.meta b/Unity/Assets/Mod/Jukebox/TruckersFM/cog disk truckersfm.prefab.meta
diff --git a/Unity/Assets/Mod/Jukebox/cog disk.meta b/Unity/Assets/Mod/Jukebox/cog disk.meta