Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Y
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
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
MyCard
ygopro
Commits
befae1bf
Commit
befae1bf
authored
May 28, 2023
by
wind2009
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'server' of
https://github.com/purerosefallen/ygopro
into 2pick
parents
946e268e
a1c09a3f
Pipeline
#21922
passed with stages
in 2 minutes and 41 seconds
Changes
9
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
1726 additions
and
924 deletions
+1726
-924
cards.cdb
cards.cdb
+0
-0
gframe/drawing.cpp
gframe/drawing.cpp
+1
-1
gframe/duelclient.cpp
gframe/duelclient.cpp
+1
-1
gframe/game.cpp
gframe/game.cpp
+1
-1
gframe/menu_handler.cpp
gframe/menu_handler.cpp
+26
-3
lflist.conf
lflist.conf
+1678
-913
ocgcore
ocgcore
+1
-1
script
script
+1
-1
strings.conf
strings.conf
+17
-3
No files found.
cards.cdb
View file @
befae1bf
No preview for this file type
gframe/drawing.cpp
View file @
befae1bf
...
...
@@ -579,7 +579,7 @@ void Game::DrawMisc() {
driver
->
draw2DImage
(
imageManager
.
tLPBar
,
Resize
(
986
-
290
*
partialLP
/
maxLP
,
12
,
986
,
28
),
recti
(
0
,
fgColorPos
*
16
,
16
,
(
fgColorPos
+
1
)
*
16
),
0
,
0
,
true
);
}
}
else
driver
->
draw2DImage
(
imageManager
.
tLPBar
,
Resize
(
986
-
290
*
dInfo
.
lp
[
1
]
/
dInfo
.
start_lp
,
12
,
986
,
28
),
recti
(
0
,
0
,
16
,
16
),
0
,
0
,
true
);
else
driver
->
draw2DImage
(
imageManager
.
tLPBar
,
Resize
(
986
-
290
*
dInfo
.
lp
[
1
]
/
maxLP
,
12
,
986
,
28
),
recti
(
0
,
0
,
16
,
16
),
0
,
0
,
true
);
}
if
(
lpframe
)
{
dInfo
.
lp
[
lpplayer
]
-=
lpd
;
...
...
gframe/duelclient.cpp
View file @
befae1bf
...
...
@@ -2390,7 +2390,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
}
mainGame
->
WaitFrameSignal
(
5
);
}
if
(
panel_confirm
.
size
()
&&
!
auto_watch_mode
)
{
if
(
panel_confirm
.
size
()
&&
mainGame
->
dInfo
.
player_type
!=
7
&&
!
auto_watch_mode
)
{
std
::
sort
(
panel_confirm
.
begin
(),
panel_confirm
.
end
(),
ClientCard
::
client_card_sort
);
mainGame
->
gMutex
.
lock
();
mainGame
->
dField
.
selectable_cards
=
panel_confirm
;
...
...
gframe/game.cpp
View file @
befae1bf
...
...
@@ -229,7 +229,7 @@ bool Game::Initialize() {
SetWindowsIcon
();
//main menu
wchar_t
strbuf
[
256
];
myswprintf
(
strbuf
,
L"KoishiPro %X.0%X.%X
ChimiMoryo
"
,
PRO_VERSION
>>
12
,
(
PRO_VERSION
>>
4
)
&
0xff
,
PRO_VERSION
&
0xf
);
myswprintf
(
strbuf
,
L"KoishiPro %X.0%X.%X
Yumezakura
"
,
PRO_VERSION
>>
12
,
(
PRO_VERSION
>>
4
)
&
0xff
,
PRO_VERSION
&
0xf
);
wMainMenu
=
env
->
addWindow
(
rect
<
s32
>
(
370
,
200
,
650
,
415
),
false
,
strbuf
);
wMainMenu
->
getCloseButton
()
->
setVisible
(
false
);
btnLanMode
=
env
->
addButton
(
rect
<
s32
>
(
10
,
30
,
270
,
60
),
wMainMenu
,
BUTTON_LAN_MODE
,
dataManager
.
GetSysString
(
1200
));
...
...
gframe/menu_handler.cpp
View file @
befae1bf
...
...
@@ -111,10 +111,15 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
case
BUTTON_HOST_CONFIRM
:
{
bot_mode
=
false
;
BufferIO
::
CopyWStr
(
mainGame
->
ebServerName
->
getText
(),
mainGame
->
gameConf
.
gamename
,
20
);
if
(
!
NetServer
::
StartServer
(
mainGame
->
gameConf
.
serverport
))
if
(
!
NetServer
::
StartServer
(
mainGame
->
gameConf
.
serverport
))
{
soundManager
.
PlaySoundEffect
(
SOUND_INFO
);
mainGame
->
env
->
addMessageBox
(
L""
,
dataManager
.
GetSysString
(
1402
));
break
;
}
if
(
!
DuelClient
::
StartClient
(
0x7f000001
,
mainGame
->
gameConf
.
serverport
))
{
NetServer
::
StopServer
();
soundManager
.
PlaySoundEffect
(
SOUND_INFO
);
mainGame
->
env
->
addMessageBox
(
L""
,
dataManager
.
GetSysString
(
1402
));
break
;
}
mainGame
->
btnHostConfirm
->
setEnabled
(
false
);
...
...
@@ -154,6 +159,10 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
case
BUTTON_HP_READY
:
{
if
(
mainGame
->
cbCategorySelect
->
getSelected
()
==
-
1
||
mainGame
->
cbDeckSelect
->
getSelected
()
==
-
1
||
!
deckManager
.
LoadDeck
(
mainGame
->
cbCategorySelect
,
mainGame
->
cbDeckSelect
))
{
mainGame
->
gMutex
.
lock
();
soundManager
.
PlaySoundEffect
(
SOUND_INFO
);
mainGame
->
env
->
addMessageBox
(
L""
,
dataManager
.
GetSysString
(
1406
));
mainGame
->
gMutex
.
unlock
();
break
;
}
UpdateDeck
();
...
...
@@ -308,10 +317,15 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
break
;
bot_mode
=
true
;
#ifdef _WIN32
if
(
!
NetServer
::
StartServer
(
mainGame
->
gameConf
.
serverport
))
if
(
!
NetServer
::
StartServer
(
mainGame
->
gameConf
.
serverport
))
{
soundManager
.
PlaySoundEffect
(
SOUND_INFO
);
mainGame
->
env
->
addMessageBox
(
L""
,
dataManager
.
GetSysString
(
1402
));
break
;
}
if
(
!
DuelClient
::
StartClient
(
0x7f000001
,
mainGame
->
gameConf
.
serverport
))
{
NetServer
::
StopServer
();
soundManager
.
PlaySoundEffect
(
SOUND_INFO
);
mainGame
->
env
->
addMessageBox
(
L""
,
dataManager
.
GetSysString
(
1402
));
break
;
}
STARTUPINFOW
si
;
...
...
@@ -358,10 +372,15 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
execl
(
"./bot"
,
"bot"
,
arg1
,
arg2
,
arg3
,
NULL
);
exit
(
0
);
}
else
{
if
(
!
NetServer
::
StartServer
(
mainGame
->
gameConf
.
serverport
))
if
(
!
NetServer
::
StartServer
(
mainGame
->
gameConf
.
serverport
))
{
soundManager
.
PlaySoundEffect
(
SOUND_INFO
);
mainGame
->
env
->
addMessageBox
(
L""
,
dataManager
.
GetSysString
(
1402
));
break
;
}
if
(
!
DuelClient
::
StartClient
(
0x7f000001
,
mainGame
->
gameConf
.
serverport
))
{
NetServer
::
StopServer
();
soundManager
.
PlaySoundEffect
(
SOUND_INFO
);
mainGame
->
env
->
addMessageBox
(
L""
,
dataManager
.
GetSysString
(
1402
));
break
;
}
}
...
...
@@ -596,7 +615,11 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
if
(
static_cast
<
irr
::
gui
::
IGUICheckBox
*>
(
caller
)
->
isChecked
())
{
if
(
mainGame
->
cbCategorySelect
->
getSelected
()
==
-
1
||
mainGame
->
cbDeckSelect
->
getSelected
()
==
-
1
||
!
deckManager
.
LoadDeck
(
mainGame
->
cbCategorySelect
,
mainGame
->
cbDeckSelect
))
{
mainGame
->
gMutex
.
lock
();
static_cast
<
irr
::
gui
::
IGUICheckBox
*>
(
caller
)
->
setChecked
(
false
);
soundManager
.
PlaySoundEffect
(
SOUND_INFO
);
mainGame
->
env
->
addMessageBox
(
L""
,
dataManager
.
GetSysString
(
1406
));
mainGame
->
gMutex
.
unlock
();
break
;
}
UpdateDeck
();
...
...
lflist.conf
View file @
befae1bf
This diff is collapsed.
Click to expand it.
ocgcore
@
d1c707fc
Subproject commit
9a18abac5d3b8cbe987a8fe4ae5b101b0ec3a8c0
Subproject commit
d1c707fcb4f3080bbc243b46ed58b5fada372109
script
@
300d1a98
Subproject commit
f3e8cf5a04950491a3b16b0750edffaf287a8abd
Subproject commit
300d1a981a3b45d47c62d0c6a5035706052a6e52
strings.conf
View file @
befae1bf
...
...
@@ -657,6 +657,8 @@
!
counter
0
x62
指示物(逐渐削减的生命)
!
counter
0
x1063
幻觉指示物
!
counter
0
x64
G
石人指示物
!
counter
0
x1065
兔耳指示物
!
counter
0
x66
指示物(推荐捏军贯)
#setnames, using tab for comment
!
setname
0
x1
正义盟军
A
・
O
・
J
!
setname
0
x2
次世代 ジェネクス
...
...
@@ -777,6 +779,7 @@
!
setname
0
x1050
凶饿毒|蛇毒 スターヴ・ヴェノム
!
setname
0
x51
零件 ガジェット
!
setname
0
x52
守护者 ガーディアン
!
setname
0
x1052
门之守护神|守护者
Gate
Guardian
!
setname
0
x53
星圣 セイクリッド
!
setname
0
x54
我我我 ガガガ
!
setname
0
x55
光子 フォトン
...
...
@@ -827,6 +830,7 @@
#setname 0x7a 圣 聖
!
setname
0
x107a
圣骑士 聖騎士(せいきし)
!
setname
0
x207a
圣剑 聖剣(せいけん)
!
setname
0
x507a
焰圣骑士 焔聖騎士
!
setname
0
x7b
银河 ギャラクシー
!
setname
0
x107b
银河眼 ギャラクシーアイズ
!
setname
0
x307b
银河眼时空龙 ギャラクシーアイズ・タキオン・ドラゴン
...
...
@@ -875,8 +879,8 @@
!
setname
0
x109a
超重武者装留
!
setname
0
x9b
幻奏
!
setname
0
x109b
幻奏的音姬 幻奏の音姫
!
setname
0
x9c
星
守
テラナイト
!
setname
0
x109c
星辉士|星
守
ステラナイト
!
setname
0
x9c
星
骑士
テラナイト
!
setname
0
x109c
星辉士|星
骑士
ステラナイト
!
setname
0
x9d
影依 シャドール
!
setname
0
x9e
龙星 竜星
!
setname
0
x9f
娱乐伙伴
EM
(エンタメイト)
...
...
@@ -1122,6 +1126,7 @@
!
setname
0
x160
原质炉 マテリアクトル
!
setname
0
x161
溟界
!
setname
0
x162
七音服 ドレミコード
!
setname
0
x1162
大钢琴之七音服 グランドレミコード
!
setname
0
x163
北极天熊 ベアルクティ
!
setname
0
x164
死狱乡 デスピア
!
setname
0
x165
魔键 魔鍵
...
...
@@ -1148,7 +1153,7 @@
!
setname
0
x179
兽带斗神 セリオンズ
!
setname
0
x17a
恐吓爪牙族 スケアクロー
!
setname
0
x17b
野蛮人 バーバリアン
!
setname
0
x17c
漫读使灵
リブロマンサー
!
setname
0
x17c
书灵师
リブロマンサー
!
setname
0
x17d
群豪 ヴァリアンツ
!
setname
0
x17e
拉比林斯迷宫 ラビュリンス
!
setname
0
x117e
拉比林斯迷宫欢迎 ウェルカム・ラビュリンス
...
...
@@ -1170,3 +1175,12 @@
!
setname
0
x18c
纯爱妖精 ピュアリィ
!
setname
0
x18d
御巫
!
setname
0
x18e
仪水镜 儀水鏡
!
setname
0
x18f
防火 ファイアウォール
!
setname
0
x190
末那愚子族 マナドゥム
!
setname
0
x191
妮穆蕾莉娅 ネムレリア
!
setname
0
x192
黄金荣耀
Gold
Pride
!
setname
0
x193
迷宫壁
Labyrinth
Wall
!
setname
0
x194
至爱 フェイバリット
!
setname
0
x195
征服斗魂
VS
(ヴァンキッシュ・ソウル)
!
setname
0
x196
新式魔厨 ヌーベルズ
!
setname
0
x197
食谱 レシピ
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