Skip to content

Commit 7ad5595

Browse files
committed
final commit with minor bug fixes for demo 1
1 parent 4544743 commit 7ad5595

26 files changed

+4804
-1081
lines changed

Assets/Prefabs/Axe.prefab

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,12 @@ SpriteRenderer:
7676
m_SortingLayerID: 0
7777
m_SortingLayer: 0
7878
m_SortingOrder: 1
79-
m_Sprite: {fileID: 21300000, guid: a83713020c8d1e146bef3c7d04636417, type: 3}
79+
m_Sprite: {fileID: 21300000, guid: 5bfd296e4f7d86846bcd0cc62ae765af, type: 3}
8080
m_Color: {r: 1, g: 1, b: 1, a: 1}
8181
m_FlipX: 0
8282
m_FlipY: 0
8383
m_DrawMode: 0
84-
m_Size: {x: 1, y: 1}
84+
m_Size: {x: 2, y: 2}
8585
m_AdaptiveModeThreshold: 0.5
8686
m_SpriteTileMode: 0
8787
m_WasSpriteAssigned: 1
@@ -102,7 +102,7 @@ MonoBehaviour:
102102
sceneId: 0
103103
serverOnly: 0
104104
visible: 0
105-
m_AssetId: d8e6fd9efba20b94383adbf17350504e
105+
m_AssetId: 805cd90d7fecc25469637f186715b4e6
106106
hasSpawned: 0
107107
--- !u!114 &4356103169647388734
108108
MonoBehaviour:
@@ -155,9 +155,7 @@ MonoBehaviour:
155155
itemName: Axe
156156
rigidbody: {fileID: 9009453118196753398}
157157
collisionBox: {fileID: 4533632347135810936}
158-
isInInventory: 1
159158
isOnGround: 1
160-
isAttachedToMouse: 0
161159
--- !u!61 &4533632347135810936
162160
BoxCollider2D:
163161
m_ObjectHideFlags: 0
@@ -176,7 +174,7 @@ BoxCollider2D:
176174
border: {x: 0, y: 0, z: 0, w: 0}
177175
pivot: {x: 0.5, y: 0.5}
178176
oldSize: {x: 2, y: 2}
179-
newSize: {x: 1, y: 1}
177+
newSize: {x: 2, y: 2}
180178
adaptiveTilingThreshold: 0.5
181179
drawMode: 0
182180
adaptiveTiling: 0

Assets/Prefabs/Axe.prefab.meta

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Prefabs/pickaxe.prefab

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Transform:
3030
m_PrefabAsset: {fileID: 0}
3131
m_GameObject: {fileID: 8851680870657050520}
3232
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
33-
m_LocalPosition: {x: 10.282932, y: -4.1174316, z: 0}
33+
m_LocalPosition: {x: 0, y: 26.7, z: 0}
3434
m_LocalScale: {x: 1, y: 1, z: 0}
3535
m_Children: []
3636
m_Father: {fileID: 0}
@@ -76,12 +76,12 @@ SpriteRenderer:
7676
m_SortingLayerID: 0
7777
m_SortingLayer: 0
7878
m_SortingOrder: 1
79-
m_Sprite: {fileID: 21300000, guid: 4b66f21097323d44ab40669b2fb9c53d, type: 3}
79+
m_Sprite: {fileID: 21300000, guid: 02c84319e8d9ad34aade2dbad44cf2f4, type: 3}
8080
m_Color: {r: 1, g: 1, b: 1, a: 1}
8181
m_FlipX: 0
8282
m_FlipY: 0
8383
m_DrawMode: 0
84-
m_Size: {x: 1, y: 1}
84+
m_Size: {x: 2, y: 2}
8585
m_AdaptiveModeThreshold: 0.5
8686
m_SpriteTileMode: 0
8787
m_WasSpriteAssigned: 1
@@ -102,7 +102,7 @@ MonoBehaviour:
102102
sceneId: 0
103103
serverOnly: 0
104104
visible: 0
105-
m_AssetId:
105+
m_AssetId: 2880292ca506c254981b2bd6cce98583
106106
hasSpawned: 0
107107
--- !u!114 &8062497170925518199
108108
MonoBehaviour:
@@ -155,6 +155,9 @@ MonoBehaviour:
155155
itemName: Pickaxe
156156
rigidbody: {fileID: 3357507556551784127}
157157
collisionBox: {fileID: 7888881771026204721}
158+
isInInventory: 1
159+
isOnGround: 1
160+
isAttachedToMouse: 0
158161
--- !u!61 &7888881771026204721
159162
BoxCollider2D:
160163
m_ObjectHideFlags: 0
@@ -172,8 +175,8 @@ BoxCollider2D:
172175
m_SpriteTilingProperty:
173176
border: {x: 0, y: 0, z: 0, w: 0}
174177
pivot: {x: 0.5, y: 0.5}
175-
oldSize: {x: 1, y: 1}
176-
newSize: {x: 1, y: 1}
178+
oldSize: {x: 2, y: 2}
179+
newSize: {x: 2, y: 2}
177180
adaptiveTilingThreshold: 0.5
178181
drawMode: 0
179182
adaptiveTiling: 0
@@ -194,7 +197,7 @@ Rigidbody2D:
194197
m_UseFullKinematicContacts: 0
195198
m_UseAutoMass: 0
196199
m_Mass: 1
197-
m_LinearDrag: 0
200+
m_LinearDrag: 6
198201
m_AngularDrag: 0.05
199202
m_GravityScale: 1
200203
m_Material: {fileID: 0}

0 commit comments

Comments
 (0)