Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
G
Grasscutter
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
ziqian zhang
Grasscutter
Commits
e9a7032c
Commit
e9a7032c
authored
3 years ago
by
Melledy
Browse files
Options
Downloads
Patches
Plain Diff
Fix weapon curve excels and camel case relic affix ecels
parent
ef6e16aa
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/emu/grasscutter/data/excels/ItemData.java
+7
-7
7 additions, 7 deletions
src/main/java/emu/grasscutter/data/excels/ItemData.java
src/main/java/emu/grasscutter/data/excels/ReliquaryAffixData.java
+14
-14
14 additions, 14 deletions
.../java/emu/grasscutter/data/excels/ReliquaryAffixData.java
with
21 additions
and
21 deletions
src/main/java/emu/grasscutter/data/excels/ItemData.java
+
7
−
7
View file @
e9a7032c
...
@@ -230,20 +230,20 @@ public class ItemData extends GameResource {
...
@@ -230,20 +230,20 @@ public class ItemData extends GameResource {
public
static
class
WeaponProperty
{
public
static
class
WeaponProperty
{
private
FightProperty
fightProp
;
private
FightProperty
fightProp
;
private
String
P
ropType
;
private
String
p
ropType
;
private
float
I
nitValue
;
private
float
i
nitValue
;
private
String
T
ype
;
private
String
t
ype
;
public
String
getPropType
(){
public
String
getPropType
(){
return
this
.
P
ropType
;
return
this
.
p
ropType
;
}
}
public
float
getInitValue
(){
public
float
getInitValue
(){
return
this
.
I
nitValue
;
return
this
.
i
nitValue
;
}
}
public
String
getType
(){
public
String
getType
(){
return
this
.
T
ype
;
return
this
.
t
ype
;
}
}
public
FightProperty
getFightProp
()
{
public
FightProperty
getFightProp
()
{
...
@@ -251,7 +251,7 @@ public class ItemData extends GameResource {
...
@@ -251,7 +251,7 @@ public class ItemData extends GameResource {
}
}
public
void
onLoad
()
{
public
void
onLoad
()
{
this
.
fightProp
=
FightProperty
.
getPropByName
(
P
ropType
);
this
.
fightProp
=
FightProperty
.
getPropByName
(
p
ropType
);
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
src/main/java/emu/grasscutter/data/excels/ReliquaryAffixData.java
+
14
−
14
View file @
e9a7032c
...
@@ -6,41 +6,41 @@ import emu.grasscutter.game.props.FightProperty;
...
@@ -6,41 +6,41 @@ import emu.grasscutter.game.props.FightProperty;
@ResourceType
(
name
=
"ReliquaryAffixExcelConfigData.json"
)
@ResourceType
(
name
=
"ReliquaryAffixExcelConfigData.json"
)
public
class
ReliquaryAffixData
extends
GameResource
{
public
class
ReliquaryAffixData
extends
GameResource
{
private
int
I
d
;
private
int
i
d
;
private
int
D
epotId
;
private
int
d
epotId
;
private
int
G
roupId
;
private
int
g
roupId
;
private
FightProperty
P
ropType
;
private
FightProperty
p
ropType
;
private
float
P
ropValue
;
private
float
p
ropValue
;
private
int
W
eight
;
private
int
w
eight
;
private
int
U
pgradeWeight
;
private
int
u
pgradeWeight
;
@Override
@Override
public
int
getId
()
{
public
int
getId
()
{
return
I
d
;
return
i
d
;
}
}
public
int
getDepotId
()
{
public
int
getDepotId
()
{
return
D
epotId
;
return
d
epotId
;
}
}
public
int
getGroupId
()
{
public
int
getGroupId
()
{
return
G
roupId
;
return
g
roupId
;
}
}
public
float
getPropValue
()
{
public
float
getPropValue
()
{
return
P
ropValue
;
return
p
ropValue
;
}
}
public
int
getWeight
()
{
public
int
getWeight
()
{
return
W
eight
;
return
w
eight
;
}
}
public
int
getUpgradeWeight
()
{
public
int
getUpgradeWeight
()
{
return
U
pgradeWeight
;
return
u
pgradeWeight
;
}
}
public
FightProperty
getFightProp
()
{
public
FightProperty
getFightProp
()
{
return
P
ropType
;
return
p
ropType
;
}
}
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment