Compare commits

...

2 Commits

37 changed files with 622 additions and 48 deletions

Binary file not shown.

View File

@ -525,6 +525,22 @@
<HintPath>Assets\Plugins\Sirenix\Assemblies\Sirenix.Serialization.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Aspose.Cells">
<HintPath>Assets\Plugins\Aspose.Cells.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Aspose.Words">
<HintPath>Assets\Plugins\Aspose.Words.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Aspose.Slides">
<HintPath>Assets\Plugins\Aspose.Slides.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Aspose.Pdf">
<HintPath>Assets\Plugins\Aspose.Pdf.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="nunit.framework">
<HintPath>Library\PackageCache\com.unity.ext.nunit@1.0.6\net35\unity-custom\nunit.framework.dll</HintPath>
<Private>False</Private>

View File

@ -514,6 +514,22 @@
<HintPath>Assets\Plugins\Sirenix\Assemblies\Sirenix.Serialization.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Aspose.Cells">
<HintPath>Assets\Plugins\Aspose.Cells.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Aspose.Words">
<HintPath>Assets\Plugins\Aspose.Words.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Aspose.Slides">
<HintPath>Assets\Plugins\Aspose.Slides.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Aspose.Pdf">
<HintPath>Assets\Plugins\Aspose.Pdf.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="nunit.framework">
<HintPath>Library\PackageCache\com.unity.ext.nunit@1.0.6\net35\unity-custom\nunit.framework.dll</HintPath>
<Private>False</Private>

View File

@ -93,10 +93,12 @@
<None Include="Assets\Plugins\Sirenix\Assemblies\Sirenix.Reflection.Editor.dll" />
<None Include="Assets\Plugins\HighlightPlus\Runtime\Resources\HighlightPlus\HighlightOverlay.shader" />
<None Include="Assets\Plugins\HighlightPlus\Runtime\Resources\HighlightPlus\HighlightOccluder.shader" />
<None Include="Assets\Plugins\Aspose.Cells.dll" />
<None Include="Assets\Plugins\Sirenix\Assemblies\NoEmitAndNoEditor\Sirenix.Serialization.dll" />
<None Include="Assets\Plugins\HighlightPlus\README.txt" />
<None Include="Assets\Plugins\HighlightPlus\Runtime\Resources\HighlightPlus\HighlightGlow.shader" />
<None Include="Assets\Plugins\Demigiant\readme_DOTweenPro.txt" />
<None Include="Assets\Plugins\Aspose.Pdf.dll" />
<None Include="Assets\Plugins\Demigiant\DOTween\DOTween.XML" />
<None Include="Assets\Plugins\HighlightPlus\Runtime\Resources\HighlightPlus\HighlightTarget.shader" />
<None Include="Assets\Plugins\Demigiant\DemiLib\Core\DemiLib.dll" />
@ -125,6 +127,7 @@
<None Include="Assets\Plugins\Sirenix\Assemblies\NoEditor\Sirenix.Utilities.dll" />
<None Include="Assets\Plugins\Sirenix\Readme.txt" />
<None Include="Assets\Plugins\HighlightPlus\Runtime\Resources\HighlightPlus\HighlightComposeOutline.shader" />
<None Include="Assets\Plugins\Aspose.Words.dll" />
<None Include="Assets\Plugins\Demigiant\DOTweenPro\DOTweenPro.dll" />
<None Include="Assets\Plugins\Demigiant\DOTweenPro\readme.txt" />
<None Include="Assets\Plugins\Sirenix\Assemblies\link.xml" />
@ -133,6 +136,7 @@
<None Include="Assets\Plugins\Demigiant\DOTweenPro\DOTweenPro.XML" />
<None Include="Assets\Plugins\Sirenix\Assemblies\Sirenix.Utilities.Editor.xml" />
<None Include="Assets\Plugins\Sirenix\Assemblies\Sirenix.Utilities.Editor.dll" />
<None Include="Assets\Plugins\Aspose.Slides.dll" />
<None Include="Assets\Plugins\Demigiant\DOTween\readme.txt" />
<None Include="Assets\Plugins\Sirenix\Assemblies\NoEmitAndNoEditor\Sirenix.Utilities.dll" />
<None Include="Assets\Plugins\HighlightPlus\Runtime\Resources\HighlightPlus\HighlightUIMask.shader" />
@ -525,6 +529,22 @@
<HintPath>Assets\Plugins\Sirenix\Assemblies\Sirenix.Serialization.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Aspose.Cells">
<HintPath>Assets\Plugins\Aspose.Cells.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Aspose.Words">
<HintPath>Assets\Plugins\Aspose.Words.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Aspose.Slides">
<HintPath>Assets\Plugins\Aspose.Slides.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Aspose.Pdf">
<HintPath>Assets\Plugins\Aspose.Pdf.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="mscorlib">
<HintPath>E:\Unity\2021.3.37f1c1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\mscorlib.dll</HintPath>
<Private>False</Private>

