From 4779aedf321681fa009ada056203e4d8dce4de7a Mon Sep 17 00:00:00 2001 From: Melledy <121644117+Melledy@users.noreply.github.com> Date: Mon, 12 Jan 2026 19:58:40 -0800 Subject: [PATCH] Update to latest version --- .../nebula/game/activity/ActivityModule.java | 27 ++++++++++++------- src/main/resources/versions.json | 10 +++---- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/src/main/java/emu/nebula/game/activity/ActivityModule.java b/src/main/java/emu/nebula/game/activity/ActivityModule.java index 3bd49dd..47e643e 100644 --- a/src/main/java/emu/nebula/game/activity/ActivityModule.java +++ b/src/main/java/emu/nebula/game/activity/ActivityModule.java @@ -17,12 +17,7 @@ public class ActivityModule extends GameContextModule { // Hardcode these activities for now // TODO make an activity json file to read activity ids from - // Trial activities - this.activities.add(700105); - this.activities.add(700106); - - // Tower defense activity - this.activities.add(102001); + // ===== Standard Events ===== // Beyond the dream //this.activities.add(1010201); @@ -30,9 +25,23 @@ public class ActivityModule extends GameContextModule { //this.activities.add(1010204); // Christmas 2025 - this.activities.add(2010101); - this.activities.add(2010103); - this.activities.add(2010104); + //this.activities.add(2010101); + //this.activities.add(2010103); + //this.activities.add(2010104); + + // Miracle of a Flicker + this.activities.add(1010301); + this.activities.add(1010303); + this.activities.add(1010304); + + // ===== Etc Events ===== + + // Trial activities + this.activities.add(700109); + this.activities.add(700110); + + // Tower defense activity + this.activities.add(102001); // Christmas 2025 login events this.activities.add(301011); diff --git a/src/main/resources/versions.json b/src/main/resources/versions.json index 9cca2ae..54da554 100644 --- a/src/main/resources/versions.json +++ b/src/main/resources/versions.json @@ -1,7 +1,7 @@ { - "global": 77, - "kr": 84, - "jp": 81, - "tw": 82, - "cn": 79 + "global": 78, + "kr": 85, + "jp": 82, + "tw": 83, + "cn": 80 } \ No newline at end of file