提交内容修改

Assets/Anm/XianWeiJing_CameraBig.anim

@@ -39,6 +39,15 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 3.3333333
+        value: 3
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
@@ -61,7 +70,7 @@ AnimationClip:
     m_AdditiveReferencePoseClip: {fileID: 0}
     m_AdditiveReferencePoseTime: 0
     m_StartTime: 0
-    m_StopTime: 1.5
+    m_StopTime: 3.3333333
     m_OrientationOffsetY: 0
     m_Level: 0
     m_CycleOffset: 0
@@ -99,6 +108,15 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 3.3333333
+        value: 3
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4

Assets/Anm/XianWeiJing_TopLight.anim

@@ -32,7 +32,7 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 1
-        value: 2
+        value: 0.25
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -92,7 +92,7 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 1
-        value: 2
+        value: 0.25
         inSlope: 0
         outSlope: 0
         tangentMode: 136

Assets/Scenes/PianGuangJing.unity

@@ -553,9 +553,9 @@ Transform:
   m_GameObject: {fileID: 684982546}
   serializedVersion: 2
   m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068}
-  m_LocalPosition: {x: 0.1149, y: 1.3494, z: 2.3476}
+  m_LocalPosition: {x: 0.1117, y: 1.3494, z: 2.3481}
-  m_LocalScale: {x: 0.054204065, y: 0.05420407, z: 0.05420407}
+  m_LocalScale: {x: 0.015670411, y: 0.015670411, z: 0.015670411}
-  m_ConstrainProportionsScale: 0
+  m_ConstrainProportionsScale: 1
   m_Children: []
   m_Father: {fileID: 297041521}
   m_LocalEulerAnglesHint: {x: 90, y: 0, z: -0.1298985}
@@ -578,8 +578,8 @@ BoxCollider:
   m_ProvidesContacts: 0
   m_Enabled: 1
   serializedVersion: 3
-  m_Size: {x: 1, y: 1.0000002, z: 0.01}
+  m_Size: {x: 4.912275, y: 4.5396757, z: 0.01}
-  m_Center: {x: 0, y: 0, z: 0}
+  m_Center: {x: 0.007165587, y: -0.050152693, z: 1.7082034e-16}
 --- !u!212 &684982549
 SpriteRenderer:
   m_ObjectHideFlags: 0
@@ -621,7 +621,7 @@ SpriteRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300000, guid: db7aaa162a1a5a54b826d15b5b20fb06, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 170551ab9e28f624092875d65a7bed10, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0

Assets/Scenes/XianWeiJing.unity

@@ -539,7 +539,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &721098892
 RectTransform:
   m_ObjectHideFlags: 0

Data/Xml/FenGuangJing.xml

@@ -14,15 +14,16 @@
 				<Action type="UIShow" value="UIOperationList" isShow="true"></Action>
 				
 				<Action type="Parallel">
-					<Action type="Move" value="FlyCamera" to="-0.4474,1.429,2.0681" time="0"></Action>
+					<Action type="Move" value="FlyCamera" to="-0.4474,1.3939,2.0604" time="0"></Action>
-					<Action type="Rotate" value="FlyCamera" to="26.37553,0,0" time="0"></Action>
+					<Action type="Rotate" value="FlyCamera" to="18.66748,0,0" time="0"></Action>
 				</Action>	
 
-				<Action type="TextTip" value="分光镜是用来观察宝石的吸收光谱，帮助鉴定宝石品种，推断宝石中的致色元素，尤其是对典型光谱的宝石种类，可以用来确定宝石的亚种。还可以用来鉴别是否经染色处理。分光镜根据宝石的特性有两种鉴定方式：
+				<Action type="TextTip" title="实验说明" value="分光镜是用来观察宝石的吸收光谱，帮助鉴定宝石品种，推断宝石中的致色元素，尤其是对典型光谱的宝石种类，可以用来确定宝石的亚种。还可以用来鉴别是否经染色处理。分光镜根据宝石的特性有两种鉴定方式：
 	一、透射法：适用于透明或半透明的宝石。
 	二、反射法：适用于透明度较差或不透明的宝石。"  btns="确定"/>
 				<Condition type="UIClick" value="UIRoot/PopUI/UITextTip/Mask/Content/BtnContent/确定"></Condition>
 
