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
e045a6c4
Commit
e045a6c4
authored
Jan 30, 2019
by
18류지석
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
아이템 버리기 만들었음. droppedItem이랑 머지할것
parent
aafa4376
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
102 additions
and
8 deletions
+102
-8
InventoryCanvas.prefab
.../Prefabs/UI/In-Game UI/InventoryUI/InventoryCanvas.prefab
+74
-4
AddonDrag.cs
Assets/Scripts/Item/AddonDrag.cs
+14
-3
InventoryManager.cs
Assets/Scripts/Item/InventoryManager.cs
+5
-1
ItemDrag.cs
Assets/Scripts/Item/ItemDrag.cs
+9
-0
No files found.
Assets/Prefabs/UI/In-Game UI/InventoryUI/InventoryCanvas.prefab
View file @
e045a6c4
...
@@ -96,6 +96,23 @@ GameObject:
...
@@ -96,6 +96,23 @@ GameObject:
m_NavMeshLayer
:
0
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
m_StaticEditorFlags
:
0
m_IsActive
:
1
m_IsActive
:
1
---
!u!1
&1116763136920546
GameObject
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
serializedVersion
:
6
m_Component
:
-
component
:
{
fileID
:
224783930886652934
}
-
component
:
{
fileID
:
222587352594232280
}
-
component
:
{
fileID
:
114109717102223206
}
m_Layer
:
5
m_Name
:
DiscardBin
m_TagString
:
Untagged
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
m_IsActive
:
1
---
!u!1
&1125633288512872
---
!u!1
&1125633288512872
GameObject
:
GameObject
:
m_ObjectHideFlags
:
1
m_ObjectHideFlags
:
1
...
@@ -767,6 +784,33 @@ MonoBehaviour:
...
@@ -767,6 +784,33 @@ MonoBehaviour:
m_FillAmount
:
1
m_FillAmount
:
1
m_FillClockwise
:
1
m_FillClockwise
:
1
m_FillOrigin
:
0
m_FillOrigin
:
0
---
!u!114
&114109717102223206
MonoBehaviour
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1116763136920546
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
-765806418
,
guid
:
f70555f144d8491a825f0804e09c671c
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
m_Material
:
{
fileID
:
0
}
m_Color
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
m_RaycastTarget
:
1
m_OnCullStateChanged
:
m_PersistentCalls
:
m_Calls
:
[]
m_TypeName
:
UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite
:
{
fileID
:
0
}
m_Type
:
0
m_PreserveAspect
:
0
m_FillCenter
:
1
m_FillMethod
:
4
m_FillAmount
:
1
m_FillClockwise
:
1
m_FillOrigin
:
0
---
!u!114
&114133791479992866
---
!u!114
&114133791479992866
MonoBehaviour
:
MonoBehaviour
:
m_ObjectHideFlags
:
1
m_ObjectHideFlags
:
1
...
@@ -1859,6 +1903,13 @@ CanvasRenderer:
...
@@ -1859,6 +1903,13 @@ CanvasRenderer:
m_PrefabInternal
:
{
fileID
:
100100000
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1022188909521056
}
m_GameObject
:
{
fileID
:
1022188909521056
}
m_CullTransparentMesh
:
0
m_CullTransparentMesh
:
0
---
!u!222
&222587352594232280
CanvasRenderer
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1116763136920546
}
m_CullTransparentMesh
:
0
---
!u!222
&222589230925798118
---
!u!222
&222589230925798118
CanvasRenderer
:
CanvasRenderer
:
m_ObjectHideFlags
:
1
m_ObjectHideFlags
:
1
...
@@ -2059,7 +2110,7 @@ Canvas:
...
@@ -2059,7 +2110,7 @@ Canvas:
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
:
...
@@ -2136,7 +2187,7 @@ RectTransform:
...
@@ -2136,7 +2187,7 @@ RectTransform:
-
{
fileID
:
224665192724407964
}
-
{
fileID
:
224665192724407964
}
-
{
fileID
:
224953692463680048
}
-
{
fileID
:
224953692463680048
}
m_Father
:
{
fileID
:
224158395360498114
}
m_Father
:
{
fileID
:
224158395360498114
}
m_RootOrder
:
2
m_RootOrder
:
3
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_AnchorMin
:
{
x
:
0.5
,
y
:
0.5
}
m_AnchorMin
:
{
x
:
0.5
,
y
:
0.5
}
m_AnchorMax
:
{
x
:
0.5
,
y
:
0.5
}
m_AnchorMax
:
{
x
:
0.5
,
y
:
0.5
}
...
@@ -2190,6 +2241,7 @@ RectTransform:
...
@@ -2190,6 +2241,7 @@ RectTransform:
m_LocalScale
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_LocalScale
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_Children
:
m_Children
:
-
{
fileID
:
224757229482181608
}
-
{
fileID
:
224757229482181608
}
-
{
fileID
:
224783930886652934
}
-
{
fileID
:
224951897679109524
}
-
{
fileID
:
224951897679109524
}
-
{
fileID
:
224137214707512560
}
-
{
fileID
:
224137214707512560
}
-
{
fileID
:
224829341147747562
}
-
{
fileID
:
224829341147747562
}
...
@@ -2664,6 +2716,24 @@ RectTransform:
...
@@ -2664,6 +2716,24 @@ RectTransform:
m_AnchoredPosition
:
{
x
:
0
,
y
:
0
}
m_AnchoredPosition
:
{
x
:
0
,
y
:
0
}
m_SizeDelta
:
{
x
:
1920
,
y
:
1080
}
m_SizeDelta
:
{
x
:
1920
,
y
:
1080
}
m_Pivot
:
{
x
:
0.5
,
y
:
0.5
}
m_Pivot
:
{
x
:
0.5
,
y
:
0.5
}
---
!u!224
&224783930886652934
RectTransform
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1116763136920546
}
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
:
224158395360498114
}
m_RootOrder
:
1
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_AnchorMin
:
{
x
:
0.5
,
y
:
0.5
}
m_AnchorMax
:
{
x
:
0.5
,
y
:
0.5
}
m_AnchoredPosition
:
{
x
:
-300
,
y
:
-200
}
m_SizeDelta
:
{
x
:
249.09
,
y
:
130
}
m_Pivot
:
{
x
:
0.5
,
y
:
0.5
}
---
!u!224
&224829341147747562
---
!u!224
&224829341147747562
RectTransform
:
RectTransform
:
m_ObjectHideFlags
:
1
m_ObjectHideFlags
:
1
...
@@ -2676,7 +2746,7 @@ RectTransform:
...
@@ -2676,7 +2746,7 @@ RectTransform:
m_Children
:
m_Children
:
-
{
fileID
:
224358157952434602
}
-
{
fileID
:
224358157952434602
}
m_Father
:
{
fileID
:
224158395360498114
}
m_Father
:
{
fileID
:
224158395360498114
}
m_RootOrder
:
3
m_RootOrder
:
4
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_AnchorMin
:
{
x
:
0.5
,
y
:
0.5
}
m_AnchorMin
:
{
x
:
0.5
,
y
:
0.5
}
m_AnchorMax
:
{
x
:
0.5
,
y
:
0.5
}
m_AnchorMax
:
{
x
:
0.5
,
y
:
0.5
}
...
@@ -2757,7 +2827,7 @@ RectTransform:
...
@@ -2757,7 +2827,7 @@ RectTransform:
-
{
fileID
:
224299749906297540
}
-
{
fileID
:
224299749906297540
}
-
{
fileID
:
224542162195928868
}
-
{
fileID
:
224542162195928868
}
m_Father
:
{
fileID
:
224158395360498114
}
m_Father
:
{
fileID
:
224158395360498114
}
m_RootOrder
:
1
m_RootOrder
:
2
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_AnchorMin
:
{
x
:
0.5
,
y
:
0.5
}
m_AnchorMin
:
{
x
:
0.5
,
y
:
0.5
}
m_AnchorMax
:
{
x
:
0.5
,
y
:
0.5
}
m_AnchorMax
:
{
x
:
0.5
,
y
:
0.5
}
...
...
Assets/Scripts/Item/AddonDrag.cs
View file @
e045a6c4
...
@@ -8,10 +8,13 @@ public class AddonDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDra
...
@@ -8,10 +8,13 @@ public class AddonDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDra
public
int
num
;
public
int
num
;
InventoryUI
ui
;
InventoryUI
ui
;
InventoryManager
manager
;
InventoryManager
manager
;
Transform
addonGroup
,
discardBin
;
void
Start
()
void
Start
()
{
{
ui
=
GameObject
.
Find
(
"InventoryCanvas"
).
GetComponent
<
InventoryUI
>();
ui
=
GameObject
.
Find
(
"InventoryCanvas"
).
GetComponent
<
InventoryUI
>();
manager
=
GameObject
.
Find
(
"InventoryManager"
).
GetComponent
<
InventoryManager
>();
manager
=
GameObject
.
Find
(
"InventoryManager"
).
GetComponent
<
InventoryManager
>();
addonGroup
=
ui
.
gameObject
.
transform
.
Find
(
"AddonGroup"
);
discardBin
=
ui
.
gameObject
.
transform
.
Find
(
"DiscardBin"
);
}
}
public
void
OnBeginDrag
(
PointerEventData
eventData
)
public
void
OnBeginDrag
(
PointerEventData
eventData
)
{
{
...
@@ -25,11 +28,19 @@ public class AddonDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDra
...
@@ -25,11 +28,19 @@ public class AddonDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDra
public
void
OnEndDrag
(
PointerEventData
eventData
)
public
void
OnEndDrag
(
PointerEventData
eventData
)
{
{
if
(
CheckBetween
(
Input
.
mousePosition
,
discardBin
.
position
,
discardBin
.
GetComponent
<
RectTransform
>().
sizeDelta
))
{
if
(
num
<
9
)
manager
.
DiscardAddon
(
num
);
else
manager
.
DiscardAddon
(
ui
.
selectedItem
,
(
AddonType
)(
num
-
9
));
manager
.
SetOnPosition
();
return
;
}
if
(
num
<
9
)
if
(
num
<
9
)
{
{
int
type
=
(
int
)
manager
.
addonList
[
num
].
type
;
int
type
=
(
int
)
manager
.
addonList
[
num
].
type
;
if
(
manager
.
itemList
[
ui
.
selectedItem
].
attachable
[
type
])
if
(
ui
.
selectedItem
!=
-
1
&&
manager
.
itemList
[
ui
.
selectedItem
].
attachable
[
type
])
{
{
if
(
CheckBetween
(
Input
.
mousePosition
,
ui
.
infoAddonsFrame
[
type
].
transform
.
position
,
ui
.
infoAddonsFrame
[
type
].
GetComponent
<
RectTransform
>().
sizeDelta
))
if
(
CheckBetween
(
Input
.
mousePosition
,
ui
.
infoAddonsFrame
[
type
].
transform
.
position
,
ui
.
infoAddonsFrame
[
type
].
GetComponent
<
RectTransform
>().
sizeDelta
))
{
{
...
@@ -40,7 +51,7 @@ public class AddonDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDra
...
@@ -40,7 +51,7 @@ public class AddonDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDra
}
}
else
else
{
{
if
(
CheckBetween
(
Input
.
mousePosition
,
ui
.
gameObject
.
transform
.
Find
(
"AddonGroup"
).
position
,
ui
.
gameObject
.
transform
.
Find
(
"AddonGroup"
)
.
GetComponent
<
RectTransform
>().
sizeDelta
))
if
(
CheckBetween
(
Input
.
mousePosition
,
addonGroup
.
position
,
addonGroup
.
GetComponent
<
RectTransform
>().
sizeDelta
))
manager
.
DetachAddon
(
ui
.
selectedItem
,
(
AddonType
)(
num
-
9
));
manager
.
DetachAddon
(
ui
.
selectedItem
,
(
AddonType
)(
num
-
9
));
}
}
manager
.
SetOnPosition
();
manager
.
SetOnPosition
();
...
...
Assets/Scripts/Item/InventoryManager.cs
View file @
e045a6c4
...
@@ -13,7 +13,7 @@ public class InventoryManager : MonoBehaviour {
...
@@ -13,7 +13,7 @@ public class InventoryManager : MonoBehaviour {
private
void
Start
()
private
void
Start
()
{
{
ui
=
GameObject
.
Find
(
"InventoryCanvas"
).
GetComponent
<
InventoryUI
>();
ui
=
GameObject
.
Find
(
"InventoryCanvas"
).
GetComponent
<
InventoryUI
>();
GameObject
.
Find
(
"InventoryCanvas"
).
SetActive
(
false
);
//
GameObject.Find("InventoryCanvas").SetActive(false);
//itemPool
//itemPool
itemPool
.
Add
(
"Bow"
);
itemPool
.
Add
(
"Bow"
);
...
@@ -32,6 +32,8 @@ public class InventoryManager : MonoBehaviour {
...
@@ -32,6 +32,8 @@ 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
])));
PushAddon
((
Addon
)
System
.
Activator
.
CreateInstance
(
System
.
Type
.
GetType
(
addonPool
[
0
])));
PushAddon
((
Addon
)
System
.
Activator
.
CreateInstance
(
System
.
Type
.
GetType
(
addonPool
[
1
])));
/*yield return new WaitForSeconds(1f);
/*yield return new WaitForSeconds(1f);
ItemSelect(0);
ItemSelect(0);
yield return new WaitForSeconds(1f);
yield return new WaitForSeconds(1f);
...
@@ -72,6 +74,8 @@ public class InventoryManager : MonoBehaviour {
...
@@ -72,6 +74,8 @@ public class InventoryManager : MonoBehaviour {
{
{
if
(
itemList
.
Count
>
index
)
if
(
itemList
.
Count
>
index
)
itemList
.
RemoveAt
(
index
);
itemList
.
RemoveAt
(
index
);
if
(
index
==
ui
.
selectedItem
)
ui
.
selectedItem
=
-
1
;
ui
.
SetOnPosition
(
itemList
,
addonList
);
ui
.
SetOnPosition
(
itemList
,
addonList
);
}
}
public
void
DiscardAddon
(
int
index
)
public
void
DiscardAddon
(
int
index
)
...
...
Assets/Scripts/Item/ItemDrag.cs
View file @
e045a6c4
...
@@ -8,10 +8,12 @@ public class ItemDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag
...
@@ -8,10 +8,12 @@ public class ItemDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag
public
int
num
;
public
int
num
;
InventoryUI
ui
;
InventoryUI
ui
;
InventoryManager
manager
;
InventoryManager
manager
;
Transform
discardBin
;
void
Start
()
void
Start
()
{
{
ui
=
GameObject
.
Find
(
"InventoryCanvas"
).
GetComponent
<
InventoryUI
>();
ui
=
GameObject
.
Find
(
"InventoryCanvas"
).
GetComponent
<
InventoryUI
>();
manager
=
GameObject
.
Find
(
"InventoryManager"
).
GetComponent
<
InventoryManager
>();
manager
=
GameObject
.
Find
(
"InventoryManager"
).
GetComponent
<
InventoryManager
>();
discardBin
=
ui
.
gameObject
.
transform
.
Find
(
"DiscardBin"
);
}
}
public
void
OnBeginDrag
(
PointerEventData
eventData
)
public
void
OnBeginDrag
(
PointerEventData
eventData
)
{
{
...
@@ -25,6 +27,9 @@ public class ItemDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag
...
@@ -25,6 +27,9 @@ public class ItemDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag
public
void
OnEndDrag
(
PointerEventData
eventData
)
public
void
OnEndDrag
(
PointerEventData
eventData
)
{
{
if
(
CheckBetween
(
Input
.
mousePosition
,
discardBin
.
position
,
discardBin
.
GetComponent
<
RectTransform
>().
sizeDelta
))
manager
.
DiscardItem
(
num
);
manager
.
SetOnPosition
();
manager
.
SetOnPosition
();
}
}
...
@@ -33,4 +38,8 @@ public class ItemDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag
...
@@ -33,4 +38,8 @@ public class ItemDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag
ui
.
selectedItem
=
num
;
ui
.
selectedItem
=
num
;
manager
.
SetOnPosition
();
manager
.
SetOnPosition
();
}
}
bool
CheckBetween
(
Vector3
mouse
,
Vector3
center
,
Vector2
size
)
{
return
Mathf
.
Abs
(
mouse
.
x
-
center
.
x
)
<=
size
.
x
/
2f
&&
Mathf
.
Abs
(
mouse
.
y
-
center
.
y
)
<=
size
.
y
/
2f
;
}
}
}
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