Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#153 Archiving Space #167

Merged
merged 10 commits into from
Feb 15, 2022
Merged

#153 Archiving Space #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
30fe68e
.
ahnjinmo Feb 14, 2022
f139f1f
added simple archiving system
ahnjinmo Feb 14, 2022
6553219
.
ahnjinmo Feb 14, 2022
b4cce26
.
ahnjinmo Feb 14, 2022
61c37d7
added article images
ahnjinmo Feb 14, 2022
6817393
.
ahnjinmo Feb 14, 2022
7a8a7d8
.
ahnjinmo Feb 15, 2022
775a5a3
[feat] completed archiving space feature
ahnjinmo Feb 15, 2022
7ece2ae
Merge branch 'dev' into #153_Client_ArchivingSpace
brainini Feb 15, 2022
0e21be0
[merge] merged completely
brainini Feb 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions Assets/Resources/CharacterPrefab.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2208,6 +2208,7 @@ GameObject:
- component: {fileID: 2860716928886699988}
- component: {fileID: 1138374259395030195}
- component: {fileID: -8478484832084735747}
- component: {fileID: 3276998854104065306}
m_Layer: 0
m_Name: CharacterPrefab
m_TagString: Player
Expand Down Expand Up @@ -2594,6 +2595,18 @@ MonoBehaviour:
launchInterval: 0.5
followParticles: {fileID: 0}
smokeParticle: {fileID: 0}
--- !u!114 &3276998854104065306
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4142847262815404090}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5c116d04ac2ac904687942d430b0e8f1, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &4184396513334393585
GameObject:
m_ObjectHideFlags: 0
Expand Down
Loading