Merge pull request #1195 from PZ157/PR-Branch

combo和语音添加

card/standard.js

@@ -2762,7 +2762,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 					next.set('ai',function(card){
 						var evt=_status.event.getTrigger();
 						if(get.attitude(evt.player,evt.target)<0){
-							if(player.needsToDiscard()) return 15-get.value(card);
+							if(evt.player.needsToDiscard()) return 15-get.value(card);
 							if(evt.baseDamage+evt.extraDamage>=Math.min(2,evt.target.hp)) return 8-get.value(card);
 							return 5-get.value(card);
 						}

character/mobile.js

@@ -2424,6 +2424,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						},
 					},
 				},
+				ai:{
+					combo:'twjichou'
+				}
 			},
 			//李遗
 			jiaohua:{

character/refresh.js

@@ -5593,6 +5593,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					player.loseMaxHp();
 					player.addSkills('xinpaiyi');
 				},
+				ai:{
+					combo:'xinquanji'
+				}
 			},
 			xinpaiyi:{
 				audio:2,

character/shenhua.js

@@ -1974,6 +1974,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					target.addMark('nzry_huaiju',1);
 					target.addSkill('nzry_huaiju_ai');
 				},
+				ai:{
+					combo:'nzry_huaiju'
+				}
 			},
 			"nzry_zhenglun":{
 				audio:2,
@@ -1990,6 +1993,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					trigger.cancel();
 					player.addMark('nzry_huaiju',1);
 				},
+				ai:{
+					combo:'nzry_huaiju'
+				}
 			},
 			"nzry_kuizhu":{
 				audio:2,

character/yijiang.js

@@ -806,6 +806,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						player.addExpose(0.1);
 					}
 				},
+				ai:{
+					combo:'duwang'
+				},
 				subSkill:{
 					fullyReady:{
 						trigger:{global:'phaseEnd'},
@@ -10956,6 +10959,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					"step 1"
 					player.loseMaxHp();
 					player.addSkills('paiyi');
+				},
+				ai:{
+					combo:'quanji'
 				}
 			},
 			paiyi:{