aaaaaaaa

fucking unity
Metatronius · Sep 7, 2019 · 5a59aab · 5a59aab
1 parent 10ff8d0
commit 5a59aab
Show file tree

Hide file tree

Showing 16 changed files with 131 additions and 200 deletions.
diff --git a/CirnoJam/Assets/Prefabs/Block.prefab b/CirnoJam/Assets/Prefabs/Block.prefab
@@ -1,45 +1,57 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1 &2087746031754128315
+--- !u!1 &2720165834423269781
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 8887906502821655099}
-  - component: {fileID: 7986984408718224218}
-  - component: {fileID: -7098323336632752977}
+  - component: {fileID: 6439386475726964316}
+  - component: {fileID: 4255847476361017118}
+  - component: {fileID: -6590108719597481641}
   m_Layer: 0
   m_Name: Block
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &8887906502821655099
+--- !u!4 &6439386475726964316
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2087746031754128315}
+  m_GameObject: {fileID: 2720165834423269781}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 1.5958331, y: 0.14959863, z: -0.7133538}
+  m_LocalPosition: {x: 3.9025574, y: -1.9828479, z: 2.3522663}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children:
-  - {fileID: 2276520501585961980}
+  m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!212 &7986984408718224218
+--- !u!114 &4255847476361017118
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2720165834423269781}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 50a8b13903d6a824b91321e6f68d9a31, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Sprite: {fileID: 0}
+--- !u!212 &-6590108719597481641
 SpriteRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2087746031754128315}
+  m_GameObject: {fileID: 2720165834423269781}
   m_Enabled: 1
   m_CastShadows: 0
   m_ReceiveShadows: 0
@@ -71,102 +83,14 @@ SpriteRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300000, guid: 2ce6f296ca270744b878c217e0390cfa, type: 3}
+  m_Sprite: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
   m_DrawMode: 0
-  m_Size: {x: 15, y: 12}
+  m_Size: {x: 1, y: 1}
   m_AdaptiveModeThreshold: 0.5
   m_SpriteTileMode: 0
-  m_WasSpriteAssigned: 1
+  m_WasSpriteAssigned: 0
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
---- !u!114 &-7098323336632752977
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2087746031754128315}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 50a8b13903d6a824b91321e6f68d9a31, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  Sprite: {fileID: 0}
---- !u!1001 &158405096674830424
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 8887906502821655099}
-    m_Modifications:
-    - target: {fileID: 6015422411894541140, guid: 572eaad945b577949a302e02419d7daa,
-        type: 3}
-      propertyPath: m_Name
-      value: BlockFactory
-      objectReference: {fileID: 0}
-    - target: {fileID: 2136139768315431844, guid: 572eaad945b577949a302e02419d7daa,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 2136139768315431844, guid: 572eaad945b577949a302e02419d7daa,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0.49999997
-      objectReference: {fileID: 0}
-    - target: {fileID: 2136139768315431844, guid: 572eaad945b577949a302e02419d7daa,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2136139768315431844, guid: 572eaad945b577949a302e02419d7daa,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2136139768315431844, guid: 572eaad945b577949a302e02419d7daa,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2136139768315431844, guid: 572eaad945b577949a302e02419d7daa,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2136139768315431844, guid: 572eaad945b577949a302e02419d7daa,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 2136139768315431844, guid: 572eaad945b577949a302e02419d7daa,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2136139768315431844, guid: 572eaad945b577949a302e02419d7daa,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2136139768315431844, guid: 572eaad945b577949a302e02419d7daa,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2136139768315431844, guid: 572eaad945b577949a302e02419d7daa,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 572eaad945b577949a302e02419d7daa, type: 3}
---- !u!4 &2276520501585961980 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 2136139768315431844, guid: 572eaad945b577949a302e02419d7daa,
-    type: 3}
-  m_PrefabInstance: {fileID: 158405096674830424}
-  m_PrefabAsset: {fileID: 0}
diff --git a/CirnoJam/Assets/Prefabs/BlockFactory.prefab b/CirnoJam/Assets/Prefabs/BlockFactory.prefab
@@ -57,7 +57,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: a14744d2d48161846b6ec8ca70c2840c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  BaseBlock: {fileID: -7098323336632752977, guid: d87e10c96c07b1e4e8ecc283c7df5716,
+  BaseBlock: {fileID: 4255847476361017118, guid: d87e10c96c07b1e4e8ecc283c7df5716,
     type: 3}
   PinkBlockSprite: {fileID: 21300000, guid: 99ab3dbc5f1862d4fbe1ce1ffd949b1d, type: 3}
   GreenBlockSprite: {fileID: 21300000, guid: 72f9973663691d34c824648323316dd0, type: 3}

diff --git a/CirnoJam/Assets/Prefabs/Cursor.prefab b/CirnoJam/Assets/Prefabs/Cursor.prefab
@@ -26,7 +26,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5498762083383611032}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -23, y: -5.60102, z: -50}
+  m_LocalPosition: {x: -3, y: -6.6, z: -2}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}

diff --git a/CirnoJam/Assets/Scripts/Nine.Core/Nine.Core.csproj.meta b/CirnoJam/Assets/Scripts/Nine.Core/Nine.Core.csproj.meta
diff --git a/CirnoJam/ProjectSettings/AudioManager.asset b/CirnoJam/ProjectSettings/AudioManager.asset
@@ -3,6 +3,7 @@
 --- !u!11 &1
 AudioManager:
   m_ObjectHideFlags: 0
