From e90d6d4aa3298718aa9b6c459294aa15b57c98a2 Mon Sep 17 00:00:00 2001
From: Akbar Yahya <akbaryahya_ym@yahoo>
Date: Wed, 7 Dec 2022 12:34:40 +0800
Subject: [PATCH] update res

---
 PacketOpcodes.java    | 10 +++++-----
 cmdid.csv             | 10 +++++-----
 cmdid.json            | 10 +++++-----
 cmdid_gc_nofound.json | 16 ++++++----------
 cmdid_gc_update.json  | 15 ++++++++-------
 op.js                 |  5 +++--
 6 files changed, 32 insertions(+), 34 deletions(-)

diff --git a/PacketOpcodes.java b/PacketOpcodes.java
index 5fecb121..5c498b71 100644
--- a/PacketOpcodes.java
+++ b/PacketOpcodes.java
@@ -199,13 +199,13 @@ public class PacketOpcodes {
   public static final int ChannelerSlabLoopDungeonTakeFirstPassRewardRsp = 8824;
   public static final int ChannelerSlabLoopDungeonTakeScoreRewardReq = 8348;
   public static final int ChannelerSlabLoopDungeonTakeScoreRewardRsp = 8369;
-  public static final int ChannelerSlabOneOffDungeonInfoNotify = 8729;
-  public static final int ChannelerSlabOneOffDungeonInfoReq = 8409;
-  public static final int ChannelerSlabOneOffDungeonInfoRsp = 8268;
+  public static final int ChannelerSlabOneOffDungeonInfoNotify = 8015;
+  public static final int ChannelerSlabOneOffDungeonInfoReq = 8877;
+  public static final int ChannelerSlabOneOffDungeonInfoRsp = 8270;
   public static final int ChannelerSlabSaveAssistInfoReq = 8039;
   public static final int ChannelerSlabSaveAssistInfoRsp = 8071;
   public static final int ChannelerSlabStageActiveChallengeIndexNotify = 8857;
-  public static final int ChannelerSlabStageOneofDungeonNotify = 8692;
+  public static final int ChannelerSlabStageOneofDungeonNotify = 8203;
   public static final int ChannelerSlabTakeoffBuffReq = 8299;
   public static final int ChannelerSlabTakeoffBuffRsp = 8034;
   public static final int ChannelerSlabWearBuffReq = 8664;
@@ -919,7 +919,7 @@ public class PacketOpcodes {
   public static final int ObstacleModifyNotify = 2356;
   public static final int OfferingInteractReq = 2920;
   public static final int OfferingInteractRsp = 2906;
-  public static final int OneofGatherPointDetectorDataNotify = 4293;
+  public static final int OneofGatherPointDetectorDataNotify = 4297;
   public static final int OpActivityDataNotify = 5156;
   public static final int OpActivityStateNotify = 2579;
   public static final int OpActivityUpdateNotify = 5119;
diff --git a/cmdid.csv b/cmdid.csv
index 6dfdb998..02ab84c1 100644
--- a/cmdid.csv
+++ b/cmdid.csv
@@ -266,13 +266,13 @@ ChannelerSlabLoopDungeonTakeFirstPassRewardReq,8498
 ChannelerSlabLoopDungeonTakeFirstPassRewardRsp,8824
 ChannelerSlabLoopDungeonTakeScoreRewardReq,8348
 ChannelerSlabLoopDungeonTakeScoreRewardRsp,8369
-ChannelerSlabOneOfDungeonInfoNotify,8015
-ChannelerSlabOneOfDungeonInfoReq,8877
-ChannelerSlabOneOfDungeonInfoRsp,8270
+ChannelerSlabOneOffDungeonInfoNotify,8015
+ChannelerSlabOneOffDungeonInfoReq,8877
+ChannelerSlabOneOffDungeonInfoRsp,8270
 ChannelerSlabSaveAssistInfoReq,8039
 ChannelerSlabSaveAssistInfoRsp,8071
 ChannelerSlabStageActiveChallengeIndexNotify,8857
-ChannelerSlabStageOneofDungeonNotify,8692
+ChannelerSlabStageOneoffDungeonNotify,8692
 ChannelerSlabTakeoffBuffReq,8299
 ChannelerSlabTakeoffBuffRsp,8034
 ChannelerSlabWearBuffReq,8664
@@ -1309,7 +1309,7 @@ NpcTalkStateNotify,450
 ObstacleModifyNotify,2356
 OfferingInteractReq,2920
 OfferingInteractRsp,2906
-OneofGatherPointDetectorDataNotify,4293
+OneoffGatherPointDetectorDataNotify,4293
 OpActivityDataNotify,5156
 OpActivityStateNotify,2579
 OpActivityUpdateNotify,5119
diff --git a/cmdid.json b/cmdid.json
index c71a7214..b242df6c 100644
--- a/cmdid.json
+++ b/cmdid.json
@@ -1072,15 +1072,15 @@
         "id": 8369
     },
     {
-        "name": "ChannelerSlabOneOfDungeonInfoNotify",
+        "name": "ChannelerSlabOneOffDungeonInfoNotify",
         "id": 8015
     },
     {
-        "name": "ChannelerSlabOneOfDungeonInfoReq",
+        "name": "ChannelerSlabOneOffDungeonInfoReq",
         "id": 8877
     },
     {
-        "name": "ChannelerSlabOneOfDungeonInfoRsp",
+        "name": "ChannelerSlabOneOffDungeonInfoRsp",
         "id": 8270
     },
     {
@@ -1096,7 +1096,7 @@
         "id": 8857
     },
     {
-        "name": "ChannelerSlabStageOneofDungeonNotify",
+        "name": "ChannelerSlabStageOneoffDungeonNotify",
         "id": 8692
     },
     {
@@ -5244,7 +5244,7 @@
         "id": 2906
     },
     {
-        "name": "OneofGatherPointDetectorDataNotify",
+        "name": "OneoffGatherPointDetectorDataNotify",
         "id": 4293
     },
     {
diff --git a/cmdid_gc_nofound.json b/cmdid_gc_nofound.json
index d0099077..0f19c4fd 100644
--- a/cmdid_gc_nofound.json
+++ b/cmdid_gc_nofound.json
@@ -1,15 +1,7 @@
 [
     {
-        "name": "ChannelerSlabOneOffDungeonInfoNotify",
-        "id": 8729
-    },
-    {
-        "name": "ChannelerSlabOneOffDungeonInfoReq",
-        "id": 8409
-    },
-    {
-        "name": "ChannelerSlabOneOffDungeonInfoRsp",
-        "id": 8268
+        "name": "ChannelerSlabStageOneofDungeonNotify",
+        "id": 8203
     },
     {
         "name": "FireworkNotify",
@@ -67,6 +59,10 @@
         "name": "MusicGameStartToPlayOthersBeatmapRsp",
         "id": 6313
     },
+    {
+        "name": "OneofGatherPointDetectorDataNotify",
+        "id": 4297
+    },
     {
         "name": "PrivateChatSetSequenceReq",
         "id": 4985
diff --git a/cmdid_gc_update.json b/cmdid_gc_update.json
index cb2e0ebb..0af9d975 100644
--- a/cmdid_gc_update.json
+++ b/cmdid_gc_update.json
@@ -962,15 +962,18 @@
     },
     {
         "name": "ChannelerSlabOneOffDungeonInfoNotify",
-        "id": 8729
+        "id": 8015,
+        "replace": 8729
     },
     {
         "name": "ChannelerSlabOneOffDungeonInfoReq",
-        "id": 8409
+        "id": 8877,
+        "replace": 8409
     },
     {
         "name": "ChannelerSlabOneOffDungeonInfoRsp",
-        "id": 8268
+        "id": 8270,
+        "replace": 8268
     },
     {
         "name": "ChannelerSlabSaveAssistInfoReq",
@@ -989,8 +992,7 @@
     },
     {
         "name": "ChannelerSlabStageOneofDungeonNotify",
-        "id": 8692,
-        "replace": 8203
+        "id": 8203
     },
     {
         "name": "ChannelerSlabTakeoffBuffReq",
@@ -4524,8 +4526,7 @@
     },
     {
         "name": "OneofGatherPointDetectorDataNotify",
-        "id": 4293,
-        "replace": 4297
+        "id": 4297
     },
     {
         "name": "OpActivityDataNotify",
diff --git a/op.js b/op.js
index 66c75a2f..e2341691 100644
--- a/op.js
+++ b/op.js
@@ -730,5 +730,6 @@ function scan_gc() {
 // now we have cmdid_gc.json and cmdid.json
 //update_cmdid_gc(); // 3. update gc cmdid (mode by id)
 //cmdid_to_op(); // 4. update op
-//scan_gc(); // 5. scan gc
-//clean_proto_gen(); // 6. clean proto
\ No newline at end of file
+// npx prettier --write PacketOpcodes.java
+// scan_gc(); // 5. scan gc
+clean_proto_gen(); // 6. clean proto
\ No newline at end of file