File diff suppressed because one or more lines are too long

Binary file not shown.

After

Width:  |  Height:  |  Size: 42 KiB

View File

@ -0,0 +1,147 @@
fileFormatVersion: 2
guid: 544855de442336f449da7c3591bffeda
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 0
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: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
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: 1
spriteTessellationDetail: -1
textureType: 8
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
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 27 KiB

View File

@ -0,0 +1,147 @@
fileFormatVersion: 2
guid: d880f749172afbe47af69c4f464a6901
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 0
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: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
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: 1
spriteTessellationDetail: -1
textureType: 8
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
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -34,6 +34,7 @@ RectTransform:
- {fileID: 2527944883655481645}
- {fileID: 6034407815697293955}
- {fileID: 2103317408242552346}
- {fileID: 5892354476193495383}
m_Father: {fileID: 496968027908146854}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -219,11 +220,11 @@ RectTransform:
m_Father: {fileID: 1738302977383553006}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 20, y: 20}
m_SizeDelta: {x: 252, y: 940}
m_Pivot: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 20, y: -120}
m_SizeDelta: {x: 252, y: 880}
m_Pivot: {x: 0, y: 1}
--- !u!222 &327764142031225726
CanvasRenderer:
m_ObjectHideFlags: 0
@ -474,6 +475,127 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_ShowMaskGraphic: 0
--- !u!1 &3077829267629978657
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5892354476193495383}
- component: {fileID: 5453933181870159294}
- component: {fileID: 5865250085420989978}
- component: {fileID: 6718153689785161971}
m_Layer: 5
m_Name: EnterPracticalTrainingBtn
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5892354476193495383
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3077829267629978657}
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: 1738302977383553006}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 20, y: 20}
m_SizeDelta: {x: 252, y: 40}
m_Pivot: {x: 0, y: 0}
--- !u!222 &5453933181870159294
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3077829267629978657}
m_CullTransparentMesh: 1
--- !u!114 &5865250085420989978
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3077829267629978657}
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: d880f749172afbe47af69c4f464a6901, 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 &6718153689785161971
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3077829267629978657}
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: 2
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: 21300000, guid: 544855de442336f449da7c3591bffeda, type: 3}
m_PressedSprite: {fileID: 21300000, guid: 544855de442336f449da7c3591bffeda, type: 3}
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: 5865250085420989978}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!1 &4670666424960680132
GameObject:
m_ObjectHideFlags: 0
@ -610,6 +732,7 @@ MonoBehaviour:
Left_content: {fileID: 8640685201192089303}
canvasGroup: {fileID: 2747193240799827809}
pptFolderName:
UI_SelectDevice: {fileID: 1751634905210954150, guid: 7a344e5bc4e2a7a46bcb6cd179226da8, type: 3}
--- !u!1 &6034407815697293954
GameObject:
m_ObjectHideFlags: 0
@ -764,9 +887,9 @@ RectTransform:
m_Father: {fileID: 5924775712395334843}
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: 804, y: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 1608, y: 940}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &6109062945893642881

View File

