Merge remote-tracking branch 'origin/dev_lys' into feat/tag_system

1 files changed, 72 insertions, 14 deletions

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