Skip to content

Commit 92a81e9

Browse files
authored
Merge pull request #5 from Im-Rises/develop
Develop
2 parents ce07820 + 11b2815 commit 92a81e9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+3449
-3214
lines changed

Assets/Animations/Ghosts/ghost_blue_sprites_128x128_0.controller

Lines changed: 0 additions & 72 deletions
This file was deleted.

Assets/Prefabs/Collectibles/CollectiblePacgum.prefab

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ GameObject:
1616
- component: {fileID: 309785153550593809}
1717
m_Layer: 0
1818
m_Name: CollectiblePacgum
19-
m_TagString: Untagged
19+
m_TagString: PacGum
2020
m_Icon: {fileID: 0}
2121
m_NavMeshLayer: 0
2222
m_StaticEditorFlags: 0

Assets/Prefabs/Door/Door.prefab

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ GameObject:
1010
m_Component:
1111
- component: {fileID: 6280111001161052539}
1212
- component: {fileID: 6280111001161052537}
13-
- component: {fileID: 6280111001161052538}
1413
m_Layer: 0
1514
m_Name: Door
1615
m_TagString: Untagged
@@ -60,20 +59,6 @@ BoxCollider2D:
6059
serializedVersion: 2
6160
m_Size: {x: 2, y: 0.5}
6261
m_EdgeRadius: 0
63-
--- !u!114 &6280111001161052538
64-
MonoBehaviour:
65-
m_ObjectHideFlags: 0
66-
m_CorrespondingSourceObject: {fileID: 0}
67-
m_PrefabInstance: {fileID: 0}
68-
m_PrefabAsset: {fileID: 0}
69-
m_GameObject: {fileID: 6280111001161052548}
70-
m_Enabled: 1
71-
m_EditorHideFlags: 0
72-
m_Script: {fileID: 11500000, guid: c4fdc83730bf04c45938ea09923438e8, type: 3}
73-
m_Name:
74-
m_EditorClassIdentifier:
75-
anim: {fileID: 6280111002132371767}
76-
open: 0
7762
--- !u!1 &6280111002132371760
7863
GameObject:
7964
m_ObjectHideFlags: 0

Assets/Prefabs/Old.meta renamed to Assets/Prefabs/GhosHome.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)