Compare commits

..

No commits in common. "d6ba79eafed090e0b03626b7633c6eb49d8f1bee" and "f47d6abafa3e590b0b06a8a318bb35e46023c13e" have entirely different histories.

16 changed files with 146 additions and 414 deletions

File diff suppressed because one or more lines are too long

View File

@ -1573,96 +1573,6 @@ MonoBehaviour:
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 824
m_Metrics:
m_Width: 84.40625
m_Height: 84.40625
m_HorizontalBearingX: 2.796875
m_HorizontalBearingY: 69.203125
m_HorizontalAdvance: 90
m_GlyphRect:
m_X: 319
m_Y: 1696
m_Width: 86
m_Height: 86
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 4576
m_Metrics:
m_Width: 84.40625
m_Height: 84.40625
m_HorizontalBearingX: 2.796875
m_HorizontalBearingY: 69.203125
m_HorizontalAdvance: 90
m_GlyphRect:
m_X: 325
m_Y: 1589
m_Width: 86
m_Height: 86
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 5051
m_Metrics:
m_Width: 84.40625
m_Height: 83.421875
m_HorizontalBearingX: 2.796875
m_HorizontalBearingY: 69.203125
m_HorizontalAdvance: 90
m_GlyphRect:
m_X: 115
m_Y: 2012
m_Width: 86
m_Height: 85
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 1636
m_Metrics:
m_Width: 84.40625
m_Height: 85.140625
m_HorizontalBearingX: 2.796875
m_HorizontalBearingY: 69.9375
m_HorizontalAdvance: 90
m_GlyphRect:
m_X: 115
m_Y: 2116
m_Width: 86
m_Height: 86
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 2642
m_Metrics:
m_Width: 82.4375
m_Height: 83.15625
m_HorizontalBearingX: 3.78125
m_HorizontalBearingY: 68.3125
m_HorizontalAdvance: 90
m_GlyphRect:
m_X: 428
m_Y: 1486
m_Width: 84
m_Height: 84
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 5336
m_Metrics:
m_Width: 84.40625
m_Height: 83.25
m_HorizontalBearingX: 2.796875
m_HorizontalBearingY: 69.203125
m_HorizontalAdvance: 90
m_GlyphRect:
m_X: 429
m_Y: 1193
m_Width: 86
m_Height: 85
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
m_CharacterTable:
- m_ElementType: 1
m_Unicode: 32
@ -2072,30 +1982,6 @@ MonoBehaviour:
m_Unicode: 30446
m_GlyphIndex: 4045
m_Scale: 1
- m_ElementType: 1
m_Unicode: 21464
m_GlyphIndex: 824
m_Scale: 1
- m_ElementType: 1
m_Unicode: 32418
m_GlyphIndex: 4576
m_Scale: 1
- m_ElementType: 1
m_Unicode: 33394
m_GlyphIndex: 5051
m_Scale: 1
- m_ElementType: 1
m_Unicode: 23574
m_GlyphIndex: 1636
m_Scale: 1
- m_ElementType: 1
m_Unicode: 26230
m_GlyphIndex: 2642
m_Scale: 1
- m_ElementType: 1
m_Unicode: 34013
m_GlyphIndex: 5336
m_Scale: 1
m_AtlasTextures:
- {fileID: 7358174349124401913}
m_AtlasTextureIndex: 0
@ -2506,30 +2392,6 @@ MonoBehaviour:
m_Y: 0
m_Width: 91
m_Height: 99
- m_X: 309
m_Y: 1686
m_Width: 105
m_Height: 105
- m_X: 315
m_Y: 1579
m_Width: 105
m_Height: 105
- m_X: 105
m_Y: 2002
m_Width: 105
m_Height: 104
- m_X: 105
m_Y: 2106
m_Width: 105
m_Height: 105
- m_X: 418
m_Y: 1476
m_Width: 103
m_Height: 103
- m_X: 419
m_Y: 1183
m_Width: 105
m_Height: 104
m_FreeGlyphRects:
- m_X: 46
m_Y: 91
@ -2655,10 +2517,22 @@ MonoBehaviour:
m_Y: 1476
m_Width: 1
m_Height: 4
- m_X: 210
m_Y: 1686
m_Width: 7981
m_Height: 2
- m_X: 209
m_Y: 1164
m_Width: 102
m_Height: 1
- m_X: 313
m_Y: 1579
m_Width: 7878
m_Height: 2
- m_X: 315
m_Y: 1579
m_Width: 7876
m_Height: 6612
- m_X: 309
m_Y: 973
m_Width: 5
@ -2667,6 +2541,10 @@ MonoBehaviour:
m_Y: 1372
m_Width: 104
m_Height: 3
- m_X: 418
m_Y: 1476
m_Width: 7773
m_Height: 6715
- m_X: 311
m_Y: 1266
m_Width: 4
@ -2691,10 +2569,22 @@ MonoBehaviour:
m_Y: 1078
m_Width: 100
m_Height: 86
- m_X: 414
m_Y: 1183
m_Width: 7777
m_Height: 83
- m_X: 419
m_Y: 1183
m_Width: 7772
m_Height: 7008
- m_X: 414
m_Y: 902
m_Width: 5
m_Height: 71
- m_X: 519
m_Y: 1007
m_Width: 7672
m_Height: 7184
- m_X: 419
m_Y: 1007
m_Width: 7772
@ -2763,6 +2653,14 @@ MonoBehaviour:
m_Y: 1897
m_Width: 2
m_Height: 3
- m_X: 105
m_Y: 2002
m_Width: 8086
m_Height: 212
- m_X: 209
m_Y: 2002
m_Width: 7982
m_Height: 6189
- m_X: 682
m_Y: 204
m_Width: 7509
@ -2779,6 +2677,14 @@ MonoBehaviour:
m_Y: 1791
m_Width: 1
m_Height: 4
- m_X: 309
m_Y: 1686
m_Width: 7882
m_Height: 105
- m_X: 312
m_Y: 1686
m_Width: 7879
m_Height: 6505
- m_X: 208
m_Y: 1896
m_Width: 7983
@ -2799,54 +2705,6 @@ MonoBehaviour:
m_Y: 0
m_Width: 7314
m_Height: 8191
- m_X: 210
m_Y: 1686
m_Width: 99
m_Height: 2
- m_X: 312
m_Y: 1791
m_Width: 7879
m_Height: 6400
- m_X: 313
m_Y: 1579
m_Width: 2
m_Height: 2
- m_X: 315
m_Y: 1684
m_Width: 7876
m_Height: 2
- m_X: 414
m_Y: 1684
m_Width: 7777
m_Height: 6507
- m_X: 105
m_Y: 2211
m_Width: 8086
m_Height: 3
- m_X: 209
m_Y: 2211
m_Width: 7982
m_Height: 5980
- m_X: 420
m_Y: 1579
m_Width: 7771
m_Height: 6612
- m_X: 414
m_Y: 1183
m_Width: 5
m_Height: 83
- m_X: 519
m_Y: 1007
m_Width: 7672
m_Height: 176
- m_X: 521
m_Y: 1287
m_Width: 7670
m_Height: 6904
- m_X: 419
m_Y: 1287
m_Width: 7772
m_Height: 189
m_fontInfo:
Name:
PointSize: 0

