提交内容

Assets/Projects/AnHui/HuangJinShouShiJiaGong/TimeLine/JiaoChuiQiaoJi.playable

@@ -25,8 +25,8 @@ MonoBehaviour:
     m_Objects: []
   m_InfiniteClipPreExtrapolation: 1
   m_InfiniteClipPostExtrapolation: 1
-  m_InfiniteClipOffsetPosition: {x: -0.25092193, y: -0.061976317, z: 0.41445738}
+  m_InfiniteClipOffsetPosition: {x: -0.25096706, y: -0.24980843, z: 0.4148021}
-  m_InfiniteClipOffsetEulerAngles: {x: 89.98022, y: 0, z: 0}
+  m_InfiniteClipOffsetEulerAngles: {x: 0, y: 0, z: -0.000010017912}
   m_InfiniteClipTimeOffset: 0
   m_InfiniteClipRemoveOffset: 0
   m_InfiniteClipApplyFootIK: 1
@@ -603,7 +603,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: {x: -0.000036152887, y: 0.00027614334, z: 0.1505}
+        value: {x: 0, y: 0, z: 0}
         inSlope: {x: 0, y: 0, z: 0}
         outSlope: {x: 0, y: 0, z: 0}
         tangentMode: 0
@@ -611,8 +611,8 @@ AnimationClip:
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
-        time: 0.8333333
+        time: 0.25
-        value: {x: -0.000036152887, y: 0.00027614334, z: 0.06415456}
+        value: {x: 0, y: 0.10776383, z: 0.000000029802322}
         inSlope: {x: 0, y: 0, z: 0}
         outSlope: {x: 0, y: 0, z: 0}
         tangentMode: 0
@@ -620,8 +620,8 @@ AnimationClip:
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
-        time: 2.5
+        time: 1.75
-        value: {x: -0.000036152887, y: 0.00027614334, z: 0.06415456}
+        value: {x: 0, y: 0.10776383, z: 0.000000029802322}
         inSlope: {x: 0, y: 0, z: 0}
         outSlope: {x: 0, y: 0, z: 0}
         tangentMode: 0
@@ -629,8 +629,8 @@ AnimationClip:
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
-        time: 3.3333333
+        time: 1.9
-        value: {x: -0, y: 0.00027614334, z: -0.1371}
+        value: {x: -0.00003299117, y: 0.33920842, z: -0.000002115965}
         inSlope: {x: 0, y: 0, z: 0}
         outSlope: {x: 0, y: 0, z: 0}
         tangentMode: 0
@@ -640,7 +640,7 @@ AnimationClip:
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
-    path: JinLiao
+    path: 
   m_ScaleCurves: []
   m_FloatCurves: []
   m_PPtrCurves: []
@@ -652,7 +652,7 @@ AnimationClip:
   m_ClipBindingConstant:
     genericBindings:
     - serializedVersion: 2
-      path: 1136743410
+      path: 0
       attribute: 1
       script: {fileID: 0}
       typeID: 4
@@ -666,7 +666,7 @@ AnimationClip:
     m_AdditiveReferencePoseClip: {fileID: 0}
     m_AdditiveReferencePoseTime: 0
     m_StartTime: 0
-    m_StopTime: 3.3333333
+    m_StopTime: 1.9
     m_OrientationOffsetY: 0
     m_Level: 0
     m_CycleOffset: 0
@@ -688,7 +688,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: -0.000036152887
+        value: 0
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -696,8 +696,8 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.8333333
+        time: 0.25
-        value: -0.000036152887
+        value: 0
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -705,8 +705,8 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 2.5
+        time: 1.75
-        value: -0.000036152887
+        value: 0
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -714,8 +714,8 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 3.3333333
+        time: 1.9
-        value: -0
+        value: -0.00003299117
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -726,7 +726,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalPosition.x
-    path: JinLiao
+    path: 
     classID: 4
     script: {fileID: 0}
     flags: 0
@@ -736,7 +736,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 0.00027614334
+        value: 0
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -744,8 +744,8 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.8333333
+        time: 0.25
-        value: 0.00027614334
+        value: 0.10776383
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -753,8 +753,8 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 2.5
+        time: 1.75
-        value: 0.00027614334
+        value: 0.10776383
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -762,8 +762,8 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 3.3333333
+        time: 1.9
-        value: 0.00027614334
+        value: 0.33920842
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -774,7 +774,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalPosition.y
-    path: JinLiao
+    path: 
     classID: 4
     script: {fileID: 0}
     flags: 0
@@ -784,7 +784,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 0.1505
+        value: 0
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -792,8 +792,8 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.8333333
+        time: 0.25
-        value: 0.06415456
+        value: 0.000000029802322
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -801,8 +801,8 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 2.5
+        time: 1.75
-        value: 0.06415456
+        value: 0.000000029802322
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -810,8 +810,8 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 3.3333333
+        time: 1.9
-        value: -0.1371
+        value: -0.000002115965
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -822,11 +822,11 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalPosition.z
-    path: JinLiao
+    path: 
     classID: 4
     script: {fileID: 0}
     flags: 0
   m_EulerEditorCurves: []
-  m_HasGenericRootTransform: 0
+  m_HasGenericRootTransform: 1
   m_HasMotionFloatCurves: 0
   m_Events: []

Assets/Projects/AnHui/HuangJinShouShiJiaGong/TimeLine/ZhuBaoQian_AnYaQueKou.playable.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: dd9b45d72f9d5e1479dc9596ce844a2e
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Data/Xml/HuangJinShouShiJiaGong.xml

@@ -238,7 +238,18 @@
             <Action type="Show" value="Main/SM_ZhuChangJing/JinLiao_YaLiao"  isShow="false" ></Action>
 
             <Action type="Show" value="Main/SM_YaPianJi"  isShow="false" ></Action>
+
+            <!--圆锥模具-->
+            <Action type="Show" value="Main/SM_ZhuChangJing/SM_ZhuBaoGongZuoTai/SM_YuanZhuiMuJu"  isShow="false" ></Action>
+            <!--小胶锤-->
+            <Action type="Show" value="Main/SM_ZhuChangJing/SM_ZhuBaoGongZuoTai/SM_XiaoJiaoChui"  isShow="false" ></Action>
+            <!--圆锥模具-金料-->
+            <Action type="Show" value="Main/SM_ZhuChangJing/SM_ZhuBaoGongZuoTai/JinLiao_ZhuBaoGongZuoTai"  isShow="false" ></Action>
             
+            <!--珠宝钳隐藏-->
+            <Action type="Show" value="Main/SM_ZhuChangJing/SM_ZhuBaoGongZuoTai/SM_ZhuBaoQian"  isShow="false" ></Action>
+
+
             <!--电子秤，隐藏-->
             <Action type="Show" value="Main/SM_ZhuChangJing/SM_DianZiCheng"  isShow="false" ></Action>
             <Action type="Show" value="Main/DiZuoxianshipin"  isShow="false" ></Action>
@@ -663,7 +674,7 @@
 
             <Action type="Show" value="Main/SM_ZhuChangJing/SM_ZhuBaoGongZuoTai/SM_YuanZhuiMuJu"  isShow="false" ></Action>
             <Action type="Show" value="Main/SM_ZhuChangJing/SM_ZhuBaoGongZuoTai/SM_XiaoJiaoChui"  isShow="false" ></Action>
-            <Action type="Show" value="Main/SM_ZhuChangJing/SM_ZhuBaoGongZuoTai/SM_YuanZhuiMuJu/JinLiao"  isShow="false" ></Action>
+            <Action type="Show" value="Main/SM_ZhuChangJing/SM_ZhuBaoGongZuoTai/JinLiao_ZhuBaoGongZuoTai"  isShow="false" ></Action>
 
             <Action type="Move" value="FlyCamera" to="-0.402340472,1.8917793,-0.97505182" time="0"></Action>
             <Action type="Rotate" value="FlyCamera" to="31.1051807,179.153503,1.55803512e-08" time="0"></Action>
@@ -683,9 +694,10 @@
             <Condition type="StrEvent" value="物品准备通过"></Condition>
             <Action type="Delay" value="0.5"></Action>
 
-            <Action type="Show" value="Main/SM_LaXianDeng/JinLiao"  isShow="true" ></Action>
+            <Action type="Show" value="Main/SM_ZhuChangJing/SM_ZhuBaoGongZuoTai/JinLiao_ZhuBaoGongZuoTai"  isShow="true" ></Action>
        
             <Action type="TimeLine" value="TimeLine/YuanZhuiMuJu_JiaoChuiQiaoJi" isShow="true" finishedEvent="播放完毕" isWait="true" frame="0" endFrame="200"></Action>
+            <Action type="Delay" value="1"></Action>
 
 
             <Action type="NextOperation"></Action>
@@ -700,15 +712,15 @@
 
             <Action type="Hint" value="请选择合适的工具，对金料的形状进行修整" time="-1" icon="true" ></Action>
 
-            <!--圆锥模具胶锤隐藏-->
+       
             <Action type="Show" value="Main/SM_ZhuChangJing/SM_ZhuBaoGongZuoTai/SM_YuanZhuiMuJu"  isShow="false" ></Action>
             <Action type="Show" value="Main/SM_ZhuChangJing/SM_ZhuBaoGongZuoTai/SM_XiaoJiaoChui"  isShow="false" ></Action>
-            
+
             <!--珠宝钳隐藏-->
             <Action type="Show" value="Main/SM_ZhuChangJing/SM_ZhuBaoGongZuoTai/SM_ZhuBaoQian"  isShow="false" ></Action>
 
-            <Action type="Move" value="FlyCamera" to="-0.402340472,1.8917793,-0.97505182" time="0"></Action>
+            <Action type="Move" value="FlyCamera" to="-0.558762372,1.67955422,-1.35572684" time="0"></Action>
-            <Action type="Rotate" value="FlyCamera" to="31.1051807,179.153503,1.55803512e-08" time="0"></Action>
+            <Action type="Rotate" value="FlyCamera" to="27.2766609,178.579239,3.00183451e-08" time="0"></Action>
 
 
             <Action type="UITools" devices="电子秤,荧光光谱仪,坩埚,液化气罐,制氧机,焊枪,模具,铁锤,圆盘,木桩,压片机,拉线凳,圆锥模具,胶锤,珠宝钳" answers="珠宝钳"
@@ -723,11 +735,53 @@
                   autoHide="1">
             </Action>
             <Condition type="StrEvent" value="物品准备通过"></Condition>
-            <Action type="Delay" value="0.5"></Action>
+            <Action type="Delay" value="1"></Action>
 
             <Action type="Show" value="Main/SM_LaXianDeng/JinLiao"  isShow="true" ></Action>
 
