Update Pixi.

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
부모 9f1efa1225
커밋 447eb0b3dd
4개의 변경된 파일30개의 추가작업 그리고 21개의 파일을 삭제

파일 보기

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

파일 보기

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

31
Js/Pixi.min.js vendored

File diff suppressed because one or more lines are too long

파일 보기

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