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
3b2b7a60
Commit
3b2b7a60
authored
Feb 07, 2019
by
18류지석
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
인벤토리에서 콤보 확인 가능
parent
8c7056b5
Changes
17
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
861 additions
and
18 deletions
+861
-18
CharA.prefab
Assets/Prefabs/UI/In-Game UI/InventoryUI/CharA.prefab
+82
-0
CharA.prefab.meta
Assets/Prefabs/UI/In-Game UI/InventoryUI/CharA.prefab.meta
+8
-0
CharB.prefab
Assets/Prefabs/UI/In-Game UI/InventoryUI/CharB.prefab
+82
-0
CharB.prefab.meta
Assets/Prefabs/UI/In-Game UI/InventoryUI/CharB.prefab.meta
+8
-0
CharC.prefab
Assets/Prefabs/UI/In-Game UI/InventoryUI/CharC.prefab
+82
-0
CharC.prefab.meta
Assets/Prefabs/UI/In-Game UI/InventoryUI/CharC.prefab.meta
+8
-0
InventoryCanvas.prefab
.../Prefabs/UI/In-Game UI/InventoryUI/InventoryCanvas.prefab
+228
-9
PlayScene.unity
Assets/Scenes/PlayScene.unity
+23
-7
InventoryManager.cs
Assets/Scripts/Item/InventoryManager.cs
+1
-1
InventoryUI.cs
Assets/Scripts/Item/InventoryUI.cs
+42
-1
Item.cs
Assets/Scripts/Item/Item.cs
+6
-0
comboCharA.png
Assets/Sprites/Inventory/comboCharA.png
+0
-0
comboCharA.png.meta
Assets/Sprites/Inventory/comboCharA.png.meta
+97
-0
comboCharB.png
Assets/Sprites/Inventory/comboCharB.png
+0
-0
comboCharB.png.meta
Assets/Sprites/Inventory/comboCharB.png.meta
+97
-0
comboCharC.png
Assets/Sprites/Inventory/comboCharC.png
+0
-0
comboCharC.png.meta
Assets/Sprites/Inventory/comboCharC.png.meta
+97
-0
No files found.
Assets/Prefabs/UI/In-Game UI/InventoryUI/CharA.prefab
0 → 100644
View file @
3b2b7a60
%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
:
1527786608046418
}
m_IsPrefabAsset
:
1
---
!u!1
&1527786608046418
GameObject
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
serializedVersion
:
6
m_Component
:
-
component
:
{
fileID
:
224972690153283332
}
-
component
:
{
fileID
:
222166020728861802
}
-
component
:
{
fileID
:
114236033364242192
}
m_Layer
:
5
m_Name
:
CharA
m_TagString
:
Untagged
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
m_IsActive
:
1
---
!u!114
&114236033364242192
MonoBehaviour
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1527786608046418
}
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
:
21300000
,
guid
:
0f9aa2df06e79a64d8981a956eb12226
,
type
:
3
}
m_Type
:
0
m_PreserveAspect
:
0
m_FillCenter
:
1
m_FillMethod
:
4
m_FillAmount
:
1
m_FillClockwise
:
1
m_FillOrigin
:
0
---
!u!222
&222166020728861802
CanvasRenderer
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1527786608046418
}
m_CullTransparentMesh
:
0
---
!u!224
&224972690153283332
RectTransform
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1527786608046418
}
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
}
m_AnchorMin
:
{
x
:
0
,
y
:
0.5
}
m_AnchorMax
:
{
x
:
0
,
y
:
0.5
}
m_AnchoredPosition
:
{
x
:
0
,
y
:
0
}
m_SizeDelta
:
{
x
:
65
,
y
:
85
}
m_Pivot
:
{
x
:
0
,
y
:
0.5
}
Assets/Prefabs/UI/In-Game UI/InventoryUI/CharA.prefab.meta
0 → 100644
View file @
3b2b7a60
fileFormatVersion: 2
guid: 3252ff0fe02ec68499890a51519cdfaa
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:
Assets/Prefabs/UI/In-Game UI/InventoryUI/CharB.prefab
0 → 100644
View file @
3b2b7a60
%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
:
1168427048054670
}
m_IsPrefabAsset
:
1
---
!u!1
&1168427048054670
GameObject
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
serializedVersion
:
6
m_Component
:
-
component
:
{
fileID
:
224861534921566450
}
-
component
:
{
fileID
:
222226625917723382
}
-
component
:
{
fileID
:
114631941095027810
}
m_Layer
:
5
m_Name
:
CharB
m_TagString
:
Untagged
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
m_IsActive
:
1
---
!u!114
&114631941095027810
MonoBehaviour
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1168427048054670
}
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
:
21300000
,
guid
:
8a73c5ced4d09b74f89078836b9bd890
,
type
:
3
}
m_Type
:
0
m_PreserveAspect
:
0
m_FillCenter
:
1
m_FillMethod
:
4
m_FillAmount
:
1
m_FillClockwise
:
1
m_FillOrigin
:
0
---
!u!222
&222226625917723382
CanvasRenderer
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1168427048054670
}
m_CullTransparentMesh
:
0
---
!u!224
&224861534921566450
RectTransform
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1168427048054670
}
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
}
m_AnchorMin
:
{
x
:
0
,
y
:
0.5
}
m_AnchorMax
:
{
x
:
0
,
y
:
0.5
}
m_AnchoredPosition
:
{
x
:
0
,
y
:
0
}
m_SizeDelta
:
{
x
:
70
,
y
:
85
}
m_Pivot
:
{
x
:
0
,
y
:
0.5
}
Assets/Prefabs/UI/In-Game UI/InventoryUI/CharB.prefab.meta
0 → 100644
View file @
3b2b7a60
fileFormatVersion: 2
guid: 26051c4537810bb4487e25937ee6c76e
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:
Assets/Prefabs/UI/In-Game UI/InventoryUI/CharC.prefab
0 → 100644
View file @
3b2b7a60
%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
:
1002363342713840
}
m_IsPrefabAsset
:
1
---
!u!1
&1002363342713840
GameObject
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
serializedVersion
:
6
m_Component
:
-
component
:
{
fileID
:
224109398812551856
}
-
component
:
{
fileID
:
222322044912383444
}
-
component
:
{
fileID
:
114083384941441790
}
m_Layer
:
5
m_Name
:
CharC
m_TagString
:
Untagged
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
m_IsActive
:
1
---
!u!114
&114083384941441790
MonoBehaviour
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1002363342713840
}
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
:
21300000
,
guid
:
eff9d90dcca182243875912722e0cec7
,
type
:
3
}
m_Type
:
0
m_PreserveAspect
:
0
m_FillCenter
:
1
m_FillMethod
:
4
m_FillAmount
:
1
m_FillClockwise
:
1
m_FillOrigin
:
0
---
!u!222
&222322044912383444
CanvasRenderer
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1002363342713840
}
m_CullTransparentMesh
:
0
---
!u!224
&224109398812551856
RectTransform
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1002363342713840
}
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
}
m_AnchorMin
:
{
x
:
0
,
y
:
0.5
}
m_AnchorMax
:
{
x
:
0
,
y
:
0.5
}
m_AnchoredPosition
:
{
x
:
0
,
y
:
0
}
m_SizeDelta
:
{
x
:
65
,
y
:
85
}
m_Pivot
:
{
x
:
0
,
y
:
0.5
}
Assets/Prefabs/UI/In-Game UI/InventoryUI/CharC.prefab.meta
0 → 100644
View file @
3b2b7a60
fileFormatVersion: 2
guid: e65160b48052e084fbede0901c02527c
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:
Assets/Prefabs/UI/In-Game UI/InventoryUI/InventoryCanvas.prefab
View file @
3b2b7a60
This diff is collapsed.
Click to expand it.
Assets/Scenes/PlayScene.unity
View file @
3b2b7a60
...
@@ -787,11 +787,6 @@ Prefab:
...
@@ -787,11 +787,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
...
@@ -882,10 +877,31 @@ Prefab:
...
@@ -882,10 +877,31 @@ Prefab:
propertyPath
:
m_Pivot.y
propertyPath
:
m_Pivot.y
value
:
0
value
:
0
objectReference
:
{
fileID
:
0
}
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
1560605499280558
,
guid
:
7c6db9a9ca4150a438bd5114c58a37cf
,
type
:
2
}
-
target
:
{
fileID
:
224829341147747562
,
guid
:
7c6db9a9ca4150a438bd5114c58a37cf
,
propertyPath
:
m_IsActive
type
:
2
}
propertyPath
:
m_RootOrder
value
:
4
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
224783930886652934
,
guid
:
7c6db9a9ca4150a438bd5114c58a37cf
,
type
:
2
}
propertyPath
:
m_RootOrder
value
:
1
value
:
1
objectReference
:
{
fileID
:
0
}
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
224757229482181608
,
guid
:
7c6db9a9ca4150a438bd5114c58a37cf
,
type
:
2
}
propertyPath
:
m_RootOrder
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
224137214707512560
,
guid
:
7c6db9a9ca4150a438bd5114c58a37cf
,
type
:
2
}
propertyPath
:
m_RootOrder
value
:
3
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
224951897679109524
,
guid
:
7c6db9a9ca4150a438bd5114c58a37cf
,
type
:
2
}
propertyPath
:
m_RootOrder
value
:
2
objectReference
:
{
fileID
:
0
}
m_RemovedComponents
:
[]
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
7c6db9a9ca4150a438bd5114c58a37cf
,
type
:
2
}
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
7c6db9a9ca4150a438bd5114c58a37cf
,
type
:
2
}
m_IsPrefabAsset
:
0
m_IsPrefabAsset
:
0
...
...
Assets/Scripts/Item/InventoryManager.cs
View file @
3b2b7a60
...
@@ -36,7 +36,7 @@ public class InventoryManager : MonoBehaviour {
...
@@ -36,7 +36,7 @@ public class InventoryManager : MonoBehaviour {
addonPool
[
i
]
=
new
List
<
string
>();
addonPool
[
i
]
=
new
List
<
string
>();
}
}
//
itemPool[0].Add("Bow");
itemPool
[
0
].
Add
(
"Bow"
);
itemPool
[
0
].
Add
(
"Dagger"
);
itemPool
[
0
].
Add
(
"Dagger"
);
itemPool
[
1
].
Add
(
"Baculus"
);
itemPool
[
1
].
Add
(
"Baculus"
);
...
...
Assets/Scripts/Item/InventoryUI.cs
View file @
3b2b7a60
...
@@ -28,6 +28,10 @@ public class InventoryUI : MonoBehaviour {
...
@@ -28,6 +28,10 @@ public class InventoryUI : MonoBehaviour {
GameObject
[]
items
;
GameObject
[]
items
;
GameObject
[]
addons
;
GameObject
[]
addons
;
public
GameObject
[]
infoAddonsFrame
;
public
GameObject
[]
infoAddonsFrame
;
public
GameObject
[]
comboStringFrame
;
public
GameObject
[]
comboCharPrefab
;
public
float
pixelBetweenChar
;
GameObject
[,]
comboChars
=
new
GameObject
[
3
,
8
];
GameObject
[]
infoAddons
;
GameObject
[]
infoAddons
;
public
int
selectedItem
=
-
1
;
public
int
selectedItem
=
-
1
;
...
@@ -53,6 +57,16 @@ public class InventoryUI : MonoBehaviour {
...
@@ -53,6 +57,16 @@ public class InventoryUI : MonoBehaviour {
infoAddons
[
i
].
SetActive
(
false
);
infoAddons
[
i
].
SetActive
(
false
);
}
}
for
(
int
i
=
0
;
i
<
3
;
i
++)
{
for
(
int
j
=
0
;
j
<
8
;
j
++)
{
comboChars
[
i
,
j
]
=
Instantiate
(
comboCharPrefab
[
0
],
comboStringFrame
[
i
].
transform
);
comboChars
[
i
,
j
].
SetActive
(
false
);
}
comboStringFrame
[
i
].
SetActive
(
false
);
}
infoSpace
.
transform
.
Find
(
"Frame"
).
gameObject
.
SetActive
(
false
);
infoSpace
.
transform
.
Find
(
"Frame"
).
gameObject
.
SetActive
(
false
);
}
}
public
void
SetOnPosition
(
List
<
Item
>
itemList
,
List
<
Addon
>
addonList
)
public
void
SetOnPosition
(
List
<
Item
>
itemList
,
List
<
Addon
>
addonList
)
...
@@ -79,13 +93,40 @@ public class InventoryUI : MonoBehaviour {
...
@@ -79,13 +93,40 @@ public class InventoryUI : MonoBehaviour {
addons
[
i
].
SetActive
(
false
);
addons
[
i
].
SetActive
(
false
);
GameObject
frameObj
=
infoSpace
.
transform
.
Find
(
"Frame"
).
gameObject
;
GameObject
frameObj
=
infoSpace
.
transform
.
Find
(
"Frame"
).
gameObject
;
if
(
selectedItem
>=
0
)
if
(
selectedItem
>=
0
)
{
{
frameObj
.
SetActive
(
true
);
frameObj
.
SetActive
(
true
);
frameObj
.
GetComponent
<
Image
>().
sprite
=
infoFrameQuality
[(
int
)
itemList
[
selectedItem
].
quality
];
frameObj
.
GetComponent
<
Image
>().
sprite
=
infoFrameQuality
[(
int
)
itemList
[
selectedItem
].
quality
];
frameObj
.
transform
.
Find
(
"ItemSprite"
).
gameObject
.
GetComponent
<
Image
>().
sprite
=
itemFrameQuality
[(
int
)
itemList
[
selectedItem
].
quality
];
frameObj
.
transform
.
Find
(
"ItemSprite"
).
gameObject
.
GetComponent
<
Image
>().
sprite
=
itemFrameQuality
[(
int
)
itemList
[
selectedItem
].
quality
];
frameObj
.
transform
.
Find
(
"ItemSprite"
).
Find
(
"Sprite"
).
gameObject
.
GetComponent
<
Image
>().
sprite
=
itemList
[
selectedItem
].
sprite
;
frameObj
.
transform
.
Find
(
"ItemSprite"
).
Find
(
"Sprite"
).
gameObject
.
GetComponent
<
Image
>().
sprite
=
itemList
[
selectedItem
].
sprite
;
frameObj
.
transform
.
Find
(
"ItemSprite"
).
Find
(
"Sprite"
).
gameObject
.
GetComponent
<
RectTransform
>().
sizeDelta
=
itemList
[
selectedItem
].
sizeInventory
;
frameObj
.
transform
.
Find
(
"ItemSprite"
).
Find
(
"Sprite"
).
gameObject
.
GetComponent
<
RectTransform
>().
sizeDelta
=
itemList
[
selectedItem
].
sizeInventory
;
for
(
int
i
=
0
;
i
<
3
;
i
++)
{
if
(
i
<
itemList
[
selectedItem
].
skillNum
)
{
comboStringFrame
[
i
].
SetActive
(
true
);
float
tmpx
=
0
;
for
(
int
j
=
0
;
j
<
8
;
j
++)
{
if
(
j
<
itemList
[
selectedItem
].
combo
[
i
].
Length
)
{
comboChars
[
i
,
j
].
SetActive
(
true
);
comboChars
[
i
,
j
].
GetComponent
<
Image
>().
sprite
=
comboCharPrefab
[
itemList
[
selectedItem
].
combo
[
i
][
j
]
-
'A'
].
GetComponent
<
Image
>().
sprite
;
comboChars
[
i
,
j
].
GetComponent
<
RectTransform
>().
sizeDelta
=
comboCharPrefab
[
itemList
[
selectedItem
].
combo
[
i
][
j
]
-
'A'
].
GetComponent
<
RectTransform
>().
sizeDelta
;
comboChars
[
i
,
j
].
GetComponent
<
RectTransform
>().
localPosition
+=
new
Vector3
(
tmpx
,
0
,
0
);
tmpx
+=
comboChars
[
i
,
j
].
GetComponent
<
RectTransform
>().
sizeDelta
.
x
+
pixelBetweenChar
;
}
else
{
comboChars
[
i
,
j
].
SetActive
(
false
);
}
}
}
else
{
comboStringFrame
[
i
].
SetActive
(
false
);
}
}
for
(
int
i
=
0
;
i
<
4
;
i
++)
for
(
int
i
=
0
;
i
<
4
;
i
++)
{
{
...
...
Assets/Scripts/Item/Item.cs
View file @
3b2b7a60
...
@@ -64,4 +64,10 @@ public abstract class Item {
...
@@ -64,4 +64,10 @@ public abstract class Item {
{
{
}
}
public
void
AttackCalculation
(
PlayerAttackInfo
attackInfo
,
Enemy
enemyInfo
)
{
}
}
}
Assets/Sprites/Inventory/comboCharA.png
0 → 100644
View file @
3b2b7a60
153 Bytes
Assets/Sprites/Inventory/comboCharA.png.meta
0 → 100644
View file @
3b2b7a60
fileFormatVersion: 2
guid: 0f9aa2df06e79a64d8981a956eb12226
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 6
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 0
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 10855db63152720408d61a6ba1d2ac08
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
Assets/Sprites/Inventory/comboCharB.png
0 → 100644
View file @
3b2b7a60
160 Bytes
Assets/Sprites/Inventory/comboCharB.png.meta
0 → 100644
View file @
3b2b7a60
fileFormatVersion: 2
guid: 8a73c5ced4d09b74f89078836b9bd890
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 6
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 0
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: b5a960afb56d6724eb8bab8af9e6152f
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
Assets/Sprites/Inventory/comboCharC.png
0 → 100644
View file @
3b2b7a60
131 Bytes
Assets/Sprites/Inventory/comboCharC.png.meta
0 → 100644
View file @
3b2b7a60
fileFormatVersion: 2
guid: eff9d90dcca182243875912722e0cec7
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 6
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 0
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: e07cef2ec1c3c2546bcc5a1405758865
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
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