Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

修复过场动画 #6

Merged
merged 5 commits into from May 3, 2024
Merged

修复过场动画 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
236414b
Fix 114514
Ylsaoe May 2, 2024
50cab9f
Delete excess files
Ylsaoe May 3, 2024
447722d
修复过场动画
Ylsaoe May 3, 2024
adc605f
Merge branch 'XeonSucksLAB:development' into development
May 3, 2024
184c5d4
Update ScriptLib.java
Ylsaoe May 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 27 additions & 29 deletions src/generated/main/java/emu/grasscutter/net/proto/CutSceneBeginNotifyOuterClass.java
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 18 additions & 18 deletions src/generated/main/java/emu/grasscutter/net/proto/CutSceneExtraParamOuterClass.java
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/main/java/emu/grasscutter/data/ResourceLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/emu/grasscutter/scripts/ScriptLib.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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();
Expand Down
Loading