-            <Action type="TimeLine" value="" isShow="true" finishedEvent="播放完毕" isWait="true" frame="0" endFrame="200"></Action>
+            <Action type="TimeLine" value="TimeLine/ZhuBaoQian_AnYaQueKou" isShow="true" finishedEvent="播放完毕" isWait="true" frame="0" endFrame="200"></Action>
+
+
+            <Action type="NextOperation"></Action>
+          </Action>
+        </Start>
+      </Step>
+
+      <!--珠宝钳-->
+      <Step name="5.整形">
+        <Start>
+          <Action type="Sequence">
+
+            <Action type="Hint" value="请选择合适的工具，对金料的形状进行修整" time="-1" icon="true" ></Action>
+
+
+            <Action type="Show" value="Main/SM_ZhuChangJing/SM_ZhuBaoGongZuoTai/SM_YuanZhuiMuJu"  isShow="false" ></Action>
+            <Action type="Show" value="Main/SM_ZhuChangJing/SM_ZhuBaoGongZuoTai/SM_XiaoJiaoChui"  isShow="false" ></Action>
+
+            <!--珠宝钳隐藏-->
+            <Action type="Show" value="Main/SM_ZhuChangJing/SM_ZhuBaoGongZuoTai/SM_ZhuBaoQian"  isShow="false" ></Action>
+
+            <Action type="Move" value="FlyCamera" to="-0.558762372,1.67955422,-1.35572684" time="0"></Action>
+            <Action type="Rotate" value="FlyCamera" to="27.2766609,178.579239,3.00183451e-08" time="0"></Action>
+
+
+            <Action type="UITools" devices="电子秤,荧光光谱仪,坩埚,液化气罐,制氧机,焊枪,模具,铁锤,圆盘,木桩,压片机,拉线凳,圆锥模具,胶锤,珠宝钳" answers="珠宝钳"
+                  setActive="true"
+                  rightLabel="提示：物品选择正确。"
+                  wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
+                  rightEvent="物品准备通过"
+                  wrongEvent=""
+                  rightScore="5.2"
+                  wrongScore=""
+                  scoreStepName="操作准备物品准备"
+                  autoHide="1">
+            </Action>
+            <Condition type="StrEvent" value="物品准备通过"></Condition>
+            <Action type="Delay" value="1"></Action>
+
+            <Action type="Show" value="Main/SM_LaXianDeng/JinLiao"  isShow="true" ></Action>
+
+            <Action type="TimeLine" value="TimeLine/ZhuBaoQian_AnYaQueKou" isShow="true" finishedEvent="播放完毕" isWait="true" frame="0" endFrame="200"></Action>
 
 
             <Action type="NextOperation"></Action>
@@ -736,6 +790,46 @@
       </Step>
 
 
+      <Step name="6.焊接">
+        <Start>
+          <Action type="Sequence">
+
+            <Action type="Hint" value="请选择合适的工具，对整形后的金料缺口进行整体预热30秒左右" time="-1" icon="true" ></Action>
+
+
+       
+            <!--珠宝钳隐藏-->
+            <Action type="Show" value="Main/SM_ZhuChangJing/SM_ZhuBaoGongZuoTai/SM_ZhuBaoQian"  isShow="false" ></Action>
+
+            <Action type="Move" value="FlyCamera" to="-0.558762372,1.67955422,-1.35572684" time="0"></Action>
+            <Action type="Rotate" value="FlyCamera" to="27.2766609,178.579239,3.00183451e-08" time="0"></Action>
+
+
+            <Action type="UITools" devices="电子秤,荧光光谱仪,坩埚,液化气罐,制氧机,焊枪,模具,铁锤,圆盘,木桩,压片机,拉线凳,圆锥模具,胶锤,珠宝钳" answers="珠宝钳"
+                  setActive="true"
+                  rightLabel="提示：物品选择正确。"
+                  wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
+                  rightEvent="物品准备通过"
+                  wrongEvent=""
+                  rightScore="5.2"
+                  wrongScore=""
+                  scoreStepName="操作准备物品准备"
+                  autoHide="1">
+            </Action>
+            <Condition type="StrEvent" value="物品准备通过"></Condition>
+            <Action type="Delay" value="1"></Action>
+
+            <Action type="Show" value="Main/SM_LaXianDeng/JinLiao"  isShow="true" ></Action>
+
+            <Action type="TimeLine" value="TimeLine/ZhuBaoQian_AnYaQueKou" isShow="true" finishedEvent="播放完毕" isWait="true" frame="0" endFrame="200"></Action>
+
+
+            <Action type="NextOperation"></Action>
+          </Action>
+        </Start>
+      </Step>
+
+     
 
     </Step>
   </Operation>