Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
M
MDPro2
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
List
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
wangbiao
MDPro2
Commits
d3976df6
Commit
d3976df6
authored
Jun 15, 2023
by
赤子奈落
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update hand card position
parent
83d92956
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
8 deletions
+16
-8
Assets/MD/main.unity
Assets/MD/main.unity
+8
-0
Assets/SibylSystem/Ocgcore/Ocgcore.cs
Assets/SibylSystem/Ocgcore/Ocgcore.cs
+8
-8
No files found.
Assets/MD/main.unity
View file @
d3976df6
...
@@ -4251,6 +4251,14 @@ PrefabInstance:
...
@@ -4251,6 +4251,14 @@ PrefabInstance:
m_Modification:
m_Modification:
m_TransformParent: {fileID: 737802523}
m_TransformParent: {fileID: 737802523}
m_Modifications:
m_Modifications:
- target: {fileID: 100916, guid: dd57848b7cec7c441b1e5e16bfaf237f, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 191502, guid: dd57848b7cec7c441b1e5e16bfaf237f, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 194658, guid: dd57848b7cec7c441b1e5e16bfaf237f, type: 3}
- target: {fileID: 194658, guid: dd57848b7cec7c441b1e5e16bfaf237f, type: 3}
propertyPath: m_Name
propertyPath: m_Name
value: new_cardDescriptionRemaster
value: new_cardDescriptionRemaster
...
...
Assets/SibylSystem/Ocgcore/Ocgcore.cs
View file @
d3976df6
...
@@ -66,9 +66,9 @@ public class Ocgcore : ServantWithCardDescription
...
@@ -66,9 +66,9 @@ public class Ocgcore : ServantWithCardDescription
private
arrow
Arrow
;
private
arrow
Arrow
;
private
autoForceChainHandlerType
autoForceChainHandler
=
autoForceChainHandlerType
.
manDoAll
;
private
autoForceChainHandlerType
autoForceChainHandler
=
autoForceChainHandlerType
.
manDoAll
;
private
float
camera_max
=
-
15f
;
//-5.5f;
private
float
camera_max
=
-
15f
;
private
float
camera_min
=
-
28
f
;
//-17
.5f;
private
float
camera_min
=
-
28.5f
;
public
bool
cantCheckGrave
;
public
bool
cantCheckGrave
;
public
List
<
gameCard
>
cards
=
new
List
<
gameCard
>();
public
List
<
gameCard
>
cards
=
new
List
<
gameCard
>();
...
@@ -5440,7 +5440,7 @@ public class Ocgcore : ServantWithCardDescription
...
@@ -5440,7 +5440,7 @@ public class Ocgcore : ServantWithCardDescription
Vector3
position
;
Vector3
position
;
if
(
cards
[
i
].
p
.
controller
==
0
)
if
(
cards
[
i
].
p
.
controller
==
0
)
{
{
position
=
new
Vector3
(
0
,
12
,
-
28
);
//mark 洗牌
position
=
new
Vector3
(
0
f
,
20f
,
-
28.5f
);
//mark 洗牌
cards
[
i
].
animation_rush_to
(
position
,
new
Vector3
(-
20
,
0
,
180
));
cards
[
i
].
animation_rush_to
(
position
,
new
Vector3
(-
20
,
0
,
180
));
}
}
else
else
...
@@ -6320,14 +6320,14 @@ public class Ocgcore : ServantWithCardDescription
...
@@ -6320,14 +6320,14 @@ public class Ocgcore : ServantWithCardDescription
for
(
var
index
=
0
;
index
<
lines
[
line_index
].
Count
;
index
++)
for
(
var
index
=
0
;
index
<
lines
[
line_index
].
Count
;
index
++)
{
{
var
want_position
=
Vector3
.
zero
;
var
want_position
=
Vector3
.
zero
;
want_position
.
y
=
12
f
;
//mark 我方手卡默认高度
want_position
.
y
=
20
f
;
//mark 我方手卡默认高度
if
((
lines
[
line_index
][
index
].
p
.
location
&
(
int
)
CardLocation
.
Hand
)
>
0
)
if
((
lines
[
line_index
][
index
].
p
.
location
&
(
int
)
CardLocation
.
Hand
)
>
0
)
want_position
.
z
=
-
line_index
*
8
+
-
28
f
;
//target -28
want_position
.
z
=
-
line_index
*
8
+
-
28
.5f
;
else
if
(
upMode
.
lineShift
)
else
if
(
upMode
.
lineShift
)
want_position
.
z
=
line_index
*
8
+
-
28f
;
want_position
.
z
=
line_index
*
8
+
-
28
.5
f
;
else
else
want_position
.
z
=
-
line_index
*
8
+
-
28f
;
want_position
.
z
=
-
line_index
*
8
+
-
28
.5
f
;
if
(
line_index
==
0
&&
(
lines
[
line_index
][
index
].
p
.
location
&
(
int
)
CardLocation
.
Hand
)
>
0
)
if
(
line_index
==
0
&&
(
lines
[
line_index
][
index
].
p
.
location
&
(
int
)
CardLocation
.
Hand
)
>
0
)
want_position
.
x
=
UIHelper
.
get_left_right_indexEnhanced
(-
16
,
16
,
index
,
lines
[
line_index
].
Count
,
6
);
//(-10, 10, index, lines[line_index].Count, 5);
want_position
.
x
=
UIHelper
.
get_left_right_indexEnhanced
(-
16
,
16
,
index
,
lines
[
line_index
].
Count
,
6
);
//(-10, 10, index, lines[line_index].Count, 5);
else
else
...
@@ -6954,7 +6954,7 @@ public class Ocgcore : ServantWithCardDescription
...
@@ -6954,7 +6954,7 @@ public class Ocgcore : ServantWithCardDescription
if
(
nearest_z
>
cards
[
i
].
UA_get_accurate_position
().
z
)
if
(
nearest_z
>
cards
[
i
].
UA_get_accurate_position
().
z
)
nearest_z
=
cards
[
i
].
UA_get_accurate_position
().
z
;
nearest_z
=
cards
[
i
].
UA_get_accurate_position
().
z
;
camera_max
=
-
37f
;
//-3.5f - 15f * Program.fieldSize;
camera_max
=
-
37f
;
//-3.5f - 15f * Program.fieldSize;
camera_min
=
nearest_z
-
9
f
;
//target -37
camera_min
=
nearest_z
-
8.5
f
;
//target -37
if
(
camera_min
>
camera_max
)
camera_min
=
camera_max
;
if
(
camera_min
>
camera_max
)
camera_min
=
camera_max
;
if
(
InAI
==
false
)
if
(
InAI
==
false
)
...
...
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