Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Y
YGOProUnity_V2
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
perfectdicky
YGOProUnity_V2
Commits
33db0174
Commit
33db0174
authored
Apr 08, 2019
by
mercury233
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
revert & fix MultiStringMaster
parent
6f6244fc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
16 deletions
+10
-16
Assets/SibylSystem/Book/Book.cs
Assets/SibylSystem/Book/Book.cs
+2
-2
Assets/SibylSystem/MonoHelpers/multiStringMaster.cs
Assets/SibylSystem/MonoHelpers/multiStringMaster.cs
+8
-14
No files found.
Assets/SibylSystem/Book/Book.cs
View file @
33db0174
...
@@ -124,7 +124,7 @@ public class Book : WindowServant2D
...
@@ -124,7 +124,7 @@ public class Book : WindowServant2D
master
.
remove
(
item
.
get_data
().
Name
);
master
.
remove
(
item
.
get_data
().
Name
);
}
}
}
}
deckString
+=
master
.
managedString
;
deckString
+=
master
.
managedString
.
TrimEnd
(
'\n'
)
;
lab
.
text
=
deckString
;
lab
.
text
=
deckString
;
}
}
if
(
labop
!=
null
)
if
(
labop
!=
null
)
...
@@ -146,7 +146,7 @@ public class Book : WindowServant2D
...
@@ -146,7 +146,7 @@ public class Book : WindowServant2D
master
.
Add
(
item
.
get_data
().
Name
);
master
.
Add
(
item
.
get_data
().
Name
);
}
}
}
}
opString
+=
master
.
managedString
;
opString
+=
master
.
managedString
.
TrimEnd
(
'\n'
)
;
if
(
master
.
strings
.
Count
>
0
)
if
(
master
.
strings
.
Count
>
0
)
{
{
labop
.
text
=
InterString
.
Get
(
"[ff5555]对手使用过:@n[?][-]"
,
opString
);
labop
.
text
=
InterString
.
Get
(
"[ff5555]对手使用过:@n[?][-]"
,
opString
);
...
...
Assets/SibylSystem/MonoHelpers/multiStringMaster.cs
View file @
33db0174
...
@@ -11,13 +11,7 @@ public class MultiStringMaster
...
@@ -11,13 +11,7 @@ public class MultiStringMaster
public
List
<
part
>
strings
=
new
List
<
part
>();
public
List
<
part
>
strings
=
new
List
<
part
>();
private
string
_managedString
=
""
;
public
string
managedString
=
""
;
public
string
managedString
{
get
{
return
_managedString
.
TrimEnd
(
'\n'
);
}
set
{
_managedString
=
value
;
}
}
public
void
Add
(
string
str
)
public
void
Add
(
string
str
)
{
{
...
@@ -37,16 +31,16 @@ public class MultiStringMaster
...
@@ -37,16 +31,16 @@ public class MultiStringMaster
t
.
str
=
str
;
t
.
str
=
str
;
strings
.
Add
(
t
);
strings
.
Add
(
t
);
}
}
_
managedString
=
""
;
managedString
=
""
;
for
(
int
i
=
0
;
i
<
strings
.
Count
;
i
++)
for
(
int
i
=
0
;
i
<
strings
.
Count
;
i
++)
{
{
if
(
strings
[
i
].
count
==
1
)
if
(
strings
[
i
].
count
==
1
)
{
{
_
managedString
+=
strings
[
i
].
str
+
"\n"
;
managedString
+=
strings
[
i
].
str
+
"\n"
;
}
}
else
else
{
{
_
managedString
+=
strings
[
i
].
str
+
"*"
+
strings
[
i
].
count
.
ToString
()
+
"\n"
;
managedString
+=
strings
[
i
].
str
+
"*"
+
strings
[
i
].
count
.
ToString
()
+
"\n"
;
}
}
}
}
}
}
...
@@ -54,7 +48,7 @@ public class MultiStringMaster
...
@@ -54,7 +48,7 @@ public class MultiStringMaster
public
void
clear
()
public
void
clear
()
{
{
strings
.
Clear
();
strings
.
Clear
();
_
managedString
=
""
;
managedString
=
""
;
}
}
public
void
remove
(
string
str
)
public
void
remove
(
string
str
)
...
@@ -78,16 +72,16 @@ public class MultiStringMaster
...
@@ -78,16 +72,16 @@ public class MultiStringMaster
t
.
count
--;
t
.
count
--;
}
}
}
}
_
managedString
=
""
;
managedString
=
""
;
for
(
int
i
=
0
;
i
<
strings
.
Count
;
i
++)
for
(
int
i
=
0
;
i
<
strings
.
Count
;
i
++)
{
{
if
(
strings
[
i
].
count
==
1
)
if
(
strings
[
i
].
count
==
1
)
{
{
_
managedString
+=
strings
[
i
].
str
+
"\n"
;
managedString
+=
strings
[
i
].
str
+
"\n"
;
}
}
else
else
{
{
_
managedString
+=
strings
[
i
].
str
+
"*"
+
strings
[
i
].
count
.
ToString
()
+
"\n"
;
managedString
+=
strings
[
i
].
str
+
"*"
+
strings
[
i
].
count
.
ToString
()
+
"\n"
;
}
}
}
}
}
}
...
...
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