Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
N
Neos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
2
Merge Requests
2
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
MyCard
Neos
Commits
dbc42578
Commit
dbc42578
authored
Mar 05, 2023
by
Chunchi Che
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix/version' into 'main'
Fix/version See merge request
!115
parents
5c785489
db40a6a8
Pipeline
#20463
failed with stages
in 1 minute and 9 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
3 deletions
+11
-3
neos.config.json
neos.config.json
+5
-0
src/service/onSocketOpen.ts
src/service/onSocketOpen.ts
+3
-2
src/ui/Login.tsx
src/ui/Login.tsx
+3
-1
No files found.
neos.config.json
View file @
dbc42578
{
{
"version"
:
4948
,
"servers"
:
[{
"ip"
:
"koishi-r.momobako.com"
,
"port"
:
"7211"
}],
"assetsPath"
:
"/neos-assets"
,
"assetsPath"
:
"/neos-assets"
,
"cardImgUrl"
:
"https://cdn02.moecube.com:444/images/ygopro-images-zh-CN"
,
"cardImgUrl"
:
"https://cdn02.moecube.com:444/images/ygopro-images-zh-CN"
,
"ui"
:
{
"ui"
:
{
...
...
src/service/onSocketOpen.ts
View file @
dbc42578
...
@@ -3,6 +3,7 @@
...
@@ -3,6 +3,7 @@
*
*
* */
* */
import
{
sendJoinGame
,
sendPlayerInfo
}
from
"
../api/ocgcore/ocgHelper
"
;
import
{
sendJoinGame
,
sendPlayerInfo
}
from
"
../api/ocgcore/ocgHelper
"
;
import
NeosConfig
from
"
../../neos.config.json
"
;
/*
/*
* 长连接建立后,需要马上发送PlayerInfo和JoinGame两个数据包,
* 长连接建立后,需要马上发送PlayerInfo和JoinGame两个数据包,
...
@@ -11,7 +12,7 @@ import { sendJoinGame, sendPlayerInfo } from "../api/ocgcore/ocgHelper";
...
@@ -11,7 +12,7 @@ import { sendJoinGame, sendPlayerInfo } from "../api/ocgcore/ocgHelper";
* */
* */
export
default
function
handleSocketOpen
(
export
default
function
handleSocketOpen
(
ws
:
WebSocket
|
null
,
ws
:
WebSocket
|
null
,
ip
:
string
,
_
ip
:
string
,
player
:
string
,
player
:
string
,
passWd
:
string
passWd
:
string
)
{
)
{
...
@@ -21,6 +22,6 @@ export default function handleSocketOpen(
...
@@ -21,6 +22,6 @@ export default function handleSocketOpen(
ws
.
binaryType
=
"
arraybuffer
"
;
ws
.
binaryType
=
"
arraybuffer
"
;
sendPlayerInfo
(
ws
,
player
);
sendPlayerInfo
(
ws
,
player
);
sendJoinGame
(
ws
,
4947
,
passWd
);
// todo: version use config
sendJoinGame
(
ws
,
NeosConfig
.
version
,
passWd
);
// todo: version use config
}
}
}
}
src/ui/Login.tsx
View file @
dbc42578
...
@@ -12,10 +12,12 @@ import { useNavigate } from "react-router-dom";
...
@@ -12,10 +12,12 @@ import { useNavigate } from "react-router-dom";
import
"
../styles/core.scss
"
;
import
"
../styles/core.scss
"
;
import
NeosConfig
from
"
../../neos.config.json
"
;
import
NeosConfig
from
"
../../neos.config.json
"
;
const
serverConfig
=
NeosConfig
.
servers
;
export
default
function
Login
()
{
export
default
function
Login
()
{
const
[
player
,
setPlayer
]
=
useState
(
""
);
const
[
player
,
setPlayer
]
=
useState
(
""
);
const
[
passWd
,
setPasswd
]
=
useState
(
""
);
const
[
passWd
,
setPasswd
]
=
useState
(
""
);
const
[
ip
,
setIp
]
=
useState
(
""
);
const
[
ip
,
setIp
]
=
useState
(
`
${
serverConfig
[
0
].
ip
}
:
${
serverConfig
[
0
].
port
}
`
);
const
navigate
=
useNavigate
();
const
navigate
=
useNavigate
();
let
handlePlayerChange
=
(
event
:
ChangeEvent
<
HTMLInputElement
>
)
=>
{
let
handlePlayerChange
=
(
event
:
ChangeEvent
<
HTMLInputElement
>
)
=>
{
...
...
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