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
a7668b1f
Commit
a7668b1f
authored
Feb 22, 2019
by
18류지석
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
애드온 설명 창 비정상적으로 작동하는 버그 수정
parent
344809c4
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3 additions
and
14 deletions
+3
-14
AddonInfo.prefab
Assets/Prefabs/UI/In-Game UI/InventoryUI/AddonInfo.prefab
+0
-13
GameManager.cs
Assets/Scripts/GameManager.cs
+1
-0
AddonDrag.cs
Assets/Scripts/Item/AddonDrag.cs
+1
-1
InventoryUI.cs
Assets/Scripts/Item/InventoryUI.cs
+1
-0
No files found.
Assets/Prefabs/UI/In-Game UI/InventoryUI/AddonInfo.prefab
View file @
a7668b1f
...
...
@@ -72,7 +72,6 @@ GameObject:
-
component
:
{
fileID
:
224196055372618916
}
-
component
:
{
fileID
:
222335990524814540
}
-
component
:
{
fileID
:
114900435719581162
}
-
component
:
{
fileID
:
114583230027247736
}
m_Layer
:
5
m_Name
:
AddonPrefab
m_TagString
:
Untagged
...
...
@@ -257,18 +256,6 @@ MonoBehaviour:
m_VerticalOverflow
:
0
m_LineSpacing
:
1
m_Text
:
---
!u!114
&114583230027247736
MonoBehaviour
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1379401480617648
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
a124b15eafc6d1847979588fabbb0756
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
num
:
0
---
!u!114
&114896825415534854
MonoBehaviour
:
m_ObjectHideFlags
:
1
...
...
Assets/Scripts/GameManager.cs
View file @
a7668b1f
...
...
@@ -90,6 +90,7 @@ public class GameManager : Singleton<GameManager> {
else
if
(
gameState
==
GameState
.
Inventory
)
{
inventoryCanvas
.
gameObject
.
SetActive
(
false
);
InventoryManager
.
Instance
.
SetOnPosition
();
gameState
=
GameState
.
Ingame
;
}
}
...
...
Assets/Scripts/Item/AddonDrag.cs
View file @
a7668b1f
...
...
@@ -70,6 +70,7 @@ public class AddonDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDra
{
if
(
eventData
.
button
==
PointerEventData
.
InputButton
.
Right
)
{
ui
.
SetAddonInfo
();
if
(
num
<
9
)
{
int
type
=
(
int
)
manager
.
addonList
[
num
].
type
;
...
...
@@ -82,7 +83,6 @@ public class AddonDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDra
}
else
manager
.
DetachAddon
(
ui
.
selectedItem
,
(
AddonType
)(
num
-
9
));
manager
.
SetOnPosition
();
}
}
...
...
Assets/Scripts/Item/InventoryUI.cs
View file @
a7668b1f
...
...
@@ -111,6 +111,7 @@ public class InventoryUI : MonoBehaviour {
public
void
SetOnPosition
(
List
<
Item
>
itemList
,
List
<
Addon
>
addonList
)
{
SetAddonInfo
();
for
(
int
i
=
0
;
i
<
itemList
.
Count
;
i
++)
{
items
[
i
].
transform
.
position
=
itemCell
[
i
].
transform
.
position
;
...
...
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