@flashist/flibs 0.0.230 → 0.0.232
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/display/pixijs/custom/display/tools/FDisplayTools.js +2 -1
- package/display/pixijs/custom/display/tools/FDisplayTools.js.map +1 -1
- package/package.json +1 -1
- package/sounds/abstract/AbstractSoundsManager.d.ts +5 -2
- package/sounds/abstract/AbstractSoundsManager.js +23 -14
- package/sounds/abstract/AbstractSoundsManager.js.map +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FDisplayTools.js","sourceRoot":"","sources":["../../../../../../src/display/pixijs/custom/display/tools/FDisplayTools.ts"],"names":[],"mappings":"AAAA,OAAO,EAGH,MAAM,
|
|
1
|
+
{"version":3,"file":"FDisplayTools.js","sourceRoot":"","sources":["../../../../../../src/display/pixijs/custom/display/tools/FDisplayTools.ts"],"names":[],"mappings":"AAAA,OAAO,EAGH,MAAM,EAGT,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAC,KAAK,EAAC,MAAM,kCAAkC,CAAC;AAEvD;IAAA;IA6EA,CAAC;IAzEU,oCAAsB,GAA7B,UAA8B,MAAqB;QAC/C,IAAI,MAAc,CAAC;QAEnB,IAAI,UAAU,GAA2B,MAAM,CAAC,MAAM,CAAC;QACvD,OAAO,UAAU,EAAE;YACf,IAAI,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;gBAC7B,MAAM,GAAI,UAAqB,CAAC;gBAChC,MAAM;aACT;iBAAM;gBACH,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC;aAClC;SACJ;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;IAEa,kCAAoB,GAAlC,UACI,IAAmB,EACnB,CAAS,EACT,CAAS,EACT,MAAiD;QAAjD,uBAAA,EAAA,aAAiD;QAEjD,IAAI,MAAmC,CAAC;QAExC,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,UAAU,EAAE;YACjC,IAAI,aAAa,GAA2B,IAA8B,CAAC;YAC3E,+BAA+B;YAC/B,IAAI,aAAa,CAAC,QAAQ,IAAI,aAAa,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC7D,IAAI,YAAY,GAAkC,EAAE,CAAC;gBACrD,IAAI,SAAS,SAAK,CAAC;gBACnB,IAAI,eAAe,SAAK,CAAC;gBACzB,IAAI,aAAa,GAAW,aAAa,CAAC,QAAQ,CAAC,MAAM,CAAC;gBAC1D,KAAK,IAAI,UAAU,GAAW,CAAC,EAAE,UAAU,GAAG,aAAa,EAAE,UAAU,EAAE,EAAE;oBACvE,SAAS,GAAG,aAAa,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;oBAC/C,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,SAAS,CAAC,EAAE;wBAC9B,eAAe,GAAG,IAAI,CAAC,oBAAoB,CAAC,SAAS,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;wBAC7D,IAAI,eAAe,EAAE;4BACjB,YAAY,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;yBACtC;qBACJ;iBACJ;gBAED,oFAAoF;gBACpF,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;oBACzB,MAAM,GAAG,EAAC,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,YAAY,EAAC,CAAC;iBACnD;gBAED,kCAAkC;aACrC;iBAAM;gBAEH,IAAI,YAAY,GAAY,KAAK,CAAC;gBAClC,IAAK,IAAY,CAAC,aAAa,EAAE;oBAC7B,IAAI,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC;oBACvB,IAAI,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC;oBACvB,IAAK,IAAY,CAAC,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE;wBAC/C,YAAY,GAAG,IAAI,CAAC;qBACvB;iBAEJ;qBAAM;oBACH,IAAI,UAAU,GAAc,IAAI,CAAC,SAAS,EAAE,CAAC;oBAC7C,IAAI,UAAU,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE;wBAC3B,YAAY,GAAG,IAAI,CAAC;qBACvB;iBACJ;gBAED,IAAI,YAAY,EAAE;oBACd,MAAM,GAAG,EAAC,MAAM,EAAE,IAAI,EAAC,CAAC;iBAC3B;aACJ;SACJ;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;IA1Ec,yBAAW,GAAU,IAAI,KAAK,EAAE,CAAC;IA2EpD,oBAAC;CAAA,AA7ED,IA6EC;SA7EY,aAAa"}
|
package/package.json
CHANGED
|
@@ -2,7 +2,8 @@ import { AssociativeArray, BaseObject, Lock } from "@flashist/fcore";
|
|
|
2
2
|
import { Sound } from "../../index";
|
|
3
3
|
export declare abstract class AbstractSoundsManager extends BaseObject {
|
|
4
4
|
protected soundsToIdMap: AssociativeArray<Sound>;
|
|
5
|
-
protected
|
|
5
|
+
protected mutedLock: Lock;
|
|
6
|
+
protected muteLock: Lock;
|
|
6
7
|
private _isMuted;
|
|
7
8
|
private _enabled;
|
|
8
9
|
private _tweenVolumeValue;
|
|
@@ -13,8 +14,10 @@ export declare abstract class AbstractSoundsManager extends BaseObject {
|
|
|
13
14
|
getSound(id: string): Sound;
|
|
14
15
|
addDisableLock(locker: any): void;
|
|
15
16
|
removeDisableLock(locker: any): void;
|
|
17
|
+
addMuteLock(locker: any): void;
|
|
18
|
+
removeMuteLock(locker: any): void;
|
|
16
19
|
get isMuted(): boolean;
|
|
17
|
-
|
|
20
|
+
protected calculateMuted(): void;
|
|
18
21
|
get enabled(): boolean;
|
|
19
22
|
protected calculateEnabled(): void;
|
|
20
23
|
protected commitData(): void;
|
|
@@ -21,7 +21,8 @@ var AbstractSoundsManager = /** @class */ (function (_super) {
|
|
|
21
21
|
function AbstractSoundsManager() {
|
|
22
22
|
var _this = _super !== null && _super.apply(this, arguments) || this;
|
|
23
23
|
_this.soundsToIdMap = new AssociativeArray();
|
|
24
|
-
_this.
|
|
24
|
+
_this.mutedLock = new Lock();
|
|
25
|
+
_this.muteLock = new Lock();
|
|
25
26
|
_this._isMuted = false;
|
|
26
27
|
_this._enabled = true;
|
|
27
28
|
_this.defaultTweenTime = 0.5;
|
|
@@ -34,7 +35,7 @@ var AbstractSoundsManager = /** @class */ (function (_super) {
|
|
|
34
35
|
args[_i] = arguments[_i];
|
|
35
36
|
}
|
|
36
37
|
_super.prototype.construction.apply(this, args);
|
|
37
|
-
this.
|
|
38
|
+
this.mutedLock = new Lock();
|
|
38
39
|
this.setVolume(this.volume);
|
|
39
40
|
};
|
|
40
41
|
AbstractSoundsManager.prototype.registerSound = function (id, sound) {
|
|
@@ -44,29 +45,37 @@ var AbstractSoundsManager = /** @class */ (function (_super) {
|
|
|
44
45
|
return this.soundsToIdMap.getItem(id);
|
|
45
46
|
};
|
|
46
47
|
AbstractSoundsManager.prototype.addDisableLock = function (locker) {
|
|
47
|
-
this.
|
|
48
|
+
this.mutedLock.add(locker);
|
|
48
49
|
this.calculateEnabled();
|
|
49
50
|
};
|
|
50
51
|
AbstractSoundsManager.prototype.removeDisableLock = function (locker) {
|
|
51
|
-
this.
|
|
52
|
+
this.mutedLock.remove(locker);
|
|
52
53
|
this.calculateEnabled();
|
|
53
54
|
};
|
|
55
|
+
AbstractSoundsManager.prototype.addMuteLock = function (locker) {
|
|
56
|
+
this.muteLock.add(locker);
|
|
57
|
+
this.calculateMuted();
|
|
58
|
+
};
|
|
59
|
+
AbstractSoundsManager.prototype.removeMuteLock = function (locker) {
|
|
60
|
+
this.muteLock.remove(locker);
|
|
61
|
+
this.calculateMuted();
|
|
62
|
+
};
|
|
54
63
|
Object.defineProperty(AbstractSoundsManager.prototype, "isMuted", {
|
|
55
64
|
get: function () {
|
|
56
65
|
return this._isMuted;
|
|
57
66
|
},
|
|
58
|
-
set: function (value) {
|
|
59
|
-
if (value === this._isMuted) {
|
|
60
|
-
return;
|
|
61
|
-
}
|
|
62
|
-
this._isMuted = value;
|
|
63
|
-
this.dispatchEvent(SoundsManagerEvent.IS_MUTED_CHANGE);
|
|
64
|
-
// this.calculateEnabled();
|
|
65
|
-
this.commitData();
|
|
66
|
-
},
|
|
67
67
|
enumerable: false,
|
|
68
68
|
configurable: true
|
|
69
69
|
});
|
|
70
|
+
AbstractSoundsManager.prototype.calculateMuted = function () {
|
|
71
|
+
var prevIsMuted = this.enabled;
|
|
72
|
+
var newIsMuted = !this.mutedLock.enabled;
|
|
73
|
+
this._isMuted = newIsMuted;
|
|
74
|
+
if (this.enabled !== prevIsMuted) {
|
|
75
|
+
this.dispatchEvent(SoundsManagerEvent.IS_MUTED_CHANGE);
|
|
76
|
+
}
|
|
77
|
+
this.commitData();
|
|
78
|
+
};
|
|
70
79
|
Object.defineProperty(AbstractSoundsManager.prototype, "enabled", {
|
|
71
80
|
get: function () {
|
|
72
81
|
return this._enabled;
|
|
@@ -76,7 +85,7 @@ var AbstractSoundsManager = /** @class */ (function (_super) {
|
|
|
76
85
|
});
|
|
77
86
|
AbstractSoundsManager.prototype.calculateEnabled = function () {
|
|
78
87
|
var prevEnabled = this.enabled;
|
|
79
|
-
var newEnabled = !this.
|
|
88
|
+
var newEnabled = !this.mutedLock.enabled;
|
|
80
89
|
this._enabled = newEnabled;
|
|
81
90
|
if (this.enabled !== prevEnabled) {
|
|
82
91
|
this.dispatchEvent(SoundsManagerEvent.ENABLED_CHANGE);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractSoundsManager.js","sourceRoot":"","sources":["../../../src/sounds/abstract/AbstractSoundsManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,OAAO,EAAC,gBAAgB,EAAE,UAAU,EAAE,IAAI,EAAC,MAAM,iBAAiB,CAAC;AAEnE,OAAO,EAAC,SAAS,EAAC,MAAM,MAAM,CAAC;AAG/B,OAAO,EAAC,kBAAkB,EAAC,MAAM,sBAAsB,CAAC;AAExD;IAAoD,yCAAU;IAA9D;QAAA,
|
|
1
|
+
{"version":3,"file":"AbstractSoundsManager.js","sourceRoot":"","sources":["../../../src/sounds/abstract/AbstractSoundsManager.ts"],"names":[],"mappings":"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"}
|