tmp

character/diy.js

@@ -52,7 +52,16 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			ns_simazhao:['male','wei',3,['nszhaoxin','nsxiuxin','nsshijun']],
 			ns_sunjian:['male','wu',4,['nswulie','nshunyou','nscangxi']],
 
-			ns_duangui:['male','qun',3,[]],
+			// ns_duangui:['male','qun',3,[]],
+			// ns_masu:['male','qun',3,[]],
+			// ns_zhangxiu:['male','qun',3,[]],
+			// ns_lvziming:['male','qun',3,[]],
+			// ns_zhaoyun:['male','qun',3,[]],
+			// ns_yuji:['male','qun',3,[]],
+			// ns_lvmeng:['male','qun',3,[]],
+			// ns_zhaoyunshen:['male','qun',3,[]],
+			// ns_lisu:['male','qun',3,[]],
+			// ns_sunhao:['male','qun',3,[]],
 		},
 		characterIntro:{
 			diy_feishi:'字公举，生卒年不详，益州犍为郡南安县（今四川省乐山市）人。刘璋占据益州时，以费诗为绵竹县县令。刘备进攻刘璋夺取益州，费诗举城而降，后受拜督军从事，转任牂牁郡太守，再为州前部司马。',

character/old.js

@@ -363,7 +363,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 	        old_huaxiong:'旧华雄',
 	        old_wangyi:'旧王异',
 	        old_caozhen:'旧曹真',
-	        old_quancong:'旧全琮',
+			old_quancong:'旧全琮',
+	        old_lingju:'旧灵雎',
 
 	        zhenshan:'振赡',
 	        zhenshan_use:'振赡',

character/shenhua.js

@@ -48,6 +48,11 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     		sp_zhugeliang:['pangtong'],
     		sunce:['zhouyu','taishici','daqiao']
     	},
+        characterFilter:{
+            zuoci:function(){
+                return get.mode()!='guozhan';
+            }
+        },
     	characterIntro:{
     		huangzhong:'字汉升，今河南南阳人。汉末三国时期蜀汉名将。本为刘表部下中郎将，后归刘备，并助刘备攻益州刘璋，在定军山一战中阵斩曹操部下名将夏侯渊。备称汉中王后改封后将军，赐关内侯。',
     		weiyan:'字文长，义阳人。三国时期蜀汉名将，诸葛亮死后，魏延因被陷害谋反而遭杨仪一党所杀。',
@@ -1531,11 +1536,13 @@ game.import('character',function(lib,game,ui,get,ai,_status){
                                 }
                             }
                         }
-    					var skill=player.additionalSkills.huashen[0];
-    					if(skill){
-    						dialog.add('<div><div class="skill">【'+get.translation(skill)+
-    						'】</div><div>'+lib.translate[skill+'_info']+'</div></div>');
-    					}
+                        if(player.additionalSkills.huashen){
+                            var skill=player.additionalSkills.huashen[0];
+        					if(skill){
+        						dialog.add('<div><div class="skill">【'+get.translation(skill)+
+        						'】</div><div>'+lib.translate[skill+'_info']+'</div></div>');
+        					}
+                        }
     				}
     			},
     			mark:true
@@ -1761,7 +1768,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
                             var sub=player.storage.huashen.owned[list[i]];
                             skills.addArray(sub);
                             for(var j=0;j<sub.length;j++){
-                                map[sub]=list[i];
+                                map[sub[j]]=list[i];
                             }
                         }
                         var add=player.additionalSkills.huashen;

game/asset.js

@@ -1,5 +1,5 @@
 window.noname_asset_list=[
-    '1.9.46',
+    '1.9.45',
     'image/background/huangtian_bg.jpg',
     'image/background/ol_bg.jpg',
     'image/background/september_bg.jpg',

game/game.js

@@ -36924,6 +36924,7 @@
 						if(lib.character[i][4].contains('stonehidden')) continue;
 						if(lib.character[i][4].contains('unseen')) continue;
 						if(lib.config.banned.contains(i)) continue;
+						if(lib.characterFilter[i]&&!lib.characterFilter[i]()) continue;
 						if(filter&&filter(i)) continue;
 						list.push(i);
 						if(namecapt.indexOf(getCapt(i))==-1){

game/update.js

@@ -1,9 +1,9 @@
 window.noname_update={
-    version:'1.9.45.4',
-    update:'1.9.45.3',
+    version:'1.9.46',
+    // update:'1.9.45.3',
     changeLog:[
-        // '武将修改',
-        // 'players://["swd_guyuesheng"]',
+        'bug修复',
+        'players://["old_lingju","yj_jushou","swd_guyue","ns_duangui"]',
     ],
     files:[
         'game/game.js',