Fix CutSceneBeginNotify (#6)

* Fix 114514 Fix ServerGlobalValueChangeNotify * Delete excess files * 修复过场动画 Fix CutSceneBeginNotify * Update ScriptLib.java
XeonSucksLAB · May 3, 2024 · 7e3785a · 7e3785a
1 parent a668778
commit 7e3785a
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 52 deletions.
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/CutSceneBeginNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/CutSceneBeginNotifyOuterClass.java
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/CutSceneExtraParamOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/CutSceneExtraParamOuterClass.java
diff --git a/src/main/java/emu/grasscutter/data/ResourceLoader.java b/src/main/java/emu/grasscutter/data/ResourceLoader.java
@@ -570,7 +570,7 @@ private static void loadQuests() {
 
         try {
             val questEncryptionMap = GameData.getMainQuestEncryptionMap();
-            var path = "QuestEncryptionKeys.json";
+            var path = "Server/QuestEncryptionKeys.json";
             try {
                 JsonUtils.loadToList(getResourcePath(path), QuestEncryptionKey.class)
                         .forEach(key -> questEncryptionMap.put(key.getMainQuestId(), key));

diff --git a/src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java b/src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java
@@ -1123,7 +1123,6 @@ public final class PacketOpcodes {
     public static final int LHNDPKAGMDE = 26691;
     public static final int PGHAEAPFAOC = 24797;
     public static final int PDFKFEDNBHI = 1839;
-    public static final int KHBDFFFPFCB = 6864;
     public static final int HPIHCDJCHIK = 4774;
     public static final int FCMLONODIOP = 27769;
     public static final int KKBLELBHAFE = 28846;
@@ -3251,7 +3250,7 @@ public final class PacketOpcodes {
     public static final int CustomDungeonOfficialNotify = 1;
     public static final int CustomDungeonRecoverNotify = 1;
     public static final int CustomDungeonUpdateNotify = 1;
-    public static final int CutSceneBeginNotify = 1;
+    public static final int CutSceneBeginNotify = 6864;
     public static final int CutSceneEndNotify = 1;
     public static final int CutSceneFinishNotify = 1;
     public static final int DAILBGKEPIG = 1;

diff --git a/src/main/java/emu/grasscutter/scripts/ScriptLib.java b/src/main/java/emu/grasscutter/scripts/ScriptLib.java
@@ -1361,7 +1361,7 @@ public int SetBlossomScheduleStateByGroupId(int groupId, int scene) {
     // TODO: SetDarkPressureLevel
 
     public int SetEntityServerGlobalValueByConfigId(int cfgId, String sgvName, int value) {
-        logger.info("[LUA] Call SetEntityServerGlobalValueByConfigId with {}, {}, {}", cfgId, sgvName, value);
+        logger.debug("[LUA] Call SetEntityServerGlobalValueByConfigId with {}, {}, {}", cfgId, sgvName, value);
         var scriptManager = this.getSceneScriptManager();
         if (scriptManager == null) return 1;
         var scene = scriptManager.getScene();
@@ -1373,7 +1373,7 @@ public int SetEntityServerGlobalValueByConfigId(int cfgId, String sgvName, int v
     }
 
     public int SetEntityServerGlobalValueByEntityId(int entityId, String sgvName, int value) {
-        logger.info("[LUA] Call SetEntityServerGlobalValueByEntityId with {}, {}, {}", entityId, sgvName, value);
+        logger.debug("[LUA] Call SetEntityServerGlobalValueByEntityId with {}, {}, {}", entityId, sgvName, value);
         var scriptManager = this.getSceneScriptManager();
         if (scriptManager == null) return 1;
         var scene = scriptManager.getScene();