提交内容

Assets/Projects/AnHuiSheYing/Scenes/02_SheYingQiCaiRenZhi.unity

@@ -480,7 +480,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 919132149155446097, guid: 26af510268283e447ba7788541dedea0, type: 3}
       propertyPath: m_IsActive
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8407066274209502872, guid: 26af510268283e447ba7788541dedea0, type: 3}
       propertyPath: m_IsActive
@@ -1720,7 +1720,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &712540518
 Transform:
   m_ObjectHideFlags: 0
@@ -4235,7 +4235,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!23 &86274631345877747
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -5752,6 +5752,7 @@ GameObject:
   - component: {fileID: 6345598472824332824}
   - component: {fileID: 6217322035290074642}
   - component: {fileID: 927721153593721858}
+  - component: {fileID: 6345598472824332825}
   m_Layer: 0
   m_Name: SM_lvmu4
   m_TagString: Untagged
@@ -5833,6 +5834,7 @@ GameObject:
   - component: {fileID: 1259800110227493503}
   - component: {fileID: 3775656745078046861}
   - component: {fileID: 6156378121610165353}
+  - component: {fileID: 6156378121610165354}
   m_Layer: 0
   m_Name: SM_lvmu3
   m_TagString: Untagged
@@ -6370,6 +6372,7 @@ GameObject:
   - component: {fileID: 4125290913093148334}
   - component: {fileID: 8084713260065477538}
   - component: {fileID: 4579644807609639711}
+  - component: {fileID: 8084713260065477539}
   m_Layer: 0
   m_Name: polySurface28
   m_TagString: Untagged
@@ -6511,7 +6514,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!23 &4889312403777216326
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -6889,7 +6892,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!65 &5501496658020409182
 BoxCollider:
   m_ObjectHideFlags: 0
@@ -7351,6 +7354,28 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
+--- !u!64 &6156378121610165354
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3094689195846715082}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 5
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 5418742766699618607, guid: 51d2e42879839f34f990cdd91a7dc18d, type: 3}
 --- !u!33 &6199635692913182741
 MeshFilter:
   m_ObjectHideFlags: 0
@@ -7400,6 +7425,28 @@ Transform:
   m_Children: []
   m_Father: {fileID: 1262891238276448086}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!64 &6345598472824332825
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2927908916710139333}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 5
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 3737427628129265718, guid: 51d2e42879839f34f990cdd91a7dc18d, type: 3}
 --- !u!23 &6355951298173720601
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -7743,6 +7790,7 @@ GameObject:
   - component: {fileID: 4509061285324479840}
   - component: {fileID: 5491685822761387312}
   - component: {fileID: 8672206687743106596}
+  - component: {fileID: 8672206687743106597}
   m_Layer: 0
   m_Name: SM_lvmu1
   m_TagString: Untagged
@@ -8379,6 +8427,28 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4603655286398670636}
   m_Mesh: {fileID: 5537914760762738905, guid: 742e8fc845d051f4a9c39d0b129c4cbf, type: 3}
+--- !u!64 &8084713260065477539
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4603655286398670636}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 5
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 5537914760762738905, guid: 742e8fc845d051f4a9c39d0b129c4cbf, type: 3}
 --- !u!33 &8125306772036159317
 MeshFilter:
   m_ObjectHideFlags: 0
@@ -8688,6 +8758,28 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
+--- !u!64 &8672206687743106597
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6949823568513337658}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 5
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 2016934698412923179, guid: 51d2e42879839f34f990cdd91a7dc18d, type: 3}
 --- !u!23 &8679141206615306543
 MeshRenderer:
   m_ObjectHideFlags: 0

Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe.unity

@@ -3285,6 +3285,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: -19.808107
       objectReference: {fileID: 0}
+    - target: {fileID: 1759168918301709824, guid: 742e8fc845d051f4a9c39d0b129c4cbf, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 7121778146626024556, guid: 742e8fc845d051f4a9c39d0b129c4cbf, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       value: 0.25229102
@@ -3329,6 +3333,9 @@ PrefabInstance:
     - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 742e8fc845d051f4a9c39d0b129c4cbf, type: 3}
       insertIndex: -1
       addedObject: {fileID: 1300625927}
