yttt-xdu/XDUPlayer
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Update Pixi.

Browse Source 
Fix some things so that if errors happen in audio the rest will still run.
This commit is contained in:
fire bingo 2018-05-11 09:37:03 -07:00
parent 9f1efa1225
commit 447eb0b3dd
4 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Js/Audio.js
View File

@ -3,6 +3,7 @@
class bufferLoader { class bufferLoader {
constructor(context, soundMap, callback) { constructor(context, soundMap, callback) {
debugger;
this.context = context; this.context = context;
this.soundMap = soundMap; this.soundMap = soundMap;
this.onloadUpdate = callback; this.onloadUpdate = callback;
@ -41,7 +42,8 @@ class bufferLoader {
} }
resolve(`${this.loadCount}|${this.soundMap.length}`); resolve(`${this.loadCount}|${this.soundMap.length}`);
}, },
function(error) { (error) => {
console.log(error); console.log(error);
console.log(`url: ${url}, name: ${name}`); console.log(`url: ${url}, name: ${name}`);
if(this.onloadUpdate) { if(this.onloadUpdate) {
@ -52,10 +54,16 @@ class bufferLoader {
); );
}); });
}, (failure) => { }, (failure) => {
if(this.onloadUpdate) {
this.onloadUpdate((++this.loadCount / this.soundMap.length) * 100);
}
console.log(failure); console.log(failure);
reject(failure); reject(failure);
}); });
} catch(error) { } catch(error) {
if(this.onloadUpdate) {
this.onloadUpdate((++this.loadCount / this.soundMap.length) * 100);
}
console.log(error); console.log(error);
reject(error); reject(error);
} }

4
Js/Main.js
View File

@ -133,8 +133,8 @@ function missionDropDownChanged(event) {
cont.innerHTML = '' + cont.innerHTML = '' +
'<div id="mission-modal" class="modal">' + '<div id="mission-modal" class="modal">' +
`<span class="mission-title">Name: ${mis.Name || 'none'}</span>` + `<span class="mission-title">Name: ${mis.Name || 'none'}</span>` +
`<img id="mission-detail" src="XDUData/Asset/Image/Quest/Snap/Detail/${mis.MstId}.png">` + `<img id="mission-detail" src="XDUData/Asset/Image/Quest/Snap/Detail/${mis.MstId}.png"/>` +
`<img id="mission-icon" src="XDUData/Asset/Image/Quest/Snap/Icon/${mis.MstId}.png">` + `<img id="mission-icon" src="XDUData/Asset/Image/Quest/Snap/Icon/${mis.MstId}.png"/>` +
`<span>Summary: ${mis.SummaryText || 'none'}</span>` + `<span>Summary: ${mis.SummaryText || 'none'}</span>` +
'<div id="mission-ids">' + '<div id="mission-ids">' +
`<span>MstId: ${mis.MstId}</span>` + `<span>MstId: ${mis.MstId}</span>` +

31
Js/Pixi.min.js vendored
View File

File diff suppressed because one or more lines are too long

6
Player.html
View File

@ -43,11 +43,11 @@
<div id="dialog"> <div id="dialog">
<div id="dialog-controls"> <div id="dialog-controls">
<div id="dialog-scroll" class="hidden"> <div id="dialog-scroll" class="hidden">
<img id="dialog-scroll-up" src="Images/next_icon.png" onclick="dialogScrollUp(event)"></img> <img id="dialog-scroll-up" src="Images/next_icon.png" onclick="dialogScrollUp(event)"/>
<img src="Images/next_icon.png" onclick="dialogScrollDown(event)"></img> <img src="Images/next_icon.png" onclick="dialogScrollDown(event)"/>
</div> </div>
<div id="dialog-next" class="hidden"> <div id="dialog-next" class="hidden">
<img src="Images/next_icon.png"></img> <img src="Images/next_icon.png"/>
</div> </div>
</div> </div>
<div id="dialog-inner"></div> <div id="dialog-inner"></div>