diff --git a/src/main/java/org/fenglin/Command/Undercover.java b/src/main/java/org/fenglin/Command/Undercover.java index 6a9d8ff..52d4c94 100644 --- a/src/main/java/org/fenglin/Command/Undercover.java +++ b/src/main/java/org/fenglin/Command/Undercover.java @@ -5,8 +5,6 @@ import net.mamoe.mirai.contact.User; import org.fenglin.Mypaly; import org.fenglin.data.MyDate; - -import java.awt.*; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -16,8 +14,8 @@ public class Undercover extends JCompositeCommand implements Runnable { private List data=new ArrayList<>(); - private Boolean Isrun=false; private CommandSender sender_run=null; + private Map world_data; public Undercover(){ super(org.fenglin.WhoUndercover.INSTANCE, "谁是卧底"); setPrefixOptional(true); @@ -66,8 +64,22 @@ public void run() { } } // 判断胜负 + + + String info = "----本局战况\n----"; + info += "普通玩家胜利"; if (data.get(max_i).getIsundercover()){ - sender_run.sendMessage("普通玩家胜利!"); + + for (Map.Entry entry : world_data.entrySet()) { + info+="玩家词条:" + entry.getKey() + ",卧底词条:" + entry.getValue()+"\n"; + } +// 卧底信息 + for (int i = 0; i < data.size(); i++) { + if (data.get(i).getIsundercover()) { + info += "本局卧底:" + data.get(i).getName(); + } + } + sender_run.sendMessage(info); c1=codplay.Cpaly; data.clear(); return; @@ -75,14 +87,24 @@ public void run() { // 删除查看剩余人数 data.remove(max_i); if (data.size()>1){ - sender_run.sendMessage("卧底玩家胜利!"); + String infoW = "----本局战况\n----"; + infoW += "普通玩家胜利"; + for (Map.Entry entry : world_data.entrySet()) { + infoW+="玩家词条:" + entry.getKey() + ",卧底词条:" + entry.getValue()+"\n"; + } + for (int i = 0; i < data.size(); i++) { + if (data.get(i).getIsundercover()) { + infoW += "本局卧底:" + data.get(i).getName(); + } + } + sender_run.sendMessage(info); c1=codplay.Cpaly; data.clear(); return; } } // 转化描述状态! - sender_run.sendMessage("卧底存在投票继续!"); + sender_run.sendMessage("卧底存在!继续描述."); c1=codplay.describe; }else { @@ -149,7 +171,7 @@ public void paly(CommandSender sender) { sender.sendMessage("无配置词库,无法开始"); } Random random=new Random(); - Map world_data = world.get(random.nextInt(world.size())); + world_data = world.get(random.nextInt(world.size())); // 分配词条 for (Map.Entry entry : world_data.entrySet()) { System.out.println("Key = " + entry.getKey() + ", Value = " + entry.getValue()); @@ -163,7 +185,7 @@ public void paly(CommandSender sender) { } // 通告 for (int i=0;i