9月14日下午

This commit is contained in:
liuyu 2024-09-14 14:48:02 +08:00
parent 978fdf25dc
commit a0a80f1498
7 changed files with 689 additions and 16 deletions

View File

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1}
m_IndirectSpecularColor: {r: 0.12731749, g: 0.13414757, b: 0.1210787, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@ -2590,6 +2590,22 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8480445623205370875, guid: fa12b84946083d14cb4447029910be28, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8480445623205370875, guid: fa12b84946083d14cb4447029910be28, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 1406223273}
- target: {fileID: 8480445623205370875, guid: fa12b84946083d14cb4447029910be28, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: PressSubmitBtn
objectReference: {fileID: 0}
- target: {fileID: 8480445623205370875, guid: fa12b84946083d14cb4447029910be28, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: SubmitBtn, Assembly-CSharp
objectReference: {fileID: 0}
- target: {fileID: 8653840729936170295, guid: fa12b84946083d14cb4447029910be28, type: 3}
propertyPath: m_Enabled
value: 0
@ -2667,6 +2683,9 @@ PrefabInstance:
- targetCorrespondingSourceObject: {fileID: 178020885541006542, guid: fa12b84946083d14cb4447029910be28, type: 3}
insertIndex: 4
addedObject: {fileID: 46015715}
- targetCorrespondingSourceObject: {fileID: 178020885541006542, guid: fa12b84946083d14cb4447029910be28, type: 3}
insertIndex: -1
addedObject: {fileID: 357746246}
- targetCorrespondingSourceObject: {fileID: 3872295731099453067, guid: fa12b84946083d14cb4447029910be28, type: 3}
insertIndex: -1
addedObject: {fileID: 1910311579}
@ -2683,6 +2702,9 @@ PrefabInstance:
- targetCorrespondingSourceObject: {fileID: 7261749442720430534, guid: fa12b84946083d14cb4447029910be28, type: 3}
insertIndex: -1
addedObject: {fileID: 191666369}
- targetCorrespondingSourceObject: {fileID: 8157337112890738104, guid: fa12b84946083d14cb4447029910be28, type: 3}
insertIndex: -1
addedObject: {fileID: 1406223273}
- targetCorrespondingSourceObject: {fileID: 6936837401119365408, guid: fa12b84946083d14cb4447029910be28, type: 3}
insertIndex: -1
addedObject: {fileID: 1927291732}
@ -3844,6 +3866,140 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 294471944}
m_CullTransparentMesh: 1
--- !u!1 &294718493
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 294718494}
- component: {fileID: 294718496}
- component: {fileID: 294718495}
m_Layer: 5
m_Name: Text (TMP)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &294718494
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 294718493}
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: 357746246}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -0.000021964, y: 85}
m_SizeDelta: {x: 464.1, y: 54.2443}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &294718495
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 294718493}
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: "\u603B\u5206\uFF1A123213"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 45138b4de74eb5a4b829ae598c8cb358, type: 2}
m_sharedMaterial: {fileID: 3942548801962692333, guid: 45138b4de74eb5a4b829ae598c8cb358, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4288303376
m_fontColor: {r: 0.0627451, g: 0.31764707, b: 0.6039216, 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: 26
m_fontSizeBase: 26
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 1
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!222 &294718496
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 294718493}
m_CullTransparentMesh: 1
--- !u!1 &305540346
GameObject:
m_ObjectHideFlags: 0
@ -4236,6 +4392,101 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 324843210}
m_CullTransparentMesh: 1
--- !u!1 &357746245
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 357746246}
- component: {fileID: 357746248}
- component: {fileID: 357746247}
- component: {fileID: 357746249}
m_Layer: 5
m_Name: "\u5206\u6570 (1)"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &357746246
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 357746245}
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: 2135181459}
- {fileID: 1662704224}
- {fileID: 294718494}
- {fileID: 1561787731}
m_Father: {fileID: 1847624253}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -22.354492}
m_SizeDelta: {x: 540, y: 356}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &357746247
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 357746245}
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: 3c03bb0ba7b7c8f4d9fec101631c1374, 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!222 &357746248
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 357746245}
m_CullTransparentMesh: 1
--- !u!114 &357746249
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 357746245}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f92172c6f4dd34947b81a7864de0de6f, type: 3}
m_Name:
m_EditorClassIdentifier:
overGame: {fileID: 357746245}
text: {fileID: 294718495}
scoreText: {fileID: 1561787732}
--- !u!1 &367232219
GameObject:
m_ObjectHideFlags: 0
@ -8209,6 +8460,11 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 748582795}
m_CullTransparentMesh: 1
--- !u!1 &752036139 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 3675874295142686003, guid: fa12b84946083d14cb4447029910be28, type: 3}
m_PrefabInstance: {fileID: 191666367}
m_PrefabAsset: {fileID: 0}
--- !u!1 &754108675
GameObject:
m_ObjectHideFlags: 0
@ -15924,6 +16180,25 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1406197010}
m_CullTransparentMesh: 1
--- !u!1 &1406223268 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 8157337112890738104, guid: fa12b84946083d14cb4447029910be28, type: 3}
m_PrefabInstance: {fileID: 191666367}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1406223273
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1406223268}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 29a20ca670e09c849b79bec899abeb97, type: 3}
m_Name:
m_EditorClassIdentifier:
CompleteOverComponent: {fileID: 357746249}
SubmitPlane: {fileID: 752036139}
--- !u!1 &1420796210
GameObject:
m_ObjectHideFlags: 0
@ -17851,6 +18126,140 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1559309477}
m_CullTransparentMesh: 1
--- !u!1 &1561787730
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1561787731}
- component: {fileID: 1561787733}
- component: {fileID: 1561787732}
m_Layer: 5
m_Name: Text (TMP) (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1561787731
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1561787730}
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: 357746246}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -0.000021964, y: -0.0000095367}
m_SizeDelta: {x: 464.1, y: 54.2443}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1561787732
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1561787730}
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: 11
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 45138b4de74eb5a4b829ae598c8cb358, type: 2}
m_sharedMaterial: {fileID: 3942548801962692333, guid: 45138b4de74eb5a4b829ae598c8cb358, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4288303376
m_fontColor: {r: 0.0627451, g: 0.31764707, b: 0.6039216, 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: 50
m_fontSizeBase: 50
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!222 &1561787733
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1561787730}
m_CullTransparentMesh: 1
--- !u!1 &1566199008
GameObject:
m_ObjectHideFlags: 0
@ -19343,6 +19752,126 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1656937172}
m_CullTransparentMesh: 1
--- !u!1 &1662704223
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1662704224}
- component: {fileID: 1662704227}
- component: {fileID: 1662704226}
- component: {fileID: 1662704225}
m_Layer: 5
m_Name: "\u786E\u5B9A"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1662704224
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1662704223}
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: 357746246}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0.0000080168, y: -132}
m_SizeDelta: {x: 120, y: 44}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1662704225
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1662704223}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 1662704226}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &1662704226
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1662704223}
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: 4b7cb31683984334e8d4d6b09f8178be, 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!222 &1662704227
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1662704223}
m_CullTransparentMesh: 1
--- !u!1 &1664430286
GameObject:
m_ObjectHideFlags: 0
@ -24614,6 +25143,126 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2133375199}
m_CullTransparentMesh: 1
--- !u!1 &2135181458
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2135181459}
- component: {fileID: 2135181462}
- component: {fileID: 2135181461}
- component: {fileID: 2135181460}
m_Layer: 5
m_Name: "\u5173\u95ED"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &2135181459
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2135181458}
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: 357746246}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -10, y: -32}
m_SizeDelta: {x: 46, y: 46}
m_Pivot: {x: 1, y: 1}
--- !u!114 &2135181460
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2135181458}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 2135181461}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &2135181461
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2135181458}
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: af9093ccdb663424ebda2262a15a47e6, 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!222 &2135181462
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2135181458}
m_CullTransparentMesh: 1
--- !u!1 &2143701945
GameObject:
m_ObjectHideFlags: 0

