修改模块3导出模式拍照,禁止跳步

Assets/Projects/AnHuiSheYing/ModuleUI/SheXiangJiRawImage.renderTexture

@@ -14,8 +14,8 @@ RenderTexture:
   m_DownscaleFallback: 0
   m_IsAlphaChannelOptional: 0
   serializedVersion: 5
-  m_Width: 256
+  m_Width: 1000
-  m_Height: 256
+  m_Height: 1000
   m_AntiAliasing: 1
   m_MipCount: -1
   m_DepthStencilFormat: 94

Assets/Projects/AnHuiSheYing/ModuleUI/ZhaoXiangJi_RawImage.renderTexture

@@ -14,8 +14,8 @@ RenderTexture:
   m_DownscaleFallback: 0
   m_IsAlphaChannelOptional: 0
   serializedVersion: 5
-  m_Width: 256
+  m_Width: 1000
-  m_Height: 256
+  m_Height: 1000
   m_AntiAliasing: 1
   m_MipCount: -1
   m_DepthStencilFormat: 94

Assets/Projects/AnHuiSheYing/ModuleUI/上下移动RawImage/SheXiangJi2_RawImage.renderTexture

@@ -14,8 +14,8 @@ RenderTexture:
   m_DownscaleFallback: 0
   m_IsAlphaChannelOptional: 0
   serializedVersion: 5
-  m_Width: 256
+  m_Width: 1000
-  m_Height: 256
+  m_Height: 1000
   m_AntiAliasing: 1
   m_MipCount: -1
   m_DepthStencilFormat: 94

Assets/Projects/AnHuiSheYing/ModuleUI/上下移动RawImage/ZhaoXiangJi2_RawImage.renderTexture

@@ -14,8 +14,8 @@ RenderTexture:
   m_DownscaleFallback: 0
   m_IsAlphaChannelOptional: 0
   serializedVersion: 5
-  m_Width: 256
+  m_Width: 1000
-  m_Height: 256
+  m_Height: 1000
   m_AntiAliasing: 1
   m_MipCount: -1
   m_DepthStencilFormat: 94

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

@@ -4158,6 +4158,9 @@ PrefabInstance:
     m_RemovedGameObjects:
     - {fileID: -5242914350902673157, guid: 742e8fc845d051f4a9c39d0b129c4cbf, type: 3}
     m_AddedGameObjects:
+    - targetCorrespondingSourceObject: {fileID: 8361194689003124512, guid: 742e8fc845d051f4a9c39d0b129c4cbf, type: 3}
+      insertIndex: 5
+      addedObject: {fileID: 1753487111}
     - targetCorrespondingSourceObject: {fileID: 1842023655691888546, guid: 742e8fc845d051f4a9c39d0b129c4cbf, type: 3}
       insertIndex: -1
       addedObject: {fileID: 855702972}
@@ -4636,7 +4639,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 919132149155446097, guid: 742e8fc845d051f4a9c39d0b129c4cbf, type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 1590792851390580316, guid: 742e8fc845d051f4a9c39d0b129c4cbf, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -10798,6 +10801,11 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 676667036}
   m_CullTransparentMesh: 1
+--- !u!4 &689678966 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 8361194689003124512, guid: 742e8fc845d051f4a9c39d0b129c4cbf, type: 3}
+  m_PrefabInstance: {fileID: 263410733}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &689943053
 GameObject:
   m_ObjectHideFlags: 0
@@ -15336,8 +15344,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: -384.36902, y: 266.98413}
+  m_AnchoredPosition: {x: -357, y: 231}
-  m_SizeDelta: {x: 768.738, y: 490.5805}
+  m_SizeDelta: {x: 700, y: 450}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &958765593
 MonoBehaviour:
@@ -16653,8 +16661,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: -384.36902, y: 266.98413}
+  m_AnchoredPosition: {x: -357, y: 231}
-  m_SizeDelta: {x: 768.738, y: 490.5805}
+  m_SizeDelta: {x: 700, y: 450}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1044465925
 MonoBehaviour:
@@ -20293,7 +20301,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4526973580622911719, guid: 742e8fc845d051f4a9c39d0b129c4cbf, type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 7121778146626024556, guid: 742e8fc845d051f4a9c39d0b129c4cbf, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -30224,6 +30232,89 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1743675696}
   m_CullTransparentMesh: 1
+--- !u!1 &1753487110
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1753487111}
+  - component: {fileID: 1753487113}
+  - component: {fileID: 1753487112}
+  m_Layer: 0
+  m_Name: SM_Shexiangji5 (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1753487111
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1753487110}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -0.000000039115548, y: 0.00007265597, z: -0.0000000013969839}
+  m_LocalScale: {x: 0.25156373, y: 0.25156373, z: 0.25156373}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 689678966}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!23 &1753487112
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1753487110}
+  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_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: a3c3f55381f077f4fae0d6f68c80b19c, 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_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!33 &1753487113
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1753487110}
+  m_Mesh: {fileID: 7453440671676911713, guid: 2dfa8f7d13438d6409b9d2d8e233d540, type: 3}
 --- !u!1 &1759906462
 GameObject:
   m_ObjectHideFlags: 0

Data/Xml/03_ChangJingXuNiPaiShe.xml

@@ -297,7 +297,7 @@
   </Operation>
 
   <!--摄像机拍摄-->
-  <Operation name="摄像机拍摄" moduleType="Study"  freeStep="true">
+  <Operation name="摄像机拍摄" moduleType="Study"  freeStep="false">
     <Step name="摄像机拍摄">
       <Step name="内容介绍">
 
@@ -909,7 +909,7 @@
   </Operation>
 
   <!--单反拍照-->
