Merge branch 'main' into test-new-mode-system

2021-12-16 02:32:51 +08:00
parent 462720881a 2b80f72c6b
commit b642f2b5c4
21 changed files with 281 additions and 230 deletions
--- a/parts/gameFuncs.lua
+++ b/parts/gameFuncs.lua
@@ -749,7 +749,7 @@ do--function resetGameData(args)
        BGM.play(type(bgm)=='string'and bgm or type(bgm)=='table'and bgm[math.random(#bgm)])

        TEXT.clear()
-        if GAME.modeEnv.eventset=='royale'then
+        if GAME.modeEnv.eventSet=='royale'then
            for i=1,#PLAYERS do
                PLAYERS[i]:changeAtk(randomTarget(PLAYERS[i]))
            end