Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Y
ygopro2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nanahira
ygopro2
Commits
af60fe6c
Commit
af60fe6c
authored
Apr 08, 2019
by
mercury233
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
make HashedButtons don't move
parent
33db0174
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
55 additions
and
28 deletions
+55
-28
Assets/ArtSystem/gameInfo/gameInfo.cs
Assets/ArtSystem/gameInfo/gameInfo.cs
+44
-17
Assets/ArtSystem/gameInfo/new_gameInfoRemaster.prefab
Assets/ArtSystem/gameInfo/new_gameInfoRemaster.prefab
+11
-11
No files found.
Assets/ArtSystem/gameInfo/gameInfo.cs
View file @
af60fe6c
...
...
@@ -7,6 +7,8 @@ public class gameUIbutton
public
string
hashString
;
public
GameObject
gameObject
;
public
int
response
;
public
bool
dying
;
public
bool
dead
;
}
public
class
gameInfo
:
MonoBehaviour
...
...
@@ -120,25 +122,41 @@ public class gameInfo : MonoBehaviour
opponent
.
transform
.
localPosition
=
new
Vector3
(
Screen
.
width
/
2
-
14
,
Screen
.
height
/
2
-
14
-
k
*
(
float
)(
opponent
.
under
.
height
));
}
float
height
=
132
+
50
*
(
HashedButtons
.
Count
);
if
(
HashedButtons
.
Count
==
0
)
{
height
=
116
;
}
width
=
(
150
*
kb
)
+
15f
;
width
=
(
150
*
kb
)
+
15f
;
float
localPositionPanX
=
(((
float
)
Screen
.
width
-
150
*
kb
)
/
2
)
-
15f
;
float
localPositionPanY
=
0
;
float
localPositionPanY_
=
instance_btnPan
.
transform
.
localPosition
.
y
+
(
localPositionPanY
-
instance_btnPan
.
transform
.
localPosition
.
y
)
*
0.2f
;
instance_btnPan
.
height
+=
(
int
)(((
float
)
height
-
(
float
)
instance_btnPan
.
height
)
*
0.2f
);
instance_btnPan
.
transform
.
localPosition
=
new
Vector3
(
localPositionPanX
,
localPositionPanY_
,
0
);
instance_btnPan
.
transform
.
localPosition
=
new
Vector3
(
localPositionPanX
,
145
,
0
);
instance_lab
.
transform
.
localPosition
=
new
Vector3
(
Screen
.
width
/
2
-
315
,
-
Screen
.
height
/
2
+
90
,
0
);
int
j
=
0
;
for
(
int
i
=
0
;
i
<
HashedButtons
.
Count
;
i
++)
{
if
(
HashedButtons
[
i
].
gameObject
!=
null
)
{
HashedButtons
[
i
].
gameObject
.
transform
.
localPosition
+=
(
new
Vector3
(
0
,
height
/
2
-
142
-
i
*
50
,
0
)
-
HashedButtons
[
i
].
gameObject
.
transform
.
localPosition
)
*
Program
.
deltaTime
*
10f
;
if
(
HashedButtons
[
i
].
dying
)
{
HashedButtons
[
i
].
gameObject
.
transform
.
localPosition
+=
(
new
Vector3
(
0
,
-
120
,
0
)
-
HashedButtons
[
i
].
gameObject
.
transform
.
localPosition
)
*
Program
.
deltaTime
*
20f
;
if
(
Math
.
Abs
(
HashedButtons
[
i
].
gameObject
.
transform
.
localPosition
.
y
-
-
120
)
<
1
)
HashedButtons
[
i
].
dead
=
true
;
}
else
{
HashedButtons
[
i
].
gameObject
.
transform
.
localPosition
+=
(
new
Vector3
(
0
,
-
145
-
j
*
50
,
0
)
-
HashedButtons
[
i
].
gameObject
.
transform
.
localPosition
)
*
Program
.
deltaTime
*
10f
;
j
++;
}
}
else
HashedButtons
[
i
].
dead
=
true
;
}
for
(
int
i
=
HashedButtons
.
Count
-
1
;
i
>=
0
;
i
--)
{
if
(
HashedButtons
[
i
].
dead
)
HashedButtons
.
RemoveAt
(
i
);
}
float
height
=
132
+
50
*
j
;
if
(
j
==
0
)
{
height
=
116
;
}
instance_btnPan
.
height
+=
(
int
)(((
float
)
height
-
(
float
)
instance_btnPan
.
height
)
*
0.2f
);
if
(
Program
.
TimePassed
()
-
lastTickTime
>
1000
)
{
lastTickTime
=
Program
.
TimePassed
();
...
...
@@ -171,9 +189,10 @@ public class gameInfo : MonoBehaviour
}
hashedButton
.
gameObject
.
transform
.
SetParent
(
instance_btnPan
.
transform
,
false
);
hashedButton
.
gameObject
.
transform
.
localScale
=
Vector3
.
zero
;
hashedButton
.
gameObject
.
transform
.
localPosition
=
Vector3
.
zero
;
hashedButton
.
gameObject
.
transform
.
localPosition
=
new
Vector3
(
0
,
-
120
,
0
)
;
hashedButton
.
gameObject
.
transform
.
localEulerAngles
=
Vector3
.
zero
;
iTween
.
ScaleTo
(
hashedButton
.
gameObject
,
new
Vector3
(
0.9f
,
0.9f
,
0.9f
),
0.3f
);
hashedButton
.
dying
=
false
;
HashedButtons
.
Add
(
hashedButton
);
refreshLine
();
}
...
...
@@ -222,9 +241,9 @@ public class gameInfo : MonoBehaviour
{
if
(
remove
.
gameObject
!=
null
)
{
Program
.
I
().
destroy
(
remove
.
gameObject
,
0.
6
f
,
true
);
Program
.
I
().
destroy
(
remove
.
gameObject
,
0.
3
f
,
true
);
}
HashedButtons
.
Remove
(
remove
)
;
remove
.
dying
=
true
;
}
refreshLine
();
}
...
...
@@ -242,16 +261,24 @@ public class gameInfo : MonoBehaviour
{
if
(
HashedButtons
[
i
].
gameObject
!=
null
)
{
Program
.
I
().
destroy
(
HashedButtons
[
i
].
gameObject
,
0.
6
f
,
true
);
Program
.
I
().
destroy
(
HashedButtons
[
i
].
gameObject
,
0.
3
f
,
true
);
}
HashedButtons
[
i
].
dying
=
true
;
}
HashedButtons
.
Clear
();
refreshLine
();
}
void
refreshLine
()
{
line
.
SetActive
(
HashedButtons
.
Count
>
0
);
int
j
=
0
;
for
(
int
i
=
0
;
i
<
HashedButtons
.
Count
;
i
++)
{
if
(!
HashedButtons
[
i
].
dying
)
{
j
++;
}
}
line
.
SetActive
(
j
>
0
);
}
int
[]
time
=
new
int
[
2
];
...
...
Assets/ArtSystem/gameInfo/new_gameInfoRemaster.prefab
View file @
af60fe6c
...
...
@@ -118,7 +118,7 @@ GameObject:
m_Component
:
-
component
:
{
fileID
:
407516
}
-
component
:
{
fileID
:
11495680
}
m_Layer
:
1
0
m_Layer
:
1
8
m_Name
:
new_gameInfoRemaster
m_TagString
:
Untagged
m_Icon
:
{
fileID
:
0
}
...
...
@@ -305,7 +305,7 @@ Transform:
m_PrefabParentObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
139962
}
m_LocalRotation
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
1
}
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
:
...
...
@@ -321,7 +321,7 @@ Transform:
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
179438
}
m_LocalRotation
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
1
}
m_LocalPosition
:
{
x
:
-65
,
y
:
20
,
z
:
0
}
m_LocalPosition
:
{
x
:
-65
,
y
:
-25
,
z
:
0
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
-
{
fileID
:
481814
}
...
...
@@ -363,7 +363,7 @@ Transform:
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
114238
}
m_LocalRotation
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
1
}
m_LocalPosition
:
{
x
:
-65
,
y
:
-
44
,
z
:
0
}
m_LocalPosition
:
{
x
:
-65
,
y
:
-
89
,
z
:
0
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
-
{
fileID
:
400434
}
...
...
@@ -379,7 +379,7 @@ Transform:
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
171338
}
m_LocalRotation
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
1
}
m_LocalPosition
:
{
x
:
0
,
y
:
-
65
,
z
:
0
}
m_LocalPosition
:
{
x
:
0
,
y
:
-
110
,
z
:
0
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
[]
m_Father
:
{
fileID
:
498562
}
...
...
@@ -418,7 +418,7 @@ Transform:
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
147310
}
m_LocalRotation
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
1
}
m_LocalPosition
:
{
x
:
-65
,
y
:
-
12
,
z
:
0
}
m_LocalPosition
:
{
x
:
-65
,
y
:
-
57
,
z
:
0
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
-
{
fileID
:
451638
}
...
...
@@ -499,7 +499,7 @@ Transform:
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
104964
}
m_LocalRotation
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
1
}
m_LocalPosition
:
{
x
:
0
,
y
:
84
,
z
:
0
}
m_LocalPosition
:
{
x
:
0
,
y
:
129
,
z
:
0
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
-
{
fileID
:
411346
}
...
...
@@ -629,7 +629,7 @@ MonoBehaviour:
checkSprite
:
{
fileID
:
0
}
checkAnimation
:
{
fileID
:
0
}
eventReceiver
:
{
fileID
:
0
}
functionName
:
OnActivate
functionName
:
startsChecked
:
0
---
!u!114
&11401798
MonoBehaviour
:
...
...
@@ -802,7 +802,7 @@ MonoBehaviour:
checkSprite
:
{
fileID
:
0
}
checkAnimation
:
{
fileID
:
0
}
eventReceiver
:
{
fileID
:
0
}
functionName
:
OnActivate
functionName
:
startsChecked
:
0
---
!u!114
&11418144
MonoBehaviour
:
...
...
@@ -1045,7 +1045,7 @@ MonoBehaviour:
checkSprite
:
{
fileID
:
0
}
checkAnimation
:
{
fileID
:
0
}
eventReceiver
:
{
fileID
:
0
}
functionName
:
OnActivate
functionName
:
startsChecked
:
0
---
!u!114
&11431158
MonoBehaviour
:
...
...
@@ -1424,7 +1424,7 @@ MonoBehaviour:
absolute
:
0
updateAnchors
:
1
mColor
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
mPivot
:
4
mPivot
:
1
mWidth
:
144
mHeight
:
90
mDepth
:
0
...
...
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