-  <Operation name="单反拍照" moduleType="Study"  freeStep="true">
+  <Operation name="单反拍照" moduleType="Study"  freeStep="false">
     <Step name="单反拍照">
       <Step name="内容介绍">
 
@@ -1356,10 +1356,7 @@
             <Action type="Show" value="DanFan_2DCanvas/Connet/KuaiMenGroup/调整前" isShow="true" ></Action>
             <Action type="Show" value="DanFan_2DCanvas/Connet/KuaiMenGroup/调整后" isShow="false" ></Action>
             <Action type="Show" value="DanFan_2DCanvas/Connet/KuaiMenGroup/通用" isShow="true" ></Action>
-
+         
-
-
-
 
             <Action type="Hint" audio="四、changjingxunipaishe/sound_50.mp3" value="请点击液晶监控屏上的快门速度图标，并根据拍摄需要调整快门速度参数大小，调整结束后进行拍照。" time="-1" icon="false"></Action>
             <Action type="Parallel">
@@ -1373,7 +1370,7 @@
             <Condition type="ObjClick" value="Main/SM_danfan/XuanNiu" ></Condition>
             <Action type="HighLightFlash" value="Main/SM_danfan/XuanNiu" isHigh="false" color="200,50,50,255" time="0.25" count="-1"></Action>
 
-
+        
 
             <Action type="Show" value="Main/SM_danfan/SM_yejingjianshiqi/Canvas/KuaiMenGroup" isShow="true" ></Action>
             <Action type="Show" value="Main/SM_danfan/SM_yejingjianshiqi/Canvas/KuaiMenGroup/调整前" isShow="false" ></Action>
@@ -1411,12 +1408,16 @@
 
             <Action type="Show" value="DanFan_2DCanvas/Connet/KuaiMenGroup" isShow="false" ></Action>
             <Action type="Show" value="DanFan_2DCanvas/Connet/拍照焦点_红色" isShow="true" ></Action>
+            <Action type="Show" value="DanFan_2DCanvas/Connet/KuaiMenGroup" isShow="false" ></Action>
+
 
 
             <Action type="Delay" value="2"></Action>
             <Action type="Show" value="Main/SM_danfan/SM_yejingjianshiqi/Canvas/拍照焦点_红色" isShow="false" ></Action>
 
             <Action type="Show" value="DanFan_2DCanvas/Connet/拍照焦点_红色" isShow="false" ></Action>
+            <Action type="Show" value="DanFan_2DCanvas/Connet/KuaiMenGroup" isShow="false" ></Action>
+
 
             <Action type="NextOperation"></Action>
 
@@ -1457,8 +1458,8 @@
 
             <Action type="Parallel">
 
-              <Action type="Move" value="FlyCamera" to="-2.212505,0.9883965,0.8058859" time="0"></Action>
+              <Action type="Move" value="FlyCamera" to="-2.214544,0.9883965,0.666735" time="0"></Action>
-              <Action type="Rotate" value="FlyCamera" to="34.07394,90.83929,-2.06147E-06" time="0"></Action>
+              <Action type="Rotate" value="FlyCamera" to="34.07394,90.83929,-4.12294E-06" time="0"></Action>
 
 
             </Action>
@@ -1669,8 +1670,8 @@
 
 
             <Action type="Parallel">
-              <Action type="Move" value="FlyCamera" to="-2.172104,0.8470231,0.8151675" time="0"></Action>
+              <Action type="Move" value="FlyCamera" to="-2.379941,0.8691487,0.5390332" time="0"></Action>
-              <Action type="Rotate" value="FlyCamera" to="6.703434,93.96447,-2.149126E-07" time="0"></Action>
+              <Action type="Rotate" value="FlyCamera" to="6.524822,85.68886,2.14835E-07" time="0"></Action>
 
 
             </Action>
@@ -1770,7 +1771,7 @@
             <Condition type="UIClick" value="UIRoot/PopUI/UITipWindow/Mask/Connnet/BtnContent/确定"></Condition>
 
 
-            <Action type="TipWindow" exportVideoPath="Recordings/Movie_002.mp4" value="导出成功，请返回指定文件夹查看。"  btns="确认"> </Action>
+            <Action type="TipWindow" exportVideoPath="Recordings/Image_01.jpg" value="导出成功，请返回指定文件夹查看。"  btns="确认"> </Action>
             <Condition type="UIClick" value="UIRoot/PopUI/UITipWindow/Mask/Connnet/BtnContent/确认"></Condition>
 
 
@@ -1793,7 +1794,7 @@
 
 
   <!--单反摄影-->
-  <Operation name="单反摄影" moduleType="Study"  freeStep="true">
+  <Operation name="单反摄影" moduleType="Study"  freeStep="false">
 
     <Step name="单反摄影">
       <Step name="内容介绍">
@@ -2422,7 +2423,7 @@
             <Action type="TipWindow" value="恭喜你完成单反摄影，点击确定，保存摄像机拍摄文件"  btns="确定"> </Action>
             <Condition type="UIClick" value="UIRoot/PopUI/UITipWindow/Mask/Connnet/BtnContent/确定"></Condition>
 
-            <Action type="TipWindow" exportVideoPath="Recordings/Movie_003.mp4" value="导出成功，请返回指定文件夹查看。"  btns="确认"> </Action>
+            <Action type="TipWindow" exportVideoPath="Recordings/Movie_002.mp4" value="导出成功，请返回指定文件夹查看。"  btns="确认"> </Action>
             <Condition type="UIClick" value="UIRoot/PopUI/UITipWindow/Mask/Connnet/BtnContent/确认"></Condition>