Merge branch 'main' into HQB_workspace
This commit is contained in:
commit
aa02fffc38
File diff suppressed because one or more lines are too long
Binary file not shown.
|
After Width: | Height: | Size: 4.6 MiB |
|
|
@ -0,0 +1,159 @@
|
|||
fileFormatVersion: 2
|
||||
guid: f315f22d3cf8cbd4d9c4cca61b25a75d
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
serializedVersion: 12
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 1
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
vTOnly: 0
|
||||
ignoreMasterTextureLimit: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 1
|
||||
aniso: 2
|
||||
mipBias: 0
|
||||
wrapU: 0
|
||||
wrapV: 0
|
||||
wrapW: 0
|
||||
nPOTScale: 1
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 0
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 0
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 0
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
flipbookRows: 1
|
||||
flipbookColumns: 1
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
ignorePngGamma: 0
|
||||
applyGammaDecoding: 0
|
||||
cookieLightType: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 3
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 8192
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 8192
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
buildTarget: iPhone
|
||||
maxTextureSize: 8192
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
buildTarget: Android
|
||||
maxTextureSize: 8192
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
buildTarget: Windows Store Apps
|
||||
maxTextureSize: 8192
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
buildTarget: WebGL
|
||||
maxTextureSize: 8192
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID:
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
nameFileIdTable: {}
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,639 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &5752134635643566008
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 5752134635643566007}
|
||||
- component: {fileID: 5752134635643566005}
|
||||
- component: {fileID: 5752134635643566006}
|
||||
m_Layer: 5
|
||||
m_Name: point
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &5752134635643566007
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5752134635643566008}
|
||||
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: 5752134636428089069}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 77, y: -3.5}
|
||||
m_SizeDelta: {x: 779.7491, y: 26.2853}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &5752134635643566005
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5752134635643566008}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &5752134635643566006
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5752134635643566008}
|
||||
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: "\u8003\u70B9"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 1c4004df1d65ff944b6e23e3af757df7, type: 2}
|
||||
m_sharedMaterial: {fileID: 1751944718996602668, guid: 1c4004df1d65ff944b6e23e3af757df7, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
m_fontColor32:
|
||||
serializedVersion: 2
|
||||
rgba: 4294178278
|
||||
m_fontColor: {r: 0.9019608, g: 0.9607843, b: 0.9529412, 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: 14
|
||||
m_fontSizeBase: 14
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 18
|
||||
m_fontSizeMax: 72
|
||||
m_fontStyle: 0
|
||||
m_HorizontalAlignment: 1
|
||||
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 &5752134635986442910
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 5752134635986442909}
|
||||
- component: {fileID: 5752134635986442907}
|
||||
- component: {fileID: 5752134635986442908}
|
||||
m_Layer: 5
|
||||
m_Name: pointInfo
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &5752134635986442909
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5752134635986442910}
|
||||
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: 5752134636428089069}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 77, y: -29.785}
|
||||
m_SizeDelta: {x: 779.7491, y: 26.2853}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &5752134635986442907
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5752134635986442910}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &5752134635986442908
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5752134635986442910}
|
||||
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: "\u8003\u70B9\u5185\u5BB9"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: f23cde0c3d86dad49bedc202ad993d21, type: 2}
|
||||
m_sharedMaterial: {fileID: -2120909647377011300, guid: f23cde0c3d86dad49bedc202ad993d21, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
m_fontColor32:
|
||||
serializedVersion: 2
|
||||
rgba: 4294178278
|
||||
m_fontColor: {r: 0.9019608, g: 0.9607843, b: 0.9529412, 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: 14
|
||||
m_fontSizeBase: 14
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 18
|
||||
m_fontSizeMax: 72
|
||||
m_fontStyle: 0
|
||||
m_HorizontalAlignment: 1
|
||||
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 &5752134636245922259
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 5752134636245922258}
|
||||
- component: {fileID: 5752134636245922256}
|
||||
- component: {fileID: 5752134636245922257}
|
||||
m_Layer: 5
|
||||
m_Name: score
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &5752134636245922258
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5752134636245922259}
|
||||
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: 5752134636428089069}
|
||||
m_RootOrder: 3
|
||||
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: -11.200012, y: 0}
|
||||
m_SizeDelta: {x: 60.4265, y: 38.1399}
|
||||
m_Pivot: {x: 1, y: 0.5}
|
||||
--- !u!222 &5752134636245922256
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5752134636245922259}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &5752134636245922257
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5752134636245922259}
|
||||
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: 5/10
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: f23cde0c3d86dad49bedc202ad993d21, type: 2}
|
||||
m_sharedMaterial: {fileID: -2120909647377011300, guid: f23cde0c3d86dad49bedc202ad993d21, 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: 16
|
||||
m_fontSizeBase: 16
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 18
|
||||
m_fontSizeMax: 72
|
||||
m_fontStyle: 0
|
||||
m_HorizontalAlignment: 4
|
||||
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 &5752134636428089070
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 5752134636428089069}
|
||||
- component: {fileID: 5752134636428089067}
|
||||
- component: {fileID: 5752134636428089068}
|
||||
- component: {fileID: 3085661424480161800}
|
||||
m_Layer: 5
|
||||
m_Name: UI_PracticeInfoItem
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &5752134636428089069
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5752134636428089070}
|
||||
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: 5752134637232285869}
|
||||
- {fileID: 5752134635643566007}
|
||||
- {fileID: 5752134635986442909}
|
||||
- {fileID: 5752134636245922258}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 952.2219, y: 60}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &5752134636428089067
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5752134636428089070}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &5752134636428089068
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5752134636428089070}
|
||||
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: 3772cb7a3c3b97042b4d33d17e7ac31b, 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!114 &3085661424480161800
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5752134636428089070}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 182995adc29f8be4686ebff46635e3ab, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
number: {fileID: 5752134637232285868}
|
||||
point: {fileID: 5752134635643566006}
|
||||
pointInfo: {fileID: 5752134635986442908}
|
||||
score: {fileID: 5752134636245922257}
|
||||
--- !u!1 &5752134637232285870
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 5752134637232285869}
|
||||
- component: {fileID: 5752134637232285867}
|
||||
- component: {fileID: 5752134637232285868}
|
||||
m_Layer: 5
|
||||
m_Name: number
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &5752134637232285869
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5752134637232285870}
|
||||
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: 5752134636428089069}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 17.6, y: -8.6}
|
||||
m_SizeDelta: {x: 34.2788, y: 38.1399}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &5752134637232285867
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5752134637232285870}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &5752134637232285868
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5752134637232285870}
|
||||
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: 1
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: f23cde0c3d86dad49bedc202ad993d21, type: 2}
|
||||
m_sharedMaterial: {fileID: -2120909647377011300, guid: f23cde0c3d86dad49bedc202ad993d21, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
m_fontColor32:
|
||||
serializedVersion: 2
|
||||
rgba: 4293912076
|
||||
m_fontColor: {r: 0.047058824, g: 0.9019608, b: 0.9372549, 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: 16
|
||||
m_fontSizeBase: 16
|
||||
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}
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: d3f708690531d2b4f8dc442fa19564e6
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -29793,7 +29793,7 @@ MonoBehaviour:
|
|||
m_Elasticity: 0.1
|
||||
m_Inertia: 1
|
||||
m_DecelerationRate: 0.135
|
||||
m_ScrollSensitivity: 1
|
||||
m_ScrollSensitivity: 8
|
||||
m_Viewport: {fileID: 5092569755324715940}
|
||||
m_HorizontalScrollbar: {fileID: 0}
|
||||
m_VerticalScrollbar: {fileID: 5092569753790709666}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,126 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &1275384510
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1275384511}
|
||||
- component: {fileID: 1275384514}
|
||||
- component: {fileID: 1275384513}
|
||||
- component: {fileID: 1275384512}
|
||||
m_Layer: 5
|
||||
m_Name: closeBtn
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1275384511
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1275384510}
|
||||
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: 7440448439230896798}
|
||||
m_RootOrder: 6
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -22.7015, y: -17.8}
|
||||
m_SizeDelta: {x: 31.2985, y: 31.9169}
|
||||
m_Pivot: {x: 1, y: 1}
|
||||
--- !u!222 &1275384514
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1275384510}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &1275384513
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1275384510}
|
||||
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: f074986326fd3a94aa20cd03487f6def, 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!114 &1275384512
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1275384510}
|
||||
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: 1275384513}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!1 &473241551733849269
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -339,8 +460,8 @@ RectTransform:
|
|||
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: -171}
|
||||
m_SizeDelta: {x: 954, y: 356}
|
||||
m_AnchoredPosition: {x: 12.649, y: -171}
|
||||
m_SizeDelta: {x: 979.3, y: 356}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!222 &4423676375775363998
|
||||
CanvasRenderer:
|
||||
|
|
@ -363,7 +484,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 0.039215688}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 0}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
|
|
@ -561,7 +682,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 1, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 10, y: 356}
|
||||
m_SizeDelta: {x: 4.9174, y: 356}
|
||||
m_Pivot: {x: 1, y: 0.5}
|
||||
--- !u!222 &8254604605554748317
|
||||
CanvasRenderer:
|
||||
|
|
@ -973,7 +1094,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 50, y: 0}
|
||||
m_AnchoredPosition: {x: 48.1, y: 0}
|
||||
m_SizeDelta: {x: 90, y: 22}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &5019641306455814346
|
||||
|
|
@ -1243,7 +1364,7 @@ RectTransform:
|
|||
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: 402, y: -136}
|
||||
m_AnchoredPosition: {x: 432.2, y: -136}
|
||||
m_SizeDelta: {x: 150, y: 22}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!222 &5547194882483757979
|
||||
|
|
@ -1379,12 +1500,13 @@ RectTransform:
|
|||
- {fileID: 6677978497714007400}
|
||||
- {fileID: 6042118791799735351}
|
||||
- {fileID: 2561553316968923878}
|
||||
m_Father: {fileID: 6320757096611808316}
|
||||
m_RootOrder: 0
|
||||
- {fileID: 1275384511}
|
||||
m_Father: {fileID: 3817148002605513986}
|
||||
m_RootOrder: 1
|
||||
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: 0}
|
||||
m_AnchoredPosition: {x: 0, y: -301}
|
||||
m_SizeDelta: {x: 1050, y: 612}
|
||||
m_Pivot: {x: 0.5, y: 0.99999994}
|
||||
--- !u!222 &3674270729544186017
|
||||
|
|
@ -1499,6 +1621,8 @@ GameObject:
|
|||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 8280803326201737033}
|
||||
- component: {fileID: 2115547483}
|
||||
- component: {fileID: 2115547484}
|
||||
m_Layer: 5
|
||||
m_Name: Content
|
||||
m_TagString: Untagged
|
||||
|
|
@ -1523,9 +1647,49 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0.00015272196}
|
||||
m_SizeDelta: {x: 0, y: 300}
|
||||
m_AnchoredPosition: {x: 0, y: 0.00043130192}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!114 &2115547483
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3957115057784079397}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Padding:
|
||||
m_Left: 0
|
||||
m_Right: 0
|
||||
m_Top: 0
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 0
|
||||
m_Spacing: 8
|
||||
m_ChildForceExpandWidth: 1
|
||||
m_ChildForceExpandHeight: 1
|
||||
m_ChildControlWidth: 0
|
||||
m_ChildControlHeight: 0
|
||||
m_ChildScaleWidth: 0
|
||||
m_ChildScaleHeight: 0
|
||||
m_ReverseArrangement: 0
|
||||
--- !u!114 &2115547484
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3957115057784079397}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_HorizontalFit: 0
|
||||
m_VerticalFit: 2
|
||||
--- !u!1 &4054617714779776324
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1682,7 +1846,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 50, y: 0}
|
||||
m_AnchoredPosition: {x: 48.7, y: 0}
|
||||
m_SizeDelta: {x: 90, y: 22}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &8168196570516417559
|
||||
|
|
@ -1855,7 +2019,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 161, y: 0}
|
||||
m_AnchoredPosition: {x: 197.1, y: -1.1}
|
||||
m_SizeDelta: {x: 50, y: 22}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &7868667528640152194
|
||||
|
|
@ -1886,7 +2050,7 @@ MonoBehaviour:
|
|||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: "\u5206\u9879\uFF1A"
|
||||
m_text: "\u5206\u6570\uFF1A"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: f23cde0c3d86dad49bedc202ad993d21, type: 2}
|
||||
m_sharedMaterial: {fileID: -2120909647377011300, guid: f23cde0c3d86dad49bedc202ad993d21, type: 2}
|
||||
|
|
@ -1991,7 +2155,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 36, y: 0}
|
||||
m_SizeDelta: {x: 50, y: 22}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &9075716879340563367
|
||||
|
|
@ -2103,7 +2267,7 @@ GameObject:
|
|||
- component: {fileID: 6694174265762331787}
|
||||
- component: {fileID: 1368541464799814158}
|
||||
m_Layer: 5
|
||||
m_Name: BG
|
||||
m_Name: Mask
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
|
|
@ -2120,8 +2284,7 @@ RectTransform:
|
|||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 7440448439230896798}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 3817148002605513986}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
@ -2151,7 +2314,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0, g: 0, b: 0, a: 0.3137255}
|
||||
m_Color: {r: 0, g: 0, b: 0, a: 0.7058824}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
|
|
@ -2178,7 +2341,7 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 3817148002605513986}
|
||||
- component: {fileID: 7450353646309351884}
|
||||
- component: {fileID: 9041295857965857462}
|
||||
- component: {fileID: 2084367063984493729}
|
||||
m_Layer: 5
|
||||
m_Name: UI_PracticeCompletedPanel
|
||||
m_TagString: Untagged
|
||||
|
|
@ -2199,6 +2362,7 @@ RectTransform:
|
|||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 6320757096611808316}
|
||||
- {fileID: 7440448439230896798}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
@ -2215,7 +2379,7 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8762165152915387485}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &9041295857965857462
|
||||
--- !u!114 &2084367063984493729
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
|
@ -2224,6 +2388,8 @@ MonoBehaviour:
|
|||
m_GameObject: {fileID: 8762165152915387485}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 2906a5efff54d77418edd381719c04cd, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: 182c33e6150e0fa4ba2470cded703ee9, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
piiPrefab: {fileID: 3085661424480161800, guid: d3f708690531d2b4f8dc442fa19564e6, type: 3}
|
||||
content: {fileID: 8280803326201737033}
|
||||
|
|
|
|||
|
|
@ -355,8 +355,8 @@ RectTransform:
|
|||
- {fileID: 1076003018959135971}
|
||||
- {fileID: 2952444591279362125}
|
||||
- {fileID: 7060027640272280436}
|
||||
m_Father: {fileID: 7319613471235136383}
|
||||
m_RootOrder: 0
|
||||
m_Father: {fileID: 493866945273487937}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 1}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
|
|
@ -809,6 +809,7 @@ RectTransform:
|
|||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 7319613471235136383}
|
||||
- {fileID: 6152588702754686429}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
@ -849,7 +850,7 @@ GameObject:
|
|||
- component: {fileID: 7982022017096541128}
|
||||
- component: {fileID: 2368228796411739469}
|
||||
m_Layer: 5
|
||||
m_Name: BG
|
||||
m_Name: mask
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
|
|
@ -866,8 +867,7 @@ RectTransform:
|
|||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 6152588702754686429}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 493866945273487937}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
@ -897,7 +897,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0, g: 0, b: 0, a: 0.3137255}
|
||||
m_Color: {r: 0, g: 0, b: 0, a: 0.7058824}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
|
|
|
|||
|
|
@ -312,8 +312,34 @@ PrefabInstance:
|
|||
propertyPath: m_Name
|
||||
value: "\u573A\u5730"
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 919132149155446097, guid: 92b1a298e95fb664cb2aa2aff35920e0, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2588606950836171102, guid: 92b1a298e95fb664cb2aa2aff35920e0, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 92b1a298e95fb664cb2aa2aff35920e0, type: 3}
|
||||
--- !u!1 &159466234 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 2588606950836171102, guid: 92b1a298e95fb664cb2aa2aff35920e0, type: 3}
|
||||
m_PrefabInstance: {fileID: 159466233}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!65 &159466235
|
||||
BoxCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 159466234}
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_Size: {x: 500, y: 761.86084, z: 1.2776842}
|
||||
m_Center: {x: 0, y: 119.0697, z: -0.60743433}
|
||||
--- !u!1 &192342789
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -3044,8 +3070,8 @@ Transform:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 950850337}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0.14606, y: -0.15198, z: 0.40478}
|
||||
m_LocalScale: {x: 0.10437811, y: 0.029909056, z: 0.0563622}
|
||||
m_LocalPosition: {x: 0.14606, y: -0.15198, z: 0.40884}
|
||||
m_LocalScale: {x: 0.10437811, y: 0.029909056, z: 0.04823308}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 543450652271447145}
|
||||
|
|
@ -6235,24 +6261,6 @@ Transform:
|
|||
m_Father: {fileID: 1501092962}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: -57, y: -68, z: 71}
|
||||
--- !u!1 &1968113507 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: -7138000903914520420, guid: 92b1a298e95fb664cb2aa2aff35920e0, type: 3}
|
||||
m_PrefabInstance: {fileID: 159466233}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!65 &1968113511
|
||||
BoxCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1968113507}
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_Size: {x: 500.00397, y: 519.947, z: 0.18053252}
|
||||
m_Center: {x: -0.0019607544, y: 240.02661, z: 0.09030101}
|
||||
--- !u!114 &1983640178 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 2576541080334431885, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
|
||||
|
|
|
|||
|
|
@ -42,9 +42,9 @@ public abstract class ScoreBase : MonoBehaviour
|
|||
|
||||
}
|
||||
/// <summary>
|
||||
/// 获取总分和各步骤分数
|
||||
/// 获取总分
|
||||
/// </summary>
|
||||
public void GetTotalScore()
|
||||
public float GetTotalScore()
|
||||
{
|
||||
float all = 0;
|
||||
foreach (var item in steps)
|
||||
|
|
@ -58,6 +58,15 @@ public abstract class ScoreBase : MonoBehaviour
|
|||
}
|
||||
|
||||
Debug.LogError("总分为：" + all);
|
||||
return all;
|
||||
}
|
||||
/// <summary>
|
||||
/// 返回成绩详情
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public Dictionary<int, ScoreSubjectStep> GetStepScore()
|
||||
{
|
||||
Debug.LogError(JsonConvert.SerializeObject(steps));
|
||||
return steps;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,12 +12,18 @@ public class ScoreManager : MonoBehaviour
|
|||
{
|
||||
instance = this;
|
||||
scoreSubjectList = transform.GetComponentsInChildren<ScoreBase>(true).ToList();
|
||||
scoreSubjectList.ForEach(a =>
|
||||
ReInit();
|
||||
}
|
||||
/// <summary>
|
||||
/// ÖØÖÃÊý¾Ý
|
||||
/// </summary>
|
||||
public void ReInit()
|
||||
{
|
||||
scoreSubjectList.ForEach(a =>
|
||||
{
|
||||
a.Init();
|
||||
});
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// ¼ì²â·ÖÊý
|
||||
/// </summary>
|
||||
|
|
@ -33,4 +39,27 @@ public class ScoreManager : MonoBehaviour
|
|||
|
||||
scoreSubjectList.Find(a => a.systemId == systemctlid && a.schemeId == schemeid)?.CheckScore(triggerName, para);
|
||||
}
|
||||
/// <summary>
|
||||
/// »ñÈ¡×Ü·Ö
|
||||
/// </summary>
|
||||
/// <param name="subjectid"></param>
|
||||
/// <returns></returns>
|
||||
public ScoreModel GetScore(int subjectid)
|
||||
{
|
||||
ScoreBase sb=scoreSubjectList.Find(a=>a.schemeId== subjectid);
|
||||
ScoreModel scoreModel = new ScoreModel();
|
||||
scoreModel.score= sb.GetTotalScore();
|
||||
var step=sb.GetStepScore();
|
||||
foreach (var item in step)
|
||||
{
|
||||
ScoreInfo scoreInfo = new ScoreInfo();
|
||||
scoreInfo.pointScore = item.Value.currentScore;
|
||||
scoreInfo.maxScore = item.Value.maxScore;
|
||||
scoreInfo.point = item.Value.step.subProcessName;
|
||||
scoreInfo.pointInfo = item.Value.step.tips;
|
||||
scoreModel.pointList.Add(scoreInfo);
|
||||
}
|
||||
|
||||
return scoreModel;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,6 +24,10 @@ public class ScoreSubjectStep
|
|||
/// 是否一票否决
|
||||
/// </summary>
|
||||
public bool isOneVoteVeto;
|
||||
/// <summary>
|
||||
/// ²½Öè
|
||||
/// </summary>
|
||||
public D_SubProcess step;
|
||||
|
||||
public ScoreSubjectStep(int subProcessId,float maxScore,bool isOneVoteVeto=false)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ using System.Collections;
|
|||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using Unity.VisualScripting;
|
||||
using Unity.VisualScripting.Antlr3.Runtime.Misc;
|
||||
using UnityEngine;
|
||||
|
||||
public class Score_1002 : ScoreBase
|
||||
|
|
@ -39,6 +40,18 @@ public class Score_1002 : ScoreBase
|
|||
steps.Add(a.subProcessId, a);
|
||||
});
|
||||
|
||||
List<D_SubProcess> dsteps=new List<D_SubProcess>();
|
||||
DataManager.Instance.d_System.subjects.Find(a => a.id == 1002).processes.ForEach(a =>
|
||||
{
|
||||
dsteps.AddRange(a.subProcesses);
|
||||
});
|
||||
|
||||
for (int i = 0; i < steps.Count; i++)
|
||||
{
|
||||
steps[i].step = dsteps[i];
|
||||
}
|
||||
|
||||
//ÇåÀí»º´æ
|
||||
TestPen3list.Clear();
|
||||
InSwitchCloseYDList.Clear();
|
||||
InSwitchOpenYDList.Clear();
|
||||
|
|
@ -48,16 +61,6 @@ public class Score_1002 : ScoreBase
|
|||
currentInstallTestJieXian.Clear();
|
||||
}
|
||||
|
||||
#if UNITY_EDITOR
|
||||
private void Update()
|
||||
{
|
||||
if (Input.GetKeyDown(KeyCode.O))
|
||||
{
|
||||
GetTotalScore();
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
/// <summary>
|
||||
/// Èý²½Ñéµç˳Ðò
|
||||
/// </summary>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,24 @@
|
|||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
[Serializable]
|
||||
public class ScoreModel
|
||||
{
|
||||
public string time;
|
||||
public float score;
|
||||
public List<ScoreInfo> pointList = new List<ScoreInfo>();
|
||||
}
|
||||
[Serializable]
|
||||
public class ScoreInfo
|
||||
{
|
||||
public string point;
|
||||
public string pointInfo;
|
||||
/// <summary>
|
||||
/// µÃ·Ö
|
||||
/// </summary>
|
||||
public float pointScore;
|
||||
/// <summary>
|
||||
/// ×Ü·Ö
|
||||
/// </summary>
|
||||
public float maxScore;
|
||||
}
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 94b1dfb6fb10c1b4b95c33a6beb698c3
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -139,18 +139,28 @@ public class StepState_1002 : StepState
|
|||
SiteManager.instance.measuringCabinet.Init();
|
||||
|
||||
//还原npc对话
|
||||
GameObject.FindObjectsOfType<NPCController>().ToList().ForEach(a => { a.speackIndex = 0; });
|
||||
GameObject.FindObjectsOfType<NPCController>().ToList().ForEach(a =>
|
||||
{
|
||||
a.speackIndex = 0;
|
||||
a.spriteRenderer.gameObject.SetActive(true);
|
||||
});
|
||||
}
|
||||
else if (num == 8)
|
||||
{
|
||||
//班前会
|
||||
GameObject.FindObjectsOfType<NPCController>().ToList().Find(a => a.triggerName == "NPC¿Í»§").spriteRenderer.gameObject.SetActive(false);
|
||||
}
|
||||
else if (num == 9)
|
||||
{
|
||||
//接线检查
|
||||
|
||||
//还原npc负责人
|
||||
GameObject.FindObjectsOfType<NPCController>().ToList().Find(a => a.triggerName == "NPC负责人").speackIndex = 1;
|
||||
GameObject.FindObjectsOfType<NPCController>().ToList().ForEach(a =>
|
||||
{
|
||||
if(a.triggerName == "NPC¸ºÔðÈË")
|
||||
a.speackIndex = 1;
|
||||
a.spriteRenderer.gameObject.SetActive(false);
|
||||
});
|
||||
}
|
||||
else if(num == 10)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -75,6 +75,8 @@ public class Tool_TestPen : Tool_Base
|
|||
{
|
||||
if (!isMoving)
|
||||
{
|
||||
isFlicker = false;
|
||||
screem.materials[0].color = Color.white;
|
||||
base.ReBackHead();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -38,12 +38,12 @@ public class D_SubProcessStep : I_Enter, I_Exit
|
|||
string[] toolIdTemp = triggerID.Split(',');
|
||||
for (int i = 0; i < toolIdTemp.Length; i++)
|
||||
{
|
||||
triggersName.Add(toolIdTemp[i].Replace("\r\n", "").Replace("\n", "").Replace("\r", ""));
|
||||
triggersName.Add(toolIdTemp[i].Replace("\r\n", "").Replace("\n", "").Replace("\r", "").Trim());
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
triggersName.Add(triggerID.Replace("\r\n", "").Replace("\n", "").Replace("\r", ""));
|
||||
triggersName.Add(triggerID.Replace("\r\n", "").Replace("\n", "").Replace("\r", "").Trim());
|
||||
}
|
||||
ProcessManager.Instance.subProcessStepTriggerID = triggersName[0];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ using System.Collections;
|
|||
using System.Collections.Generic;
|
||||
using System.Net.NetworkInformation;
|
||||
using UnityEngine;
|
||||
using System.Linq;
|
||||
|
||||
public class ProcessManager : BaseManager<ProcessManager>
|
||||
{
|
||||
|
|
@ -142,7 +143,6 @@ public class ProcessManager : BaseManager<ProcessManager>
|
|||
if (spID <= d_Scheme.CurrentProcess.subProcesses[spCount - 1].id)
|
||||
{
|
||||
HandoverSubProcess(spID, 0);
|
||||
currentSubProcessIDTemp = d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.subProcessId;
|
||||
GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcess, d_Scheme.CurrentProcess.CurrentSubProcessId);
|
||||
Debug.Log("进入下一步子流程");
|
||||
return 2;
|
||||
|
|
@ -179,7 +179,7 @@ public class ProcessManager : BaseManager<ProcessManager>
|
|||
}
|
||||
|
||||
}
|
||||
public int currentSubProcessIDTemp = 0;
|
||||
|
||||
/// <summary>
|
||||
/// 0 正常，1 不在当前步骤触发ID，2 当前步骤没有触发ID了
|
||||
/// </summary>
|
||||
|
|
@ -203,16 +203,23 @@ public class ProcessManager : BaseManager<ProcessManager>
|
|||
{
|
||||
if (triggerName != "工具间按钮" && triggerName != "现场按钮" && triggerName != "收回工具")
|
||||
{
|
||||
if (d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.subProcessId != currentSubProcessIDTemp)
|
||||
if (d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep == d_Scheme.CurrentProcess.CurrentSubProcess.subProcessStepes.Last())
|
||||
{
|
||||
GameManager.UIMgr.ShowPanel<UI_MessagePanel>(E_UI_Layer.System, (p) =>
|
||||
if (d_Scheme.CurrentProcess.CurrentSubProcess == d_Scheme.CurrentProcess.subProcesses.Last())
|
||||
{
|
||||
p.Init("提示", "当前步骤已完成，即将进入下一步", E_MessageType.Normal, () =>
|
||||
CheckSubProcessSteps(subProcessStepId);
|
||||
}
|
||||
else
|
||||
{
|
||||
GameManager.UIMgr.ShowPanel<UI_MessagePanel>(E_UI_Layer.System, (p) =>
|
||||
{
|
||||
CheckSubProcessSteps(subProcessStepId);
|
||||
CurrentSubProcessStepTriggerNames();
|
||||
p.Init("提示", "当前步骤已完成，即将进入下一步", E_MessageType.Normal, () =>
|
||||
{
|
||||
CheckSubProcessSteps(subProcessStepId);
|
||||
CurrentSubProcessStepTriggerNames();
|
||||
});
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
|||
|
|
@ -0,0 +1,19 @@
|
|||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using TMPro;
|
||||
|
||||
public class UI_PracticeInfoItem : BaseItem
|
||||
{
|
||||
public TextMeshProUGUI number;
|
||||
public TextMeshProUGUI point;
|
||||
public TextMeshProUGUI pointInfo;
|
||||
public TextMeshProUGUI score;
|
||||
public void Init(string _number,string _point,string _pointInfo,string _score)
|
||||
{
|
||||
number.text = _number;
|
||||
point.text = _point;
|
||||
pointInfo.text = _pointInfo;
|
||||
score.text = _score;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 182995adc29f8be4686ebff46635e3ab
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -40,10 +40,18 @@ public class UI_SubProcessItem : BaseItem
|
|||
else
|
||||
GetControl<Image>("learningTips").gameObject.SetActive(false);
|
||||
}
|
||||
public void OnResetClick(bool isReset)
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
/// <param name="isReset"></param>
|
||||
/// <param name="state">0 未完成所有步骤跳转，1 完成所有步骤跳转</param>
|
||||
public void OnResetClick(bool isReset, int state)
|
||||
{
|
||||
warnnigTips = isReset ? "是否重新学习？" : "当前步骤还没有学完，确定要切换吗？";
|
||||
OnClick("subProcessBtn");
|
||||
if (state == 0)
|
||||
OnClick("subProcessBtn");
|
||||
else
|
||||
CheckSubProcess();
|
||||
}
|
||||
protected override void OnClick(string btnName)
|
||||
{
|
||||
|
|
@ -54,23 +62,27 @@ public class UI_SubProcessItem : BaseItem
|
|||
|
||||
if (GameManager.ProcessMgr.d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersName.Count > 0)
|
||||
{
|
||||
GameManager.UIMgr.ShowPanel<UI_MessagePanel>(E_UI_Layer.System, (p) =>
|
||||
{
|
||||
p.Init("Ìáʾ", warnnigTips, E_MessageType.Error, () =>
|
||||
{
|
||||
GameManager.ProcessMgr.HandoverProcess(processID, subProcessID, subProcessStepID);
|
||||
//ÖØÖÃÎïÌå
|
||||
StepStateControl.instance.InvokeInitStepState(GameManager.Instance.systemId, GameManager.ProcessMgr.d_Scheme.id, subProcessID);
|
||||
GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcess, subProcessID);
|
||||
//Debug.LogError(ProcessManager.Instance.subProcessStepTriggerID);
|
||||
GameManager.EventMgr.EventTrigger<string>(Enum_EventType.SwitchSubProcessStepTriggerID, ProcessManager.Instance.subProcessStepTriggerID);
|
||||
});
|
||||
});
|
||||
CheckSubProcess();
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
private void CheckSubProcess()
|
||||
{
|
||||
GameManager.UIMgr.ShowPanel<UI_MessagePanel>(E_UI_Layer.System, (p) =>
|
||||
{
|
||||
p.Init("提示", warnnigTips, E_MessageType.Error, () =>
|
||||
{
|
||||
GameManager.ProcessMgr.HandoverProcess(processID, subProcessID, subProcessStepID);
|
||||
//重置物体
|
||||
StepStateControl.instance.InvokeInitStepState(GameManager.Instance.systemId, GameManager.ProcessMgr.d_Scheme.id, subProcessID);
|
||||
GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcess, subProcessID);
|
||||
//Debug.LogError(ProcessManager.Instance.subProcessStepTriggerID);
|
||||
GameManager.EventMgr.EventTrigger<string>(Enum_EventType.SwitchSubProcessStepTriggerID, ProcessManager.Instance.subProcessStepTriggerID);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
private void OnDestroy()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@ public class UI_CustomSessionPanel : BasePanel
|
|||
{
|
||||
this.triggerID = triggerID;
|
||||
callBack += _callBack;
|
||||
GetControl<TextMeshProUGUI>("ClientText_DialogBox").DOKill();
|
||||
GetControl<TextMeshProUGUI>("ClientText_DialogBox").text = "";
|
||||
//UItext = GetControl<TextMeshProUGUI>("ClientText_DialogBox");
|
||||
StartTypewriterEffect(clientTalk);
|
||||
|
|
|
|||
|
|
@ -95,13 +95,27 @@ public class UI_MainTitlePanel : BasePanel
|
|||
case "closeBtn":
|
||||
print("退出应用");
|
||||
GameManager.UIMgr.ShowPanel<UI_MessagePanel>(E_UI_Layer.System,
|
||||
(panel) => { panel.Init("提示", "确定退出应用吗?", E_MessageType.Warning, () => { Application.Quit(); }); });
|
||||
(panel) =>
|
||||
{
|
||||
panel.Init("提示", "确定退出应用吗?", E_MessageType.Error, () =>
|
||||
{
|
||||
Debug.Log("退出");
|
||||
Application.Quit();
|
||||
}, () =>
|
||||
{
|
||||
Debug.Log("取消");
|
||||
});
|
||||
});
|
||||
break;
|
||||
case "upExamBtn":
|
||||
print("交卷");
|
||||
GameManager.EventMgr.EventTrigger(Enum_EventType.UpExam);
|
||||
break;
|
||||
case "submitBtn":
|
||||
GameManager.UIMgr.ShowPanel<UI_PracticeCompletedPanel>(E_UI_Layer.System, (p) =>
|
||||
{
|
||||
p.Init();
|
||||
});
|
||||
print("交卷");
|
||||
GameManager.EventMgr.EventTrigger(Enum_EventType.Submit);
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,37 @@
|
|||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using TMPro;
|
||||
|
||||
public class UI_PracticeCompletedPanel : BasePanel
|
||||
{
|
||||
|
||||
public UI_PracticeInfoItem piiPrefab;
|
||||
public RectTransform content;
|
||||
public void Init()
|
||||
{
|
||||
//ScoreManager.instance.GetScore();
|
||||
//ScoreManager.instance.GetStepScore();
|
||||
UI_PracticeInfoItem temp = Instantiate(piiPrefab, content);
|
||||
GetControl<TextMeshProUGUI>("UsedTimesRes").text = "00:555";
|
||||
GetControl<TextMeshProUGUI>("ScoreRes").text = "123";
|
||||
}
|
||||
|
||||
protected override void OnClick(string btnName)
|
||||
{
|
||||
switch (btnName)
|
||||
{
|
||||
case "restartBtn":
|
||||
GameManager.Instance.Practice();
|
||||
break;
|
||||
case "backBtn":
|
||||
GameManager.Instance.ShowUIPanelAndLoadScene(true);
|
||||
break;
|
||||
case "closeBtn":
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
GameManager.UIMgr.HidePanel<UI_PracticeCompletedPanel>();
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 182c33e6150e0fa4ba2470cded703ee9
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -48,16 +48,17 @@ public class UI_TaskListPanel : BasePanel
|
|||
/// <summary>
|
||||
/// µã»÷µÚÒ»¸ö
|
||||
/// </summary>
|
||||
public void ClickFirstSubProcessesItem()
|
||||
/// <param name="state">0 未完成所有步骤跳转，1 完成所有步骤跳转</param>
|
||||
public void ClickFirstSubProcessesItem(int state)
|
||||
{
|
||||
if (_content.GetChild(0).GetComponent<UI_SubProcessItem>())
|
||||
{
|
||||
_content.GetChild(0).GetComponent<UI_SubProcessItem>().OnResetClick(true);
|
||||
_content.GetChild(0).GetComponent<UI_SubProcessItem>().OnResetClick(true, state);
|
||||
return;
|
||||
}
|
||||
if (_content.GetChild(1).GetComponent<UI_SubProcessItem>())
|
||||
{
|
||||
_content.GetChild(1).GetComponent<UI_SubProcessItem>().OnResetClick(true);
|
||||
_content.GetChild(1).GetComponent<UI_SubProcessItem>().OnResetClick(true, state);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -70,7 +71,7 @@ public class UI_TaskListPanel : BasePanel
|
|||
GameManager.Instance.ShowUIPanelAndLoadScene(true);
|
||||
break;
|
||||
case "ReStartBtn":
|
||||
ClickFirstSubProcessesItem();
|
||||
ClickFirstSubProcessesItem(0);
|
||||
break;
|
||||
case "RePracticeBtn":
|
||||
GameManager.Instance.Practice();
|
||||
|
|
|
|||
|
|
@ -2,20 +2,6 @@ using UnityEngine;
|
|||
|
||||
public class UI_TipsForPracticePanel : BasePanel
|
||||
{
|
||||
public void Init()
|
||||
{
|
||||
}
|
||||
|
||||
public override void ShowMe()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public override void HideMe()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
protected override void OnClick(string btnName)
|
||||
{
|
||||
switch (btnName)
|
||||
|
|
@ -26,7 +12,7 @@ public class UI_TipsForPracticePanel : BasePanel
|
|||
case "ResetStudy":
|
||||
if (GameManager.UIMgr.GetPanel<UI_TaskListPanel>())
|
||||
{
|
||||
GameManager.UIMgr.GetPanel<UI_TaskListPanel>().ClickFirstSubProcessesItem();
|
||||
GameManager.UIMgr.GetPanel<UI_TaskListPanel>().ClickFirstSubProcessesItem(1);
|
||||
}
|
||||
break;
|
||||
case "BackBtn":
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
</Step>
|
||||
|
||||
<Step id="" subProcessName="正确着装" isPrecondition="FALSE" precondition="" tipTitle="" tips="请前往工具间，选取工作服、绝缘鞋、安全帽、手套，到梳妆镜面前进行换装">
|
||||
<operation id="" subProcessStepName="前往工具间" isPrecondition="" precondition="Office" triggerID="工具间按钮" tipTitle="" score=""></operation>
|
||||
<operation id="" subProcessStepName="前往工具间" isPrecondition="" precondition="Office" triggerID="工具间按钮" tipTitle="前往工具间" score=""></operation>
|
||||
<operation id="" subProcessStepName="选择着装" isPrecondition="" precondition="ToolRoom" triggerID="国网安全帽,工作服,绝缘手套,绝缘靴" tipTitle="请点击正确的着装" score=""></operation>
|
||||
<operation id="" subProcessStepName="正确着装" isPrecondition="" precondition="ToolRoom" triggerID="镜子,国网安全帽,工作服,绝缘手套,绝缘靴" tipTitle="请走到镜子面前，点击镜子" score=""></operation>
|
||||
</Step>
|
||||
|
|
|
|||
Loading…
Reference in New Issue