Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
tetra-tower
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Oenos
tetra-tower
Commits
f30a49c8
Commit
f30a49c8
authored
Jan 28, 2019
by
18류지석
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
드랍된 아이템 구현
parent
976e2819
Changes
31
Show whitespace changes
Inline
Side-by-side
Showing
31 changed files
with
303 additions
and
710 deletions
+303
-710
Player.prefab
Assets/Prefabs/Characters/Player.prefab
+21
-4
Addon.prefab
Assets/Prefabs/Pickups/Addon.prefab
+0
-53
Addon.prefab.meta
Assets/Prefabs/Pickups/Addon.prefab.meta
+0
-8
DroppedItem.prefab
Assets/Prefabs/Pickups/DroppedItem.prefab
+0
-53
Frame.prefab
Assets/Prefabs/Pickups/Frame.prefab
+0
-53
Item.prefab
Assets/Prefabs/Pickups/Item.prefab
+0
-53
Item.prefab.meta
Assets/Prefabs/Pickups/Item.prefab.meta
+0
-8
LifeCrystal.prefab
Assets/Prefabs/Pickups/LifeCrystal.prefab
+0
-357
LifeCrystal.prefab.meta
Assets/Prefabs/Pickups/LifeCrystal.prefab.meta
+0
-8
Potion.prefab
Assets/Prefabs/Pickups/Potion.prefab
+0
-53
Potion.prefab.meta
Assets/Prefabs/Pickups/Potion.prefab.meta
+0
-8
DroppedItem.prefab
Assets/Prefabs/UI/In-Game UI/InventoryUI/DroppedItem.prefab
+148
-0
DroppedItem.prefab.meta
...Prefabs/UI/In-Game UI/InventoryUI/DroppedItem.prefab.meta
+1
-1
InventoryCanvas.prefab
.../Prefabs/UI/In-Game UI/InventoryUI/InventoryCanvas.prefab
+2
-2
LifeStoneUI.meta
Assets/Prefabs/UI/In-Game UI/LifeStoneUI.meta
+0
-0
DroppedLifeUnitPrefab.prefab
...bs/UI/In-Game UI/LifeStoneUI/DroppedLifeUnitPrefab.prefab
+1
-1
DroppedLifeUnitPrefab.prefab.meta
.../In-Game UI/LifeStoneUI/DroppedLifeUnitPrefab.prefab.meta
+0
-0
LifeStoneUnit.prefab
...ts/Prefabs/UI/In-Game UI/LifeStoneUI/LifeStoneUnit.prefab
+0
-0
LifeStoneUnit.prefab.meta
...efabs/UI/In-Game UI/LifeStoneUI/LifeStoneUnit.prefab.meta
+0
-0
LifeUnitHighlight.prefab
...refabs/UI/In-Game UI/LifeStoneUI/LifeUnitHighlight.prefab
+0
-0
LifeUnitHighlight.prefab.meta
...s/UI/In-Game UI/LifeStoneUI/LifeUnitHighlight.prefab.meta
+0
-0
LifeUnitSprite.prefab
...s/Prefabs/UI/In-Game UI/LifeStoneUI/LifeUnitSprite.prefab
+0
-0
LifeUnitSprite.prefab.meta
...fabs/UI/In-Game UI/LifeStoneUI/LifeUnitSprite.prefab.meta
+0
-0
standardImage.prefab
...ts/Prefabs/UI/In-Game UI/LifeStoneUI/standardImage.prefab
+0
-0
standardImage.prefab.meta
...efabs/UI/In-Game UI/LifeStoneUI/standardImage.prefab.meta
+0
-0
PlayScene.unity
Assets/Scenes/PlayScene.unity
+7
-37
DroppedItem.cs
Assets/Scripts/Item/DroppedItem.cs
+64
-0
DroppedItem.cs.meta
Assets/Scripts/Item/DroppedItem.cs.meta
+11
-0
InventoryManager.cs
Assets/Scripts/Item/InventoryManager.cs
+45
-10
Physics2DSettings.asset
ProjectSettings/Physics2DSettings.asset
+1
-1
TagManager.asset
ProjectSettings/TagManager.asset
+2
-0
No files found.
Assets/Prefabs/Characters/Player.prefab
View file @
f30a49c8
...
@@ -42,6 +42,7 @@ GameObject:
...
@@ -42,6 +42,7 @@ GameObject:
m_Component
:
m_Component
:
-
component
:
{
fileID
:
4710911479571038
}
-
component
:
{
fileID
:
4710911479571038
}
-
component
:
{
fileID
:
61129044981816742
}
-
component
:
{
fileID
:
61129044981816742
}
-
component
:
{
fileID
:
114394263314388464
}
m_Layer
:
0
m_Layer
:
0
m_Name
:
AttackColider
m_Name
:
AttackColider
m_TagString
:
Untagged
m_TagString
:
Untagged
...
@@ -176,11 +177,11 @@ MonoBehaviour:
...
@@ -176,11 +177,11 @@ MonoBehaviour:
m_Name
:
m_Name
:
m_EditorClassIdentifier
:
m_EditorClassIdentifier
:
rbGravityScale
:
3
rbGravityScale
:
3
rbAttackGravityScale
:
3
rbAttackGravityScale
:
0.5
maxSpeed
:
3
maxSpeed
:
3
maxDashSpeed
:
6
maxDashSpeed
:
6
accerlation
:
1200
accerlation
:
1200
jumpSpeed
:
1
1
jumpSpeed
:
1
2
ropeSpeed
:
3
ropeSpeed
:
3
doubleJumpSpeed
:
10
doubleJumpSpeed
:
10
dashAccerlation
:
2000
dashAccerlation
:
2000
...
@@ -207,6 +208,22 @@ MonoBehaviour:
...
@@ -207,6 +208,22 @@ MonoBehaviour:
ropeDown
:
0.8
ropeDown
:
0.8
playerState
:
0
playerState
:
0
previousState
:
0
previousState
:
0
---
!u!114
&114394263314388464
MonoBehaviour
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1862495014651308
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
64f948f7c7aacab409fe963a6f9e0d2a
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
damage
:
0
knockBackMultiplier
:
1
debuffNum
:
0
debuffType
:
debuffTime
:
00000000000000000000000000000000000000000000000000000000000000000000000000000000
---
!u!114
&114880704145925944
---
!u!114
&114880704145925944
MonoBehaviour
:
MonoBehaviour
:
m_ObjectHideFlags
:
1
m_ObjectHideFlags
:
1
...
@@ -218,13 +235,13 @@ MonoBehaviour:
...
@@ -218,13 +235,13 @@ MonoBehaviour:
m_Script
:
{
fileID
:
11500000
,
guid
:
4ab58a64164eb984d8683df370ddce96
,
type
:
3
}
m_Script
:
{
fileID
:
11500000
,
guid
:
4ab58a64164eb984d8683df370ddce96
,
type
:
3
}
m_Name
:
m_Name
:
m_EditorClassIdentifier
:
m_EditorClassIdentifier
:
state
:
0
attackRaw
:
attackRaw
:
-
0
-
0
-
0
-
0
-
0
-
0
attackKeyState
:
000000000000000000000000
attackKeyState
:
000000000000000000000000
cancel
:
0
cancelRaw
:
0
cancelKeyState
:
0
playingSkill
:
0
playingSkill
:
0
comboTime
:
1
comboTime
:
1
time
:
{
fileID
:
0
}
time
:
{
fileID
:
0
}
...
...
Assets/Prefabs/Pickups/Addon.prefab
deleted
100644 → 0
View file @
976e2819
%YAML
1.1
%TAG
!u!
tag:unity3d.com,2011:
---
!u!1001
&100100000
Prefab
:
m_ObjectHideFlags
:
1
serializedVersion
:
2
m_Modification
:
m_TransformParent
:
{
fileID
:
0
}
m_Modifications
:
[]
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
0
}
m_RootGameObject
:
{
fileID
:
1007759869299288
}
m_IsPrefabAsset
:
1
---
!u!1
&1007759869299288
GameObject
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
serializedVersion
:
6
m_Component
:
-
component
:
{
fileID
:
4671478330306208
}
-
component
:
{
fileID
:
114131886443682132
}
m_Layer
:
0
m_Name
:
Addon
m_TagString
:
Untagged
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
m_IsActive
:
1
---
!u!4
&4671478330306208
Transform
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1007759869299288
}
m_LocalRotation
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
1
}
m_LocalPosition
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
[]
m_Father
:
{
fileID
:
0
}
m_RootOrder
:
0
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
---
!u!114
&114131886443682132
MonoBehaviour
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1007759869299288
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
138c726404f3fd444abdec4d37ba3b85
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
Assets/Prefabs/Pickups/Addon.prefab.meta
deleted
100644 → 0
View file @
976e2819
fileFormatVersion: 2
guid: 1ccb31a1ed695bb4ba0f4cb27dc7ecea
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:
Assets/Prefabs/Pickups/DroppedItem.prefab
deleted
100644 → 0
View file @
976e2819
%YAML
1.1
%TAG
!u!
tag:unity3d.com,2011:
---
!u!1001
&100100000
Prefab
:
m_ObjectHideFlags
:
1
serializedVersion
:
2
m_Modification
:
m_TransformParent
:
{
fileID
:
0
}
m_Modifications
:
[]
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
0
}
m_RootGameObject
:
{
fileID
:
1930691243125776
}
m_IsPrefabAsset
:
1
---
!u!1
&1930691243125776
GameObject
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
serializedVersion
:
6
m_Component
:
-
component
:
{
fileID
:
4879553040286588
}
-
component
:
{
fileID
:
114583635118442760
}
m_Layer
:
0
m_Name
:
DroppedItem
m_TagString
:
Untagged
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
m_IsActive
:
1
---
!u!4
&4879553040286588
Transform
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1930691243125776
}
m_LocalRotation
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
1
}
m_LocalPosition
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
[]
m_Father
:
{
fileID
:
0
}
m_RootOrder
:
0
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
---
!u!114
&114583635118442760
MonoBehaviour
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1930691243125776
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
5ac27f5d1dcc7e241b8cffe2a360a604
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
Assets/Prefabs/Pickups/Frame.prefab
deleted
100644 → 0
View file @
976e2819
%YAML
1.1
%TAG
!u!
tag:unity3d.com,2011:
---
!u!1001
&100100000
Prefab
:
m_ObjectHideFlags
:
1
serializedVersion
:
2
m_Modification
:
m_TransformParent
:
{
fileID
:
0
}
m_Modifications
:
[]
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
0
}
m_RootGameObject
:
{
fileID
:
1536692734079516
}
m_IsPrefabAsset
:
1
---
!u!1
&1536692734079516
GameObject
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
serializedVersion
:
6
m_Component
:
-
component
:
{
fileID
:
4590347336141776
}
-
component
:
{
fileID
:
114780538278930512
}
m_Layer
:
0
m_Name
:
Frame
m_TagString
:
Untagged
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
m_IsActive
:
1
---
!u!4
&4590347336141776
Transform
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1536692734079516
}
m_LocalRotation
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
1
}
m_LocalPosition
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
[]
m_Father
:
{
fileID
:
0
}
m_RootOrder
:
0
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
---
!u!114
&114780538278930512
MonoBehaviour
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1536692734079516
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
8af377227dc260b4aa0846ed539ffd3c
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
Assets/Prefabs/Pickups/Item.prefab
deleted
100644 → 0
View file @
976e2819
%YAML
1.1
%TAG
!u!
tag:unity3d.com,2011:
---
!u!1001
&100100000
Prefab
:
m_ObjectHideFlags
:
1
serializedVersion
:
2
m_Modification
:
m_TransformParent
:
{
fileID
:
0
}
m_Modifications
:
[]
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
0
}
m_RootGameObject
:
{
fileID
:
1892097559098470
}
m_IsPrefabAsset
:
1
---
!u!1
&1892097559098470
GameObject
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
serializedVersion
:
6
m_Component
:
-
component
:
{
fileID
:
4694445303096730
}
-
component
:
{
fileID
:
114583774776711718
}
m_Layer
:
0
m_Name
:
Item
m_TagString
:
Untagged
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
m_IsActive
:
1
---
!u!4
&4694445303096730
Transform
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1892097559098470
}
m_LocalRotation
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
1
}
m_LocalPosition
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
[]
m_Father
:
{
fileID
:
0
}
m_RootOrder
:
0
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
---
!u!114
&114583774776711718
MonoBehaviour
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1892097559098470
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
9574d82cade29e6419b802dfbd1c8c64
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
Assets/Prefabs/Pickups/Item.prefab.meta
deleted
100644 → 0
View file @
976e2819
fileFormatVersion: 2
guid: 1ca84ddb657019041a7cfe19bb2885b7
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:
Assets/Prefabs/Pickups/LifeCrystal.prefab
deleted
100644 → 0
View file @
976e2819
%YAML
1.1
%TAG
!u!
tag:unity3d.com,2011:
---
!u!1001
&100100000
Prefab
:
m_ObjectHideFlags
:
1
serializedVersion
:
2
m_Modification
:
m_TransformParent
:
{
fileID
:
0
}
m_Modifications
:
[]
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
0
}
m_RootGameObject
:
{
fileID
:
1598456437412398
}
m_IsPrefabAsset
:
1
---
!u!1
&1086150782504474
GameObject
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
serializedVersion
:
6
m_Component
:
-
component
:
{
fileID
:
4539484780910042
}
-
component
:
{
fileID
:
212294618985456844
}
m_Layer
:
0
m_Name
:
LC02
m_TagString
:
Untagged
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
m_IsActive
:
1
---
!u!1
&1598456437412398
GameObject
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
serializedVersion
:
6
m_Component
:
-
component
:
{
fileID
:
4899151099023828
}
-
component
:
{
fileID
:
114668887705250660
}
m_Layer
:
0
m_Name
:
LifeCrystal
m_TagString
:
Untagged
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
m_IsActive
:
1
---
!u!1
&1621192770531916
GameObject
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
serializedVersion
:
6
m_Component
:
-
component
:
{
fileID
:
4666237034905418
}
-
component
:
{
fileID
:
212955730789522360
}
m_Layer
:
0
m_Name
:
LC04
m_TagString
:
Untagged
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
m_IsActive
:
1
---
!u!1
&1742116263787068
GameObject
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
serializedVersion
:
6
m_Component
:
-
component
:
{
fileID
:
4930501416020388
}
-
component
:
{
fileID
:
212435145151143632
}
m_Layer
:
0
m_Name
:
LC01
m_TagString
:
Untagged
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
m_IsActive
:
1
---
!u!1
&1990459702590890
GameObject
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
serializedVersion
:
6
m_Component
:
-
component
:
{
fileID
:
4741057175483640
}
-
component
:
{
fileID
:
212888278394536528
}
m_Layer
:
0
m_Name
:
LC03
m_TagString
:
Untagged
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
m_IsActive
:
1
---
!u!4
&4539484780910042
Transform
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1086150782504474
}
m_LocalRotation
:
{
x
:
-0
,
y
:
-0
,
z
:
-0
,
w
:
1
}
m_LocalPosition
:
{
x
:
1
,
y
:
0
,
z
:
0
}
m_LocalScale
:
{
x
:
10
,
y
:
10
,
z
:
1
}
m_Children
:
[]
m_Father
:
{
fileID
:
4899151099023828
}
m_RootOrder
:
1
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
---
!u!4
&4666237034905418
Transform
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1621192770531916
}
m_LocalRotation
:
{
x
:
-0
,
y
:
-0
,
z
:
-0
,
w
:
1
}
m_LocalPosition
:
{
x
:
2
,
y
:
1
,
z
:
0
}
m_LocalScale
:
{
x
:
10
,
y
:
10
,
z
:
1
}
m_Children
:
[]
m_Father
:
{
fileID
:
4899151099023828
}
m_RootOrder
:
3
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
---
!u!4
&4741057175483640
Transform
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1990459702590890
}
m_LocalRotation
:
{
x
:
-0
,
y
:
-0
,
z
:
-0
,
w
:
1
}
m_LocalPosition
:
{
x
:
2
,
y
:
0
,
z
:
0
}
m_LocalScale
:
{
x
:
10
,
y
:
10
,
z
:
1
}
m_Children
:
[]
m_Father
:
{
fileID
:
4899151099023828
}
m_RootOrder
:
2
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
---
!u!4
&4899151099023828
Transform
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1598456437412398
}
m_LocalRotation
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
1
}
m_LocalPosition
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_LocalScale
:
{
x
:
0.2
,
y
:
0.2
,
z
:
1
}
m_Children
:
-
{
fileID
:
4930501416020388
}
-
{
fileID
:
4539484780910042
}
-
{
fileID
:
4741057175483640
}
-
{
fileID
:
4666237034905418
}
m_Father
:
{
fileID
:
0
}
m_RootOrder
:
0
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
---
!u!4
&4930501416020388
Transform
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1742116263787068
}
m_LocalRotation
:
{
x
:
-0
,
y
:
-0
,
z
:
-0
,
w
:
1
}
m_LocalPosition
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_LocalScale
:
{
x
:
10
,
y
:
10
,
z
:
1
}
m_Children
:
[]
m_Father
:
{
fileID
:
4899151099023828
}
m_RootOrder
:
0
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
---
!u!114
&114668887705250660
MonoBehaviour
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1598456437412398
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
60f8b2083eab5134ead2083cd318cbc0
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
---
!u!212
&212294618985456844
SpriteRenderer
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1086150782504474
}
m_Enabled
:
1
m_CastShadows
:
0
m_ReceiveShadows
:
0
m_DynamicOccludee
:
1
m_MotionVectors
:
1
m_LightProbeUsage
:
1
m_ReflectionProbeUsage
:
1
m_RenderingLayerMask
:
4294967295
m_Materials
:
-
{
fileID
:
10754
,
guid
:
0000000000000000f000000000000000
,
type
:
0
}
m_StaticBatchInfo
:
firstSubMesh
:
0
subMeshCount
:
0
m_StaticBatchRoot
:
{
fileID
:
0
}
m_ProbeAnchor
:
{
fileID
:
0
}
m_LightProbeVolumeOverride
:
{
fileID
:
0
}
m_ScaleInLightmap
:
1
m_PreserveUVs
:
0
m_IgnoreNormalsForChartDetection
:
0
m_ImportantGI
:
0
m_StitchLightmapSeams
:
0
m_SelectedEditorRenderState
:
0
m_MinimumChartSize
:
4
m_AutoUVMaxDistance
:
0.5
m_AutoUVMaxAngle
:
89
m_LightmapParameters
:
{
fileID
:
0
}
m_SortingLayerID
:
0
m_SortingLayer
:
0
m_SortingOrder
:
0
m_Sprite
:
{
fileID
:
21300000
,
guid
:
137b0e8d2160bab45893f33e02df312a
,
type
:
3
}
m_Color
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
m_FlipX
:
0
m_FlipY
:
0
m_DrawMode
:
0
m_Size
:
{
x
:
0.12
,
y
:
0.12
}
m_AdaptiveModeThreshold
:
0.5
m_SpriteTileMode
:
0
m_WasSpriteAssigned
:
1
m_MaskInteraction
:
0
m_SpriteSortPoint
:
0
---
!u!212
&212435145151143632
SpriteRenderer
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1742116263787068
}
m_Enabled
:
1
m_CastShadows
:
0
m_ReceiveShadows
:
0
m_DynamicOccludee
:
1
m_MotionVectors
:
1
m_LightProbeUsage
:
1
m_ReflectionProbeUsage
:
1
m_RenderingLayerMask
:
4294967295
m_Materials
:
-
{
fileID
:
10754
,
guid
:
0000000000000000f000000000000000
,
type
:
0
}
m_StaticBatchInfo
:
firstSubMesh
:
0
subMeshCount
:
0
m_StaticBatchRoot
:
{
fileID
:
0
}
m_ProbeAnchor
:
{
fileID
:
0
}
m_LightProbeVolumeOverride
:
{
fileID
:
0
}
m_ScaleInLightmap
:
1
m_PreserveUVs
:
0
m_IgnoreNormalsForChartDetection
:
0
m_ImportantGI
:
0
m_StitchLightmapSeams
:
0
m_SelectedEditorRenderState
:
0
m_MinimumChartSize
:
4
m_AutoUVMaxDistance
:
0.5
m_AutoUVMaxAngle
:
89
m_LightmapParameters
:
{
fileID
:
0
}
m_SortingLayerID
:
0
m_SortingLayer
:
0
m_SortingOrder
:
0
m_Sprite
:
{
fileID
:
21300000
,
guid
:
137b0e8d2160bab45893f33e02df312a
,
type
:
3
}
m_Color
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
m_FlipX
:
0
m_FlipY
:
0
m_DrawMode
:
0
m_Size
:
{
x
:
0.12
,
y
:
0.12
}
m_AdaptiveModeThreshold
:
0.5
m_SpriteTileMode
:
0
m_WasSpriteAssigned
:
1
m_MaskInteraction
:
0
m_SpriteSortPoint
:
0
---
!u!212
&212888278394536528
SpriteRenderer
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1990459702590890
}
m_Enabled
:
1
m_CastShadows
:
0
m_ReceiveShadows
:
0
m_DynamicOccludee
:
1
m_MotionVectors
:
1
m_LightProbeUsage
:
1
m_ReflectionProbeUsage
:
1
m_RenderingLayerMask
:
4294967295
m_Materials
:
-
{
fileID
:
10754
,
guid
:
0000000000000000f000000000000000
,
type
:
0
}
m_StaticBatchInfo
:
firstSubMesh
:
0
subMeshCount
:
0
m_StaticBatchRoot
:
{
fileID
:
0
}
m_ProbeAnchor
:
{
fileID
:
0
}
m_LightProbeVolumeOverride
:
{
fileID
:
0
}
m_ScaleInLightmap
:
1
m_PreserveUVs
:
0
m_IgnoreNormalsForChartDetection
:
0
m_ImportantGI
:
0
m_StitchLightmapSeams
:
0
m_SelectedEditorRenderState
:
0
m_MinimumChartSize
:
4
m_AutoUVMaxDistance
:
0.5
m_AutoUVMaxAngle
:
89
m_LightmapParameters
:
{
fileID
:
0
}
m_SortingLayerID
:
0
m_SortingLayer
:
0
m_SortingOrder
:
0
m_Sprite
:
{
fileID
:
21300000
,
guid
:
137b0e8d2160bab45893f33e02df312a
,
type
:
3
}
m_Color
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
m_FlipX
:
0
m_FlipY
:
0
m_DrawMode
:
0
m_Size
:
{
x
:
0.12
,
y
:
0.12
}
m_AdaptiveModeThreshold
:
0.5
m_SpriteTileMode
:
0
m_WasSpriteAssigned
:
1
m_MaskInteraction
:
0
m_SpriteSortPoint
:
0
---
!u!212
&212955730789522360
SpriteRenderer
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1621192770531916
}
m_Enabled
:
1
m_CastShadows
:
0
m_ReceiveShadows
:
0
m_DynamicOccludee
:
1
m_MotionVectors
:
1
m_LightProbeUsage
:
1
m_ReflectionProbeUsage
:
1
m_RenderingLayerMask
:
4294967295
m_Materials
:
-
{
fileID
:
10754
,
guid
:
0000000000000000f000000000000000
,
type
:
0
}
m_StaticBatchInfo
:
firstSubMesh
:
0
subMeshCount
:
0
m_StaticBatchRoot
:
{
fileID
:
0
}
m_ProbeAnchor
:
{
fileID
:
0
}
m_LightProbeVolumeOverride
:
{
fileID
:
0
}
m_ScaleInLightmap
:
1
m_PreserveUVs
:
0
m_IgnoreNormalsForChartDetection
:
0
m_ImportantGI
:
0
m_StitchLightmapSeams
:
0
m_SelectedEditorRenderState
:
0
m_MinimumChartSize
:
4
m_AutoUVMaxDistance
:
0.5
m_AutoUVMaxAngle
:
89
m_LightmapParameters
:
{
fileID
:
0
}
m_SortingLayerID
:
0
m_SortingLayer
:
0
m_SortingOrder
:
0
m_Sprite
:
{
fileID
:
21300000
,
guid
:
137b0e8d2160bab45893f33e02df312a
,
type
:
3
}
m_Color
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
m_FlipX
:
0
m_FlipY
:
0
m_DrawMode
:
0
m_Size
:
{
x
:
0.12
,
y
:
0.12
}
m_AdaptiveModeThreshold
:
0.5
m_SpriteTileMode
:
0
m_WasSpriteAssigned
:
1
m_MaskInteraction
:
0
m_SpriteSortPoint
:
0
Assets/Prefabs/Pickups/LifeCrystal.prefab.meta
deleted
100644 → 0
View file @
976e2819
fileFormatVersion: 2
guid: 86dcaa3d062378746bffa7e9c773fa12
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:
Assets/Prefabs/Pickups/Potion.prefab
deleted
100644 → 0
View file @
976e2819
%YAML
1.1
%TAG
!u!
tag:unity3d.com,2011:
---
!u!1001
&100100000
Prefab
:
m_ObjectHideFlags
:
1
serializedVersion
:
2
m_Modification
:
m_TransformParent
:
{
fileID
:
0
}
m_Modifications
:
[]
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
0
}
m_RootGameObject
:
{
fileID
:
1919051286898630
}
m_IsPrefabAsset
:
1
---
!u!1
&1919051286898630
GameObject
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
serializedVersion
:
6
m_Component
:
-
component
:
{
fileID
:
4437898873928542
}
-
component
:
{
fileID
:
114034260101831288
}
m_Layer
:
0
m_Name
:
Potion
m_TagString
:
Untagged
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
m_IsActive
:
1
---
!u!4
&4437898873928542
Transform
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1919051286898630
}
m_LocalRotation
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
1
}
m_LocalPosition
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
[]
m_Father
:
{
fileID
:
0
}
m_RootOrder
:
0
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
---
!u!114
&114034260101831288
MonoBehaviour
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1919051286898630
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
d9fdb539a8c32be4bb032f0a7434f6a6
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
Assets/Prefabs/Pickups/Potion.prefab.meta
deleted
100644 → 0
View file @
976e2819
fileFormatVersion: 2
guid: d8bc3f2dd1b5a704e86716847680ea95
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:
Assets/Prefabs/UI/In-Game UI/InventoryUI/DroppedItem.prefab
0 → 100644
View file @
f30a49c8
%YAML
1.1
%TAG
!u!
tag:unity3d.com,2011:
---
!u!1001
&100100000
Prefab
:
m_ObjectHideFlags
:
1
serializedVersion
:
2
m_Modification
:
m_TransformParent
:
{
fileID
:
0
}
m_Modifications
:
[]
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
0
}
m_RootGameObject
:
{
fileID
:
1610049888013262
}
m_IsPrefabAsset
:
1
---
!u!1
&1610049888013262
GameObject
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
serializedVersion
:
6
m_Component
:
-
component
:
{
fileID
:
4490692399716652
}
-
component
:
{
fileID
:
114311885383538228
}
-
component
:
{
fileID
:
50921709401281676
}
-
component
:
{
fileID
:
61781846804253628
}
-
component
:
{
fileID
:
212078234558260036
}
m_Layer
:
13
m_Name
:
DroppedItem
m_TagString
:
DroppedItem
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
m_IsActive
:
1
---
!u!4
&4490692399716652
Transform
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1610049888013262
}
m_LocalRotation
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
1
}
m_LocalPosition
:
{
x
:
203.65184
,
y
:
44.907085
,
z
:
-0.060713544
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
[]
m_Father
:
{
fileID
:
0
}
m_RootOrder
:
0
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
---
!u!50
&50921709401281676
Rigidbody2D
:
serializedVersion
:
4
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1610049888013262
}
m_BodyType
:
0
m_Simulated
:
1
m_UseFullKinematicContacts
:
0
m_UseAutoMass
:
0
m_Mass
:
1
m_LinearDrag
:
0
m_AngularDrag
:
0.05
m_GravityScale
:
1
m_Material
:
{
fileID
:
0
}
m_Interpolate
:
0
m_SleepingMode
:
1
m_CollisionDetection
:
0
m_Constraints
:
0
---
!u!61
&61781846804253628
BoxCollider2D
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1610049888013262
}
m_Enabled
:
1
m_Density
:
1
m_Material
:
{
fileID
:
0
}
m_IsTrigger
:
0
m_UsedByEffector
:
0
m_UsedByComposite
:
0
m_Offset
:
{
x
:
0
,
y
:
0
}
m_SpriteTilingProperty
:
border
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
0
}
pivot
:
{
x
:
0
,
y
:
0
}
oldSize
:
{
x
:
0
,
y
:
0
}
newSize
:
{
x
:
0
,
y
:
0
}
adaptiveTilingThreshold
:
0
drawMode
:
0
adaptiveTiling
:
0
m_AutoTiling
:
0
serializedVersion
:
2
m_Size
:
{
x
:
1
,
y
:
1
}
m_EdgeRadius
:
0
---
!u!114
&114311885383538228
MonoBehaviour
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1610049888013262
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
f734cf02cf882904b9735e036ad7fbda
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
itemAddon
:
0
---
!u!212
&212078234558260036
SpriteRenderer
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1610049888013262
}
m_Enabled
:
1
m_CastShadows
:
0
m_ReceiveShadows
:
0
m_DynamicOccludee
:
1
m_MotionVectors
:
1
m_LightProbeUsage
:
1
m_ReflectionProbeUsage
:
1
m_RenderingLayerMask
:
4294967295
m_Materials
:
-
{
fileID
:
10754
,
guid
:
0000000000000000f000000000000000
,
type
:
0
}
m_StaticBatchInfo
:
firstSubMesh
:
0
subMeshCount
:
0
m_StaticBatchRoot
:
{
fileID
:
0
}
m_ProbeAnchor
:
{
fileID
:
0
}
m_LightProbeVolumeOverride
:
{
fileID
:
0
}
m_ScaleInLightmap
:
1
m_PreserveUVs
:
0
m_IgnoreNormalsForChartDetection
:
0
m_ImportantGI
:
0
m_StitchLightmapSeams
:
0
m_SelectedEditorRenderState
:
0
m_MinimumChartSize
:
4
m_AutoUVMaxDistance
:
0.5
m_AutoUVMaxAngle
:
89
m_LightmapParameters
:
{
fileID
:
0
}
m_SortingLayerID
:
2145601713
m_SortingLayer
:
9
m_SortingOrder
:
0
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
:
1
,
y
:
1
}
m_AdaptiveModeThreshold
:
0.5
m_SpriteTileMode
:
0
m_WasSpriteAssigned
:
0
m_MaskInteraction
:
0
m_SpriteSortPoint
:
0
Assets/Prefabs/
Pickups
/DroppedItem.prefab.meta
→
Assets/Prefabs/
UI/In-Game UI/InventoryUI
/DroppedItem.prefab.meta
View file @
f30a49c8
fileFormatVersion: 2
fileFormatVersion: 2
guid:
4a28c3bf4e32d654facd1cc72d68c10b
guid:
ee63f05b79e18ce4bad2c226aa70a28e
NativeFormatImporter:
NativeFormatImporter:
externalObjects: {}
externalObjects: {}
mainObjectFileID: 100100000
mainObjectFileID: 100100000
...
...
Assets/Prefabs/UI/In-Game UI/InventoryUI/InventoryCanvas.prefab
View file @
f30a49c8
...
@@ -2052,14 +2052,14 @@ Canvas:
...
@@ -2052,14 +2052,14 @@ Canvas:
m_RenderMode
:
0
m_RenderMode
:
0
m_Camera
:
{
fileID
:
0
}
m_Camera
:
{
fileID
:
0
}
m_PlaneDistance
:
100
m_PlaneDistance
:
100
m_PixelPerfect
:
0
m_PixelPerfect
:
1
m_ReceivesEvents
:
1
m_ReceivesEvents
:
1
m_OverrideSorting
:
0
m_OverrideSorting
:
0
m_OverridePixelPerfect
:
0
m_OverridePixelPerfect
:
0
m_SortingBucketNormalizedSize
:
0
m_SortingBucketNormalizedSize
:
0
m_AdditionalShaderChannelsFlag
:
0
m_AdditionalShaderChannelsFlag
:
0
m_SortingLayerID
:
0
m_SortingLayerID
:
0
m_SortingOrder
:
0
m_SortingOrder
:
1
m_TargetDisplay
:
0
m_TargetDisplay
:
0
---
!u!224
&224015295540900420
---
!u!224
&224015295540900420
RectTransform
:
RectTransform
:
...
...
Assets/Prefabs/UI/In-Game UI/Life
Crystal
UI.meta
→
Assets/Prefabs/UI/In-Game UI/Life
Stone
UI.meta
View file @
f30a49c8
File moved
Assets/Prefabs/UI/In-Game UI/Life
Crystal
UI/DroppedLifeUnitPrefab.prefab
→
Assets/Prefabs/UI/In-Game UI/Life
Stone
UI/DroppedLifeUnitPrefab.prefab
View file @
f30a49c8
...
@@ -24,7 +24,7 @@ GameObject:
...
@@ -24,7 +24,7 @@ GameObject:
-
component
:
{
fileID
:
114071444104977984
}
-
component
:
{
fileID
:
114071444104977984
}
m_Layer
:
13
m_Layer
:
13
m_Name
:
DroppedLifeUnitPrefab
m_Name
:
DroppedLifeUnitPrefab
m_TagString
:
Untagged
m_TagString
:
DroppedLifeStone
m_Icon
:
{
fileID
:
0
}
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
m_StaticEditorFlags
:
0
...
...
Assets/Prefabs/UI/In-Game UI/Life
Crystal
UI/DroppedLifeUnitPrefab.prefab.meta
→
Assets/Prefabs/UI/In-Game UI/Life
Stone
UI/DroppedLifeUnitPrefab.prefab.meta
View file @
f30a49c8
File moved
Assets/Prefabs/UI/In-Game UI/Life
Crystal
UI/LifeStoneUnit.prefab
→
Assets/Prefabs/UI/In-Game UI/Life
Stone
UI/LifeStoneUnit.prefab
View file @
f30a49c8
File moved
Assets/Prefabs/UI/In-Game UI/Life
Crystal
UI/LifeStoneUnit.prefab.meta
→
Assets/Prefabs/UI/In-Game UI/Life
Stone
UI/LifeStoneUnit.prefab.meta
View file @
f30a49c8
File moved
Assets/Prefabs/UI/In-Game UI/Life
Crystal
UI/LifeUnitHighlight.prefab
→
Assets/Prefabs/UI/In-Game UI/Life
Stone
UI/LifeUnitHighlight.prefab
View file @
f30a49c8
File moved
Assets/Prefabs/UI/In-Game UI/Life
Crystal
UI/LifeUnitHighlight.prefab.meta
→
Assets/Prefabs/UI/In-Game UI/Life
Stone
UI/LifeUnitHighlight.prefab.meta
View file @
f30a49c8
File moved
Assets/Prefabs/UI/In-Game UI/Life
Crystal
UI/LifeUnitSprite.prefab
→
Assets/Prefabs/UI/In-Game UI/Life
Stone
UI/LifeUnitSprite.prefab
View file @
f30a49c8
File moved
Assets/Prefabs/UI/In-Game UI/Life
Crystal
UI/LifeUnitSprite.prefab.meta
→
Assets/Prefabs/UI/In-Game UI/Life
Stone
UI/LifeUnitSprite.prefab.meta
View file @
f30a49c8
File moved
Assets/Prefabs/UI/In-Game UI/Life
Crystal
UI/standardImage.prefab
→
Assets/Prefabs/UI/In-Game UI/Life
Stone
UI/standardImage.prefab
View file @
f30a49c8
File moved
Assets/Prefabs/UI/In-Game UI/Life
Crystal
UI/standardImage.prefab.meta
→
Assets/Prefabs/UI/In-Game UI/Life
Stone
UI/standardImage.prefab.meta
View file @
f30a49c8
File moved
Assets/Scenes/PlayScene.unity
View file @
f30a49c8
...
@@ -267,11 +267,6 @@ Prefab:
...
@@ -267,11 +267,6 @@ Prefab:
m_Modification
:
m_Modification
:
m_TransformParent
:
{
fileID
:
0
}
m_TransformParent
:
{
fileID
:
0
}
m_Modifications
:
m_Modifications
:
-
target
:
{
fileID
:
224158395360498114
,
guid
:
7c6db9a9ca4150a438bd5114c58a37cf
,
type
:
2
}
propertyPath
:
m_RootOrder
value
:
12
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
224158395360498114
,
guid
:
7c6db9a9ca4150a438bd5114c58a37cf
,
-
target
:
{
fileID
:
224158395360498114
,
guid
:
7c6db9a9ca4150a438bd5114c58a37cf
,
type
:
2
}
type
:
2
}
propertyPath
:
m_LocalPosition.x
propertyPath
:
m_LocalPosition.x
...
@@ -364,7 +359,7 @@ Prefab:
...
@@ -364,7 +359,7 @@ Prefab:
objectReference
:
{
fileID
:
0
}
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
1560605499280558
,
guid
:
7c6db9a9ca4150a438bd5114c58a37cf
,
type
:
2
}
-
target
:
{
fileID
:
1560605499280558
,
guid
:
7c6db9a9ca4150a438bd5114c58a37cf
,
type
:
2
}
propertyPath
:
m_IsActive
propertyPath
:
m_IsActive
value
:
0
value
:
1
objectReference
:
{
fileID
:
0
}
objectReference
:
{
fileID
:
0
}
m_RemovedComponents
:
[]
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
7c6db9a9ca4150a438bd5114c58a37cf
,
type
:
2
}
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
7c6db9a9ca4150a438bd5114c58a37cf
,
type
:
2
}
...
@@ -828,6 +823,12 @@ Prefab:
...
@@ -828,6 +823,12 @@ Prefab:
propertyPath
:
m_RootOrder
propertyPath
:
m_RootOrder
value
:
11
value
:
11
objectReference
:
{
fileID
:
0
}
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
114939219159237616
,
guid
:
62a83d11a7addc342ad436145784e698
,
type
:
2
}
propertyPath
:
droppedPrefab
value
:
objectReference
:
{
fileID
:
1610049888013262
,
guid
:
ee63f05b79e18ce4bad2c226aa70a28e
,
type
:
2
}
m_RemovedComponents
:
[]
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
62a83d11a7addc342ad436145784e698
,
type
:
2
}
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
62a83d11a7addc342ad436145784e698
,
type
:
2
}
m_IsPrefabAsset
:
0
m_IsPrefabAsset
:
0
...
@@ -1019,40 +1020,9 @@ Prefab:
...
@@ -1019,40 +1020,9 @@ Prefab:
propertyPath
:
inventoryManager
propertyPath
:
inventoryManager
value
:
value
:
objectReference
:
{
fileID
:
1908917313
}
objectReference
:
{
fileID
:
1908917313
}
-
target
:
{
fileID
:
114294925164316638
,
guid
:
3d077a5f727dd1e4780e9265ed26e036
,
type
:
2
}
propertyPath
:
rbAttackGravityScale
value
:
0.5
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
61129044981816742
,
guid
:
3d077a5f727dd1e4780e9265ed26e036
,
type
:
2
}
propertyPath
:
m_Enabled
value
:
0
objectReference
:
{
fileID
:
0
}
m_RemovedComponents
:
[]
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
3d077a5f727dd1e4780e9265ed26e036
,
type
:
2
}
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
3d077a5f727dd1e4780e9265ed26e036
,
type
:
2
}
m_IsPrefabAsset
:
0
m_IsPrefabAsset
:
0
---
!u!1
&1618052741
stripped
GameObject
:
m_CorrespondingSourceObject
:
{
fileID
:
1862495014651308
,
guid
:
3d077a5f727dd1e4780e9265ed26e036
,
type
:
2
}
m_PrefabInternal
:
{
fileID
:
1618052740
}
---
!u!114
&1618052742
MonoBehaviour
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
1618052741
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
64f948f7c7aacab409fe963a6f9e0d2a
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
damage
:
0
knockBackMultiplier
:
1
debuffNum
:
0
debuffType
:
debuffTime
:
00000000000000000000000000000000000000000000000000000000000000000000000000000000
---
!u!1001
&1708140758
---
!u!1001
&1708140758
Prefab
:
Prefab
:
m_ObjectHideFlags
:
0
m_ObjectHideFlags
:
0
...
...
Assets/Scripts/Item/DroppedItem.cs
0 → 100644
View file @
f30a49c8
using
System.Collections
;
using
System.Collections.Generic
;
using
UnityEngine
;
public
class
DroppedItem
:
MonoBehaviour
{
InventoryManager
inventoryManager
;
public
bool
itemAddon
;
//false: item true: addon
public
Item
item
;
public
Addon
addon
;
float
itemSizeMultiplier
=
0.0077f
;
Rigidbody2D
rb2D
;
BoxCollider2D
bc2D
;
SpriteRenderer
sprt
;
public
void
Init
(
Item
_item
,
Vector3
pos
)
{
inventoryManager
=
GameObject
.
Find
(
"InventoryManager"
).
GetComponent
<
InventoryManager
>();
item
=
_item
;
itemAddon
=
false
;
rb2D
=
GetComponent
<
Rigidbody2D
>();
bc2D
=
GetComponent
<
BoxCollider2D
>();
sprt
=
GetComponent
<
SpriteRenderer
>();
transform
.
position
=
pos
;
sprt
.
sprite
=
item
.
sprite
;
bc2D
.
size
=
sprt
.
size
;
transform
.
localScale
=
new
Vector3
((
item
.
sizeInventory
.
x
*
itemSizeMultiplier
)
/
sprt
.
size
.
x
,
(
item
.
sizeInventory
.
y
*
itemSizeMultiplier
)
/
sprt
.
size
.
y
,
1
);
}
public
void
Init
(
Addon
_addon
,
Vector3
pos
)
{
inventoryManager
=
GameObject
.
Find
(
"InventoryManager"
).
GetComponent
<
InventoryManager
>();
addon
=
_addon
;
itemAddon
=
true
;
rb2D
=
GetComponent
<
Rigidbody2D
>();
bc2D
=
GetComponent
<
BoxCollider2D
>();
sprt
=
GetComponent
<
SpriteRenderer
>();
transform
.
position
=
pos
;
sprt
.
sprite
=
addon
.
sprite
;
sprt
.
size
=
addon
.
sizeInventory
/
100f
;
bc2D
.
size
=
sprt
.
size
;
transform
.
localScale
=
new
Vector3
((
addon
.
sizeInventory
.
x
*
itemSizeMultiplier
)
/
sprt
.
size
.
x
,
(
addon
.
sizeInventory
.
y
*
itemSizeMultiplier
)
/
sprt
.
size
.
y
,
1
);
}
public
bool
PushItem
()
{
if
(!
itemAddon
&&
inventoryManager
.
PushItem
(
item
))
{
Destroy
(
gameObject
);
return
true
;
}
else
if
(
itemAddon
&&
inventoryManager
.
PushAddon
(
addon
))
{
Destroy
(
gameObject
);
return
true
;
}
return
false
;
}
public
void
HighlightSwitch
(
bool
enabled
)
{
if
(
itemAddon
)
Debug
.
Log
(
addon
.
name
+
(
enabled
?
"on"
:
"off"
));
else
Debug
.
Log
(
item
.
name
+
(
enabled
?
"on"
:
"off"
));
}
}
Assets/
Prefabs/Pickups/Frame.prefab
.meta
→
Assets/
Scripts/Item/DroppedItem.cs
.meta
View file @
f30a49c8
fileFormatVersion: 2
fileFormatVersion: 2
guid:
0222e2d8b56397143aea40e4c1d2f7df
guid:
f734cf02cf882904b9735e036ad7fbda
NativeFormat
Importer:
Mono
Importer:
externalObjects: {}
externalObjects: {}
mainObjectFileID: 100100000
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
userData:
assetBundleName:
assetBundleName:
assetBundleVariant:
assetBundleVariant:
Assets/Scripts/Item/InventoryManager.cs
View file @
f30a49c8
...
@@ -9,6 +9,7 @@ public class InventoryManager : MonoBehaviour {
...
@@ -9,6 +9,7 @@ public class InventoryManager : MonoBehaviour {
InventoryUI
ui
;
InventoryUI
ui
;
public
List
<
string
>
itemPool
=
new
List
<
string
>();
public
List
<
string
>
itemPool
=
new
List
<
string
>();
public
List
<
string
>
addonPool
=
new
List
<
string
>();
public
List
<
string
>
addonPool
=
new
List
<
string
>();
public
GameObject
droppedPrefab
;
private
void
Start
()
private
void
Start
()
{
{
...
@@ -16,13 +17,16 @@ public class InventoryManager : MonoBehaviour {
...
@@ -16,13 +17,16 @@ public class InventoryManager : MonoBehaviour {
GameObject
.
Find
(
"InventoryCanvas"
).
SetActive
(
false
);
GameObject
.
Find
(
"InventoryCanvas"
).
SetActive
(
false
);
//itemPool
//itemPool
itemPool
.
Add
(
"B
ow
"
);
itemPool
.
Add
(
"B
aculus
"
);
itemPool
.
Add
(
"BambooSpear"
);
itemPool
.
Add
(
"BambooSpear"
);
itemPool
.
Add
(
"Ksanife"
);
itemPool
.
Add
(
"Bow"
);
itemPool
.
Add
(
"ChainSickle"
);
itemPool
.
Add
(
"Festo"
);
//addonPool
//addonPool
addonPool
.
Add
(
"ApprenticesMark"
);
addonPool
.
Add
(
"ApprenticesMark"
);
addonPool
.
Add
(
"ParchmentPiece"
);
addonPool
.
Add
(
"ParchmentPiece"
);
addonPool
.
Add
(
"GlowingHerb"
);
StartCoroutine
(
"TestCoroutine"
);
StartCoroutine
(
"TestCoroutine"
);
}
}
...
@@ -32,8 +36,19 @@ public class InventoryManager : MonoBehaviour {
...
@@ -32,8 +36,19 @@ public class InventoryManager : MonoBehaviour {
yield
return
null
;
yield
return
null
;
PushItem
((
Item
)
System
.
Activator
.
CreateInstance
(
System
.
Type
.
GetType
(
itemPool
[
0
])));
PushItem
((
Item
)
System
.
Activator
.
CreateInstance
(
System
.
Type
.
GetType
(
itemPool
[
0
])));
PushItem
((
Item
)
System
.
Activator
.
CreateInstance
(
System
.
Type
.
GetType
(
itemPool
[
2
])));
PushItem
((
Item
)
System
.
Activator
.
CreateInstance
(
System
.
Type
.
GetType
(
itemPool
[
2
])));
/*yield return new WaitForSeconds(1f);
yield
return
new
WaitForSeconds
(
1.5f
);
ItemSelect(0);
ItemInstantiate
(
itemPool
[
0
],
GameObject
.
Find
(
"Player"
).
transform
.
position
);
yield
return
new
WaitForSeconds
(
1.5f
);
ItemInstantiate
(
itemPool
[
1
],
GameObject
.
Find
(
"Player"
).
transform
.
position
);
yield
return
new
WaitForSeconds
(
1.5f
);
ItemInstantiate
(
itemPool
[
2
],
GameObject
.
Find
(
"Player"
).
transform
.
position
);
yield
return
new
WaitForSeconds
(
1.5f
);
ItemInstantiate
(
itemPool
[
3
],
GameObject
.
Find
(
"Player"
).
transform
.
position
);
yield
return
new
WaitForSeconds
(
1.5f
);
AddonInstantiate
(
addonPool
[
0
],
GameObject
.
Find
(
"Player"
).
transform
.
position
);
yield
return
new
WaitForSeconds
(
1.5f
);
AddonInstantiate
(
addonPool
[
1
],
GameObject
.
Find
(
"Player"
).
transform
.
position
);
/*ItemSelect(0);
yield return new WaitForSeconds(1f);
yield return new WaitForSeconds(1f);
PushItem((Item)System.Activator.CreateInstance(System.Type.GetType(itemPool[1])));
PushItem((Item)System.Activator.CreateInstance(System.Type.GetType(itemPool[1])));
yield return new WaitForSeconds(1f);
yield return new WaitForSeconds(1f);
...
@@ -47,6 +62,16 @@ public class InventoryManager : MonoBehaviour {
...
@@ -47,6 +62,16 @@ public class InventoryManager : MonoBehaviour {
yield return new WaitForSeconds(1f);
yield return new WaitForSeconds(1f);
*/
*/
}
}
public
void
ItemInstantiate
(
string
str
,
Vector3
pos
)
{
GameObject
tmpItem
=
Instantiate
(
droppedPrefab
);
tmpItem
.
GetComponent
<
DroppedItem
>().
Init
((
Item
)
System
.
Activator
.
CreateInstance
(
System
.
Type
.
GetType
(
str
)),
pos
);
}
public
void
AddonInstantiate
(
string
str
,
Vector3
pos
)
{
GameObject
tmpItem
=
Instantiate
(
droppedPrefab
);
tmpItem
.
GetComponent
<
DroppedItem
>().
Init
((
Addon
)
System
.
Activator
.
CreateInstance
(
System
.
Type
.
GetType
(
str
)),
pos
);
}
public
void
SetOnPosition
()
public
void
SetOnPosition
()
{
{
ui
.
SetOnPosition
(
itemList
,
addonList
);
ui
.
SetOnPosition
(
itemList
,
addonList
);
...
@@ -56,17 +81,27 @@ public class InventoryManager : MonoBehaviour {
...
@@ -56,17 +81,27 @@ public class InventoryManager : MonoBehaviour {
ui
.
selectedItem
=
itemIndex
;
ui
.
selectedItem
=
itemIndex
;
ui
.
SetOnPosition
(
itemList
,
addonList
);
ui
.
SetOnPosition
(
itemList
,
addonList
);
}
}
public
void
PushItem
(
Item
item
)
public
bool
PushItem
(
Item
item
)
{
{
if
(
itemList
.
Count
<
9
)
for
(
int
i
=
0
;
i
<
item
.
skillNum
;
i
++)
foreach
(
Item
tmpItem
in
itemList
)
for
(
int
j
=
0
;
j
<
tmpItem
.
skillNum
;
j
++)
if
(
item
.
combo
[
i
].
Equals
(
tmpItem
.
combo
[
j
]))
return
false
;
if
(
itemList
.
Count
>
8
)
return
false
;
itemList
.
Add
(
item
);
itemList
.
Add
(
item
);
ui
.
SetOnPosition
(
itemList
,
addonList
);
ui
.
SetOnPosition
(
itemList
,
addonList
);
return
true
;
}
}
public
void
PushAddon
(
Addon
addon
)
public
bool
PushAddon
(
Addon
addon
)
{
{
if
(
addonList
.
Count
<
9
)
if
(
addonList
.
Count
>
8
)
return
false
;
addonList
.
Add
(
addon
);
addonList
.
Add
(
addon
);
ui
.
SetOnPosition
(
itemList
,
addonList
);
ui
.
SetOnPosition
(
itemList
,
addonList
);
return
true
;
}
}
public
void
DiscardItem
(
int
index
)
public
void
DiscardItem
(
int
index
)
{
{
...
...
ProjectSettings/Physics2DSettings.asset
View file @
f30a49c8
...
@@ -52,4 +52,4 @@ Physics2DSettings:
...
@@ -52,4 +52,4 @@ Physics2DSettings:
m_ColliderAsleepColor
:
{
r
:
0.5686275
,
g
:
0.95686275
,
b
:
0.54509807
,
a
:
0.36078432
}
m_ColliderAsleepColor
:
{
r
:
0.5686275
,
g
:
0.95686275
,
b
:
0.54509807
,
a
:
0.36078432
}
m_ColliderContactColor
:
{
r
:
1
,
g
:
0
,
b
:
1
,
a
:
0.6862745
}
m_ColliderContactColor
:
{
r
:
1
,
g
:
0
,
b
:
1
,
a
:
0.6862745
}
m_ColliderAABBColor
:
{
r
:
1
,
g
:
1
,
b
:
0
,
a
:
0.2509804
}
m_ColliderAABBColor
:
{
r
:
1
,
g
:
1
,
b
:
0
,
a
:
0.2509804
}
m_LayerCollisionMatrix
:
ffdff
ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe9fffffffdfffffffffffffffffff
ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
m_LayerCollisionMatrix
:
ffdff
efffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe9fffffffdffffffffffffffefffe
ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
ProjectSettings/TagManager.asset
View file @
f30a49c8
...
@@ -7,6 +7,8 @@ TagManager:
...
@@ -7,6 +7,8 @@ TagManager:
-
MapManager
-
MapManager
-
Tetrimino
-
Tetrimino
-
TetriminoSpawner
-
TetriminoSpawner
-
DroppedLifeStone
-
DroppedItem
layers
:
layers
:
-
Default
-
Default
-
TransparentFX
-
TransparentFX
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment