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
Dark_Zane
MDPro3
Commits
87102988
Commit
87102988
authored
Jul 12, 2024
by
SherryChaos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug fix
parent
876cc5ed
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
58 additions
and
23 deletions
+58
-23
Assets/Addressables/Text/UpdateContent.txt
Assets/Addressables/Text/UpdateContent.txt
+5
-0
Assets/Scripts/MDPro3/Net/OnlineDeck.cs
Assets/Scripts/MDPro3/Net/OnlineDeck.cs
+3
-3
Assets/Scripts/MDPro3/Servants/Online.cs
Assets/Scripts/MDPro3/Servants/Online.cs
+44
-18
Assets/Scripts/MDPro3/Servants/SelectDeck.cs
Assets/Scripts/MDPro3/Servants/SelectDeck.cs
+3
-1
Assets/Scripts/MasterDuel/YgomGame/Bg/BgEffectSettingInner.cs
...ts/Scripts/MasterDuel/YgomGame/Bg/BgEffectSettingInner.cs
+2
-1
Data/locales/zh-CN/translation.conf
Data/locales/zh-CN/translation.conf
+1
-0
No files found.
Assets/Addressables/Text/UpdateContent.txt
View file @
87102988
MDPro3 v1.1.6.1更新:
1.修复部分卡片效果特效[灰流丽等]不播放的错误;
2.修复多端同步MyCard卡组时,删除的卡组死灰复燃、生生不息的错误。
3.修复对面的决斗场地[六世坏·帕拉索眦]播放触摸动画后,动画本体消失的错误。
MDPro3 v1.1.6更新:
MDPro3 v1.1.6更新:
1.部分外观设置中新增随机、无设置等选项。
1.部分外观设置中新增随机、无设置等选项。
2.背景设置中新增DIY选项,支持设置中导入图片,或者修改[Picture\DIY\Background.png],jpg格式也支持,优先读取png格式。
2.背景设置中新增DIY选项,支持设置中导入图片,或者修改[Picture\DIY\Background.png],jpg格式也支持,优先读取png格式。
...
...
Assets/Scripts/MDPro3/Net/OnlineDeck.cs
View file @
87102988
...
@@ -174,9 +174,7 @@ namespace MDPro3
...
@@ -174,9 +174,7 @@ namespace MDPro3
if
(
request
.
result
==
UnityWebRequest
.
Result
.
Success
)
if
(
request
.
result
==
UnityWebRequest
.
Result
.
Success
)
{
{
string
jsonResult
=
request
.
downloadHandler
.
text
;
return
JsonUtility
.
FromJson
<
ResponseSingleData
>(
request
.
downloadHandler
.
text
).
data
;
var
responseData
=
JsonUtility
.
FromJson
<
ResponseSingleData
>(
request
.
downloadHandler
.
text
);
return
responseData
.
data
;
}
}
else
else
{
{
...
@@ -532,6 +530,8 @@ namespace MDPro3
...
@@ -532,6 +530,8 @@ namespace MDPro3
public
string
deckMainSerial
;
public
string
deckMainSerial
;
public
int
userid
;
public
int
userid
;
public
bool
isPublic
;
public
bool
isPublic
;
public
string
description
;
public
bool
isDelete
;
public
OnlineDeckData
()
{
}
public
OnlineDeckData
()
{
}
...
...
Assets/Scripts/MDPro3/Servants/Online.cs
View file @
87102988
...
@@ -731,9 +731,12 @@ namespace MDPro3.Net
...
@@ -731,9 +731,12 @@ namespace MDPro3.Net
deckList
.
Add
(
new
Deck
(
deck
));
deckList
.
Add
(
new
Deck
(
deck
));
var
decksNeedUpload
=
new
Dictionary
<
string
,
Deck
>();
//没在服务器找到对应的deckId的本地卡组
var
decksNeedUpload
=
new
Dictionary
<
string
,
Deck
>();
//没在服务器找到对应的deckId的本地卡组
var
decksNeedUpdate
=
new
Dictionary
<
string
,
Deck
>();
//找到deckId但本地时间大于服务器时间五秒以上的卡组
var
decksNeedUpdate
=
new
Dictionary
<
string
,
Deck
>();
//找到deckId但本地时间大于服务器时间五秒以上的卡组
var
decksNeedUpdate2
=
new
Dictionary
<
string
,
Deck
>();
//找到deckId但本地时间小于服务器时间五秒以上的卡组
var
decksNeedUpdate2
=
new
Dictionary
<
string
,
Deck
>();
//找到deckId但本地时间小于服务器时间五秒以上的卡组
var
localDeckIds
=
new
List
<
string
>();
var
localDeckIds
=
new
List
<
string
>();
var
decksNeedDelete
=
new
List
<
string
>();
//需要删除的卡组
for
(
int
i
=
0
;
i
<
deckList
.
Count
;
i
++)
for
(
int
i
=
0
;
i
<
deckList
.
Count
;
i
++)
{
{
var
deckName
=
Path
.
GetFileNameWithoutExtension
(
deckFiles
[
i
]);
var
deckName
=
Path
.
GetFileNameWithoutExtension
(
deckFiles
[
i
]);
...
@@ -751,31 +754,49 @@ namespace MDPro3.Net
...
@@ -751,31 +754,49 @@ namespace MDPro3.Net
{
{
deckIdFound
=
true
;
deckIdFound
=
true
;
var
fileInfo
=
new
FileInfo
(
deckFiles
[
i
]);
var
fileInfo
=
new
FileInfo
(
deckFiles
[
i
]);
DateTime
serverTime
;
if
(
od
.
isDelete
)
try
{
serverTime
=
DateTime
.
Parse
(
od
.
deckUpdateDate
);
}
catch
{
{
serverTime
=
DateTime
.
Parse
(
od
.
deckUploadDat
e
);
decksNeedDelete
.
Add
(
deckNam
e
);
}
}
var
diff
=
serverTime
-
fileInfo
.
LastWriteTime
;
else
if
(
diff
.
TotalSeconds
>
5f
)
{
{
if
(
fileInfo
.
LastWriteTime
>
serverTime
)
DateTime
serverTime
;
decksNeedUpdate
.
Add
(
deckName
,
deckList
[
i
]);
try
else
{
decksNeedUpdate2
.
Add
(
deckName
,
deckList
[
i
]);
serverTime
=
DateTime
.
Parse
(
od
.
deckUpdateDate
);
}
catch
{
serverTime
=
DateTime
.
Parse
(
od
.
deckUploadDate
);
}
var
diff
=
serverTime
-
fileInfo
.
LastWriteTime
;
if
(
diff
.
TotalSeconds
>
5f
)
{
if
(
fileInfo
.
LastWriteTime
>
serverTime
)
decksNeedUpdate
.
Add
(
deckName
,
deckList
[
i
]);
else
decksNeedUpdate2
.
Add
(
deckName
,
deckList
[
i
]);
}
}
}
}
}
if
(!
deckIdFound
)
if
(!
deckIdFound
)
decksNeedUpload
.
Add
(
deckName
,
deckList
[
i
]);
{
var
getDeck
=
OnlineDeck
.
GetDeck
(
deckList
[
i
].
deckId
);
while
(!
getDeck
.
IsCompleted
)
yield
return
null
;
if
(
getDeck
.
Result
==
null
)
decksNeedUpload
.
Add
(
deckName
,
deckList
[
i
]);
else
{
if
(
getDeck
.
Result
.
isDelete
)
decksNeedDelete
.
Add
(
deckName
);
else
decksNeedUpload
.
Add
(
deckName
,
deckList
[
i
]);
}
}
}
}
//上传已经有Id的本地较新卡组
//上传已经有Id的本地较新卡组
foreach
(
var
deck
in
decksNeedUpdate
)
foreach
(
var
deck
in
decksNeedUpdate
)
{
{
...
@@ -813,8 +834,9 @@ namespace MDPro3.Net
...
@@ -813,8 +834,9 @@ namespace MDPro3.Net
//下载本地ID不存在的服务器卡组
//下载本地ID不存在的服务器卡组
List
<
OnlineDeck
.
OnlineDeckData
>
odtd
=
new
List
<
OnlineDeck
.
OnlineDeckData
>();
List
<
OnlineDeck
.
OnlineDeckData
>
odtd
=
new
List
<
OnlineDeck
.
OnlineDeckData
>();
foreach
(
var
od
in
OnlineDeck
.
decks
)
foreach
(
var
od
in
OnlineDeck
.
decks
)
if
(!
localDeckIds
.
Contains
(
od
.
deckId
))
if
(!
od
.
isDelete
)
odtd
.
Add
(
od
);
if
(!
localDeckIds
.
Contains
(
od
.
deckId
))
odtd
.
Add
(
od
);
foreach
(
var
deck
in
odtd
)
foreach
(
var
deck
in
odtd
)
{
{
var
d
=
new
Deck
(
deck
.
deckYdk
,
Deck
.
defaultDeckAuthor
);
var
d
=
new
Deck
(
deck
.
deckYdk
,
Deck
.
defaultDeckAuthor
);
...
@@ -842,6 +864,10 @@ namespace MDPro3.Net
...
@@ -842,6 +864,10 @@ namespace MDPro3.Net
info
.
LastWriteTime
=
DateTime
.
Parse
(
deck
.
deckUploadDate
);
info
.
LastWriteTime
=
DateTime
.
Parse
(
deck
.
deckUploadDate
);
}
}
}
}
//删除已经被标记为删除的卡组
foreach
(
var
deck
in
decksNeedDelete
)
File
.
Delete
(
Program
.
deckPath
+
deck
+
Program
.
ydkExpansion
);
}
}
public
void
SetWatchRooms
(
List
<
MyCardRoom
>
rooms
)
public
void
SetWatchRooms
(
List
<
MyCardRoom
>
rooms
)
...
...
Assets/Scripts/MDPro3/Servants/SelectDeck.cs
View file @
87102988
...
@@ -128,6 +128,8 @@ namespace MDPro3
...
@@ -128,6 +128,8 @@ namespace MDPro3
foreach
(
var
d
in
OnlineDeck
.
decks
)
foreach
(
var
d
in
OnlineDeck
.
decks
)
{
{
if
(
d
.
isDelete
)
continue
;
if
(
decks
.
ContainsKey
(
d
.
deckName
))
if
(
decks
.
ContainsKey
(
d
.
deckName
))
{
{
int
avoid
=
2
;
int
avoid
=
2
;
...
@@ -355,7 +357,7 @@ namespace MDPro3
...
@@ -355,7 +357,7 @@ namespace MDPro3
{
{
count
++;
count
++;
File
.
Delete
(
Program
.
deckPath
+
item
.
args
[
0
]
+
Program
.
ydkExpansion
);
File
.
Delete
(
Program
.
deckPath
+
item
.
args
[
0
]
+
Program
.
ydkExpansion
);
MessageManager
.
Cast
(
InterString
.
Get
(
"已删除卡组「[?]」"
,
item
.
args
[
0
]));
MessageManager
.
Cast
(
InterString
.
Get
(
"已删除
本地
卡组「[?]」"
,
item
.
args
[
0
]));
toDelete
.
Add
(
item
.
args
[
7
]);
toDelete
.
Add
(
item
.
args
[
7
]);
}
}
DeleteOnlineDecks
(
toDelete
);
DeleteOnlineDecks
(
toDelete
);
...
...
Assets/Scripts/MasterDuel/YgomGame/Bg/BgEffectSettingInner.cs
View file @
87102988
...
@@ -185,7 +185,8 @@ namespace YgomGame.Bg
...
@@ -185,7 +185,8 @@ namespace YgomGame.Bg
tapPlaying
=
true
;
tapPlaying
=
true
;
yield
return
new
WaitForSeconds
(
activeTime
==
0
?
4
:
activeTime
);
yield
return
new
WaitForSeconds
(
activeTime
==
0
?
4
:
activeTime
);
tapPlaying
=
false
;
tapPlaying
=
false
;
gameObject
.
SetActive
(
false
);
if
(
playingOnlyActive
)
gameObject
.
SetActive
(
false
);
}
}
private
IEnumerator
CheckParticleEffectEnd
()
private
IEnumerator
CheckParticleEffectEnd
()
...
...
Data/locales/zh-CN/translation.conf
View file @
87102988
...
@@ -633,3 +633,4 @@ YDK 内容不合法,主卡组必须满 40 张->YDK 内容不合法,主卡组
...
@@ -633,3 +633,4 @@ YDK 内容不合法,主卡组必须满 40 张->YDK 内容不合法,主卡组
注册->注册
注册->注册
自定义游戏->自定义游戏
自定义游戏->自定义游戏
检测到新版先行卡,请至 [游戏设置]-[扩展卡包]-[更新先行卡] 处进行更新。->检测到新版先行卡,请至 [游戏设置]-[扩展卡包]-[更新先行卡] 处进行更新。
检测到新版先行卡,请至 [游戏设置]-[扩展卡包]-[更新先行卡] 处进行更新。->检测到新版先行卡,请至 [游戏设置]-[扩展卡包]-[更新先行卡] 处进行更新。
已删除卡组「[?]」->已删除卡组「[?]」
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