Merge branch 'development' into more-events (1de402bd) · Commits · ziqian zhang / Grasscutter

Commit 1de402bd authored 3 years ago by

KingRainbow44

Browse files

Merge branch 'development' into more-events

parents b9b4b6f4 f25fb629

Branches

Tags

No related merge requests found

Show whitespace changes

Inline Side-by-side

Showing

src/main/java/emu/grasscutter/game/quest/content/ContentQuestStateNotEqual.java 23 additions, 0 deletions

...scutter/game/quest/content/ContentQuestStateNotEqual.java
src/main/java/emu/grasscutter/game/quest/content/ContentQuestVarEqual.java 19 additions, 0 deletions

.../grasscutter/game/quest/content/ContentQuestVarEqual.java
src/main/java/emu/grasscutter/game/quest/content/ContentQuestVarGreater.java 19 additions, 0 deletions

...rasscutter/game/quest/content/ContentQuestVarGreater.java
src/main/java/emu/grasscutter/game/quest/content/ContentQuestVarLess.java 19 additions, 0 deletions

...u/grasscutter/game/quest/content/ContentQuestVarLess.java
src/main/java/emu/grasscutter/game/quest/content/ContentTriggerFire.java 25 additions, 0 deletions

...mu/grasscutter/game/quest/content/ContentTriggerFire.java
src/main/java/emu/grasscutter/game/quest/content/ContentUnlockTransPoint.java 15 additions, 0 deletions

...asscutter/game/quest/content/ContentUnlockTransPoint.java
src/main/java/emu/grasscutter/game/quest/enums/QuestState.java 10 additions, 3 deletions

...ain/java/emu/grasscutter/game/quest/enums/QuestState.java
src/main/java/emu/grasscutter/game/quest/exec/ExecDecQuestGlobalVar.java 17 additions, 0 deletions

...mu/grasscutter/game/quest/exec/ExecDecQuestGlobalVar.java
src/main/java/emu/grasscutter/game/quest/exec/ExecDecQuestVar.java 16 additions, 0 deletions

...java/emu/grasscutter/game/quest/exec/ExecDecQuestVar.java
src/main/java/emu/grasscutter/game/quest/exec/ExecIncQuestGlobalVar.java 16 additions, 0 deletions

...mu/grasscutter/game/quest/exec/ExecIncQuestGlobalVar.java
src/main/java/emu/grasscutter/game/quest/exec/ExecIncQuestVar.java 16 additions, 0 deletions

...java/emu/grasscutter/game/quest/exec/ExecIncQuestVar.java
src/main/java/emu/grasscutter/game/quest/exec/ExecSetQuestGlobalVar.java 16 additions, 0 deletions

...mu/grasscutter/game/quest/exec/ExecSetQuestGlobalVar.java
src/main/java/emu/grasscutter/game/quest/exec/ExecSetQuestVar.java 16 additions, 0 deletions

...java/emu/grasscutter/game/quest/exec/ExecSetQuestVar.java
src/main/java/emu/grasscutter/game/world/Scene.java 8 additions, 2 deletions

src/main/java/emu/grasscutter/game/world/Scene.java
src/main/java/emu/grasscutter/scripts/SceneScriptManager.java 58 additions, 21 deletions

...main/java/emu/grasscutter/scripts/SceneScriptManager.java
src/main/java/emu/grasscutter/scripts/data/SceneGadget.java 1 addition, 0 deletions

src/main/java/emu/grasscutter/scripts/data/SceneGadget.java
src/main/java/emu/grasscutter/scripts/data/SceneRegion.java 2 additions, 1 deletion

src/main/java/emu/grasscutter/scripts/data/SceneRegion.java
src/main/java/emu/grasscutter/scripts/serializer/LuaSerializer.java 58 additions, 10 deletions

...ava/emu/grasscutter/scripts/serializer/LuaSerializer.java
src/main/java/emu/grasscutter/scripts/serializer/Serializer.java 5 additions, 3 deletions

...n/java/emu/grasscutter/scripts/serializer/Serializer.java
src/main/java/emu/grasscutter/server/packet/recv/HandlerAddQuestContentProgressReq.java 14 additions, 3 deletions

...server/packet/recv/HandlerAddQuestContentProgressReq.java

with 373 additions and 43 deletions

Please register or to comment