提交修改bug,UI预制体修改

This commit is contained in:
李浩 2025-03-08 14:08:20 +08:00
parent c1e2fdeed4
commit d6b0abd2ca
11 changed files with 1988 additions and 1716 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -439,7 +439,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: a0ec3394970395e4ca7601b29e619696, type: 3}
m_Sprite: {fileID: 21300000, guid: 37ba5170da6a99a4ba200206618744a9, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
@ -759,7 +759,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 31ccce56954dabe4794ee1673aae0a0a, type: 3}
m_Sprite: {fileID: 21300000, guid: fb45aabc50022264c97daa91981cf8d7, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -1058,8 +1058,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: fa63ae52e51e2064390c2a75c12f664c, type: 3}
m_Type: 0
m_Sprite: {fileID: 21300000, guid: 3ac2dc7900241e5418caadf342908284, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
@ -1125,7 +1125,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
MarkType: 0
CustomComponentName:
CustomComponentName: BtnPrefab
CustomComment:
mComponentName: UnityEngine.UI.Button
--- !u!1 &7732673408388049736
@ -1193,7 +1193,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 1f3a0bac1ca134645a24b4ced465ef5e, type: 3}
m_Sprite: {fileID: 21300000, guid: 2fa24870f7a9f1c428205d0fedb0c297, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1

View File

@ -183,13 +183,13 @@ MonoBehaviour:
m_Padding:
m_Left: 17
m_Right: 5
m_Top: 64
m_Bottom: 30
m_Top: 27
m_Bottom: 60
m_ChildAlignment: 0
m_StartCorner: 0
m_StartAxis: 0
m_CellSize: {x: 95, y: 95}
m_Spacing: {x: 3, y: 25}
m_Spacing: {x: 3, y: 26.52}
m_Constraint: 0
m_ConstraintCount: 2
--- !u!114 &1691005042306177730
@ -645,6 +645,140 @@ MonoBehaviour:
m_EditorClassIdentifier:
objs:
- {fileID: 5478117157784657024}
--- !u!1 &2089927538293200856
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6567746856032384694}
- component: {fileID: 4770789190701861879}
- component: {fileID: 8344488048681177442}
m_Layer: 0
m_Name: Text (TMP)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6567746856032384694
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2089927538293200856}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 7360545664958513336}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4770789190701861879
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2089927538293200856}
m_CullTransparentMesh: 1
--- !u!114 &8344488048681177442
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2089927538293200856}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: "\u4EEA\u5668\u680F"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 9bbfb1bdb0251664eb0932e39724900e, type: 2}
m_sharedMaterial: {fileID: 5103963756306747964, guid: 9bbfb1bdb0251664eb0932e39724900e, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 36
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &2685508885550636136
GameObject:
m_ObjectHideFlags: 0
@ -677,7 +811,6 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 8229723427790603414}
- {fileID: 8917602652266463158}
m_Father: {fileID: 9189599814967438796}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@ -769,6 +902,7 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 7328848354993208298}
- {fileID: 7360545664958513336}
m_Father: {fileID: 4604846658045866225}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@ -894,17 +1028,10 @@ RectTransform:
- {fileID: 9189599814967438796}
m_Father: {fileID: 4477385101412774245}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
<<<<<<< HEAD
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -179.30054, y: 0}
m_SizeDelta: {x: 315.6011, y: 653}
=======
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 111.5, y: 0}
m_SizeDelta: {x: 223, y: 653}
>>>>>>> origin/master
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7995524027316056123
CanvasRenderer:
@ -934,8 +1061,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 30e3aa8ffb9bffe41a9b324f16d17ce9, type: 3}
m_Type: 0
m_Sprite: {fileID: 21300000, guid: 37ba5170da6a99a4ba200206618744a9, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
@ -996,216 +1123,6 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &3599546748676528918
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8917602652266463158}
- component: {fileID: 8128287803592049109}
- component: {fileID: 7749456324095236735}
m_Layer: 0
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8917602652266463158
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3599546748676528918}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 7543916184555857751}
m_Father: {fileID: 7328848354993208298}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: -2.1110992, y: -25}
m_SizeDelta: {x: 204.2207, y: 43.0254}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8128287803592049109
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3599546748676528918}
m_CullTransparentMesh: 1
--- !u!114 &7749456324095236735
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3599546748676528918}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 075df38eca74a7c4a8c95447dd328334, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &5055299857677371178
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7543916184555857751}
- component: {fileID: 7901742777482044344}
- component: {fileID: 4358930841536560966}
m_Layer: 0
m_Name: Text (TMP)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7543916184555857751
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5055299857677371178}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8917602652266463158}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7901742777482044344
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5055299857677371178}
m_CullTransparentMesh: 1
--- !u!114 &4358930841536560966
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5055299857677371178}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: "\u5DE5\u5177\u680F"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 9bbfb1bdb0251664eb0932e39724900e, type: 2}
m_sharedMaterial: {fileID: 5103963756306747964, guid: 9bbfb1bdb0251664eb0932e39724900e, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 30
m_fontSizeBase: 30
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &5478117157784657024
GameObject:
m_ObjectHideFlags: 0
@ -1223,7 +1140,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &7464141640143892343
RectTransform:
m_ObjectHideFlags: 0
@ -1264,7 +1181,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0.19816756, b: 1, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@ -1434,6 +1351,82 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &7191781189427440038
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7360545664958513336}
- component: {fileID: 4723410735855962375}
- component: {fileID: 1680076001771992938}
m_Layer: 0
m_Name: Title
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7360545664958513336
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7191781189427440038}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 6567746856032384694}
m_Father: {fileID: 9189599814967438796}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -35.3}
m_SizeDelta: {x: 174, y: 45}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4723410735855962375
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7191781189427440038}
m_CullTransparentMesh: 1
--- !u!114 &1680076001771992938
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7191781189427440038}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 3ac2dc7900241e5418caadf342908284, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &9141652036248099059
GameObject:
m_ObjectHideFlags: 0
@ -1493,7 +1486,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 1}
m_Color: {r: 0.07058824, g: 0.15686275, b: 0.19607843, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1

View File

@ -41,47 +41,6 @@ MonoBehaviour:
m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1}
m_Rotation: {x: 0, y: 0, z: 0, w: 1}
m_ApplyOffsets: 0
--- !u!114 &-310080560755062523
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d21dcc2386d650c4597f3633c75a1f98, type: 3}
m_Name: Animation Track
m_EditorClassIdentifier:
m_Version: 3
m_AnimClip: {fileID: 0}
m_Locked: 0
m_Muted: 0
m_CustomPlayableFullTypename:
m_Curves: {fileID: 0}
m_Parent: {fileID: 11400000}
m_Children: []
m_Clips: []
m_Markers:
m_Objects: []
m_InfiniteClipPreExtrapolation: 1
m_InfiniteClipPostExtrapolation: 1
m_InfiniteClipOffsetPosition: {x: -0.15467434, y: -0.017526474, z: 0.022634063}
m_InfiniteClipOffsetEulerAngles: {x: 0.000005018332, y: 0.0000009810276, z: 90}
m_InfiniteClipTimeOffset: 0
m_InfiniteClipRemoveOffset: 0
m_InfiniteClipApplyFootIK: 1
mInfiniteClipLoop: 0
m_MatchTargetFields: 63
m_Position: {x: 0, y: 0, z: 0}
m_EulerAngles: {x: 0, y: 0, z: 0}
m_AvatarMask: {fileID: 0}
m_ApplyAvatarMask: 1
m_TrackOffset: 0
m_InfiniteClip: {fileID: 3956335740466789298}
m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1}
m_Rotation: {x: 0, y: 0, z: 0, w: 1}
m_ApplyOffsets: 0
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
@ -97,7 +56,7 @@ MonoBehaviour:
m_Version: 0
m_Tracks:
- {fileID: -6968582957645526548}
- {fileID: -310080560755062523}
- {fileID: 8441259877855007824}
m_FixedDuration: 0
m_EditorSettings:
m_Framerate: 60
@ -787,13 +746,13 @@ AnimationClip:
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []
--- !u!74 &3956335740466789298
--- !u!74 &5763791104914073583
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Recorded
m_Name: Recorded (2)
serializedVersion: 7
m_Legacy: 0
m_Compressed: 0
@ -806,7 +765,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 360, y: 0.00001189519, z: -0.0000001751087}
value: {x: 0, y: 0, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@ -815,7 +774,7 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 1.6666666
value: {x: 467.6995, y: 0.00001189519, z: 0.00001508368}
value: {x: 510, y: 0, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@ -826,7 +785,23 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
path:
m_PositionCurves: []
m_PositionCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0, y: 0, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path:
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves: []
@ -846,6 +821,15 @@ AnimationClip:
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
- serializedVersion: 2
path: 0
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
@ -874,7 +858,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 360
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
@ -883,7 +867,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 1.6666666
value: 467.6995
value: 510
inSlope: 0
outSlope: 0
tangentMode: 136
@ -904,7 +888,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0.00001189519
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
@ -913,7 +897,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 1.6666666
value: 0.00001189519
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
@ -934,7 +918,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -0.0000001751087
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
@ -943,7 +927,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 1.6666666
value: 0.00001508368
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
@ -958,6 +942,69 @@ AnimationClip:
classID: 4
script: {fileID: 0}
flags: 16
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.x
path:
classID: 4
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.y
path:
classID: 4
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.z
path:
classID: 4
script: {fileID: 0}
flags: 0
m_EulerEditorCurves:
- serializedVersion: 2
curve:
@ -998,3 +1045,44 @@ AnimationClip:
m_HasGenericRootTransform: 1
m_HasMotionFloatCurves: 0
m_Events: []
--- !u!114 &8441259877855007824
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d21dcc2386d650c4597f3633c75a1f98, type: 3}
m_Name: Animation Track (2)
m_EditorClassIdentifier:
m_Version: 3
m_AnimClip: {fileID: 0}
m_Locked: 0
m_Muted: 0
m_CustomPlayableFullTypename:
m_Curves: {fileID: 0}
m_Parent: {fileID: 11400000}
m_Children: []
m_Clips: []
m_Markers:
m_Objects: []
m_InfiniteClipPreExtrapolation: 1
m_InfiniteClipPostExtrapolation: 1
m_InfiniteClipOffsetPosition: {x: -0.08094797, y: 0, z: 0.0053549297}
m_InfiniteClipOffsetEulerAngles: {x: -0, y: 0, z: 0}
m_InfiniteClipTimeOffset: 0
m_InfiniteClipRemoveOffset: 0
m_InfiniteClipApplyFootIK: 1
mInfiniteClipLoop: 0
m_MatchTargetFields: 63
m_Position: {x: 0, y: 0, z: 0}
m_EulerAngles: {x: 0, y: 0, z: 0}
m_AvatarMask: {fileID: 0}
m_ApplyAvatarMask: 1
m_TrackOffset: 0
m_InfiniteClip: {fileID: 5763791104914073583}
m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1}
m_Rotation: {x: 0, y: 0, z: 0, w: 1}
m_ApplyOffsets: 0