View File

@ -7,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@ -54,7 +54,7 @@ TextureImporter:
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 1
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1

View File

@ -7,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@ -54,7 +54,7 @@ TextureImporter:
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 1
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1

View File

@ -7,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@ -54,7 +54,7 @@ TextureImporter:
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 1
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1

View File

@ -7,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@ -54,7 +54,7 @@ TextureImporter:
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 1
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: dd2aa4a0412a45146858fbc90da9806e
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: f14459f61818c3a4ab325e427e675e98
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 7710dd94e37560944939b0c45a842839
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 70cde04492c5e3a4f9b2baf80e2a252c
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 6a12ebd0f9ad0a143956ba7005abe43f
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: e715209f34e462a4e9022aff36d0ab9c
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -35,7 +35,7 @@ RectTransform:
m_Father: {fileID: 2678946878578782220}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
@ -123,10 +123,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 6365095733657119206}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 160.99538, y: -15.605}
m_SizeDelta: {x: 315.99075, y: 25.21}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8748311836690854901
CanvasRenderer:
@ -354,9 +354,9 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 0, y: -27.3056}
m_SizeDelta: {x: 382.0447, y: 603.0081}
m_Pivot: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -249.50732, y: 74.69849}
m_SizeDelta: {x: 499.0146, y: 548.397}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9046346095875189800
CanvasRenderer:
m_ObjectHideFlags: 0
@ -386,7 +386,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 37ba5170da6a99a4ba200206618744a9, type: 3}
m_Type: 0
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
@ -612,7 +612,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 64, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 3, y: 0}
m_Pivot: {x: 1, y: 1}
--- !u!222 &2891513177057236110
@ -895,10 +895,10 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 3
m_Right: 3
m_Top: 3
m_Bottom: 3
m_Left: 5
m_Right: 5
m_Top: 5
m_Bottom: 5
m_ChildAlignment: 1
m_Spacing: 0
m_ChildForceExpandWidth: 1
@ -935,7 +935,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
MarkType: 0
CustomComponentName: Content
CustomComponentName:
CustomComment:
mComponentName: RectTransform
--- !u!1 &5937840426462675448
@ -1157,7 +1157,7 @@ MonoBehaviour:
m_HorizontalScrollbar: {fileID: 0}
m_VerticalScrollbar: {fileID: 8014185367982738860}
m_HorizontalScrollbarVisibility: 2
m_VerticalScrollbarVisibility: 1
m_VerticalScrollbarVisibility: 2
m_HorizontalScrollbarSpacing: -3
m_VerticalScrollbarSpacing: -3
m_OnValueChanged:
@ -1176,7 +1176,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
MarkType: 0
CustomComponentName: Scroll
CustomComponentName:
CustomComment:
mComponentName: UnityEngine.UI.ScrollRect
--- !u!1 &7427182242613163747

