修改罗师傅写的题目

2 files changed, 38 insertions, 37 deletions

diff --git a/Assets/Scripts/Tag/QuestionSystem.cs b/Assets/Scripts/Tag/QuestionSystem.cs
index a1883f6..a8e6e62 100644
--- a/Assets/Scripts/Tag/QuestionSystem.cs
+++ b/Assets/Scripts/Tag/QuestionSystem.cs
@@ -9,80 +9,80 @@ namespace Tag
             var random = new System.Random().Next(0, 15);
             if (random == 0)
                 return new Question("我想要一张高兴的脸，我不喜欢眼镜",
-                    new[] { "开心", "开心" },
-                    new string[] { "伤心","愤怒","眼镜"});
+                    new[] { "Happy", "Happy" },
+                    new string[] { "Sad","Angry","Glass"});
             if (random == 1)
                 return new Question("我想要一张气愤的脸，我喜欢胡子",
-                    new[] { "愤怒", "愤怒" ,"胡子"},
-                    new string[] { "开心","伤心"});
+                    new[] { "Angry", "Angry" ,"Beard"},
+                    new string[] { "Happy","Sad"});
             if (random == 2)
                 return new Question("我很气愤，我得带上眼镜遮掩一下",
-                    new[] { "愤怒", "愤怒", "眼镜" },
-                    new string[] { "开心","伤心"});
+                    new[] { "Angry", "Angry", "Glass" },
+                    new string[] { "Happy","Sad"});
             if (random == 3)
                 return new Question("无所谓，只是想带个眼镜，嘻嘻，不要别的装饰",
-                    new[] { "眼镜" ,"开心"},
-                    new string[] {"纹身","相连","胡子","钉子"});
+                    new[] { "Glass" ,"Happy"},
+                    new string[] {"Tattoo","Necklace","Beard","Piercing"});
             if (random == 4)
                 return new Question("我只想要一张伤心的脸，我伤心极了",
-                    new[] { "伤心","伤心","伤心"},
-                    new string[] {"开心","愤怒","纹身","相连","胡子","钉子","眼镜" });
+                    new[] { "Sad","Sad","Sad"},
+                    new string[] {"Happy","Angry","Tattoo","Necklace","Beard","Piercing","Glass" });
             if (random == 5)
                 return new Question("我想要一张有点伤心的脸",
-                    new[] { "伤心"},
-                    new string[] {"开心","愤怒" });
+                    new[] { "Sad"},
+                    new string[] {"Happy","Angry" });
             if (random == 5)
                 return new Question("我想要一张又生气又委屈的脸",
-                    new[] { "生气","伤心","伤心"},
-                    new string[] {"开心","愤怒" });
+                    new[] { "Angry","Sad","Sad"},
+                    new string[] {"Happy","Angry" });
             if (random == 6)
                 return new Question("我想要一张戴眼镜得意的脸，我昨天已经剃了胡须",
-                    new[] { "开心","开心","开心","得意"},
-                    new string[] {"开心","愤怒","胡子" });
+                    new[] { "Happy","Happy","Happy","Glass"},
+                    new string[] {"Happy","Angry","Beard" });
             if (random == 7)
                 return new Question("我想要一张又生气又委屈的脸，因为我的眼镜被偷了",
-                    new[] { "生气","伤心","伤心",},
-                    new string[] {"开心","愤怒","眼镜" });
+                    new[] { "Angry","Sad","Sad",},
+                    new string[] {"Happy","Angry","Glass" });
             if (random == 8)
                 return new Question("我想要一张卡通风格的高兴脸",
-                    new[] { "开心","开心","卡通",},
-                    new string[] {"伤心","生气","抽象","硬朗" });
+                    new[] { "Happy","Happy","Cartoon",},
+                    new string[] {"Sad","Angry","Abstract","Hard" });
             if (random == 9)
                 return new Question("我想要一张硬朗风格的气愤脸",
-                    new[] { "硬朗","生气","生气","硬朗",},
-                    new string[] {"伤心","开心","抽象","卡通" });
+                    new[] { "Hard","Angry","Angry","Hard",},
+                    new string[] {"Sad","Happy","Abstract","Cartoon" });
             if (random == 10)
                 return new Question("我想要一张抽象风格的伤心脸",
-                    new[] { "抽象","伤心"},
-                    new string[] {"生气","开心","硬朗","卡通" });
+                    new[] { "Abstract","Sad"},
+                    new string[] {"Angry","Happy","Hard","Cartoon" });
             if (random == 11)
                 return new Question("我想要一张有胡子的硬朗气愤脸，我喜欢眼镜,可是昨天剃了胡子把我的眼镜弄掉了 ",
-                    new[] { "胡子","硬朗","生气","生气"},
-                    new string[] {"开心","伤心","抽象","卡通","眼镜","胡子" });
+                    new[] { "Beard","Hard","Angry","Angry"},
+                    new string[] {"Happy","Sad","Abstract","Cartoon","Glass","Beard" });
             if (random == 11)
                 return new Question("我想要一张钉子配饰不要其他也都不要的委屈卡通脸，谁想的卡通角色有纹身，我不喜欢纹身 ",
-                    new[] { "伤心","伤心","卡通"},
-                    new string[] {"开心","生气","抽象","硬朗","纹身","相连","胡子","钉子","眼镜" });
+                    new[] { "Sad","Sad","Cartoon"},
+                    new string[] {"Happy","Angry","Abstract","Hard","Tattoo","Necklace","Beard","Piercing","Glass" });
             if (random == 12)
                 return new Question("我想要一张有眼镜和钉子的抽象开心脸，配饰我只纹了纹身但是长胡子了就洗了 ",
-                    new[] { "眼镜","开心","抽象","眼镜","钉子","胡子"},
-                    new string[] {"伤心","生气","卡通","硬朗","纹身","相连"});
+                    new[] { "Glass","Happy","Abstract","Glass","Piercing","Beard"},
+                    new string[] {"Sad","Angry","Cartoon","Hard","Tattoo","Necklace"});
             if (random == 13)
                 return new Question("硬汉王脸，带胡带火不带镜，万配不沾 ",
-                    new[] { "硬朗","胡子","生气"},
-                    new string[] {"伤心","生气","卡通","硬朗","纹身","相连","钉子","眼镜"});
+                    new[] { "Hard","Beard","Angry"},
+                    new string[] {"Sad","Angry","Cartoon","Hard","Tattoo","Necklace","Piercing","Glass"});
             if (random == 14)
                 return new Question("卡硬混搭，又喜又怒但只一点,原生态不带配 ",
-                    new[] { "卡通","硬朗","生气","开心"},
-                    new string[] {"伤心","胡子","抽象","纹身","相连","钉子","眼镜"});
+                    new[] { "Cartoon","Hard","Angry","Happy"},
+                    new string[] {"Sad","Beard","Abstract","Tattoo","Necklace","Piercing","Glass"});
             if (random == 15)
                 return new Question("火气直冲天灵盖，什么风格都不带 ",
-                    new[] { "生气","生气","生气"},
-                    new string[] {"开心","伤心","抽象","卡通","硬朗"});
+                    new[] { "Angry","Angry","Angry"},
+                    new string[] {"Happy","Sad","Abstract","Cartoon","Hard"});
             
             return new Question("我很难蚌，来到这就说明程序错误了，纯纯地扣分",
                 new[] { "难蚌" },
-                new[] { "愤怒","开心", "伤心","纹身","相连","胡子","钉子","眼镜"});
+                new[] { "Angry","Happy", "Sad","Tattoo","Necklace","Beard","Piercing","Glass"});
             
         }
     }
diff --git a/Assets/Scripts/Tag/TaggedItemSelector.cs b/Assets/Scripts/Tag/TaggedItemSelector.cs
index 0179bf4..6ce7334 100644
--- a/Assets/Scripts/Tag/TaggedItemSelector.cs
+++ b/Assets/Scripts/Tag/TaggedItemSelector.cs
@@ -18,6 +18,7 @@ namespace Tag
 
         private void Start()
         {
+            var question = QuestionFactory
         }
 
         public List<TaggedItemInfo> FilterByQuestion(Question question)