@ -226,7 +226,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &7446126606034719109
RectTransform:
m_ObjectHideFlags: 0
@ -632,7 +632,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &1845062522072722416
RectTransform:
m_ObjectHideFlags: 0
@ -648,11 +648,11 @@ RectTransform:
m_Father: {fileID: 5188996151553498385}
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: 1704, y: -50.940918}
m_SizeDelta: {x: 138.8723, y: 44.2819}
m_Pivot: {x: 0.5, y: 0.5}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -18.9}
m_SizeDelta: {x: 236, y: 100}
m_Pivot: {x: 1, y: 0}
--- !u!222 &4267848746142626731
CanvasRenderer:
m_ObjectHideFlags: 0
@ -681,7 +681,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 84e1c76bba0fa7648869c649360b7ebf, type: 3}
m_Sprite: {fileID: 21300000, guid: bc79f0041df22854db76be6705d9acf8, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -720,8 +720,8 @@ MonoBehaviour:
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 21300000, guid: 65fec5547faf23347b9f26ecaf821b82, type: 3}
m_PressedSprite: {fileID: 0}
m_HighlightedSprite: {fileID: 21300000, guid: 8f8a49b1351644b44b5c4f42251f836c, type: 3}
m_PressedSprite: {fileID: 21300000, guid: 8f8a49b1351644b44b5c4f42251f836c, type: 3}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
@ -806,7 +806,7 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 20, y: 20}
m_Pivot: {x: 0.5, y: 0.5}

View File

@ -139,7 +139,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &402120147
RectTransform:
m_ObjectHideFlags: 0
@ -188,7 +188,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 8f8a49b1351644b44b5c4f42251f836c, type: 3}
m_Sprite: {fileID: 21300000, guid: bc79f0041df22854db76be6705d9acf8, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -227,8 +227,8 @@ MonoBehaviour:
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 21300000, guid: 65fec5547faf23347b9f26ecaf821b82, type: 3}
m_HighlightedSprite: {fileID: 21300000, guid: 8f8a49b1351644b44b5c4f42251f836c, type: 3}
m_PressedSprite: {fileID: 21300000, guid: 8f8a49b1351644b44b5c4f42251f836c, type: 3}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
@ -460,7 +460,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &6024269452742515074
RectTransform:
m_ObjectHideFlags: 0
@ -906,7 +906,7 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 20, y: 20}
m_Pivot: {x: 0.5, y: 0.5}

View File

@ -1,4 +1,5 @@
using Cysharp.Threading.Tasks;
using System;
using System.Collections;
using System.Collections.Generic;
using System.IO;
@ -21,6 +22,8 @@ public class UI_PPTForPracticePanel : BasePanel
public string pptFolderName;
public UI_SelectDevicePanel UI_SelectDevice;
protected override void Awake()
{
canvasGroup.alpha = 1f;
@ -57,20 +60,20 @@ public class UI_PPTForPracticePanel : BasePanel
}
public override async void ShowMe()
public override void ShowMe()
{
base.ShowMe();
string pptBtnName = Left_content.GetChild(0).GetComponent<UI_TipsForPracticePanelPPTNameItem>().PPTName_Tog.gameObject.name;
OnClick(pptBtnName);
//await ToolManager.CanvasFadeIn(canvasGroup, 0.5f);
}
public override async void HideMe()
public override void HideMe()
{
base.HideMe();
//await ToolManager.CanvasFadeOut(canvasGroup, 0.5f);
}
protected override async void OnClick(string btnName)
protected override void OnClick(string btnName)
{
Debug.Log(btnName);
switch (btnName)
@ -98,6 +101,25 @@ public class UI_PPTForPracticePanel : BasePanel
}
//Bootstrap.Instance.uiManager.HidePanel<UI_TipsForPracticePanel>();
break;
case "EnterPracticalTrainingBtn":
//UI_SelectDevice.Init();
GameManager.UIMgr.ShowPanel<UI_LoadingPanel>(E_UI_Layer.System, (panel) =>
{
panel.Init();
GameManager.EventMgr.EventTrigger<float>(Enum_EventType.UpdateProgress, 0.1f);
GameManager.ScenesMgr.LoadSceneAsyn($"{GameManager.Instance.systemId}_2002_{GameManager.Instance.startSceneName}", () =>
{
GameManager.UIMgr.HidePanel<UI_SelectDevicePanel>();
GameManager.UIMgr.HidePanel<UI_BGPanel>();
GameManager.UIMgr.HidePanel<UI_PPTForPracticePanel>();
GameManager.EventMgr.EventTrigger<float>(Enum_EventType.UpdateProgress, 0.9f);
});
});
Debug.Log("½øÈëʵѵ");
break;
}
//await ToolManager.RefreshScrollView(content, scrollRect);

View File

