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
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
love_飞影
Neos
Commits
113f72b5
Commit
113f72b5
authored
Mar 12, 2023
by
Chunchi Che
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
fcb1fe34
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
86 additions
and
72 deletions
+86
-72
src/common.ts
src/common.ts
+77
-68
src/ui/Duel/cardModal.tsx
src/ui/Duel/cardModal.tsx
+9
-4
No files found.
src/common.ts
View file @
113f72b5
//! 一些Neos中基础的数据结构
//! 一些Neos中基础的数据结构
// 类型
const
TYPE_MONSTER
=
0x1
;
//
const
TYPE_MONSTER
=
0x1
;
//
const
TYPE_SPELL
=
0x2
;
//
const
TYPE_SPELL
=
0x2
;
//
const
TYPE_TRAP
=
0x4
;
//
const
TYPE_TRAP
=
0x4
;
//
...
@@ -26,48 +27,13 @@ const TYPE_PENDULUM = 0x1000000; //
...
@@ -26,48 +27,13 @@ const TYPE_PENDULUM = 0x1000000; //
const
TYPE_SPSUMMON
=
0x2000000
;
//
const
TYPE_SPSUMMON
=
0x2000000
;
//
const
TYPE_LINK
=
0x4000000
;
//
const
TYPE_LINK
=
0x4000000
;
//
// const ATTRIBUTE_ALL = 0x7f; //
const
ATTRIBUTE_EARTH
=
0x01
;
//
const
ATTRIBUTE_WATER
=
0x02
;
//
const
ATTRIBUTE_FIRE
=
0x04
;
//
const
ATTRIBUTE_WIND
=
0x08
;
//
const
ATTRIBUTE_LIGHT
=
0x10
;
//
const
ATTRIBUTE_DARK
=
0x20
;
//
const
ATTRIBUTE_DEVINE
=
0x40
;
//
const
RACE_WARRIOR
=
0x1
;
//
const
RACE_SPELLCASTER
=
0x2
;
//
const
RACE_FAIRY
=
0x4
;
//
const
RACE_FIEND
=
0x8
;
//
const
RACE_ZOMBIE
=
0x10
;
//
const
RACE_MACHINE
=
0x20
;
//
const
RACE_AQUA
=
0x40
;
//
const
RACE_PYRO
=
0x80
;
//
const
RACE_ROCK
=
0x100
;
//
const
RACE_WINDBEAST
=
0x200
;
//
const
RACE_PLANT
=
0x400
;
//
const
RACE_INSECT
=
0x800
;
//
const
RACE_THUNDER
=
0x1000
;
//
const
RACE_DRAGON
=
0x2000
;
//
const
RACE_BEAST
=
0x4000
;
//
const
RACE_BEASTWARRIOR
=
0x8000
;
//
const
RACE_DINOSAUR
=
0x10000
;
//
const
RACE_FISH
=
0x20000
;
//
const
RACE_SEASERPENT
=
0x40000
;
//
const
RACE_REPTILE
=
0x80000
;
//
const
RACE_PSYCHO
=
0x100000
;
//
const
RACE_DEVINE
=
0x200000
;
//
const
RACE_CREATORGOD
=
0x400000
;
//
const
RACE_WYRM
=
0x800000
;
//
const
RACE_CYBERSE
=
0x1000000
;
//
/*
/*
* 在做卡牌信息展示的时候,发现`CardMeta`里面的数据和`strings.conf`配置文件
* 在做卡牌信息展示的时候,发现`CardMeta`里面的数据和`strings.conf`配置文件
* 里面的code是不对应的,这里定义一个哈希表来管理其中的映射关系。
* 里面的code是不对应的,这里定义一个哈希表来管理其中的映射关系。
*
*
* metaCode -> stringCode
* metaCode -> stringCode
* */
* */
export
const
Meta
2StringCodeMap
:
Map
<
number
,
number
>
=
new
Map
([
export
const
Type
2StringCodeMap
:
Map
<
number
,
number
>
=
new
Map
([
[
TYPE_MONSTER
,
1050
],
[
TYPE_MONSTER
,
1050
],
[
TYPE_SPELL
,
1051
],
[
TYPE_SPELL
,
1051
],
[
TYPE_TRAP
,
1052
],
[
TYPE_TRAP
,
1052
],
...
@@ -93,38 +59,6 @@ export const Meta2StringCodeMap: Map<number, number> = new Map([
...
@@ -93,38 +59,6 @@ export const Meta2StringCodeMap: Map<number, number> = new Map([
[
TYPE_PENDULUM
,
1074
],
[
TYPE_PENDULUM
,
1074
],
[
TYPE_SPSUMMON
,
1075
],
[
TYPE_SPSUMMON
,
1075
],
[
TYPE_LINK
,
1076
],
[
TYPE_LINK
,
1076
],
[
ATTRIBUTE_EARTH
,
1010
],
[
ATTRIBUTE_WATER
,
1011
],
[
ATTRIBUTE_FIRE
,
1012
],
[
ATTRIBUTE_WIND
,
1013
],
[
ATTRIBUTE_LIGHT
,
1014
],
[
ATTRIBUTE_DARK
,
1015
],
[
ATTRIBUTE_DEVINE
,
1016
],
[
RACE_WARRIOR
,
1020
],
[
RACE_SPELLCASTER
,
1021
],
[
RACE_FAIRY
,
1022
],
[
RACE_FIEND
,
1023
],
[
RACE_ZOMBIE
,
1024
],
[
RACE_MACHINE
,
1025
],
[
RACE_AQUA
,
1026
],
[
RACE_PYRO
,
1027
],
[
RACE_ROCK
,
1028
],
[
RACE_WINDBEAST
,
1029
],
[
RACE_PLANT
,
1030
],
[
RACE_INSECT
,
1031
],
[
RACE_THUNDER
,
1032
],
[
RACE_DRAGON
,
1033
],
[
RACE_BEAST
,
1034
],
[
RACE_BEASTWARRIOR
,
1035
],
[
RACE_DINOSAUR
,
1036
],
[
RACE_FISH
,
1037
],
[
RACE_SEASERPENT
,
1038
],
[
RACE_REPTILE
,
1039
],
[
RACE_PSYCHO
,
1040
],
[
RACE_DEVINE
,
1041
],
[
RACE_CREATORGOD
,
1042
],
[
RACE_WYRM
,
1043
],
[
RACE_CYBERSE
,
1044
],
]);
]);
/*
/*
...
@@ -158,3 +92,78 @@ export function extraCardTypes(typeCode: number): number[] {
...
@@ -158,3 +92,78 @@ export function extraCardTypes(typeCode: number): number[] {
TYPE_LINK
,
TYPE_LINK
,
].
filter
((
target
)
=>
(
target
&
typeCode
)
>
0
);
].
filter
((
target
)
=>
(
target
&
typeCode
)
>
0
);
}
}
// 属性
// const ATTRIBUTE_ALL = 0x7f; //
const
ATTRIBUTE_EARTH
=
0x01
;
//
const
ATTRIBUTE_WATER
=
0x02
;
//
const
ATTRIBUTE_FIRE
=
0x04
;
//
const
ATTRIBUTE_WIND
=
0x08
;
//
const
ATTRIBUTE_LIGHT
=
0x10
;
//
const
ATTRIBUTE_DARK
=
0x20
;
//
const
ATTRIBUTE_DEVINE
=
0x40
;
//
export
const
Attribute2StringCodeMap
:
Map
<
number
,
number
>
=
new
Map
([
[
ATTRIBUTE_EARTH
,
1010
],
[
ATTRIBUTE_WATER
,
1011
],
[
ATTRIBUTE_FIRE
,
1012
],
[
ATTRIBUTE_WIND
,
1013
],
[
ATTRIBUTE_LIGHT
,
1014
],
[
ATTRIBUTE_DARK
,
1015
],
[
ATTRIBUTE_DEVINE
,
1016
],
]);
// 种族
const
RACE_WARRIOR
=
0x1
;
//
const
RACE_SPELLCASTER
=
0x2
;
//
const
RACE_FAIRY
=
0x4
;
//
const
RACE_FIEND
=
0x8
;
//
const
RACE_ZOMBIE
=
0x10
;
//
const
RACE_MACHINE
=
0x20
;
//
const
RACE_AQUA
=
0x40
;
//
const
RACE_PYRO
=
0x80
;
//
const
RACE_ROCK
=
0x100
;
//
const
RACE_WINDBEAST
=
0x200
;
//
const
RACE_PLANT
=
0x400
;
//
const
RACE_INSECT
=
0x800
;
//
const
RACE_THUNDER
=
0x1000
;
//
const
RACE_DRAGON
=
0x2000
;
//
const
RACE_BEAST
=
0x4000
;
//
const
RACE_BEASTWARRIOR
=
0x8000
;
//
const
RACE_DINOSAUR
=
0x10000
;
//
const
RACE_FISH
=
0x20000
;
//
const
RACE_SEASERPENT
=
0x40000
;
//
const
RACE_REPTILE
=
0x80000
;
//
const
RACE_PSYCHO
=
0x100000
;
//
const
RACE_DEVINE
=
0x200000
;
//
const
RACE_CREATORGOD
=
0x400000
;
//
const
RACE_WYRM
=
0x800000
;
//
const
RACE_CYBERSE
=
0x1000000
;
//
export
const
Race2StringCodeMap
:
Map
<
number
,
number
>
=
new
Map
([
[
RACE_WARRIOR
,
1020
],
[
RACE_SPELLCASTER
,
1021
],
[
RACE_FAIRY
,
1022
],
[
RACE_FIEND
,
1023
],
[
RACE_ZOMBIE
,
1024
],
[
RACE_MACHINE
,
1025
],
[
RACE_AQUA
,
1026
],
[
RACE_PYRO
,
1027
],
[
RACE_ROCK
,
1028
],
[
RACE_WINDBEAST
,
1029
],
[
RACE_PLANT
,
1030
],
[
RACE_INSECT
,
1031
],
[
RACE_THUNDER
,
1032
],
[
RACE_DRAGON
,
1033
],
[
RACE_BEAST
,
1034
],
[
RACE_BEASTWARRIOR
,
1035
],
[
RACE_DINOSAUR
,
1036
],
[
RACE_FISH
,
1037
],
[
RACE_SEASERPENT
,
1038
],
[
RACE_REPTILE
,
1039
],
[
RACE_PSYCHO
,
1040
],
[
RACE_DEVINE
,
1041
],
[
RACE_CREATORGOD
,
1042
],
[
RACE_WYRM
,
1043
],
[
RACE_CYBERSE
,
1044
],
]);
src/ui/Duel/cardModal.tsx
View file @
113f72b5
...
@@ -16,7 +16,12 @@ import Icon, { StarOutlined } from "@ant-design/icons";
...
@@ -16,7 +16,12 @@ import Icon, { StarOutlined } from "@ant-design/icons";
import
NeosConfig
from
"
../../../neos.config.json
"
;
import
NeosConfig
from
"
../../../neos.config.json
"
;
import
{
ReactComponent
as
BattleSvg
}
from
"
../../../neos-assets/battle-axe.svg
"
;
import
{
ReactComponent
as
BattleSvg
}
from
"
../../../neos-assets/battle-axe.svg
"
;
import
{
ReactComponent
as
DefenceSvg
}
from
"
../../../neos-assets/checked-shield.svg
"
;
import
{
ReactComponent
as
DefenceSvg
}
from
"
../../../neos-assets/checked-shield.svg
"
;
import
{
extraCardTypes
,
Meta2StringCodeMap
}
from
"
../../common
"
;
import
{
extraCardTypes
,
Type2StringCodeMap
,
Attribute2StringCodeMap
,
Race2StringCodeMap
,
}
from
"
../../common
"
;
import
{
fetchStrings
}
from
"
../../api/strings
"
;
import
{
fetchStrings
}
from
"
../../api/strings
"
;
const
{
Meta
}
=
Card
;
const
{
Meta
}
=
Card
;
...
@@ -118,13 +123,13 @@ const AttLine = (props: {
...
@@ -118,13 +123,13 @@ const AttLine = (props: {
attribute
?:
number
;
attribute
?:
number
;
})
=>
{
})
=>
{
const
race
=
props
.
race
const
race
=
props
.
race
?
fetchStrings
(
"
!system
"
,
Meta
2StringCodeMap
.
get
(
props
.
race
)
||
0
)
?
fetchStrings
(
"
!system
"
,
Race
2StringCodeMap
.
get
(
props
.
race
)
||
0
)
:
undefined
;
:
undefined
;
const
attribute
=
props
.
attribute
const
attribute
=
props
.
attribute
?
fetchStrings
(
"
!system
"
,
Meta
2StringCodeMap
.
get
(
props
.
attribute
)
||
0
)
?
fetchStrings
(
"
!system
"
,
Attribute
2StringCodeMap
.
get
(
props
.
attribute
)
||
0
)
:
undefined
;
:
undefined
;
const
types
=
props
.
types
const
types
=
props
.
types
.
map
((
t
)
=>
fetchStrings
(
"
!system
"
,
Meta
2StringCodeMap
.
get
(
t
)
||
0
))
.
map
((
t
)
=>
fetchStrings
(
"
!system
"
,
Type
2StringCodeMap
.
get
(
t
)
||
0
))
.
join
(
"
|
"
);
.
join
(
"
|
"
);
return
(
return
(
<
Row
gutter=
{
8
}
>
<
Row
gutter=
{
8
}
>
...
...
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