Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
R
rd-ygopro
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
苍蓝
rd-ygopro
Commits
eaee1f6f
Commit
eaee1f6f
authored
Feb 13, 2018
by
mercury233
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://github.com/Fluorohydride/ygopro
into test
parents
8bc24d6c
d530ec2f
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
206 additions
and
28 deletions
+206
-28
gframe/duelclient.cpp
gframe/duelclient.cpp
+0
-2
lflist.conf
lflist.conf
+200
-24
ocgcore
ocgcore
+1
-1
script
script
+1
-1
strings.conf
strings.conf
+4
-0
No files found.
gframe/duelclient.cpp
View file @
eaee1f6f
...
...
@@ -1104,7 +1104,6 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
pcard->chain_code = code;
mainGame->dField.conti_cards.push_back(pcard);
mainGame->dField.conti_act = true;
pcard
->
cmdFlag
|=
COMMAND_OPERATION
;
} else {
pcard->cmdFlag |= COMMAND_ACTIVATE;
if (pcard->location == LOCATION_GRAVE)
...
...
@@ -1234,7 +1233,6 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
pcard->chain_code = code;
mainGame->dField.conti_cards.push_back(pcard);
mainGame->dField.conti_act = true;
pcard
->
cmdFlag
|=
COMMAND_OPERATION
;
} else {
pcard->cmdFlag |= COMMAND_ACTIVATE;
if (pcard->location == LOCATION_GRAVE)
...
...
lflist.conf
View file @
eaee1f6f
This diff is collapsed.
Click to expand it.
ocgcore
@
8ffc4947
Subproject commit
74247b0dd884254a153062c2eada47264246cfbb
Subproject commit
8ffc49474903e22aa7bc013bdf76dccdc0d04253
script
@
6a41c3e8
Subproject commit
0abc46fdd0ec78371d79ea352eab2eb4e556cb
4a
Subproject commit
6a41c3e80af4da50ff43a0fddab3c2e5e24531
4a
strings.conf
View file @
eaee1f6f
...
...
@@ -524,6 +524,7 @@
!
counter
0
x44
指示物(弹带城壁龙)
!
counter
0
x1045
鳞粉指示物
!
counter
0
x46
指示物(刚鬼死斗)
!
counter
0
x47
指示物(限制代码)
#setnames, using tab for comment
!
setname
0
x1
正义盟军
A
・
O
・
J
!
setname
0
x2
次世代 ジェネクス
...
...
@@ -548,6 +549,7 @@
!
setname
0
xd
剑士 セイバー
!
setname
0
x100d
X
-剑士
X
-セイバー
#setname 0x300d XX-剑士 XX-セイバー
!
setname
0
x400d
元素灵剑士 エレメントセイバー
!
setname
0
xe
电气 エレキ
!
setname
0
xf
扰乱 おジャマ
!
setname
0
x10
薰风 ガスタ
...
...
@@ -878,3 +880,5 @@
!
setname
0
x10f
枪管 ヴァレル
!
setname
0
x110
眼纳祭神 アイズ・サクリファイス
!
setname
0
x111
武装龙 アームド・ドラゴン
!
setname
0
x112
幻崩 トロイメア
!
setname
0
x113
灵神 霊神
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