Binary file not shown.

Before

Width:  |  Height:  |  Size: 110 KiB

After

Width:  |  Height:  |  Size: 186 KiB

File diff suppressed because one or more lines are too long

View File

@ -21,9 +21,12 @@
<Action type="LoadRes" value="FenGuangJing.xml" resType="xml" index="8"></Action>
<!--模块9黄金首饰加工工艺-->
<Action type="LoadRes" value="HuangJinShouShiJiaGong.xml" resType="xml" index="9"></Action>
<!--模块10玉雕的制作-->
<Action type="LoadRes" value="YuDiaoDeZhiZuo.xml" resType="xml" index="10"></Action>
<!--模块11宝石琢磨加工-->
<Action type="LoadRes" value="BaoShiZhuoMoJiaGong.xml" resType="xml" index="11"></Action>
<!--模块12 珠宝工作台的认知-->

View File

@ -525,11 +525,25 @@
<Action type="Hint" value="请选择合适的工具,用于放置刚才熔化的金料,等待自然冷却" time="-1" icon="true" ></Action>
<Action type="HighLightFlash" value="Main/SM_ZhuChangJing/SM_MuJu" isHigh="true" color="255,0,0,255" time="0.25" count="-1"></Action>
<Condition type="ObjClick" value="Main/SM_ZhuChangJing/SM_MuJu" ></Condition>
<Action type="HighLightFlash" value="Main/SM_ZhuChangJing/SM_MuJu" isHigh="false" color="255,0,0,255"></Action>
<Action type="Show" value="Main/SM_ZhuChangJing/SM_MuJu" isShow="false" ></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="UIShow" value="UITools" isShow="false"></Action>
<Action type="Show" value="Main/SM_ZhuChangJing/SM_MuJu" isShow="true" ></Action>
<!--坩埚金水倒入摸具,-->
<Action type="TimeLine" value="TimeLine/HanQiang_JinShuiDoaRuMuJu" isShow="true" finishedEvent="播放完毕" isWait="true" frame="0" endFrame="300"></Action>

