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
5bfb16ff
Commit
5bfb16ff
authored
Apr 07, 2019
by
mercury233
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix strings to use translation
parent
f1b6724f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
15 deletions
+18
-15
Assets/SibylSystem/Ocgcore/Ocgcore.cs
Assets/SibylSystem/Ocgcore/Ocgcore.cs
+7
-4
Assets/SibylSystem/Room/Room.cs
Assets/SibylSystem/Room/Room.cs
+11
-11
No files found.
Assets/SibylSystem/Ocgcore/Ocgcore.cs
View file @
5bfb16ff
...
...
@@ -1795,12 +1795,15 @@ public class Ocgcore : ServantWithCardDescription
data = r.ReadByte();
int data1 = data & 0x3;
int data2 = (data >> 2) & 0x3;
string
res1
=
(
data1
==
1
?
"剪刀"
:
(
data1
==
2
?
"布"
:
"石头"
));
string
res2
=
(
data2
==
1
?
"剪刀"
:
(
data2
==
2
?
"布"
:
"石头"
));
string scissors = InterString.Get("剪刀");
string rock = InterString.Get("石头");
string paper = InterString.Get("布");
string res1 = (data1 == 1 ? scissors : (data1 == 2 ? paper : rock));
string res2 = (data2 == 1 ? scissors : (data2 == 2 ? paper : rock));
if (isFirst)
printDuelLog
(
"猜拳结果:你好像出了"
+
res2
+
data2
.
ToString
()
+
",对方好像出了"
+
res1
+
data1
.
ToString
()
);
printDuelLog(
InterString.Get("猜拳结果:你好像出了") + res2 + InterString.Get(",对方好像出了") + res1
);
else
printDuelLog
(
"猜拳结果:你好像出了"
+
data1
.
ToString
()
+
res1
+
",对方好像出了"
+
res2
+
data2
.
ToString
()
);
printDuelLog(
InterString.Get("猜拳结果:你好像出了") + res1 + InterString.Get(",对方好像出了") + res2
);
break;
case GameMessage.Attack:
game_card = GCS_cardGet(r.ReadGPS(), false);
...
...
Assets/SibylSystem/Room/Room.cs
View file @
5bfb16ff
...
...
@@ -2,8 +2,8 @@
using
System
;
using
System.Collections.Generic
;
using
System.IO
;
using
YGOSharp.Network.Enums
;
using
YGOSharp.Network.Enums
;
public
class
Room
:
WindowServantSP
{
UIselectableList
superScrollView
=
null
;
...
...
@@ -522,31 +522,31 @@ public class Room : WindowServantSP
switch
(
flag
)
{
case
1
:
// DECKERROR_LFLIST
RMSshow_onlyYes
(
""
,
InterString
.
Get
(
"卡组非法,请检查:[?]"
,
YGOSharp
.
CardsManager
.
Get
(
code
).
Name
)
+
"
(数量不符合禁限卡表)"
,
null
);
RMSshow_onlyYes
(
""
,
InterString
.
Get
(
"卡组非法,请检查:[?]"
,
YGOSharp
.
CardsManager
.
Get
(
code
).
Name
)
+
"
\r\n"
+
InterString
.
Get
(
"(数量不符合禁限卡表)"
)
,
null
);
break
;
case
2
:
// DECKERROR_OCGONLY
RMSshow_onlyYes
(
""
,
InterString
.
Get
(
"卡组非法,请检查:[?]"
,
YGOSharp
.
CardsManager
.
Get
(
code
).
Name
)
+
"
(OCG独有卡,不能在当前设置使用)"
,
null
);
RMSshow_onlyYes
(
""
,
InterString
.
Get
(
"卡组非法,请检查:[?]"
,
YGOSharp
.
CardsManager
.
Get
(
code
).
Name
)
+
"
\r\n"
+
InterString
.
Get
(
"(OCG独有卡,不能在当前设置使用)"
)
,
null
);
break
;
case
3
:
// DECKERROR_TCGONLY
RMSshow_onlyYes
(
""
,
InterString
.
Get
(
"卡组非法,请检查:[?]"
,
YGOSharp
.
CardsManager
.
Get
(
code
).
Name
)
+
"
(TCG独有卡,不能在当前设置使用)"
,
null
);
RMSshow_onlyYes
(
""
,
InterString
.
Get
(
"卡组非法,请检查:[?]"
,
YGOSharp
.
CardsManager
.
Get
(
code
).
Name
)
+
"
\r\n"
+
InterString
.
Get
(
"(TCG独有卡,不能在当前设置使用)"
)
,
null
);
break
;
case
4
:
// DECKERROR_UNKNOWNCARD
if
(
code
<
100000000
)
RMSshow_onlyYes
(
""
,
InterString
.
Get
(
"卡组非法,请检查:[?]"
,
YGOSharp
.
CardsManager
.
Get
(
code
).
Name
)
+
"
(服务器无法识别此卡,可能是服务器未更新)"
,
null
);
RMSshow_onlyYes
(
""
,
InterString
.
Get
(
"卡组非法,请检查:[?]"
,
YGOSharp
.
CardsManager
.
Get
(
code
).
Name
)
+
"
\r\n"
+
InterString
.
Get
(
"(服务器无法识别此卡,可能是服务器未更新)"
)
,
null
);
else
RMSshow_onlyYes
(
""
,
InterString
.
Get
(
"卡组非法,请检查:[?]"
,
YGOSharp
.
CardsManager
.
Get
(
code
).
Name
)
+
"
(服务器无法识别此卡,可能是服务器不支持先行卡或此先行卡已正式更新)"
,
null
);
RMSshow_onlyYes
(
""
,
InterString
.
Get
(
"卡组非法,请检查:[?]"
,
YGOSharp
.
CardsManager
.
Get
(
code
).
Name
)
+
"
\r\n"
+
InterString
.
Get
(
"(服务器无法识别此卡,可能是服务器不支持先行卡或此先行卡已正式更新)"
)
,
null
);
break
;
case
5
:
// DECKERROR_CARDCOUNT
RMSshow_onlyYes
(
""
,
InterString
.
Get
(
"卡组非法,请检查:[?]"
,
YGOSharp
.
CardsManager
.
Get
(
code
).
Name
)
+
"
(数量过多)"
,
null
);
RMSshow_onlyYes
(
""
,
InterString
.
Get
(
"卡组非法,请检查:[?]"
,
YGOSharp
.
CardsManager
.
Get
(
code
).
Name
)
+
"
\r\n"
+
InterString
.
Get
(
"(数量过多)"
)
,
null
);
break
;
case
6
:
// DECKERROR_MAINCOUNT
RMSshow_onlyYes
(
""
,
"主卡组数量应为40-60张"
,
null
);
RMSshow_onlyYes
(
""
,
InterString
.
Get
(
"主卡组数量应为40-60张"
)
,
null
);
break
;
case
7
:
// DECKERROR_EXTRACOUNT
RMSshow_onlyYes
(
""
,
"额外卡组数量应为0-15张"
,
null
);
RMSshow_onlyYes
(
""
,
InterString
.
Get
(
"额外卡组数量应为0-15张"
)
,
null
);
break
;
case
8
:
// DECKERROR_SIDECOUNT
RMSshow_onlyYes
(
""
,
"副卡组数量应为0-15"
,
null
);
RMSshow_onlyYes
(
""
,
InterString
.
Get
(
"副卡组数量应为0-15"
)
,
null
);
break
;
default
:
RMSshow_onlyYes
(
""
,
GameStringManager
.
get_unsafe
(
1406
),
null
);
...
...
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