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

2 files changed, 330 insertions, 18 deletions

diff --git a/Assets/Scenes/Test.unity b/Assets/Scenes/Test.unity
index d091020..bb3f742 100644
--- a/Assets/Scenes/Test.unity
+++ b/Assets/Scenes/Test.unity
@@ -263,7 +263,7 @@ Transform:
   m_GameObject: {fileID: 330585543}
   serializedVersion: 2
   m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
-  m_LocalPosition: {x: 0, y: 3.99, z: -10}
+  m_LocalPosition: {x: 0, y: 10.56, z: -10}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -440,6 +440,132 @@ MonoBehaviour:
   m_ShadowLayerMask: 1
   m_RenderingLayers: 1
   m_ShadowRenderingLayers: 1
+--- !u!1 &426424000
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 426424005}
+  - component: {fileID: 426424004}
+  - component: {fileID: 426424003}
+  - component: {fileID: 426424002}
+  - component: {fileID: 426424001}
+  m_Layer: 0
+  m_Name: Plane_2
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!65 &426424001
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 426424000}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 1
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 9.999999, y: 2.2204459e-16, z: 10}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &426424002
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 426424000}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c69e2aa4d45550a818a819efbd91c846, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Assembly-CSharp::DragItem
+  dragger: {fileID: 0}
+--- !u!23 &426424003
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 426424000}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RayTracingAccelStructBuildFlagsOverride: 0
+  m_RayTracingAccelStructBuildFlags: 1
+  m_SmallMeshCulling: 1
+  m_ForceMeshLod: -1
+  m_MeshLodSelectionBias: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_GlobalIlluminationMeshLod: 0
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_MaskInteraction: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!33 &426424004
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 426424000}
+  m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!4 &426424005
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 426424000}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -5.07, y: 0.15, z: -11.14}
+  m_LocalScale: {x: 0.26638, y: 0.26638, z: 0.32647535}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &605998529
 GameObject:
   m_ObjectHideFlags: 0
@@ -639,8 +765,8 @@ Transform:
   m_GameObject: {fileID: 808063308}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -0.13, y: 0.15, z: -9.71}
-  m_LocalScale: {x: 0.26638, y: 0.26638, z: 0.32647535}
+  m_LocalPosition: {x: 0, y: 1, z: 0}
+  m_LocalScale: {x: 0.25, y: 0.25, z: 0.25}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
@@ -677,7 +803,7 @@ BoxCollider:
   m_ProvidesContacts: 0
   m_Enabled: 1
   serializedVersion: 3
-  m_Size: {x: 9.999999, y: 2.2204459e-16, z: 10}
+  m_Size: {x: 10, y: 5, z: 10}
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!1 &832575517
 GameObject:
@@ -728,6 +854,132 @@ Transform:
   m_Children: []
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1724173762
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1724173767}
+  - component: {fileID: 1724173766}
+  - component: {fileID: 1724173765}
+  - component: {fileID: 1724173764}
+  - component: {fileID: 1724173763}
+  m_Layer: 0
+  m_Name: Plane_3
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!65 &1724173763
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1724173762}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 1
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 9.999999, y: 2.2204459e-16, z: 10}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &1724173764
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1724173762}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c69e2aa4d45550a818a819efbd91c846, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Assembly-CSharp::DragItem
+  dragger: {fileID: 0}
+--- !u!23 &1724173765
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1724173762}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RayTracingAccelStructBuildFlagsOverride: 0
+  m_RayTracingAccelStructBuildFlags: 1
+  m_SmallMeshCulling: 1
+  m_ForceMeshLod: -1
+  m_MeshLodSelectionBias: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_GlobalIlluminationMeshLod: 0
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_MaskInteraction: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!33 &1724173766
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1724173762}
+  m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!4 &1724173767
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1724173762}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -2.5, y: 0.15, z: -16.01}
+  m_LocalScale: {x: 0.26638, y: 0.26638, z: 0.32647535}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1660057539 &9223372036854775807
 SceneRoots:
   m_ObjectHideFlags: 0
@@ -737,4 +989,6 @@ SceneRoots:
   - {fileID: 832575519}
   - {fileID: 605998533}
   - {fileID: 808063312}
+  - {fileID: 426424005}
+  - {fileID: 1724173767}
   - {fileID: 240209370}
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[] { "愤怒","开心", "伤心","纹身","相连","胡子","钉子","眼镜"});
+            
         }
     }