View File

@ -86,11 +86,17 @@
<!--随便配置的分数模块-->
<Score>
<Item step="1111" name="1111" sum="2" bind=""/>
<Item step="紫外荧光灯" name="1.肉眼观察" sum="14.28" bind=""/>
<Item step="紫外荧光灯" name="2.均质体/非均质体检测" sum="14.28" bind=""/>
<Item step="紫外荧光灯" name="3.折射率检测" sum="14.28" bind=""/>
<Item step="紫外荧光灯" name="4.放大检测" sum="14.28" bind=""/>
<Item step="紫外荧光灯" name="5.密度检测" sum="14.28" bind=""/>
<Item step="紫外荧光灯" name="6.紫外荧光检测" sum="14.28" bind=""/>
<Item step="紫外荧光灯" name="7.结论总结" sum="14.28" bind=""/>
</Score>
<Operation moduleType="Study" freeStep="true">
<Operation moduleType="All" freeStep="true">
@ -102,7 +108,10 @@
<Action type="Show" value="Main/SM_NieZi (1)" isShow="false" ></Action>
<!--隐藏物体-->
<Action type="Show" value="Main/SM_NieZi (1)" isShow="false" ></Action>
<Action type="Show" value="Main/SM_LengShiFenGuangJing" isShow="false" ></Action>
<Action type="Show" value="Main/SM_GuangShanFenGuangJing" isShow="false" ></Action>
<Action type="Show" value="Main/SM_GanSHeQiu" isShow="false" ></Action>
<!--台面视角-->
<Action type="Move" value="FlyCamera" to="0.238259211,1.44267952,2.06465316" time="0"></Action>
@ -118,9 +127,9 @@
wrongLabel="提示:物品选择错误,当前模块中,不需要该物品。"
rightEvent="物品准备通过"
wrongEvent=""
rightScore="1"
rightScore="14.28"
wrongScore=""
scoreStepName="操作准备物品准备"
scoreStepName="紫外荧光灯1.肉眼观察"
autoHide="1">
</Action>
<Condition type="StrEvent" value="物品准备通过"></Condition>
@ -159,9 +168,9 @@
wrongLabel="提示:物品选择错误,当前模块中,不需要该物品。"
rightEvent="物品准备通过"
wrongEvent=""
rightScore="1"
rightScore="14.28"
wrongScore=""
scoreStepName="操作准备物品准备"
scoreStepName="紫外荧光灯2.均质体/非均质体检测"
autoHide="1">
</Action>
<Condition type="StrEvent" value="物品准备通过"></Condition>
@ -240,9 +249,9 @@
wrongLabel="提示:物品选择错误,当前模块中,不需要该物品。"
rightEvent="物品准备通过"
wrongEvent=""
rightScore="1"
rightScore="14.28"
wrongScore=""
scoreStepName="操作准备物品准备"
scoreStepName="紫外荧光灯3.折射率检测"
autoHide="1">
</Action>
<Condition type="StrEvent" value="物品准备通过"></Condition>
@ -355,7 +364,7 @@
<Action type="Input" title="请输入折射率最小值,最大值" finishedEvent="UI关闭事件通知用StrEvent接收">
<Input name="数字1:" var="变量1" answer="1.578"></Input>
<Input name="数字2:" var="变量2" answer="1.582"></Input>
<Btn name="确定" clickEvent="确定点击" checkAnswer="true" wrongLabel="输入错误" wrongCount="3" autoHide="-1" scoreStepName="" rightScore="0" wrongScore="-1"></Btn>
<Btn name="确定" clickEvent="确定点击" checkAnswer="true" wrongLabel="输入错误" wrongCount="3" autoHide="-1" scoreStepName="" rightScore="14.28" wrongScore="-1"></Btn>
</Action>
<Condition type="StrEvent" value="UI关闭事件通知用StrEvent接收"></Condition>
@ -422,9 +431,9 @@
wrongLabel="提示:物品选择错误,当前模块中,不需要该物品。"
rightEvent="物品准备通过"
wrongEvent=""
rightScore="1"
rightScore="14.28"
wrongScore=""
scoreStepName="操作准备物品准备"
scoreStepName="紫外荧光灯4.放大检测"
autoHide="1">
</Action>
<Condition type="StrEvent" value="物品准备通过"></Condition>
@ -518,9 +527,9 @@
wrongLabel="提示:物品选择错误,当前模块中,不需要该物品。"
rightEvent="物品准备通过"
wrongEvent=""
rightScore="1"
rightScore="14.28"
wrongScore=""
scoreStepName="操作准备物品准备"
scoreStepName="紫外荧光灯5.密度检测"
autoHide="1">
</Action>
<Condition type="StrEvent" value="物品准备通过"></Condition>
@ -639,9 +648,9 @@
wrongLabel="提示:物品选择错误,当前模块中,不需要该物品。"
rightEvent="物品准备通过"
wrongEvent=""
rightScore="1"
rightScore="14.28"
wrongScore=""
scoreStepName="操作准备物品准备"
scoreStepName="紫外荧光灯6.紫外荧光检测"
autoHide="1">
</Action>
<Condition type="StrEvent" value="物品准备通过"></Condition>
@ -661,7 +670,7 @@
<Action type="Move" value="FlyCamera" to="-0.347500294,1.37970066,2.14059496" time="0"></Action>
<Action type="Rotate" value="FlyCamera" to="33.3920975,359.285889,-1.59777631e-08" time="0"></Action>
<Action type="Hint" value="请将被测试的玉滴石放置到紫外荧光灯的暗箱内" time="-1" icon="true" ></Action>
<Action type="Hint" value="请选择合适的工具,检测祖母绿在紫外灯照射下的影像" time="-1" icon="true" ></Action>
<!--拿出 玉滴石,放入暗门-->
<Action type="TimeLine" value="TimeLines/NaChuBaoShiBingFangRuAnMen" isShow="true" finishedEvent="播放完毕" isWait="true" frame="0" endFrame="150"></Action>
<Action type="Delay" value="1"></Action>
@ -701,11 +710,15 @@
<Step name="7.结论总结">
<Start>
<Action type="Sequence">
<Action type="TextQuestion" title="请根据上述测量结果,判定当前测试的祖母绿是否为水热法合成祖母绿?" options="A.是|B.不是" answers="1" btns="确定" wait="1" showAnswer="true" scoreName="分数名" rightScore="5" wrongScore="-5" absolutely="false" format="{0:F1}" finishedEvent="事件名" optionType="0"></Action>
<Action type="TextQuestion" title="请根据上述测量结果,判定当前测试的祖母绿是否为水热法合成祖母绿?" options="A.是|B.不是" answers="1" btns="确定" wait="1" showAnswer="true" scoreName="紫外荧光灯7.结论总结" rightScore="14.28" absolutely="false" format="{0:F1}" finishedEvent="答题完成" optionType="0"></Action>
<Condition type="StrEvent" value="答题完成"></Condition>
<Action type="UIShow" value="UIScore" isShow="true"></Action>
<Action type="TipWindow" value="恭喜你完成当前模块" btns="确定" audio=""></Action>
<Condition type="UIClick" value="UIRoot/PopUI/UITipWindow/Mask/Connnet/BtnContent/确定"></Condition>
</Action>
</Start>
</Step>

