From 60e4996f331b1aa405df86fa4dd51dcb06b901ac Mon Sep 17 00:00:00 2001
From: libccy <widget@widgetdeMacBook-Pro.local>
Date: Tue, 14 Feb 2017 00:20:37 +0800
Subject: [PATCH] a

---
 game/game.js | 37 ++++++++++++++++++++++++++++++++-----
 1 file changed, 32 insertions(+), 5 deletions(-)

diff --git a/game/game.js b/game/game.js
index 1f7dff08c..010e379f0 100644
--- a/game/game.js
+++ b/game/game.js
@@ -9495,12 +9495,13 @@
                         }
 
                         if(lib.config.background_speak){
-    						if(lib.character[player.name]&&
-    						lib.character[player.name][4].contains('die_audio')){
+    						if(lib.character[player.name]&&lib.character[player.name][4].contains('die_audio')){
     							game.playAudio('die',player.name);
     						}
     						else if(lib.config.background_ogg){
-    							game.playAudio('die',player.name.slice(player.name.indexOf('_')+1));
+    							game.playAudio('die',player.name,function(){
+									game.playAudio('die',player.name.slice(player.name.indexOf('_')+1));
+								});
     						}
     					}
                     },player,event.cards);
@@ -17521,10 +17522,14 @@
 		playAudio:function(){
 			if(_status.video&&arguments[1]!='video') return;
 			var str='';
+			var onerror=null;
 			for(var i=0;i<arguments.length;i++){
 				if(typeof arguments[i]==='string'||typeof arguments[i]=='number'){
 					str+='/'+arguments[i];
 				}
+				else if(typeof arguments[i]=='function'){
+					onerror=arguments[i]
+				}
 				if(_status.video) break;
 			}
 			if(_status.skillaudio.contains(str)) return;
@@ -17543,6 +17548,9 @@
 			audio.onerror=function(){
 				if(this._changed){
 					this.remove();
+					if(onerror){
+						onerror();
+					}
 				}
 				else{
 					this.src=lib.assetURL+'audio'+str+'.ogg';
@@ -24333,10 +24341,27 @@
                             ui.create.div('',str2,dash);
                         };
 						var getFileList=function(dir,callback){
+							var files=[],folders=[];
 							if(lib.node&&lib.node.fs){
-
+								dir=__dirname+'/'+dir;
+								lib.node.fs.readdir(dir,function(err,filelist){
+									for(var i=0;i<filelist.length;i++){
+										if(filelist[i][0]!='.'&&filelist[i][0]!='_'){
+											if(lib.node.fs.statSync(dir+'/'+filelist[i]).isDirectory()){
+												folders.push(filelist[i]);
+											}
+											else{
+												files.push(filelist[i]);
+											}
+										}
+									}
+									callback(folders,files);
+								});
 							}
 						};
+						var createFolder=function(dir,node){
+
+						};
                         var dash1=(function(){
 							var page=ui.create.div('.hidden.menu-buttons');
 							ui.create.div('.config.more.margin-bottom','<div style="transform:none;margin-right:3px">←</div>返回',page,function(){
@@ -24345,7 +24370,9 @@
                                 pageboard.show();
                             });
 							page.init=function(){
-								console.log(1);
+								getFileList('image',function(folders,files){
+									console.log(folders,files);
+								});
 							};
                             return page;
                         }());