mirror of
https://github.com/Melledy/Grasscutter.git
synced 2024-11-22 15:38:24 +00:00
Merge remote-tracking branch 'origin/unstable' into unstable
This commit is contained in:
commit
c0ad1bf75b
@ -6,9 +6,7 @@ import lombok.ToString;
|
||||
@ToString
|
||||
@Setter
|
||||
public class SceneGadget extends SceneObject {
|
||||
public int config_id;
|
||||
public int gadget_id;
|
||||
public int level;
|
||||
public int chest_drop_id;
|
||||
public int drop_count;
|
||||
public String drop_tag;
|
||||
@ -28,7 +26,6 @@ public class SceneGadget extends SceneObject {
|
||||
*/
|
||||
public boolean isOneoff;
|
||||
|
||||
public int area_id;
|
||||
public int draft_id;
|
||||
public int route_id;
|
||||
public boolean start_route = true;
|
||||
|
@ -6,10 +6,8 @@ import lombok.ToString;
|
||||
@ToString
|
||||
@Setter
|
||||
public class SceneMonster extends SceneObject {
|
||||
public int config_id;
|
||||
public int monster_id;
|
||||
public int pose_id;
|
||||
public int level;
|
||||
public int drop_id;
|
||||
public boolean disableWander;
|
||||
public int title_id;
|
||||
|
Loading…
Reference in New Issue
Block a user