View File

@ -13,17 +13,75 @@
<State name="初始状态">
<Enter>
<Action type="Sequence">
<Action type="UIShow" value="UIOperationList"></Action>
<Action type="NextOperation"></Action>
<!--<Action type="UIShow" value="UIOperationList"></Action>
<Action type="NextOperation"></Action>-->
<!--<Action type="StrEvent" name="HighLightTrigger" value="false"></Action>-->
<Action type="UIBackPack" devices="偏光镜,棱镜式分光镜,光栅式分光镜"
random="true"
scrollSpeed="25"
position="right"></Action>
</Action>
</Enter>
</State>
<State name="偏光镜">
<Enter>
</Enter>
<Exit>
</Exit>
</State>
<State name="棱镜式分光镜">
<Enter>
<Action type="Sequence">
<Action type="Log" value="进入 棱镜式分光镜 状态"></Action>
</Action>
</Enter>
</State>
<State name="光栅式分光镜">
<Enter>
<Action type="Sequence">
<Action type="Log" value="进入 光栅式分光镜 状态"></Action>
</Action>
</Enter>
</State>
<Transision from="any" to="初始状态">
</Transision>
<Transision from="any" to="偏光镜">
<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>
</Transision>
<Transision from="any" to="光栅式分光镜">
<Condition type="UIClick" value="UIRoot/PopUI/UIBackPack/bg/Scroll/Viewport/Content/光栅式分光镜"></Condition>
</Transision>
</FSM>