Merge branch 'eesast:dev' into dev

Ador-N · web-flow · commit 6758da214f44 · 2025-05-31T17:43:14.000+08:00
diff --git a/logic/GameClass/GameObj/Character.cs b/logic/GameClass/GameObj/Character.cs
@@ -180,6 +180,8 @@ public long SetCharacterState(CharacterState value1 = CharacterState.NULL_CHARAC
             if (nowState1 == value1 && nowState2 == value2) return -1;
             if (value2 == CharacterState.NULL_CHARACTER_STATE)
                 value2 = nowState2;
+            if (value2 == CharacterState.DECEASED)
+                return ChangeCharacterState(CharacterState.NULL_CHARACTER_STATE, value2, gameobj);
             if (nowState2 == CharacterState.KNOCKED_BACK)
                 return -1;
             switch (value1)
diff --git a/logic/Gaming/ActionManager.cs b/logic/Gaming/ActionManager.cs
@@ -230,7 +230,7 @@ public bool SetTrap(Character character, TrapType traptype)
                                                             new FrameRateTaskExecutor<int>
                                                             (
                                                                 loopCondition: () =>
-                                                                    gameMap.Timer.IsGaming && cage != null,
+                                                                    gameMap.Timer.IsGaming && cage != null && cage.IsActivated,
                                                                 loopToDo: () =>
                                                                 {
                                                                     var characters = gameMap.CharacterInTheRangeNotTeamID(
@@ -280,7 +280,7 @@ public bool SetTrap(Character character, TrapType traptype)
                                                         new FrameRateTaskExecutor<int>
                                                         (
                                                             loopCondition: () =>
-                                                                gameMap.Timer.IsGaming && hole != null,
+                                                                gameMap.Timer.IsGaming && hole != null && hole.IsActivated,
                                                             loopToDo: () =>
                                                             {
                                                                 var characters = gameMap.CharacterInTheRangeNotTeamID(
diff --git a/logic/Gaming/CharacterManager.cs b/logic/Gaming/CharacterManager.cs
@@ -382,11 +382,15 @@ public void CheckQuickStepTime(Character character)
             public void CheckWideViewTime(Character character)
             {
                 long nowtime = Environment.TickCount64;
-                if (nowtime - character.WideViewTime >= 60000 && character.CanSeeAll)
+                if (nowtime - character.WideViewTime >= 60000 && character.CanSeeAll && gameMap.Timer.NowTime() <= GameData.SevenMinutes)
                 {
                     character.CanSeeAll = false;
                     character.WideViewTime = 0;
                 }
+                else if (gameMap.Timer.NowTime() > GameData.SevenMinutes)
+                {
+                    character.CanSeeAll = true;
+                }
             }
             public void CheckPurified(Character character)
             {

Original file line number	Diff line number	Diff line change
`@@ -230,7 +230,7 @@ public bool SetTrap(Character character, TrapType traptype)`
`230`	`230`	`new FrameRateTaskExecutor<int>`
`231`	`231`	`(`
`232`	`232`	`loopCondition: () =>`
`233`		`- gameMap.Timer.IsGaming && cage != null,`
	`233`	`+ gameMap.Timer.IsGaming && cage != null && cage.IsActivated,`
`234`	`234`	`loopToDo: () =>`
`235`	`235`	`{`
`236`	`236`	`var characters = gameMap.CharacterInTheRangeNotTeamID(`
`@@ -280,7 +280,7 @@ public bool SetTrap(Character character, TrapType traptype)`
`280`	`280`	`new FrameRateTaskExecutor<int>`
`281`	`281`	`(`
`282`	`282`	`loopCondition: () =>`
`283`		`- gameMap.Timer.IsGaming && hole != null,`
	`283`	`+ gameMap.Timer.IsGaming && hole != null && hole.IsActivated,`
`284`	`284`	`loopToDo: () =>`
`285`	`285`	`{`
`286`	`286`	`var characters = gameMap.CharacterInTheRangeNotTeamID(`
Original file line number	Diff line number	Diff line change
`@@ -382,11 +382,15 @@ public void CheckQuickStepTime(Character character)`
`382`	`382`	`public void CheckWideViewTime(Character character)`
`383`	`383`	`{`
`384`	`384`	`long nowtime = Environment.TickCount64;`
`385`		`- if (nowtime - character.WideViewTime >= 60000 && character.CanSeeAll)`
	`385`	`+ if (nowtime - character.WideViewTime >= 60000 && character.CanSeeAll && gameMap.Timer.NowTime() <= GameData.SevenMinutes)`
`386`	`386`	`{`
`387`	`387`	`character.CanSeeAll = false;`
`388`	`388`	`character.WideViewTime = 0;`
`389`	`389`	`}`
	`390`	`+ else if (gameMap.Timer.NowTime() > GameData.SevenMinutes)`
	`391`	`+ {`
	`392`	`+ character.CanSeeAll = true;`
	`393`	`+ }`
`390`	`394`	`}`
`391`	`395`	`public void CheckPurified(Character character)`
`392`	`396`	`{`