From 4dac84d13bec6ecfb967d98d8a1fc9219559834d Mon Sep 17 00:00:00 2001
From: libccy <widget@widgetdeMacBook-Pro.local>
Date: Fri, 20 May 2016 20:30:12 +0800
Subject: [PATCH] f

---
 character/sp.js           |  2 +-
 game/game.js              | 78 +++++++++++++++++++++++++++++++++++++--
 game/update.js            | 10 ++---
 layout/default/layout.css |  5 ++-
 4 files changed, 85 insertions(+), 10 deletions(-)

diff --git a/character/sp.js b/character/sp.js
index e072cb9ce..1d8ef44a2 100755
--- a/character/sp.js
+++ b/character/sp.js
@@ -2064,7 +2064,7 @@ character.sp={
 						player.setIdentity();
 					}
 					target.identity=identity;
-				},player,trigger.player,target.identityShown);
+				},player,trigger.player,trigger.player.identityShown);
 				player.line(trigger.player,'green');
 				player.storage.fenxin=true;
 				player.unmarkSkill('fenxin');
diff --git a/game/game.js b/game/game.js
index b9f74a697..be7efeb1e 100755
--- a/game/game.js
+++ b/game/game.js
@@ -15680,6 +15680,41 @@
 			lib.characterPack[packname][name]=character;
 			lib.translate[packname+'_character_config']=extname;
 		},
+        addCharacterPack:function(pack,packagename){
+            var extname=_status.extension||'扩展';
+            packagename=packagename||extname;
+            for(var i in pack){
+                if(i=='mode'||i=='forbid') continue;
+                for(var j in pack[i]){
+                    if(i=='character'){
+                        if(!pack[i][j][4]){
+                            pack[i][j][4]=[];
+                        }
+                        var imgsrc;
+                        if(_status.evaluatingExtension){
+                            imgsrc='db:extension-'+extname+':'+j+'.jpg';
+                        }
+                        else{
+                            imgsrc='ext:'+extname+'/'+j+'.jpg';
+                        }
+                        pack[i][j][4].push(imgsrc);
+                        if(pack[i][j][4].contains('boss')||
+                            pack[i][j][4].contains('hiddenboss')){
+                            lib.config.forbidai.add(j);
+                        }
+                        for(var l=0;l<pack[i][j][3].length;l++){
+                            lib.skilllist.add(pack[i][j][3][l]);
+                        }
+                    }
+                    if(lib[i][j]==undefined){
+                        lib[i][j]=lib.init.eval(pack[i][j]);
+                    }
+                }
+            }
+			var packname='mode_extension_'+extname;
+			lib.characterPack[packname]=pack.character;
+			lib.translate[packname+'_character_config']=packagename;
+        },
 		addCard:function(name,info,info2){
 			var extname=(_status.extension||info2.extension);
 			if(info.fullskin){
@@ -15720,6 +15755,44 @@
 			}
 			lib.cardPack[packname].push(name);
 		},