+  serializedVersion: 2
   m_Volume: 1
   Rolloff Scale: 1
   Doppler Factor: 1
@@ -15,3 +16,4 @@ AudioManager:
   m_AmbisonicDecoderPlugin: 
   m_DisableAudio: 0
   m_VirtualizeEffects: 1
+  m_RequestedDSPBufferSize: 0
diff --git a/CirnoJam/ProjectSettings/DynamicsManager.asset b/CirnoJam/ProjectSettings/DynamicsManager.asset
@@ -3,7 +3,7 @@
 --- !u!55 &1
 PhysicsManager:
   m_ObjectHideFlags: 0
-  serializedVersion: 7
+  serializedVersion: 13
   m_Gravity: {x: 0, y: -9.81, z: 0}
   m_DefaultMaterial: {fileID: 0}
   m_BounceThreshold: 2
@@ -14,17 +14,22 @@ PhysicsManager:
   m_QueriesHitBackfaces: 0
   m_QueriesHitTriggers: 1
   m_EnableAdaptiveForce: 0
-  m_ClothInterCollisionDistance: 0
-  m_ClothInterCollisionStiffness: 0
+  m_ClothInterCollisionDistance: 0.1
+  m_ClothInterCollisionStiffness: 0.2
   m_ContactsGeneration: 1
   m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
   m_AutoSimulation: 1
   m_AutoSyncTransforms: 0
-  m_ReuseCollisionCallbacks: 1
+  m_ReuseCollisionCallbacks: 0
   m_ClothInterCollisionSettingsToggle: 0
+  m_ClothGravity: {x: 0, y: -9.81, z: 0}
   m_ContactPairsMode: 0
   m_BroadphaseType: 0
   m_WorldBounds:
     m_Center: {x: 0, y: 0, z: 0}
     m_Extent: {x: 250, y: 250, z: 250}
   m_WorldSubdivisions: 8
+  m_FrictionType: 0
+  m_EnableEnhancedDeterminism: 0
+  m_EnableUnifiedHeightmaps: 1
+  m_DefaultMaxAngularSpeed: 50
diff --git a/CirnoJam/ProjectSettings/EditorBuildSettings.asset b/CirnoJam/ProjectSettings/EditorBuildSettings.asset
@@ -8,10 +8,10 @@ EditorBuildSettings:
   - enabled: 1
     path: Assets/Scenes/TitleScreen.unity
     guid: 4006052ee4542ca4f869f9c5ea8e1e3d
-  - enabled: 1
-    path: Assets/Scenes/Marathon.unity
-    guid: dfd8c5a4247557d478b1184e6c080495
   - enabled: 1
     path: Assets/Scenes/Credits.unity
     guid: 889cf5f7e739db443bd8c7841af72bfe
+  - enabled: 1
+    path: Assets/Scenes/Marathon.unity
+    guid: dfd8c5a4247557d478b1184e6c080495
   m_configObjects: {}
diff --git a/CirnoJam/ProjectSettings/EditorSettings.asset b/CirnoJam/ProjectSettings/EditorSettings.asset
@@ -3,19 +3,24 @@
 --- !u!159 &1
 EditorSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 7
-  m_ExternalVersionControlSupport: Visible Meta Files
+  serializedVersion: 8
+  m_ExternalVersionControlSupport: Auto Detect
   m_SerializationMode: 2
   m_LineEndingsForNewScripts: 2
-  m_DefaultBehaviorMode: 1
-  m_SpritePackerMode: 4
+  m_DefaultBehaviorMode: 0
+  m_PrefabRegularEnvironment: {fileID: 0}
+  m_PrefabUIEnvironment: {fileID: 0}
+  m_SpritePackerMode: 0
   m_SpritePackerPaddingPower: 1
   m_EtcTextureCompressorBehavior: 1
   m_EtcTextureFastCompressor: 1
   m_EtcTextureNormalCompressor: 2
   m_EtcTextureBestCompressor: 4
-  m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd
+  m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmdef;asmref;rsp
   m_ProjectGenerationRootNamespace: 
-  m_UserGeneratedProjectSuffix: 
   m_CollabEditorSettings:
     inProgressEnabled: 1
+  m_EnableTextureStreamingInEditMode: 1
+  m_EnableTextureStreamingInPlayMode: 1
+  m_AsyncShaderCompilation: 1
+  m_ShowLightmapResolutionOverlay: 1
diff --git a/CirnoJam/ProjectSettings/GraphicsSettings.asset b/CirnoJam/ProjectSettings/GraphicsSettings.asset
@@ -29,11 +29,13 @@ GraphicsSettings:
     m_Mode: 1
     m_Shader: {fileID: 102, guid: 0000000000000000f000000000000000, type: 0}
   m_AlwaysIncludedShaders:
+  - {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 15104, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 15105, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
-  - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
-  - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
-  - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 10783, guid: 0000000000000000f000000000000000, type: 0}
   m_PreloadedShaders: []
   m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
     type: 0}

diff --git a/CirnoJam/ProjectSettings/Physics2DSettings.asset b/CirnoJam/ProjectSettings/Physics2DSettings.asset