@ -5,6 +5,7 @@ using UnityEngine.UI;
using UnityEngine.SceneManagement;
using System.Collections.Generic;
using System;
using UnityEngine.Rendering.VirtualTexturing;
public class UI_TaskListPanel : BasePanel
{
@ -82,7 +83,30 @@ public class UI_TaskListPanel : BasePanel
switch (btnName)
{
case "BackBtn":
GameManager.Instance.ShowUIPanelAndLoadScene(true);
//GameManager.Instance.ShowUIPanelAndLoadScene(true);
GameManager.UIMgr.ShowPanel<UI_LoadingPanel>(E_UI_Layer.System, (panel) =>
{
panel.Init();
GameManager.EventMgr.EventTrigger<float>(Enum_EventType.UpdateProgress, 0.1f);
GameManager.ScenesMgr.LoadSceneAsyn("02_MenuScene", () =>
{
GameManager.UIMgr.ShowPanel<UI_BGPanel>(E_UI_Layer.Bot, (panel) =>
{
GameManager.UIMgr.ShowPanel<UI_SelectModePanel>(E_UI_Layer.Mid, (panel) =>
{
GameManager.EventMgr.EventTrigger<float>(Enum_EventType.UpdateProgress, 0.9f);
GameManager.UIMgr.HidePanel<UI_GrowthPeriodPanel>();
GameManager.UIMgr.HidePanel<UI_MenuBar>();
GameManager.UIMgr.HidePanel<UI_TaskListPanel>();
});
});
});
//if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
// GameManager.EventMgr.EventTrigger<string>(Enum_EventType.SwitchSubProcessStepTriggerID, ProcessManager.Instance.subProcessStepTriggerID);
});
break;
case "ReStartBtn":
ClickFirstSubProcessesItem(0);

View File

@ -513,6 +513,22 @@
<HintPath>Assets\Plugins\Sirenix\Assemblies\Sirenix.Serialization.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Aspose.Cells">
<HintPath>Assets\Plugins\Aspose.Cells.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Aspose.Words">
<HintPath>Assets\Plugins\Aspose.Words.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Aspose.Slides">
<HintPath>Assets\Plugins\Aspose.Slides.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Aspose.Pdf">
<HintPath>Assets\Plugins\Aspose.Pdf.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="nunit.framework">
<HintPath>Library\PackageCache\com.unity.ext.nunit@1.0.6\net35\unity-custom\nunit.framework.dll</HintPath>
<Private>False</Private>

View File

@ -730,6 +730,22 @@
<HintPath>Assets\Plugins\Sirenix\Assemblies\Sirenix.Serialization.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Aspose.Cells">
<HintPath>Assets\Plugins\Aspose.Cells.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Aspose.Words">
<HintPath>Assets\Plugins\Aspose.Words.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Aspose.Slides">
<HintPath>Assets\Plugins\Aspose.Slides.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Aspose.Pdf">
<HintPath>Assets\Plugins\Aspose.Pdf.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="mscorlib">
<HintPath>E:\Unity\2021.3.37f1c1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\mscorlib.dll</HintPath>
<Private>False</Private>

View File

@ -6,23 +6,23 @@ EditorUserSettings:
serializedVersion: 4
m_ConfigSettings:
RecentlyUsedSceneGuid-0:
value: 0609045307065a5d5a0d0874407b5944124f1e72787b2465287e1f36b0b8316f
flags: 0
RecentlyUsedSceneGuid-1:
value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a
flags: 0
RecentlyUsedSceneGuid-2:
RecentlyUsedSceneGuid-1:
value: 01070d5f560c5e0d5f0f5c7240735b4444164a2c2e7a7f3579784e63e4b06d61
flags: 0
RecentlyUsedSceneGuid-3:
RecentlyUsedSceneGuid-2:
value: 54090c025006080809565e7249740e444015492f297f7565287d1b65b7b2323a
flags: 0
RecentlyUsedSceneGuid-4:
RecentlyUsedSceneGuid-3:
value: 0550025e01010c0c0f5d54704175074444154073752d7733757d4a30b2e2366a
flags: 0
RecentlyUsedSceneGuid-5:
RecentlyUsedSceneGuid-4:
value: 5b52575304530d5e585e5926147108444415417c2e707132752b4e60e0e6673b
flags: 0
RecentlyUsedSceneGuid-5:
value: 505457525c055d0d5b0d5c7344265c444e4e4d7c7c7a22322b7e4e32e7b7316d
flags: 0
RecentlyUsedSceneGuid-6:
value: 020207045d025c580b565f2047225c44424e4d7d2a2a74317b7f1e6ae7b26260
flags: 0