Merge branch 'master' of http://gitea.umayle.com/huangjiayu/CQ_Intelligent-Technology-Training-Base

Assets/Scenes/康养仿真/KYFZ.unity

@@ -1716,7 +1716,7 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 20, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -1776,7 +1776,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &87343295
 RectTransform:
   m_ObjectHideFlags: 0
@@ -6910,7 +6910,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &320013820
 RectTransform:
   m_ObjectHideFlags: 0
@@ -18102,8 +18102,8 @@ MonoBehaviour:
   onValueChanged:
     m_PersistentCalls:
       m_Calls:
-      - m_Target: {fileID: 0}
-        m_TargetAssemblyTypeName: Control_Light, Assembly-CSharp
+      - m_Target: {fileID: 1226101744}
+        m_TargetAssemblyTypeName: ClickKangYangdevice, Assembly-CSharp
         m_MethodName: Warmlight
         m_Mode: 1
         m_Arguments:
@@ -19440,10 +19440,10 @@ MonoBehaviour:
   m_FillRect: {fileID: 1180407057}
   m_HandleRect: {fileID: 83100450}
   m_Direction: 0
-  m_MinValue: 1.5
+  m_MinValue: 1
   m_MaxValue: 2
   m_WholeNumbers: 0
-  m_Value: 1.5
+  m_Value: 1
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
@@ -19667,8 +19667,8 @@ MonoBehaviour:
   onValueChanged:
     m_PersistentCalls:
       m_Calls:
-      - m_Target: {fileID: 0}
-        m_TargetAssemblyTypeName: Control_Light, Assembly-CSharp
+      - m_Target: {fileID: 1226101744}
+        m_TargetAssemblyTypeName: ClickKangYangdevice, Assembly-CSharp
         m_MethodName: Coollight
         m_Mode: 1
         m_Arguments:
@@ -22773,10 +22773,10 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
-      - m_Target: {fileID: 0}
+      - m_Target: {fileID: 1646754559}
         m_TargetAssemblyTypeName: SpeechToText, Assembly-CSharp
         m_MethodName: StartSpeechTotext
-        m_Mode: 1
+        m_Mode: 5
         m_Arguments:
           m_ObjectArgument: {fileID: 0}
           m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
@@ -23409,7 +23409,7 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 10, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -25337,8 +25337,8 @@ MonoBehaviour:
   onValueChanged:
     m_PersistentCalls:
       m_Calls:
-      - m_Target: {fileID: 0}
-        m_TargetAssemblyTypeName: Control_Light, Assembly-CSharp
+      - m_Target: {fileID: 1226101744}
+        m_TargetAssemblyTypeName: ClickKangYangdevice, Assembly-CSharp
         m_MethodName: Incandescentlight
         m_Mode: 1
         m_Arguments:
@@ -30579,6 +30579,8 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 1646754557}
+  - component: {fileID: 1646754559}
+  - component: {fileID: 1646754558}
   m_Layer: 0
   m_Name: Mangner
   m_TagString: Untagged
@@ -30601,6 +30603,32 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1646754558
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1646754556}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 713212b703cdf204fbdcc299d07c2122, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &1646754559
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1646754556}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b76e35a25bf30ab41af3844076f25edd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioSource: {fileID: 0}
+  GetSpeechText: 
 --- !u!1 &1665608117
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scripts/语音控制脚本/SpeechToText.cs

@@ -90,6 +90,10 @@ public class SpeechToText : MonoBehaviour
                     }
                     IntelliSense.Instance.AudiosTalk(text);
                 }
+                if (scenename.name == "KYFZ")
+                {
+                    ClickKangYangdevice.Instance.AudiosContorl(text);
+                }
             });
         }
     }