nightly

ipodtouch0218 · Jun 19, 2022 · 67d5a38 · 67d5a38
1 parent 1158f4c
commit 67d5a38
Show file tree

Hide file tree

Showing 28 changed files with 6,367 additions and 6,849 deletions.
diff --git a/Assets/Models/Players/mario_small/mario_small_source.blend b/Assets/Models/Players/mario_small/mario_small_source.blend
diff --git a/Assets/Models/Players/mario_small/mario_small_source.blend1 b/Assets/Models/Players/mario_small/mario_small_source.blend1
diff --git a/Assets/Resources/Prefabs/Enemy/Koopa.prefab b/Assets/Resources/Prefabs/Enemy/Koopa.prefab
@@ -129,7 +129,7 @@ Rigidbody2D:
   m_Simulated: 1
   m_UseFullKinematicContacts: 0
   m_UseAutoMass: 1
-  m_Mass: 0.15296769
+  m_Mass: 0.153
   m_LinearDrag: 0
   m_AngularDrag: 0.05
   m_GravityScale: 2.2
@@ -151,7 +151,7 @@ BoxCollider2D:
   m_IsTrigger: 0
   m_UsedByEffector: 0
   m_UsedByComposite: 0
-  m_Offset: {x: 0, y: 0.019871838}
+  m_Offset: {x: 0, y: 0.02}
   m_SpriteTilingProperty:
     border: {x: 0, y: 0, z: 0, w: 0}
     pivot: {x: 0.5, y: 0.25}
@@ -162,7 +162,7 @@ BoxCollider2D:
     adaptiveTiling: 0
   m_AutoTiling: 0
   serializedVersion: 2
-  m_Size: {x: 0.1, y: 0.16996409}
+  m_Size: {x: 0.1, y: 0.17}
   m_EdgeRadius: 0
 --- !u!114 &8836298984178612580
 MonoBehaviour:
@@ -199,6 +199,10 @@ MonoBehaviour:
   flipXFlip: 0
   putdown: 0
   wakeupTimer: 0
+  outShellHitboxSize: {x: 0.1, y: 0.17}
+  inShellHitboxSize: {x: 0.1, y: 0.1}
+  outShellHitboxOffset: {x: 0, y: 0.02}
+  inShellHitboxOffset: {x: 0, y: -0.015}
 --- !u!114 &-8304985406365087950
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -477,7 +481,7 @@ BoxCollider2D:
   m_IsTrigger: 1
   m_UsedByEffector: 0
   m_UsedByComposite: 0
-  m_Offset: {x: 0, y: 0.019871831}
+  m_Offset: {x: 0, y: 0.02}
   m_SpriteTilingProperty:
     border: {x: 0, y: 0, z: 0, w: 0}
     pivot: {x: 0.5, y: 0.25}
@@ -488,7 +492,7 @@ BoxCollider2D:
     adaptiveTiling: 0
   m_AutoTiling: 0
   serializedVersion: 2
-  m_Size: {x: 0.1, y: 0.16996408}
+  m_Size: {x: 0.1, y: 0.17}
   m_EdgeRadius: 0
 --- !u!114 &2923871750627057164
 MonoBehaviour:

diff --git a/Assets/Resources/Prefabs/Enemy/RedKoopa.prefab b/Assets/Resources/Prefabs/Enemy/RedKoopa.prefab
@@ -22,16 +22,6 @@ PrefabInstance:
       propertyPath: red
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 8836298984178612584, guid: 4f50cb5e806289d43bf820de1f1347bb,
-        type: 3}
-      propertyPath: m_SpriteTilingProperty.oldSize.x
-      value: 0.17
-      objectReference: {fileID: 0}
-    - target: {fileID: 8836298984178612584, guid: 4f50cb5e806289d43bf820de1f1347bb,
-        type: 3}
-      propertyPath: m_SpriteTilingProperty.oldSize.y
-      value: 0.3
-      objectReference: {fileID: 0}
     - target: {fileID: 8836298984178612585, guid: 4f50cb5e806289d43bf820de1f1347bb,
         type: 3}
       propertyPath: m_Controller
@@ -111,7 +101,7 @@ PrefabInstance:
     - target: {fileID: 8836298984178612591, guid: 4f50cb5e806289d43bf820de1f1347bb,
         type: 3}
       propertyPath: m_Mass
-      value: 0.11719838
+      value: 0.15296769
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 4f50cb5e806289d43bf820de1f1347bb, type: 3}