+				<Action type="Hint" value="请点击宝石库中需要鉴定的宝石" time="-1" icon="true" ></Action>
 				<Action type="UIShow" value="UIFengGuangJingBSKPanel" isShow="true"></Action>
 				<Condition type="StrEvent" value="InputUI使用结束"></Condition>
 				
@@ -111,6 +112,9 @@
 					<Action type="HighLightFlash" value="CustomParent/Eye" isHigh="false"></Action>
 					
 					<Action type="Show" value="CustomParent/Canvas" isShow="true"></Action>
+					<Action type="Delay" value="2"></Action>
+					<Action type="TipWindow" value="恭喜你完成当前模块" btns="确定" audio=""></Action>
+					<Condition type="UIClick" value="UIRoot/PopUI/UITipWindow/Mask/Connnet/BtnContent/确定"></Condition>
 				</Action>
 			</Start>
 		</Step>
@@ -166,6 +170,9 @@
 					<Action type="HighLightFlash" value="CustomParent/Eye" isHigh="false"></Action>
 					
 					<Action type="Show" value="CustomParent/Canvas" isShow="true"></Action>
+					<Action type="Delay" value="2"></Action>
+					<Action type="TipWindow" value="恭喜你完成当前模块" btns="确定" audio=""></Action>
+					<Condition type="UIClick" value="UIRoot/PopUI/UITipWindow/Mask/Connnet/BtnContent/确定"></Condition>
 				</Action>
 			</Start>
 		</Step>

Data/Xml/MiDuYi.xml

@@ -50,7 +50,7 @@
 		<Step name="1.检查密度仪是否放置水平">
 			<Start>
 				<Action type="Sequence">
-					<Action type="TextTip" value="密度仪用来测宝石的比重，采用了高精度称重系统和严密的测定程序，使得密度直接显示在显示屏上。从而大大减少了人工换算的繁琐性和人为误差。不同的宝石有不同的密度，比如红宝石和蓝宝石的比重为4左右，翡翠为3.34，软玉为2.95，有时只测量宝玉石的比重对鉴定宝玉石非常有效。"  btns="确定"/>
+					<Action type="TextTip" title="实验说明" value="密度仪用来测宝石的比重，采用了高精度称重系统和严密的测定程序，使得密度直接显示在显示屏上。从而大大减少了人工换算的繁琐性和人为误差。不同的宝石有不同的密度，比如红宝石和蓝宝石的比重为4左右，翡翠为3.34，软玉为2.95，有时只测量宝玉石的比重对鉴定宝玉石非常有效。"  btns="确定"/>
 					<Condition type="UIClick" value="UIRoot/PopUI/UITextTip/Mask/Content/BtnContent/确定"></Condition>
 					
 					<Action type="Move" value="FlyCamera" to="-0.126,1.437,1.9828" time="0"></Action>

Data/Xml/PianGuangJing.xml

@@ -32,10 +32,7 @@
 		<Step name="1.打开偏光镜电源">
 			<Start>
 				<Action type="Sequence">
-          <Action type="Move" value="FlyCamera" to="0.115,1.43,2.213" time="0"></Action>
+					<Action type="TextTip" title="实验说明" value="偏光镜是常规鉴定仪器中，往往是首先使用的仪器，因为它可以非常快速的确定宝石是否为均质体、非均质体，因此在宝石鉴定仪器中具有非常重要的地位。偏光镜的结构包括上下两个偏光片，光源、开关。下偏光片固定不动的，它的上面加装一个可以旋转的玻璃片，称为载物台。避免宝石与偏光片直接接触，影响仪器的使用寿命。"  btns="确定"/>
-          <Action type="Rotate" value="FlyCamera" to="39.7456,0,0" time="0"></Action>
-
-          <Action type="TextTip" value="偏光镜是常规鉴定仪器中，往往是首先使用的仪器，因为它可以非常快速的确定宝石是否为均质体、非均质体，因此在宝石鉴定仪器中具有非常重要的地位。偏光镜的结构包括上下两个偏光片，光源、开关。下偏光片固定不动的，它的上面加装一个可以旋转的玻璃片，称为载物台。避免宝石与偏光片直接接触，影响仪器的使用寿命。"  btns="确定"/>
 					<Condition type="UIClick" value="UIRoot/PopUI/UITextTip/Mask/Content/BtnContent/确定"></Condition>
 					
 					<Action type="Move" value="FlyCamera" to="0.115,1.43,2.213" time="0"></Action>