+    - targetCorrespondingSourceObject: {fileID: -3166246327466752185, guid: 742e8fc845d051f4a9c39d0b129c4cbf, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 1313724740}
     - targetCorrespondingSourceObject: {fileID: -5526445345328031170, guid: 742e8fc845d051f4a9c39d0b129c4cbf, type: 3}
       insertIndex: -1
       addedObject: {fileID: 1088457622}
@@ -3401,6 +3408,33 @@ BoxCollider:
   serializedVersion: 3
   m_Size: {x: 0.41134277, y: 0.39983654, z: 1}
   m_Center: {x: 0, y: 1.647721, z: 0}
+--- !u!1 &1313724739 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: -3166246327466752185, guid: 742e8fc845d051f4a9c39d0b129c4cbf, type: 3}
+  m_PrefabInstance: {fileID: 1300625922}
+  m_PrefabAsset: {fileID: 0}
+--- !u!64 &1313724740
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1313724739}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 5
+  m_Convex: 1
+  m_CookingOptions: 30
+  m_Mesh: {fileID: -2183719134944184998, guid: 742e8fc845d051f4a9c39d0b129c4cbf, type: 3}
 --- !u!1 &1322177592
 GameObject:
   m_ObjectHideFlags: 0

Assets/QFramework/Toolkits/ResKit/Scripts/Implements/NetImageRes.cs

