Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
M
MDPro3
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
Senator John
MDPro3
Commits
e02bc7e5
Commit
e02bc7e5
authored
Apr 12, 2024
by
SherryChaos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bugs
parent
c220392c
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
27 additions
and
38 deletions
+27
-38
Assets/Scripts/MDPro3/Program.cs
Assets/Scripts/MDPro3/Program.cs
+1
-0
Assets/Scripts/MDPro3/Servants/OcgCore.cs
Assets/Scripts/MDPro3/Servants/OcgCore.cs
+19
-20
Assets/Scripts/MDPro3/Servants/Room.cs
Assets/Scripts/MDPro3/Servants/Room.cs
+4
-14
Assets/Scripts/MDPro3/Servants/Servant.cs
Assets/Scripts/MDPro3/Servants/Servant.cs
+1
-1
ProjectSettings/ProjectSettings.asset
ProjectSettings/ProjectSettings.asset
+2
-3
No files found.
Assets/Scripts/MDPro3/Program.cs
View file @
e02bc7e5
...
...
@@ -298,6 +298,7 @@ namespace MDPro3
private
void
OnApplicationQuit
()
{
Running
=
false
;
TcpHelper
.
tcpClient
?.
Close
();
YgoServer
.
StopServer
();
}
}
...
...
Assets/Scripts/MDPro3/Servants/OcgCore.cs
View file @
e02bc7e5
...
...
@@ -1696,14 +1696,7 @@ namespace MDPro3
{
if
(
condition
!=
Condition
.
Replay
)
{
selections
=
new
List
<
string
>()
{
InterString
.
Get
(
"保存回放"
),
InterString
.
Get
(
"保存"
),
InterString
.
Get
(
"放弃"
),
Tools
.
GetTimeString
()
};
ShowPopupInput
(
selections
,
OnSaveReplay
,
OnGiveUpReplay
,
InputValidation
.
ValidationType
.
Path
);
ShowSaveReplay
();
Destroy
(
mono
.
gameObject
);
}
};
...
...
@@ -1714,6 +1707,8 @@ namespace MDPro3
playableGuide0
.
GetComponent
<
Animator
>().
SetTrigger
(
"End"
);
playableGuide1
.
GetComponent
<
Animator
>().
SetTrigger
(
"End"
);
}
//防止对方在更换副卡组时拔螺丝
UIManager
.
UIBlackOut
(
transitionTime
);
break
;
case
GameMessage
.
Start
:
CoreReset
();
...
...
@@ -4756,22 +4751,14 @@ namespace MDPro3
#
region
PracticalizeTools
public
int
LocalPlayer
(
int
p
,
bool
advanced
=
false
)
public
int
LocalPlayer
(
int
p
)
{
if
(
p
==
0
||
p
==
1
)
{
if
(
advanced
)
{
}
else
{
if
(
isFirst
)
return
p
;
return
1
-
p
;
}
if
(
isFirst
)
return
p
;
return
1
-
p
;
}
return
p
;
}
public
static
int
[]
GetSelectLevelSum
(
List
<
GameCard
>
cards
)
...
...
@@ -6442,6 +6429,18 @@ namespace MDPro3
}
}
void
ShowSaveReplay
()
{
var
selections
=
new
List
<
string
>()
{
InterString
.
Get
(
"保存回放"
),
InterString
.
Get
(
"保存"
),
InterString
.
Get
(
"放弃"
),
Tools
.
GetTimeString
()
};
ShowPopupInput
(
selections
,
OnSaveReplay
,
OnGiveUpReplay
,
InputValidation
.
ValidationType
.
Path
);
}
#
endregion
#
region
Enum
...
...
Assets/Scripts/MDPro3/Servants/Room.cs
View file @
e02bc7e5
...
...
@@ -402,28 +402,18 @@ namespace MDPro3
}
void
AddChatItem
(
int
player
,
string
content
)
{
if
(
Program
.
I
().
ocgcore
.
isShowed
)
if
(
Program
.
I
().
ocgcore
.
isShowed
&&
player
<
4
)
{
if
(
mode
!=
2
)
player
=
Program
.
I
().
ocgcore
.
LocalPlayer
(
player
);
else
{
if
(
Program
.
I
().
ocgcore
.
isFirst
)
player
^=
2
;
if
(
player
==
0
)
player
=
0
;
else
if
(
player
==
1
)
player
=
2
;
else
if
(
player
==
2
)
player
=
1
;
else
if
(
player
==
3
)
player
=
3
;
else
player
=
10
;
if
(
Program
.
I
().
ocgcore
.
isFirst
&&
selfType
>
1
||
!
Program
.
I
().
ocgcore
.
isFirst
&&
selfType
<
2
)
player
=
(
player
+
2
)
%
4
;
}
}
var
nickName
=
players
[
player
]?.
name
;
GameObject
item
=
null
;
var
position
=
GetPlayerPositon
(
player
);
...
...
Assets/Scripts/MDPro3/Servants/Servant.cs
View file @
e02bc7e5
...
...
@@ -88,7 +88,7 @@ namespace MDPro3
cg
.
alpha
=
1f
;
cg
.
interactable
=
true
;
cg
.
blocksRaycasts
=
true
;
if
(
depth
<=
0
)
if
(
depth
<=
0
||
(
this
==
Program
.
I
().
editDeck
&&
Program
.
I
().
editDeck
.
condition
==
EditDeck
.
EditDeckCondition
.
ChangeSide
)
)
UIManager
.
HideExitButton
(
0
);
else
UIManager
.
ShowExitButton
(
0
);
...
...
ProjectSettings/ProjectSettings.asset
View file @
e02bc7e5
...
...
@@ -135,8 +135,7 @@ PlayerSettings:
16:9:
1
Others
:
1
bundleVersion
:
1.0.6
preloadedAssets
:
-
{
fileID
:
11400000
,
guid
:
5fb02d2098f52054b89ce4a9f63ba9ee
,
type
:
2
}
preloadedAssets
:
[]
metroInputSource
:
0
wsaTransparentSwapchain
:
0
m_HolographicPauseOnTrackingLoss
:
1
...
...
@@ -530,7 +529,7 @@ PlayerSettings:
m_APIs
:
0b000000
m_Automatic
:
1
-
m_BuildTarget
:
WindowsStandaloneSupport
m_APIs
:
0
b000000020000001200000015
000000
m_APIs
:
0
200000012000000150000000b
000000
m_Automatic
:
0
m_BuildTargetVRSettings
:
-
m_BuildTarget
:
Standalone
...
...
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