mirror of
https://github.com/Melledy/Nebula.git
synced 2026-09-19 17:19:58 +02:00
Update to support game version 1.8.0.*
This commit is contained in:
@@ -6,7 +6,7 @@ import emu.nebula.game.inventory.ItemParam;
|
||||
import emu.nebula.util.WeightedList;
|
||||
|
||||
public class GameConstants {
|
||||
public static final String VERSION = "1.7.0";
|
||||
public static final String VERSION = "1.8.0";
|
||||
public static int DATA_VERSION = 0;
|
||||
|
||||
public static final ZoneId UTC_ZONE = ZoneId.of("UTC");
|
||||
|
||||
@@ -40,9 +40,14 @@ public class ActivityModule extends GameContextModule {
|
||||
//this.activities.add(1010404);
|
||||
|
||||
// Winter Requiem and the Trigger of Dawn
|
||||
this.activities.add(1010501);
|
||||
this.activities.add(1010503);
|
||||
this.activities.add(1010504);
|
||||
//this.activities.add(1010501);
|
||||
//this.activities.add(1010503);
|
||||
//this.activities.add(1010504);
|
||||
|
||||
// To My Dearest You
|
||||
this.activities.add(1010601);
|
||||
this.activities.add(1010603);
|
||||
this.activities.add(1010604);
|
||||
|
||||
// ===== Joint Drills (Finale Echoing) =====
|
||||
this.activities.add(510003);
|
||||
@@ -60,8 +65,8 @@ public class ActivityModule extends GameContextModule {
|
||||
this.activities.add(301011);
|
||||
this.activities.add(301012);
|
||||
|
||||
// Trekker versus
|
||||
this.activities.add(600001);
|
||||
// Trekker versus (broken)
|
||||
//this.activities.add(600001);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -81,6 +81,9 @@ public class TrekkerVersusActivity extends GameActivity {
|
||||
public TrekkerVersusShow getShowProto() {
|
||||
var show = TrekkerVersusShow.newInstance();
|
||||
|
||||
// TODO update
|
||||
|
||||
/*
|
||||
if (this.getCharIds() != null) {
|
||||
show.addAllCharIds(this.getCharIds());
|
||||
show.setBuildScore(this.getBuildScore());
|
||||
@@ -89,6 +92,7 @@ public class TrekkerVersusActivity extends GameActivity {
|
||||
if (this.getAffixIds() != null) {
|
||||
show.addAllAffixIds(this.getAffixIds());
|
||||
}
|
||||
*/
|
||||
|
||||
return show;
|
||||
}
|
||||
|
||||
@@ -711,6 +711,18 @@ public class NetMsgId {
|
||||
public static final int activity_trekker_versus_reward_receive_req = 9131;
|
||||
public static final int activity_trekker_versus_reward_receive_succeed_ack = 9132;
|
||||
public static final int activity_trekker_versus_reward_receive_failed_ack = 9133;
|
||||
public static final int activity_trekker_versus_idle_refresh_req = 9134;
|
||||
public static final int activity_trekker_versus_idle_refresh_succeed_ack = 9135;
|
||||
public static final int activity_trekker_versus_idle_refresh_failed_ack = 9136;
|
||||
public static final int activity_trekker_versus_idle_reward_receive_req = 9137;
|
||||
public static final int activity_trekker_versus_idle_reward_receive_succeed_ack = 9138;
|
||||
public static final int activity_trekker_versus_idle_reward_receive_failed_ack = 9139;
|
||||
public static final int activity_trekker_versus_rank_boost_req = 9140;
|
||||
public static final int activity_trekker_versus_rank_boost_succeed_ack = 9141;
|
||||
public static final int activity_trekker_versus_rank_boost_failed_ack = 9142;
|
||||
public static final int activity_trekker_versus_schedule_reward_receive_req = 9143;
|
||||
public static final int activity_trekker_versus_schedule_reward_receive_succeed_ack = 9144;
|
||||
public static final int activity_trekker_versus_schedule_reward_receive_failed_ack = 9145;
|
||||
public static final int phone_contacts_info_req = 9201;
|
||||
public static final int phone_contacts_info_succeed_ack = 9202;
|
||||
public static final int phone_contacts_info_failed_ack = 9203;
|
||||
|
||||
@@ -60,9 +60,11 @@ public class Handbook {
|
||||
var itemLanguageKey = loadLanguageKey(ItemDef.class);
|
||||
for (int id : list) {
|
||||
ItemDef data = GameData.getItemDataTable().get(id);
|
||||
String name = itemLanguageKey.getOrDefault(data.getTitle(), data.getTitle());
|
||||
|
||||
writer.print(data.getId());
|
||||
writer.print(" : ");
|
||||
writer.print(itemLanguageKey.getOrDefault(data.getTitle(), data.getTitle()));
|
||||
writer.print(name);
|
||||
|
||||
writer.print(" [");
|
||||
writer.print(data.getItemType());
|
||||
@@ -80,7 +82,7 @@ public class Handbook {
|
||||
// Hacky way of checking if a skin is released or not
|
||||
if (data.getItemType() == ItemType.CharacterSkin) {
|
||||
var skinData = GameData.getCharacterSkinDataTable().get(id);
|
||||
if (skinData != null) {
|
||||
if (skinData != null && !name.equals("???")) {
|
||||
skinData.setReleased(itemLanguageKey.containsKey(data.getTitle()));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"global": 93,
|
||||
"kr": 99,
|
||||
"jp": 96,
|
||||
"tw": 102,
|
||||
"cn": 95
|
||||
"global": 95,
|
||||
"kr": 100,
|
||||
"jp": 97,
|
||||
"tw": 104,
|
||||
"cn": 96
|
||||
}
|
||||
Reference in New Issue
Block a user