View File

@ -35,7 +35,7 @@
<HighLight color="255,255,255"/>
<Path>Main/SM_NieZi</Path>
<Tip>宝石镊子</Tip>
<Icon>工具/镊子.png</Icon>
<Icon>工具/骨刀.png</Icon>
</Device>
<Device>
@ -43,7 +43,7 @@
<HighLight color="255,255,255"/>
<Path>Main/SM_PianGuangJing</Path>
<Tip>偏光镜</Tip>
<Icon>工具/偏光镜.png</Icon>
<Icon>工具/骨刀.png</Icon>
</Device>
@ -52,7 +52,7 @@
<HighLight color="255,255,255"/>
<Path>Main/SM_ZHeSheYi</Path>
<Tip>折射仪</Tip>
<Icon>工具/折射仪.png</Icon>
<Icon>工具/骨刀.png</Icon>
</Device>
<Device>
@ -60,7 +60,7 @@
<HighLight color="255,255,255"/>
<Path>Main/SM_XianWeiJing</Path>
<Tip>显微镜</Tip>
<Icon>工具/显微镜.png</Icon>
<Icon>工具/骨刀.png</Icon>
</Device>
@ -69,7 +69,7 @@
<HighLight color="255,255,255"/>
<Path>Main/SM_MiDuYi</Path>
<Tip>密度仪</Tip>
<Icon>工具/密度仪.png</Icon>
<Icon>工具/骨刀.png</Icon>
</Device>
@ -79,7 +79,7 @@
<HighLight color="255,255,255"/>
<Path>Main/SM_ZiWaiYingGuangDeng (1)</Path>
<Tip>紫外荧光灯</Tip>
<Icon>工具/紫外荧光灯.png</Icon>
<Icon>工具/骨刀.png</Icon>
</Device>
@ -101,7 +101,7 @@
<Step name="1.肉眼观察">
<Step name="1.打开偏光镜电源">
<Start>
<Action type="Sequence">
<Action type="Show" value="Main/SM_NieZi" isShow="false" ></Action>