@@ -208,6 +208,7 @@ namespace QFramework
 
             if (www.error != null)
             {
+        
                 Debug.LogError($"Res:{mUrl}, WWW Errors:{www.error}");
                 OnResLoadFaild();
                 finishCallback();

Data/Xml/01_ShiYanLiLunRenZhi.xml

@@ -249,12 +249,12 @@
 
    
 
-    <Component type="Button" size="932,526" pos="20,-9653">
+    <!--<Component type="Button" size="932,526" pos="20,-9653">-->
       <!--<Action type="Sequence">
         <Action type="Log" value="第一步_第一个子步骤"></Action>
         <Action type="Video" value="test.mp4" size="500,500" offset="10,10" finishedEvent="finished" closeEvent="close"></Action>
       </Action>-->
-    </Component>
+    <!--</Component>-->
 
 
 

Data/Xml/02_SheYingQiCaiRenZhi.xml

@@ -16,7 +16,7 @@
           <Action type="Show" value="FlyCamera"  isShow="false" ></Action>
           <Action type="Move" value="FlyCamera" to="0.0845993,1.371632,2.146553" time="0"></Action>
           <Action type="Rotate" value="FlyCamera" to="21.66745,356.097,-5.741785E-08" time="0"></Action>
-          <Action type="UIBackPack" devices="三脚架,单反,摄影机,绿幕,补光灯"
+          <Action type="UIBackPack" devices="三脚架,单反,摄像机,绿幕,补光灯"
               random="false"
               scrollSpeed="25" position="left"
               ></Action>
@@ -81,17 +81,17 @@
         </Action>
       </Enter>
     </State>
-    <State name="摄影机">
+    <State name="摄像机">
       <Enter>
         <Action type="Sequence">
-          <Action type="Log" value="摄影机"></Action>
+          <Action type="Log" value="摄像机"></Action>
 
           <Action type="Show" value="Main/SM_Sanjiaojia"  isShow="false" ></Action>
           <Action type="Show" value="Main/SM_danfan"    isShow="false" ></Action>
           <Action type="Show" value="Main/SM_Shexiangji"  isShow="true" ></Action>
           <Action type="Show" value="Main/SM_lvmu"  isShow="false" ></Action>
           <Action type="Show"  value="Main/SM_buguangdeng"   isShow="false" ></Action>
-          <Action type="TextWindow"    title="摄影机" value="摄像机是一种用于捕捉动态图像和声音的设备，用于拍摄电影、电视剧、广告、纪录片等影视作品，是创作视觉内容的重要工具。具有高分辨率、高帧率、宽动态范围、丰富的手动控制功能等特点，能够满足专业摄影师和导演对画面质量和创作灵活性的要求。"   position="right" scrollSpeed="25"/>
+          <Action type="TextWindow"    title="摄像机" value="摄像机是一种用于捕捉动态图像和声音的设备，用于拍摄电影、电视剧、广告、纪录片等影视作品，是创作视觉内容的重要工具。具有高分辨率、高帧率、宽动态范围、丰富的手动控制功能等特点，能够满足专业摄影师和导演对画面质量和创作灵活性的要求。"   position="right" scrollSpeed="25"/>
 
         </Action>
 
@@ -140,8 +140,8 @@
     <Transision from="any" to="单反">
       <Condition type="UIClick" value="UIRoot/PopUI/UIBackPack/bg/Scroll/Viewport/Content/单反"></Condition>
     </Transision>
-    <Transision from="any" to="摄影机">
+    <Transision from="any" to="摄像机">
-      <Condition type="UIClick" value="UIRoot/PopUI/UIBackPack/bg/Scroll/Viewport/Content/摄影机"></Condition>
+      <Condition type="UIClick" value="UIRoot/PopUI/UIBackPack/bg/Scroll/Viewport/Content/摄像机"></Condition>
     </Transision>
     <Transision from="any" to="绿幕">
       <Condition type="UIClick" value="UIRoot/PopUI/UIBackPack/bg/Scroll/Viewport/Content/绿幕"></Condition>
@@ -174,24 +174,20 @@
   <Device>
     <Name>单反</Name>
     <HighLight color="255,0,0,255"/>
-    <Path>Main/SM_danfan</Path>
+    <!--<Path>Main/SM_danfan</Path>-->
     <Tip>单反</Tip>
     <Icon>gongju/gudao.png</Icon>
   </Device>
   <Device>
-    <Name>摄影机</Name>
+    <Name>摄像机</Name>
     <HighLight color="255,0,0,255"/>
-    <Path>Main/SM_Shexiangji</Path>
+    <!--<Path>Main/SM_Shexiangji</Path>-->
-    <Tip>摄影机</Tip>
+    <Tip>摄像机</Tip>
-    <Icon>gongju/gudao.png</Icon>
-  </Device>
-  <Device>
-    <Name>绿幕</Name>
-    <HighLight color="255,0,0,255"/>
-    <Path>Main/SM_lvmu</Path>
-    <Tip>绿幕</Tip>
     <Icon>gongju/gudao.png</Icon>
   </Device>
+
+
+
   <Device>
     <Name>补光灯</Name>
     <HighLight color="255,0,0,255"/>
@@ -222,12 +218,12 @@
 
 
 
-  <Device>
+  <!--<Device>
     <Name>单反-焦距调整旋钮</Name>
     <HighLight color="255,0,0,255"/>
     <Path>Main/SM_danfan/SM_pizhi_02</Path>
     <Tip>焦距调整旋钮：通常位于单反相机镜头的外部，表面有防滑的纹理或凸起，以便用户能够更方便、更精准地转动它。</Tip>
-  </Device>
+  </Device>-->
 
   <Device>
     <Name>单反-调焦旋钮</Name>
@@ -269,7 +265,43 @@
     <Tip>START/STOP键：摄像机摄影录制启动/停止功能按键。</Tip>
   </Device>
 
+  <Device>
+    <Name>摄像机-开机键</Name>
+    <HighLight color="255,0,0,255"/>
+    <Path>Main/SM_Shexiangji/SM_Shexiangji7/polySurface28</Path>
+    <Tip>摄像机-开机键：摄像机开机按钮。</Tip>
+  </Device>
 
+  <Device>
+    <Name>绿幕</Name>
+    <HighLight color="255,0,0,255"/>
+    <Path>Main/SM_lvmu/SM_lvmu1</Path>
+    <Tip>绿幕</Tip>
+    <Icon>gongju/lvmu.png</Icon>
+  </Device>
+
+
+  <!--<Device>
+    <Name>绿幕</Name>
+    <HighLight color="255,0,0,255"/>
+    <Path>Main/SM_lvmu/SM_lvmu1</Path>
+    <Tip>绿幕</Tip>
+  </Device>
+
+  <Device>
+    <Name>左支架</Name>
+    <HighLight color="255,0,0,255"/>
+    <Path>Main/SM_lvmu/SM_lvmu4</Path>
+    <Tip>支架</Tip>
+  </Device>
+
+
+  <Device>
+    <Name>右支架</Name>
+    <HighLight color="255,0,0,255"/>
+    <Path>Main/SM_lvmu/SM_lvmu3</Path>
+    <Tip>支架</Tip>
+  </Device>-->
 
 
 

Data/Xml/03_ChangJingXuNiPaiShe.xml

@@ -16,6 +16,11 @@
           <Action type="Move" value="FlyCamera" to="1.921192,1.341881,-1.91985" time="0"></Action>
           <Action type="Rotate" value="FlyCamera" to="1.338014,327.1598,2.66877E-08" time="0"></Action>
 
+          <Action type="Show" value="Main/SheXiangJi/SM_Shexiangji/SM_Shexiangji6/SM_Shexiangji_jingpian/Canvas" isShow="false" ></Action>
+          <Action type="Show" value="Main/SheXiangJi/SM_Shexiangji/SM_Shexiangji6/SM_Shexiangji_jingpian/Canvas/RawImage" isShow="false" ></Action>
+          <Action type="Show" value="Main/SheXiangJi/SM_Shexiangji/SM_Shexiangji6/SM_Shexiangji_jingpian/Canvas/Image1" isShow="false" ></Action>
+          <Action type="Show" value="Main/SheXiangJi/SM_Shexiangji/SM_Shexiangji6/SM_Shexiangji_jingpian/Canvas/Image2" isShow="false" ></Action>
+
 
 
         </Action>
@@ -26,7 +31,7 @@
 			</Transision>
 	</FSM>
   <Descript>
-    安徽非遗资源丰富，涵盖民间文学、传统音乐、传统舞蹈、传统戏剧、曲艺、传统体育游艺与杂技、传统美术、传统技艺、民俗等多个类别。虚拟仿真系统高度还原了安徽特色非物质文化遗产美术场馆，通过三维建模的形式，对单反、摄像机、三角架、绿幕摄影器材进行讲解。学生在了解摄影器材基础后，再学习镜头语言（景别、镜号、摄影技巧）相关理论知识。最后学生可在非遗美术场馆自主漫游，调用摄影器材进行拍摄，可灵活调整摄影器材拍摄位置、拍摄角度、曝光、ISO等相关参照，相机会实时显示当前拍摄影像，拍摄结束后，仿真系统会导出当前拍摄视频可供下载观看。通过本仿真实验，减少了对真实场景搭建、道具制作和运输等方面的投入，并能够取得良好的摄影拍摄教学培训效果。
+    安徽非遗资源丰富，涵盖民间文学、传统音乐、传统舞蹈、传统戏剧、曲艺、传统体育游艺与杂技、传统美术、传统技艺、民俗等多个类别。虚拟仿真系统高度还原了安徽特色非物质文化遗产美术场馆，通过三维建模的形式，对单反、摄像机、三脚架、绿幕摄影器材进行讲解。学生在了解摄影器材基础后，再学习镜头语言（景别、镜号、摄影技巧）相关理论知识。最后学生可在非遗美术场馆自主漫游，调用摄影器材进行拍摄，可灵活调整摄影器材拍摄位置、拍摄角度、曝光、ISO等相关参照，相机会实时显示当前拍摄影像，拍摄结束后，仿真系统会导出当前拍摄视频可供下载观看。通过本仿真实验，减少了对真实场景搭建、道具制作和运输等方面的投入，并能够取得良好的摄影拍摄教学培训效果。
   </Descript>
 
   <Score>
@@ -48,10 +53,10 @@
   </Device>
 
   <Device>
-    <Name>摄影机</Name>
+    <Name>摄像机</Name>
     <HighLight color="255,0,0,255"/>
     <Path>Main/SheXiangJi</Path>
-    <!--<Tip>摄影机</Tip>-->
+    <!--<Tip>摄像机</Tip>-->
     <Icon>gongju/sheyingji.png</Icon>
   </Device>
 
@@ -83,7 +88,7 @@
 
 
   <Operation moduleType="Study"  freeStep="true">
-    <Step name="摄影机拍摄">
+    <Step name="摄像机拍摄">
     <Step name="内容介绍">
 
       <Start>
@@ -95,7 +100,7 @@
 
 
           <!--audio="Zhu/Z001.mp3"-->
-          <Action type="TextTip" title="实训说明" value="安徽非遗资源丰富，涵盖民间文学、传统音乐、传统舞蹈、传统戏剧、曲艺、传统体育游艺与杂技、传统美术、传统技艺、民俗等多个类别。虚拟仿真系统高度还原了安徽特色非物质文化遗产美术场馆，通过三维建模的形式，对单反、摄像机、三角架、绿幕摄影器材进行讲解。学生在了解摄影器材基础后，再学习镜头语言（景别、镜号、摄影技巧）相关理论知识。最后学生可在非遗美术场馆自主漫游，调用摄影器材进行拍摄，可灵活调整摄影器材拍摄位置、拍摄角度、曝光、ISO等相关参照，相机会实时显示当前拍摄影像，拍摄结束后，仿真系统会导出当前拍摄视频可供下载观看。通过本仿真实验，减少了对真实场景搭建、道具制作和运输等方面的投入，并能够取得良好的摄影拍摄教学培训效果。"  btns="确定"/>
+          <Action type="TextTip" title="实训说明" value="安徽非遗资源丰富，涵盖民间文学、传统音乐、传统舞蹈、传统戏剧、曲艺、传统体育游艺与杂技、传统美术、传统技艺、民俗等多个类别。虚拟仿真系统高度还原了安徽特色非物质文化遗产美术场馆，通过三维建模的形式，对单反、摄像机、三脚架、绿幕摄影器材进行讲解。学生在了解摄影器材基础后，再学习镜头语言（景别、镜号、摄影技巧）相关理论知识。最后学生可在非遗美术场馆自主漫游，调用摄影器材进行拍摄，可灵活调整摄影器材拍摄位置、拍摄角度、曝光、ISO等相关参照，相机会实时显示当前拍摄影像，拍摄结束后，仿真系统会导出当前拍摄视频可供下载观看。通过本仿真实验，减少了对真实场景搭建、道具制作和运输等方面的投入，并能够取得良好的摄影拍摄教学培训效果。"  btns="确定"/>
           <Condition type="UIClick" value="UIRoot/PopUI/UITextTip/Mask/Content/BtnContent/确定"></Condition>
 
           <Action type="NextOperation"></Action>
@@ -105,12 +110,12 @@
 
 
 
-    <Step name="1.安装三角架">
+    <Step name="1.安装三脚架">
 
       <Start>
         <Action type="Sequence">
           <!--audio="Zhu/Z007.mp3"-->
-          <Action type="Hint" value="请到达拍摄场地，若需稳定拍摄，请先安装三角架到指定位置" time="-1" icon="false"></Action>
+          <Action type="Hint" value="请到达拍摄场地，若需稳定拍摄，请先安装三脚架到指定位置" time="-1" icon="false"></Action>
 
 
           <Action type="Move" value="FlyCamera" to="2.685,1.094,-1.496" time="0"></Action>
@@ -118,7 +123,7 @@
 
 
 
-          <Action type="UITools" devices="照相机,三脚架,摄影机,绿幕,补光灯" answers="三脚架"
+          <Action type="UITools" devices="照相机,三脚架,摄像机,绿幕,补光灯" answers="三脚架"
               setActive="true"
               rightLabel="提示：物品选择正确。"
               wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
@@ -152,12 +157,16 @@
       </Start>
     </Step>
 
-      <Step name="2.调整三角架高度">
+      <Step name="2.调整三脚架高度">
 
         <Start>
           <Action type="Sequence">
             <!--audio="Zhu/Z007.mp3"-->
-            <Action type="Hint" value="请调整三角架高度，使之符合拍摄高度要求" time="-1" icon="false"></Action>
+            <Action type="Hint" value="请调整三脚架高度，使之符合拍摄高度要求" time="-1" icon="false"></Action>
+
+            <Action type="Move" value="FlyCamera" to="2.370009,0.4084793,-1.46314" time="0"></Action>
+            <Action type="Rotate" value="FlyCamera" to="35.28457,264.0591,2.091831E-06" time="0"></Action>
+
 
             <Action type="HighLightFlash" value="Main/SanJiaoJia/SM_Sanjiaojia/SM_Sanjiaojia22/polySurface8" isHigh="true" color="200,50,50,255" time="0.25" count="-1"></Action>
             <Action type="HighLightFlash" value="Main/SanJiaoJia/SM_Sanjiaojia/SM_Sanjiaojia12/polySurface8" isHigh="true" color="200,50,50,255" time="0.25" count="-1"></Action>
@@ -178,8 +187,13 @@
             <Action type="HighLightFlash" value="Main/SanJiaoJia/SM_Sanjiaojia/SM_Sanjiaojia23/polySurface8" isHigh="false" color="200,50,50,255" time="0.25" count="-1"></Action>
 
 
-            <Action type="TimeLine" value="TimeLines/SanJiaoJiaShenZhan" isShow="true" finishedEvent="播放完毕" isWait="true" frame="0" endFrame="70"></Action>
 
+            <Action type="Move" value="FlyCamera" to="2.685,1.094,-1.496" time="0"></Action>
+            <Action type="Rotate" value="FlyCamera" to="27.40498,270,9.616999E-07" time="0"></Action>
+
+
+
+            <Action type="TimeLine" value="TimeLines/SanJiaoJiaShenZhan" isShow="true" finishedEvent="播放完毕" isWait="true" frame="0" endFrame="70"></Action>
 
 
 
@@ -191,19 +205,19 @@
         </Start>
       </Step>
 
-      <Step name="3.安装摄影机">
+      <Step name="3.安装摄像机">
 
         <Start>
           <Action type="Sequence">
             <!--audio="Zhu/Z007.mp3"-->
-            <Action type="Hint" value="请调整三角架高度，使之符合拍摄高度要求" time="-1" icon="false"></Action>
+            <Action type="Hint" value="请调整三脚架高度，使之符合拍摄高度要求" time="-1" icon="false"></Action>
 
 
             <Action type="Move" value="FlyCamera" to="2.685,1.094,-1.496" time="0"></Action>
             <Action type="Rotate" value="FlyCamera" to="27.40498,270,9.616999E-07" time="0"></Action>
 
 
-            <Action type="UITools" devices="照相机,三脚架,摄影机,绿幕,补光灯" answers="摄影机"
+            <Action type="UITools" devices="照相机,三脚架,摄像机,绿幕,补光灯" answers="摄像机"
                 setActive="true"
                 rightLabel="提示：物品选择正确。"
                 wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
@@ -219,9 +233,18 @@
 
             <Action type="Show" value="Main/SheXiangJi" isShow="true" ></Action>
 
-            <Action type="HighLightFlash" value="Main/SanJiaoJia/SM_Sanjiaojia/SM_Sanjiaojia22/polySurface8" isHigh="true" color="200,50,50,255" time="0.25" count="-1"></Action>
+            <!--摄像机移动-->
-            <Condition type="ObjClick" value="Main/SanJiaoJia/SM_Sanjiaojia/SM_Sanjiaojia22/polySurface8" ></Condition>
+            <Action type="Parallel">
-            <Action type="HighLightFlash" value="Main/SanJiaoJia/SM_Sanjiaojia/SM_Sanjiaojia12/polySurface8" isHigh="false" color="200,50,50,255" time="0.25" count="-1"></Action>
+
+            <Action type="Move" value="Main/SheXiangJi" to="1.385,-0.096,-1.33" time="1"></Action>
+            <Action type="Rotate" value="Main/SheXiangJi" to="0,90,0" time="1"></Action>
+            </Action>
+            <Action type="Parallel">
+            <Action type="Move" value="FlyCamera" to="1.870171,1.035589,-0.9453864" time="1"></Action>
+            <Action type="Rotate" value="FlyCamera" to="22.00154,172.0238,-0.0003757005" time="1"></Action>
+            </Action>
+            <Action type="Delay" value="0.5"></Action>
+
 
             <Action type="TimeLine" value="TimeLines/AnZhuangSheXiangJi" isShow="true" finishedEvent="播放完毕" isWait="true" frame="0" endFrame="20"></Action>
 
@@ -243,16 +266,26 @@
             <!--audio="Zhu/Z007.mp3"-->
             <Action type="Hint" value="请打开电源开机键，观察取景器拍摄画面" time="-1" icon="false"></Action>
 
-            <Action type="Move" value="FlyCamera" to="1.914637,0.8545135,-1.348654" time="0"></Action>
+            <Action type="Parallel">
-            <Action type="Rotate" value="FlyCamera" to="22.00154,172.0238,-0.0003757005" time="0"></Action>
+            <Action type="Move" value="FlyCamera" to="1.870171,1.035589,-0.9453864" time="1"></Action>
+            <Action type="Rotate" value="FlyCamera" to="22.00154,172.0238,-0.0003757005" time="1"></Action>
+
+            </Action>
+
+
+            <Action type="Collider" value="Main/SheXiangJi" colliderType="Active" args="false"></Action>
 
 
             <Action type="HighLightFlash" value="Main/SheXiangJi/SM_Shexiangji/SM_Shexiangji7/polySurface28" isHigh="true" color="200,50,50,255" time="0.25" count="-1"></Action>
             <Condition type="ObjClick" value="Main/SheXiangJi/SM_Shexiangji/SM_Shexiangji7/polySurface28" ></Condition>
             <Action type="HighLightFlash" value="Main/SheXiangJi/SM_Shexiangji/SM_Shexiangji7/polySurface28" isHigh="false" color="200,50,50,255" time="0.25" count="-1"></Action>
 
-            <Action type="Move" value="FlyCamera" to="1.921192,1.341881,-1.91985" time="0"></Action>
+            <Action type="Parallel">
-            <Action type="Rotate" value="FlyCamera" to="1.338014,327.1598,2.66877E-08" time="0"></Action>
+            <Action type="Move" value="FlyCamera" to="2.06191,1.068654,-1.559713" time="1"></Action>
+            <Action type="Rotate" value="FlyCamera" to="48.01657,283.4631,5.105418E-06" time="1"></Action>
+            </Action>
+            <Action type="Delay" value="0.5"></Action>
+
 
             <Action type="Show" value="Main/SheXiangJi/SM_Shexiangji/SM_Shexiangji6/SM_Shexiangji_jingpian/Canvas" isShow="true" ></Action>
             <Action type="Show" value="Main/SheXiangJi/SM_Shexiangji/SM_Shexiangji6/SM_Shexiangji_jingpian/Canvas/RawImage" isShow="true" ></Action>
@@ -260,7 +293,7 @@
             <Action type="Show" value="Main/SheXiangJi/SM_Shexiangji/SM_Shexiangji6/SM_Shexiangji_jingpian/Canvas/Image2" isShow="false" ></Action>
 
 
-            
+            <Action type="Delay" value="1"></Action>
 
             <Action type="NextOperation"></Action>
 
@@ -307,9 +340,9 @@
             <Action type="Hint" value="请调整焦距调整旋钮，通过推镜头、拉镜头的方式拍摄影视频" time="-1" icon="false"></Action>
 
             <!--焦距调整旋钮，顺时针-->
-            <Action type="HighLightFlash" value="Main/SheXiangJi/SM_Shexiangji/SM_Shexiangji7/polySurface27" isHigh="true" color="200,50,50,255" time="0.25" count="-1"></Action>
+            <Action type="HighLightFlash" value="Main/SheXiangJi/SM_Shexiangji/polySurface46" isHigh="true" color="200,50,50,255" time="0.25" count="-1"></Action>
-            <Condition type="ObjClick" value="Main/SheXiangJi/SM_Shexiangji/SM_Shexiangji7/polySurface27" ></Condition>
+            <Condition type="ObjClick" value="Main/SheXiangJi/SM_Shexiangji/polySurface46" ></Condition>
-            <Action type="HighLightFlash" value="Main/SheXiangJi/SM_Shexiangji/SM_Shexiangji7/polySurface27" isHigh="false" color="200,50,50,255" time="0.25" count="-1"></Action>
+            <Action type="HighLightFlash" value="Main/SheXiangJi/SM_Shexiangji/polySurface46" isHigh="false" color="200,50,50,255" time="0.25" count="-1"></Action>
 
             
             <Action type="Rotate" value="Main/SheXiangJi/SM_Shexiangji/polySurface46" to="0,0,0" time="3"></Action>
@@ -322,9 +355,9 @@
             </Action>
 
             <!--焦距调整旋钮，逆时针-->
-            <Action type="HighLightFlash" value="Main/SheXiangJi/SM_Shexiangji/SM_Shexiangji7/polySurface27" isHigh="true" color="200,50,50,255" time="0.25" count="-1"></Action>
+            <Action type="HighLightFlash" value="Main/SheXiangJi/SM_Shexiangji/polySurface46" isHigh="true" color="200,50,50,255" time="0.25" count="-1"></Action>
-            <Condition type="ObjClick" value="Main/SheXiangJi/SM_Shexiangji/SM_Shexiangji7/polySurface27" ></Condition>
+            <Condition type="ObjClick" value="Main/SheXiangJi/SM_Shexiangji/polySurface46" ></Condition>
-            <Action type="HighLightFlash" value="Main/SheXiangJi/SM_Shexiangji/SM_Shexiangji7/polySurface27" isHigh="false" color="200,50,50,255" time="0.25" count="-1"></Action>
+            <Action type="HighLightFlash" value="Main/SheXiangJi/SM_Shexiangji/polySurface46" isHigh="false" color="200,50,50,255" time="0.25" count="-1"></Action>
 
             <Action type="Rotate" value="Main/SheXiangJi/SM_Shexiangji/polySurface46" to="0,0,480" time="0"></Action>
        
@@ -361,6 +394,8 @@
 
             <Action type="Rotate" value="Main/SheXiangJi/SM_Shexiangji/polySurface46" to="0,0,0" time="0"></Action>
          
+            <!--虚化特效-->
+            
             <Action type="NextOperation"></Action>
 
 
@@ -408,8 +443,9 @@
         <Start>
           <Action type="Sequence">
             <!--audio="Zhu/Z007.mp3"-->
-            <Action type="Hint" value="请将摄像机从三角架取下，移动摄像机，达到移镜头的拍摄效果" time="-1" icon="false"></Action>
+            <Action type="Hint" value="请将摄像机从三脚架取下，移动摄像机，达到移镜头的拍摄效果" time="-1" icon="false"></Action>
 
+            <Action type="Collider" value="Main/SheXiangJi" colliderType="Active" args="true"></Action>
 
             <Action type="HighLightFlash" value="Main/SheXiangJi" isHigh="true" color="200,50,50,255" time="0.25" count="-1"></Action>
             <Condition type="ObjClick" value="Main/SheXiangJi" ></Condition>
@@ -458,7 +494,7 @@
 
 
 
-            <Action type="TipWindow" value="恭喜你完成摄影机拍摄，点击确定，保存摄像机拍摄文件"  btns="确定"> </Action>
+            <Action type="TipWindow" value="恭喜你完成摄像机拍摄，点击确定，保存摄像机拍摄文件"  btns="确定"> </Action>
             <Condition type="UIClick" value="UIRoot/PopUI/UITipWindow/Mask/Connnet/BtnContent/确定"></Condition>