+        addCardPack:function(pack,packagename){
+            var extname=_status.extension||'扩展';
+            packagename=packagename||extname;
+			var packname='mode_extension_'+extname;
+			lib.cardPack[packname]=[];
+			lib.translate[packname+'_card_config']=packagename;
+            for(var i in pack){
+                if(i=='mode'||i=='forbid') continue;
+                if(i=='list'){
+                    for(var j=0;j<pack[i].length;j++){
+                        lib.card.list.push(pack[i][j]);
+                    }
+                    continue;
+                }
+                for(var j in pack[i]){
+                    if(i=='card'){
+                        if(pack[i][j].fullskin){
+                            if(_status.evaluatingExtension){
+                                pack[i][j].image='db:extension-'+extname+':'+j+'.png';
+                            }
+                            else{
+                                pack[i][j].image='ext:'+extname+'/'+j+'.png';
+                            }
+            			}
+            			else if(pack[i][j].fullimage){
+                            if(_status.evaluatingExtension){
+                                pack[i][j].image='db:extension-'+extname+':'+j+'.jpg';
+                            }
+                            else{
+                                pack[i][j].image='ext:'+extname+'/'+j+'.jpg';
+                            }
+            			}
+                        lib.cardPack[packname].push(j);
+                    }
+                    if(lib[i][j]==undefined) lib[i][j]=lib.init.eval(pack[i][j]);
+                }
+            }
+        },
         addSkill:function(name,info,translate,description){
             if(lib.skill[name]){
                 return false;
@@ -19380,7 +19453,7 @@
 								_status.clicked=false;
 								return;
 							}
-							if(mode.indexOf('mode_')==0){
+							if(mode.indexOf('mode_')==0&&mode.indexOf('mode_extension_')!=0){
 								return;
 							}
 							this.classList.toggle('unselectable');
@@ -20251,7 +20324,7 @@
 								_status.clicked=false;
 								return;
 							}
-							if(mode.indexOf('mode_')==0){
+							if(mode.indexOf('mode_')==0&&mode.indexOf('mode_extension_')!=0){
 								return;
 							}
 							this.classList.toggle('unselectable');
@@ -20864,7 +20937,6 @@
                                     var download=ui.create.div('.menubutton.text.active','下载扩展',node.firstChild,downloadExtension);
                                     if(lib.config.extensions.contains(list[i].name)){
                                         download.classList.remove('active');
-                                        console.log(lib.config['extension_'+list[i].name+'_version'],list[i].version);
                                         if(lib.config['extension_'+list[i].name+'_version']!=list[i].version){
                                             download.innerHTML='更新扩展';
                                             download.classList.add('highlight');
diff --git a/game/update.js b/game/update.js
index d061f1d80..9573aaf12 100644
--- a/game/update.js
+++ b/game/update.js
@@ -1,11 +1,11 @@
 window.noname_update={
-    version:'1.8.10.3',
+    version:'1.8.10.4',
     changeLog:[
-        '扩展更新',
-        '修复明置bug'
+        '修bug',
     ],
     files:{
-        global:['game/game.js','mode/guozhan.js'],
-        '1.8.10.2':[],
+        global:['game/game.js','character/sp.js','layout/default/layout.js'],
+        '1.8.10.2':['mode/guozhan.js'],
+        '1.8.10.3':[],
     }
 }
diff --git a/layout/default/layout.css b/layout/default/layout.css
index dc781b0c8..dd9bede99 100755
--- a/layout/default/layout.css
+++ b/layout/default/layout.css
@@ -1325,7 +1325,6 @@ span[data-nature='firem']{
 		rgba(232, 53, 53,1) 0 0 5px,black 0 0 1px;
 }
 .player .identity[data-color="zhong"],
-.player .identity[data-color="mingzhong"],
 .player .identity[data-color="qun"],
 .player .identity[data-color="neutral"],
 .player .identity[data-color="friend2"],
@@ -1334,6 +1333,10 @@ span[data-nature='metal']{
 	text-shadow: black 0 0 1px,rgba(255, 203, 0,1) 0 0 2px,rgba(255, 203, 0,1) 0 0 5px,rgba(255, 203, 0,1) 0 0 10px,
 		rgba(255, 203, 0,1) 0 0 10px
 }
+.player .identity[data-color="mingzhong"]{
+	text-shadow: black 0 0 1px,rgba(255, 120, 0,1) 0 0 2px,rgba(255, 120, 0,1) 0 0 5px,rgba(255, 120, 0,1) 0 0 10px,
+		rgba(255, 120, 0,1) 0 0 10px
+}
 div[data-nature='metalm'],
 span[data-nature='metalm']{
 	text-shadow: black 0 0 1px,rgba(255, 203, 0,1) 0 0 2px,rgba(255, 203, 0,1) 0 0 5px,rgba(255, 203, 0,1) 0 0 5px,