View File

@ -1088,7 +1088,7 @@
<!--随便配置的分数模块-->
<!--<Operation moduleType="Study" freeStep="true">
<Operation moduleType="Study" freeStep="true">
<Step name="工具列表">
@ -1098,7 +1098,7 @@
<Start>
<Action type="Sequence">
--><!--金粉回收抽屉,归位--><!--
<!--金粉回收抽屉,归位-->
<Action type="Move" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="-0.2597893,1.198578,-1.485134" time="0"></Action>
<Action type="Rotate" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="270,0,0" time="0"></Action>
@ -1126,7 +1126,7 @@
<Condition type="UIClick" value="UIRoot/PopUI/UITextTip/Mask/Content/BtnContent/1"></Condition>
--><!--<Action type="NextOperation"></Action>--><!--
<!--<Action type="NextOperation"></Action>-->
</Action>
</Start>
@ -1137,7 +1137,7 @@
<Action type="Sequence">
--><!--金粉回收抽屉,归位--><!--
<!--金粉回收抽屉,归位-->
<Action type="Move" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="-0.2597893,1.198578,-1.485134" time="0"></Action>
<Action type="Rotate" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="270,0,0" time="0"></Action>
@ -1159,7 +1159,7 @@
--><!--<Action type="NextOperation"></Action>--><!--
<!--<Action type="NextOperation"></Action>-->
</Action>
</Start>
@ -1170,7 +1170,7 @@
<Start>
<Action type="Sequence">
--><!--金粉回收抽屉,归位--><!--
<!--金粉回收抽屉,归位-->
<Action type="Move" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="-0.2597893,1.198578,-1.485134" time="0"></Action>
<Action type="Rotate" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="270,0,0" time="0"></Action>
@ -1192,7 +1192,7 @@
--><!--<Action type="NextOperation"></Action>--><!--
<!--<Action type="NextOperation"></Action>-->
</Action>
</Start>
@ -1203,7 +1203,7 @@
<Step name="氧气焊接机">
<Start>
<Action type="Sequence">
--><!--金粉回收抽屉,归位--><!--
<!--金粉回收抽屉,归位-->
<Action type="Move" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="-0.2597893,1.198578,-1.485134" time="0"></Action>
<Action type="Rotate" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="270,0,0" time="0"></Action>
@ -1221,7 +1221,7 @@
--><!--<Action type="NextOperation"></Action>--><!--
<!--<Action type="NextOperation"></Action>-->
</Action>
</Start>
@ -1231,7 +1231,7 @@
<Step name="小火枪">
<Start>
<Action type="Sequence">
--><!--金粉回收抽屉,归位--><!--
<!--金粉回收抽屉,归位-->
<Action type="Move" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="-0.2597893,1.198578,-1.485134" time="0"></Action>
<Action type="Rotate" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="270,0,0" time="0"></Action>
@ -1249,7 +1249,7 @@
--><!--<Action type="NextOperation"></Action>--><!--
<!--<Action type="NextOperation"></Action>-->
</Action>
</Start>
@ -1262,7 +1262,7 @@
<Start>
<Action type="Sequence">
--><!--金粉回收抽屉,归位--><!--
<!--金粉回收抽屉,归位-->
<Action type="Move" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="-0.2597893,1.198578,-1.485134" time="0"></Action>
<Action type="Rotate" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="270,0,0" time="0"></Action>
@ -1280,7 +1280,7 @@
--><!--<Action type="NextOperation"></Action>--><!--
<!--<Action type="NextOperation"></Action>-->
</Action>
</Start>
@ -1291,7 +1291,7 @@
<Step name="锉刀">
<Start>
<Action type="Sequence">
--><!--金粉回收抽屉,归位--><!--
<!--金粉回收抽屉,归位-->
<Action type="Move" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="-0.2597893,1.198578,-1.485134" time="0"></Action>
<Action type="Rotate" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="270,0,0" time="0"></Action>
@ -1309,7 +1309,7 @@
--><!--<Action type="NextOperation"></Action>--><!--
<!--<Action type="NextOperation"></Action>-->
</Action>
</Start>
@ -1320,7 +1320,7 @@
<Step name="台灯">
<Start>
<Action type="Sequence">
--><!--金粉回收抽屉,归位--><!--
<!--金粉回收抽屉,归位-->
<Action type="Move" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="-0.2597893,1.198578,-1.485134" time="0"></Action>
<Action type="Rotate" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="270,0,0" time="0"></Action>
@ -1337,7 +1337,7 @@
--><!--<Action type="NextOperation"></Action>--><!--
<!--<Action type="NextOperation"></Action>-->
</Action>
</Start>
@ -1347,7 +1347,7 @@
<Step name="锯弓">
<Start>
<Action type="Sequence">
--><!--金粉回收抽屉,归位--><!--
<!--金粉回收抽屉,归位-->
<Action type="Move" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="-0.2597893,1.198578,-1.485134" time="0"></Action>
<Action type="Rotate" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="270,0,0" time="0"></Action>
@ -1364,7 +1364,7 @@
--><!--<Action type="NextOperation"></Action>--><!--
<!--<Action type="NextOperation"></Action>-->
</Action>
</Start>
@ -1373,7 +1373,7 @@
<Step name="砂纸卷">
<Start>
<Action type="Sequence">
--><!--金粉回收抽屉,归位--><!--
<!--金粉回收抽屉,归位-->
<Action type="Move" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="-0.2597893,1.198578,-1.485134" time="0"></Action>
<Action type="Rotate" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="270,0,0" time="0"></Action>
@ -1390,7 +1390,7 @@
--><!--<Action type="NextOperation"></Action>--><!--
<!--<Action type="NextOperation"></Action>-->
</Action>
</Start>
@ -1400,7 +1400,7 @@
<Step name="水盅">
<Start>
<Action type="Sequence">
--><!--金粉回收抽屉,归位--><!--
<!--金粉回收抽屉,归位-->
<Action type="Move" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="-0.2597893,1.198578,-1.485134" time="0"></Action>
<Action type="Rotate" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="270,0,0" time="0"></Action>
@ -1416,7 +1416,7 @@
--><!--<Action type="NextOperation"></Action>--><!--
<!--<Action type="NextOperation"></Action>-->
</Action>
</Start>
@ -1426,7 +1426,7 @@
<Step name="煮明矾水杯">
<Start>
<Action type="Sequence">
--><!--金粉回收抽屉,归位--><!--
<!--金粉回收抽屉,归位-->
<Action type="Move" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="-0.2597893,1.198578,-1.485134" time="0"></Action>
<Action type="Rotate" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="270,0,0" time="0"></Action>
@ -1443,7 +1443,7 @@
--><!--<Action type="NextOperation"></Action>--><!--
<!--<Action type="NextOperation"></Action>-->
</Action>
</Start>
@ -1455,7 +1455,7 @@
<Start>
<Action type="Sequence">
--><!--金粉回收抽屉,归位--><!--
<!--金粉回收抽屉,归位-->
<Action type="Move" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="-0.2597893,1.198578,-1.485134" time="0"></Action>
<Action type="Rotate" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="270,0,0" time="0"></Action>
@ -1473,7 +1473,7 @@
--><!--<Action type="NextOperation"></Action>--><!--
<!--<Action type="NextOperation"></Action>-->
</Action>
</Start>
@ -1484,7 +1484,7 @@
<Step name="珠宝钳">
<Start>
<Action type="Sequence">
--><!--金粉回收抽屉,归位--><!--
<!--金粉回收抽屉,归位-->
<Action type="Move" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="-0.2597893,1.198578,-1.485134" time="0"></Action>
<Action type="Rotate" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="270,0,0" time="0"></Action>
@ -1501,7 +1501,7 @@
--><!--<Action type="NextOperation"></Action>--><!--
<!--<Action type="NextOperation"></Action>-->
</Action>
</Start>
@ -1513,7 +1513,7 @@
<Start>
<Action type="Sequence">
--><!--金粉回收抽屉,归位--><!--
<!--金粉回收抽屉,归位-->
<Action type="Move" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="-0.2597893,1.198578,-1.485134" time="0"></Action>
<Action type="Rotate" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="270,0,0" time="0"></Action>
@ -1529,7 +1529,7 @@
--><!--<Action type="NextOperation"></Action>--><!--
<!--<Action type="NextOperation"></Action>-->
</Action>
</Start>
@ -1539,7 +1539,7 @@
<Step name="钛针">
<Start>
<Action type="Sequence">
--><!--金粉回收抽屉,归位--><!--
<!--金粉回收抽屉,归位-->
<Action type="Move" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="-0.2597893,1.198578,-1.485134" time="0"></Action>
<Action type="Rotate" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="270,0,0" time="0"></Action>
@ -1557,7 +1557,7 @@
--><!--<Action type="NextOperation"></Action>--><!--
<!--<Action type="NextOperation"></Action>-->
</Action>
</Start>
@ -1567,7 +1567,7 @@
<Step name="手术刀">
<Start>
<Action type="Sequence">
--><!--金粉回收抽屉,归位--><!--
<!--金粉回收抽屉,归位-->
<Action type="Move" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="-0.2597893,1.198578,-1.485134" time="0"></Action>
<Action type="Rotate" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="270,0,0" time="0"></Action>
@ -1584,7 +1584,7 @@
--><!--<Action type="NextOperation"></Action>--><!--
<!--<Action type="NextOperation"></Action>-->
</Action>
</Start>
@ -1595,7 +1595,7 @@
<Step name="方铁">
<Start>
<Action type="Sequence">
--><!--金粉回收抽屉,归位--><!--
<!--金粉回收抽屉,归位-->
<Action type="Move" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="-0.2597893,1.198578,-1.485134" time="0"></Action>
<Action type="Rotate" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="270,0,0" time="0"></Action>
@ -1612,7 +1612,7 @@
--><!--<Action type="NextOperation"></Action>--><!--
<!--<Action type="NextOperation"></Action>-->
</Action>
</Start>
@ -1622,7 +1622,7 @@
<Step name="机针">
<Start>
<Action type="Sequence">
--><!--金粉回收抽屉,归位--><!--
<!--金粉回收抽屉,归位-->
<Action type="Move" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="-0.2597893,1.198578,-1.485134" time="0"></Action>
<Action type="Rotate" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="270,0,0" time="0"></Action>
@ -1639,7 +1639,7 @@
--><!--<Action type="NextOperation"></Action>--><!--
<!--<Action type="NextOperation"></Action>-->
</Action>
</Start>
@ -1649,7 +1649,7 @@
<Step name="胶水">
<Start>
<Action type="Sequence">
--><!--金粉回收抽屉,归位--><!--
<!--金粉回收抽屉,归位-->
<Action type="Move" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="-0.2597893,1.198578,-1.485134" time="0"></Action>
<Action type="Rotate" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="270,0,0" time="0"></Action>
@ -1666,7 +1666,7 @@
--><!--<Action type="NextOperation"></Action>--><!--
<!--<Action type="NextOperation"></Action>-->
</Action>
</Start>
@ -1676,7 +1676,7 @@
<Step name="砂纸条">
<Start>
<Action type="Sequence">
--><!--金粉回收抽屉,归位--><!--
<!--金粉回收抽屉,归位-->
<Action type="Move" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="-0.2597893,1.198578,-1.485134" time="0"></Action>
<Action type="Rotate" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="270,0,0" time="0"></Action>
@ -1693,7 +1693,7 @@
--><!--<Action type="NextOperation"></Action>--><!--
<!--<Action type="NextOperation"></Action>-->
</Action>
</Start>
@ -1702,7 +1702,7 @@
<Step name="直尺">
<Start>
<Action type="Sequence">
--><!--金粉回收抽屉,归位--><!--
<!--金粉回收抽屉,归位-->
<Action type="Move" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="-0.2597893,1.198578,-1.485134" time="0"></Action>
<Action type="Rotate" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="270,0,0" time="0"></Action>
@ -1719,7 +1719,7 @@
--><!--<Action type="NextOperation"></Action>--><!--
<!--<Action type="NextOperation"></Action>-->
</Action>
</Start>
@ -1728,7 +1728,7 @@
<Step name="游标卡尺">
<Start>
<Action type="Sequence">
--><!--金粉回收抽屉,归位--><!--
<!--金粉回收抽屉,归位-->
<Action type="Move" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="-0.2597893,1.198578,-1.485134" time="0"></Action>
<Action type="Rotate" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="270,0,0" time="0"></Action>
@ -1745,7 +1745,7 @@
--><!--<Action type="NextOperation"></Action>--><!--
<!--<Action type="NextOperation"></Action>-->
</Action>
</Start>
@ -1755,7 +1755,7 @@
<Step name="胶锤">
<Start>
<Action type="Sequence">
--><!--金粉回收抽屉,归位--><!--
<!--金粉回收抽屉,归位-->
<Action type="Move" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="-0.2597893,1.198578,-1.485134" time="0"></Action>
<Action type="Rotate" value="Main/SM_ZhuBaoGongZuoTai/SM_ChouTi" to="270,0,0" time="0"></Action>
@ -1772,7 +1772,7 @@
--><!--<Action type="NextOperation"></Action>--><!--
<!--<Action type="NextOperation"></Action>-->
</Action>
</Start>
@ -1781,6 +1781,6 @@
</Step>
</Operation>-->
</Operation>
</Module>

