Since we dont have battles we use "divaeffectcontinue" as a fade out but they also sometimes call "fadeout" so set a flag so we don't do fade out again if we are already doing it.
这个提交包含在:
父节点
ae90fd1c37
当前提交
90236c665d
@ -27,6 +27,7 @@ class Player {
|
|||||||
this.waitTime = 0;
|
this.waitTime = 0;
|
||||||
this.manualNext = false;
|
this.manualNext = false;
|
||||||
this.hasMoreText = false;
|
this.hasMoreText = false;
|
||||||
|
this.hasFadedOut = false;
|
||||||
this.uiHidden = false;
|
this.uiHidden = false;
|
||||||
this.center = {x: ((baseDimensions.width / 2) * this.resolutionScale), y: ((baseDimensions.height / 2) * this.resolutionScale) };
|
this.center = {x: ((baseDimensions.width / 2) * this.resolutionScale), y: ((baseDimensions.height / 2) * this.resolutionScale) };
|
||||||
this.assetLoadPercent = 0;
|
this.assetLoadPercent = 0;
|
||||||
@ -504,6 +505,8 @@ class Player {
|
|||||||
//FadeTo
|
//FadeTo
|
||||||
case "divaeffectcontinue":
|
case "divaeffectcontinue":
|
||||||
case "fadeout": {
|
case "fadeout": {
|
||||||
|
if(this.hasFadedOut) { break; }
|
||||||
|
this.hasFadedOut = true;
|
||||||
if(cur.Command.toLowerCase() === "divaeffectcontinue") {
|
if(cur.Command.toLowerCase() === "divaeffectcontinue") {
|
||||||
cur.Arg1 = 'black';
|
cur.Arg1 = 'black';
|
||||||
cur.Arg6 = 1;
|
cur.Arg6 = 1;
|
||||||
@ -520,6 +523,7 @@ class Player {
|
|||||||
}
|
}
|
||||||
//FadeFrom
|
//FadeFrom
|
||||||
case "fadein": {
|
case "fadein": {
|
||||||
|
this.hasFadedOut = false;
|
||||||
this.waitTime = Number(cur.Arg6) * 1000;
|
this.waitTime = Number(cur.Arg6) * 1000;
|
||||||
if(!cur.Arg1)
|
if(!cur.Arg1)
|
||||||
cur.Arg1 = 'white';
|
cur.Arg1 = 'white';
|
||||||
@ -1378,6 +1382,7 @@ class Player {
|
|||||||
this.lerpTargets = [];
|
this.lerpTargets = [];
|
||||||
this.manualNext = false;
|
this.manualNext = false;
|
||||||
this.hasMoreText = false;
|
this.hasMoreText = false;
|
||||||
|
this.hasFadedOut = false;
|
||||||
this.audioLoadPercent = 0;
|
this.audioLoadPercent = 0;
|
||||||
this.assetLoadPercent = 0;
|
this.assetLoadPercent = 0;
|
||||||
this.playingVoice = undefined;
|
this.playingVoice = undefined;
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit c8e9be400b68111bd1abfb879205e2f07d91d1a5
|
Subproject commit ac0bfbd699431e9befdd843379e7c91ad1014cec
|
正在加载...
x
在新工单中引用
屏蔽一个用户