View File

@ -11532,7 +11532,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7661808200932631899, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
propertyPath: m_Enabled
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7745216743049305763, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
propertyPath: m_LocalRotation.w
@ -28920,7 +28920,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1505150129}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f92172c6f4dd34947b81a7864de0de6f, type: 3}
m_Name:

View File

@ -1,6 +1,11 @@
using DefaultNamespace.ProcessMode;
using DefaultNamespace;
using MotionFramework;
using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.SocialPlatforms.Impl;
public class SubmitBtn : MonoBehaviour
{
@ -8,8 +13,19 @@ public class SubmitBtn : MonoBehaviour
public GameObject SubmitPlane;
public void PressSubmitBtn()
{
{
switch (MotionEngine.GetModule<DataConfigManager>().GetProcessMode())
{
case ProcessMode.Practice:
CompleteOverComponent.CompleteEvent(MotionEngine.GetModule<AnimationProcessManager>().CalculateTotalScore());
break;
case ProcessMode.Assessment:
SubmitPlane.SetActive(true);
break;
default:
throw new ArgumentOutOfRangeException();
}
}
// Start is called before the first frame update

View File

@ -557,7 +557,7 @@ namespace DefaultNamespace.ProcessMode
else
{
Debug.Log("步骤没问题");
totalScore += step.Score; // 每个步骤满分为10
//totalScore += step.Score; // 每个步骤满分为10
if (!step.IsCompleted)
{
sub.score = 0;
@ -565,6 +565,7 @@ namespace DefaultNamespace.ProcessMode
else
{
sub.score = (int)step.Score;
totalScore += step.Score; // HQB 步骤完成才能加分
}
sub.stepName = step.StepDescription;

View File

@ -209,6 +209,8 @@ public class ToolManager : MonoBehaviour
TooslManager.instance.currentTool = Tool[2];
RetractBtn[0].gameObject.SetActive(true);
Tool[2].transform.localScale = new Vector3(0.001f, 0.001f, 0.001f);//LY
Tool[3].gameObject.SetActive(false);//LY
RetractBtn[1].gameObject.SetActive(false);//LY
}
if (message == "螺丝刀")
@ -217,18 +219,24 @@ public class ToolManager : MonoBehaviour
TooslManager.instance.currentTool = Tool[4];
RetractBtn[2].gameObject.SetActive(true);
Tool[4].transform.localScale = new Vector3(1f, 1f, 1f);//LY
Tool[3].gameObject.SetActive(false);//LY
RetractBtn[1].gameObject.SetActive(false);//LY
}
if (message == "绝缘胶带")
{
Tool[5].gameObject.SetActive(true);
TooslManager.instance.currentTool = Tool[5];
RetractBtn[3].gameObject.SetActive(true);
Tool[3].gameObject.SetActive(false);
RetractBtn[1].gameObject.SetActive(false);
}
if (message == "l型集中器")
{
Tool[6].gameObject.SetActive(true);
TooslManager.instance.currentTool = Tool[6];
Tool[3].gameObject.SetActive(false);
RetractBtn[1].gameObject.SetActive(false);
return;
// RetractBtn[4].gameObject.SetActive(true);
}
@ -237,6 +245,8 @@ public class ToolManager : MonoBehaviour
Tool[7].gameObject.SetActive(true);
TooslManager.instance.currentTool = Tool[7];
RetractBtn[4].gameObject.SetActive(true);
Tool[3].gameObject.SetActive(false);
RetractBtn[1].gameObject.SetActive(false);
}
Debug.Log("Received message: " + message);

View File

@ -26,7 +26,7 @@ public class CompleteOverComponent : MonoBehaviour
MotionEngine.GetModule<AnimationProcessManager>().OnCompleteEvent -= CompleteEvent;
}
private void CompleteEvent(int score)
public void CompleteEvent(int score)//HQB 改public
{
overGame.SetActive(true);
@ -44,16 +44,13 @@ public class CompleteOverComponent : MonoBehaviour
text.text = "本次练习实训总分";
scoreText.text = score.ToString();
break;
case ProcessMode.Assessment:
text.text = "本次考核模式总分";
scoreText.text = score.ToString();
break;
//case ProcessMode.Assessment://HQB考试只提交不出分
// text.text = "本次考核模式总分";
// scoreText.text = score.ToString();
// break;
default:
throw new ArgumentOutOfRangeException();
}
}
}

View File

@ -197,10 +197,10 @@ public class Fieldobservation : MonoBehaviour
MotionEngine.GetModule<AnimationProcessManager>().HandleClick("¸Ç_͸Ã÷Íâ¿Ç");
}
public IEnumerator ParentOverSealCoro()
public IEnumerator ParentOverSealCoro()//HQB 透明盖子移动后被DoTween占用
{
DOTween.Kill(Transparentover);
if (DOTween.IsTweening(Transparentover))
while (DOTween.IsTweening(Transparentover))
{
Debug.Log("Transparentover killing....");
yield return null;