View File

@ -95,7 +95,7 @@
<Action type="Rotate" value="FlyCamera" to="33.3920975,359.285889,-1.59777631e-08" time="0"></Action>
<Action type="TextTip" title="实验说明" value="紫外荧光灯的功能是用来检测宝石是否具有荧光和磷光,天然红宝石在紫外荧光灯下就显示很漂亮的红色,大部分钻石在紫外灯下也有多种颜色的荧光显示,如橙色、黄色、绿色、蓝色和紫色,而有些宝石却不具有荧光性,如蓝宝石、石榴石等,这些都可以在宝石鉴定时起到一定的启示性作用。" btns="确定"/>
<Action type="TextTip" value="紫外荧光灯的功能是用来检测宝石是否具有荧光和磷光,天然红宝石在紫外荧光灯下就显示很漂亮的红色,大部分钻石在紫外灯下也有多种颜色的荧光显示,如橙色、黄色、绿色、蓝色和紫色,而有些宝石却不具有荧光性,如蓝宝石、石榴石等,这些都可以在宝石鉴定时起到一定的启示性作用。" btns="确定"/>
<Condition type="UIClick" value="UIRoot/PopUI/UITextTip/Mask/Content/BtnContent/确定"></Condition>
<!--近距离 视角-->
@ -213,10 +213,9 @@
<!--暂时只能输入一个-->
<Action type="Input" title="请输入" finishedEvent="UI关闭事件通知用StrEvent接收">
<Input name="短波数值1:" var="变量1" answer="253.7"></Input>
<Input name="短波数值2:" var="变量2" answer="254"></Input>
<Input name="数字1:" var="变量1" answer="253.7"></Input>
<Btn name="确定" clickEvent="确定点击" checkAnswer="true" wrongLabel="输入错误" wrongCount="3" autoHide="1" ></Btn>
<Btn name="取消"></Btn>
</Action>
<Condition type="StrEvent" value="UI关闭事件通知用StrEvent接收"></Condition>