From d36b07d7830a41398cbef5a70b1fb355d0a0b6c2 Mon Sep 17 00:00:00 2001 From: YangHua <1475658476@qq.com> Date: Mon, 2 Sep 2024 15:13:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=87=8D=E7=BD=AE=E5=AD=A6?= =?UTF-8?q?=E4=B9=A0=E5=92=8C=E9=87=8D=E6=96=B0=E7=BB=83=E4=B9=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArtRes/Sprite/Temp/重新练习-悬浮@2x.png | Bin 0 -> 29958 bytes .../Sprite/Temp/重新练习-悬浮@2x.png.meta | 159 ++++++++++++++++++ .../ArtRes/Sprite/Temp/重新练习-默认@2x.png | Bin 0 -> 14502 bytes .../Sprite/Temp/重新练习-默认@2x.png.meta | 159 ++++++++++++++++++ .../UI_SelectDevicePanel/deviceItemBtn.prefab | 91 +--------- .../UI/UI_Panel/UI_SelectDevicePanel.prefab | 2 +- .../UI/UI_Panel/UI_TaskListPanel.prefab | 8 +- .../UI_Panel/UI_TipsForPracticePanel.prefab | 6 +- Assets/Scripts/Project/Manager/GameManager.cs | 38 +++-- .../Scripts/Project/Manager/OfficeManager.cs | 21 +-- .../Project/UI/UI_Item/UI_SubProcessItem.cs | 5 +- .../UI/UI_Panel/UI_SelectDevicePanel.cs | 4 +- .../Project/UI/UI_Panel/UI_TaskListPanel.cs | 20 ++- .../UI/UI_Panel/UI_TipsForPracticePanel.cs | 9 +- 14 files changed, 395 insertions(+), 127 deletions(-) create mode 100644 Assets/ArtRes/Sprite/Temp/重新练习-悬浮@2x.png create mode 100644 Assets/ArtRes/Sprite/Temp/重新练习-悬浮@2x.png.meta create mode 100644 Assets/ArtRes/Sprite/Temp/重新练习-默认@2x.png create mode 100644 Assets/ArtRes/Sprite/Temp/重新练习-默认@2x.png.meta diff --git a/Assets/ArtRes/Sprite/Temp/重新练习-悬浮@2x.png b/Assets/ArtRes/Sprite/Temp/重新练习-悬浮@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..c521c704b666827ba348fd5dd9abac2af854589d GIT binary patch literal 29958 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
f|620f~lL`W@Be^`j*$3k?K_=^?Y)N>F+L z;$JKldgJQ57he_zn42O1^TfS(&4I}4WYP}B!lWpw*Fmry0ZbO<8W3nlg{L6=lJ|(U zT}dP)2}bgVG0?4q#f_!Q;VCt7>k3@7;|G0&h0!9=_v_C3hTu z?1+u^^{JzNbI0c--coD}DenQM0}+!%;4r}GI2qrr7jY0^O8Wxj) z{`$A20F%n%V*AALV=G*3I_YRyPE#?i-)GN3rAUMgJm%NbG(Y|2S9Rpx_28kDFb84_ zFf%;Qq$qONn7?XO)7+&?13(L~VAJZIh( z|Mxo1fkP%jZe5qfQS+SLCiT94->HL3+}fnOu(ptW+8N)*bA9NCV<5Q zu!6n7J)20X(L;w6zklWBQ+i_2boV`QBDZ9+xsxA#{Hx`gHl-+L2+RP|3c@BuZ>hTa zib(@Xw_k9_xaMuz+pk^l{ytv#!4W;dkF%ed9l#S)FejmXCG0 z^^{YGpLg(q9UiJ({fw{ky1`do`=OCdLvIw1YR)lp&}YcBGAy{UrE~*~B+j0;O)Cio zlRy?VGniOXegCq{_70B4{8dvbMC~8G`_50`IdW5AFs#K;EKDYgLf{n9OF}Odl!Cd0 zCY2m-Cn5DL!H_1YllCai!yuQdZIj*ZC1As|D{jy688CgPa)y>|R+f~+Zrp$Bfaw#)5qNavQMGPe}*MIwu4}U&y<*F7xk(HK$XjkC!wry6HmD+PI{K>AR2>X{u zb2jVj@#qta>u^7nGDlYSihp$4DeW|t?HyP2?;d{lz12594S!ARVVnZ0}Wj?cQ~rak(X zmnWk)X4&S=t;hZGk%e_FEnM40oFV)=+RXWARu=X0u3j4;gUt+4)lxU@ziQNu&}!ta)^ zY`ksJ(gtm7=i_-0??diW7PDC^fOsu}wg{6{36Lh7H5iUtQu8mqU}98j>B^i2Uo&@W zZQHRk-`jA=!2U%~9k}1%=-cB3bKX~jxGXHYPB@>Q{ z&{xd=^37XXzWs+kGPr1c$N#FMObKEnHz@)z0G3!xk(->|!s@1d_vwGZt`oQE_O4oA z-8k*{4=gfJ2pXV*JeEw_F;i*RC^VsK~xxw@D$eUfk52ezSUG8^^Cv zEU|gY(7`2xi}F2`nsPb!(Uof&*S56g9$UG(`QUzilmFO%?~v)Tp|vfy+bgfH<_K%( zT;lB@os1Vh=3h}*0eL-G_~U5Zd~z)5d$zgs(hGNuivHuC_{Wku91!BE8&O^!|M<9R z+pPt44`4*76Q=dU!w(&J(w=(^$lvdLVk;F8k@@5!H6rv1VfKsG^TC@>y@(8~EEcoI z^sX$5j(70SZkdBaROJw%564E

m?=f&mf9ajBw8R{-XsD8M|>k`9?jcinl%*JCic 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 literal 0 HcmV?d00001 diff --git a/Assets/ArtRes/Sprite/Temp/重新练习-悬浮@2x.png.meta b/Assets/ArtRes/Sprite/Temp/重新练习-悬浮@2x.png.meta new file mode 100644 index 0000000..f40ea0f --- /dev/null +++ b/Assets/ArtRes/Sprite/Temp/重新练习-悬浮@2x.png.meta @@ -0,0 +1,159 @@ +fileFormatVersion: 2 +guid: e5833786c4c54374c9ccc0441cde8f2d +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 + - 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: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ArtRes/Sprite/Temp/重新练习-默认@2x.png b/Assets/ArtRes/Sprite/Temp/重新练习-默认@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..4788de1aa3a3f2babd96285dd918c4a39cf085cd GIT binary patch literal 14502 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 Ef@=P)#Q*>R literal 0 HcmV?d00001 diff --git a/Assets/ArtRes/Sprite/Temp/重新练习-默认@2x.png.meta b/Assets/ArtRes/Sprite/Temp/重新练习-默认@2x.png.meta new file mode 100644 index 0000000..a178f1a --- /dev/null +++ b/Assets/ArtRes/Sprite/Temp/重新练习-默认@2x.png.meta @@ -0,0 +1,159 @@ +fileFormatVersion: 2 +guid: 75c41c3c4c6245b4c835992941592114 +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 + - 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: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/UI/UI_Item/UI_SelectDevicePanel/deviceItemBtn.prefab b/Assets/Resources/UI/UI_Item/UI_SelectDevicePanel/deviceItemBtn.prefab index 2b4fdc3..09a7db4 100644 --- a/Assets/Resources/UI/UI_Item/UI_SelectDevicePanel/deviceItemBtn.prefab +++ b/Assets/Resources/UI/UI_Item/UI_SelectDevicePanel/deviceItemBtn.prefab @@ -1,81 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &4170357601739698860 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1728984890007447347} - - component: {fileID: 8575163737800612770} - - component: {fileID: 7044640413962384597} - m_Layer: 5 - m_Name: Bg - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1728984890007447347 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4170357601739698860} - 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: 771806173659001502} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 7.593704, y: 0} - m_SizeDelta: {x: -15.187, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8575163737800612770 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4170357601739698860} - m_CullTransparentMesh: 1 ---- !u!114 &7044640413962384597 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4170357601739698860} - 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: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 29f36a4ea7a8f834790a0455a1b9ca58, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &5268434527328650183 GameObject: m_ObjectHideFlags: 0 @@ -88,7 +12,7 @@ GameObject: - component: {fileID: 1203145776376208031} - component: {fileID: 4570010695021958386} - component: {fileID: 2576342188210821588} - - component: {fileID: 4374445411415707542} + - component: {fileID: 7203119007215407391} m_Layer: 5 m_Name: deviceItemBtn m_TagString: Untagged @@ -108,7 +32,6 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1728984890007447347} - {fileID: 2134925957530674845} m_Father: {fileID: 0} m_RootOrder: 0 @@ -139,14 +62,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 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: 0} + m_Sprite: {fileID: 21300000, guid: 29f36a4ea7a8f834790a0455a1b9ca58, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -186,7 +109,7 @@ MonoBehaviour: m_FadeDuration: 0.1 m_SpriteState: m_HighlightedSprite: {fileID: 21300000, guid: 606f2a731815df94fb3d13a890a1072f, type: 3} - m_PressedSprite: {fileID: 21300000, guid: 606f2a731815df94fb3d13a890a1072f, type: 3} + m_PressedSprite: {fileID: 0} m_SelectedSprite: {fileID: 0} m_DisabledSprite: {fileID: 0} m_AnimationTriggers: @@ -196,11 +119,11 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 7044640413962384597} + m_TargetGraphic: {fileID: 4570010695021958386} m_OnClick: m_PersistentCalls: m_Calls: [] ---- !u!114 &4374445411415707542 +--- !u!114 &7203119007215407391 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -244,7 +167,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 771806173659001502} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} diff --git a/Assets/Resources/UI/UI_Panel/UI_SelectDevicePanel.prefab b/Assets/Resources/UI/UI_Panel/UI_SelectDevicePanel.prefab index 7a45927..d2209a5 100644 --- a/Assets/Resources/UI/UI_Panel/UI_SelectDevicePanel.prefab +++ b/Assets/Resources/UI/UI_Panel/UI_SelectDevicePanel.prefab @@ -178,7 +178,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Padding: m_Left: 7 - m_Right: 10 + m_Right: -25 m_Top: 26 m_Bottom: 10 m_ChildAlignment: 1 diff --git a/Assets/Resources/UI/UI_Panel/UI_TaskListPanel.prefab b/Assets/Resources/UI/UI_Panel/UI_TaskListPanel.prefab index 44e5ff5..c05b618 100644 --- a/Assets/Resources/UI/UI_Panel/UI_TaskListPanel.prefab +++ b/Assets/Resources/UI/UI_Panel/UI_TaskListPanel.prefab @@ -106,7 +106,7 @@ MonoBehaviour: m_ColorMultiplier: 1 m_FadeDuration: 0.1 m_SpriteState: - m_HighlightedSprite: {fileID: 0} + m_HighlightedSprite: {fileID: 21300000, guid: 4fbab97bec78c1c40998ad19c53c393e, type: 3} m_PressedSprite: {fileID: 21300000, guid: 4fbab97bec78c1c40998ad19c53c393e, type: 3} m_SelectedSprite: {fileID: 0} m_DisabledSprite: {fileID: 0} @@ -781,7 +781,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: d7de17f617f397a4b88ee5e911877a3e, type: 3} + m_Sprite: {fileID: 21300000, guid: 75c41c3c4c6245b4c835992941592114, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -820,8 +820,8 @@ MonoBehaviour: m_ColorMultiplier: 1 m_FadeDuration: 0.1 m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 21300000, guid: 4fbab97bec78c1c40998ad19c53c393e, type: 3} + m_HighlightedSprite: {fileID: 21300000, guid: e5833786c4c54374c9ccc0441cde8f2d, type: 3} + m_PressedSprite: {fileID: 21300000, guid: e5833786c4c54374c9ccc0441cde8f2d, type: 3} m_SelectedSprite: {fileID: 0} m_DisabledSprite: {fileID: 0} m_AnimationTriggers: diff --git a/Assets/Resources/UI/UI_Panel/UI_TipsForPracticePanel.prefab b/Assets/Resources/UI/UI_Panel/UI_TipsForPracticePanel.prefab index 82b20c0..f603188 100644 --- a/Assets/Resources/UI/UI_Panel/UI_TipsForPracticePanel.prefab +++ b/Assets/Resources/UI/UI_Panel/UI_TipsForPracticePanel.prefab @@ -13,7 +13,7 @@ GameObject: - component: {fileID: 3186491756994606986} - component: {fileID: 6022205943530221735} m_Layer: 5 - m_Name: Button (Legacy) (1) + m_Name: ResetStudy m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -414,7 +414,7 @@ GameObject: - component: {fileID: 9186553699674210857} - component: {fileID: 1149586307798198828} m_Layer: 5 - m_Name: Button (Legacy) + m_Name: StartPractice m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -535,7 +535,7 @@ GameObject: - component: {fileID: 7044389489826003207} - component: {fileID: 969337629717612101} m_Layer: 5 - m_Name: Button (Legacy) (2) + m_Name: BackBtn m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Scripts/Project/Manager/GameManager.cs b/Assets/Scripts/Project/Manager/GameManager.cs index 32c6565..4979dbb 100644 --- a/Assets/Scripts/Project/Manager/GameManager.cs +++ b/Assets/Scripts/Project/Manager/GameManager.cs @@ -167,7 +167,7 @@ public class GameManager : SingletonAutoMono { if (isReset) { - ResetUIPanelAndEvent(); + ResetStateAndEvent(); } UIMgr.ShowPanel(E_UI_Layer.Bot); UIMgr.ShowPanel(E_UI_Layer.Bot, (panel) => { panel.Init(); }); @@ -181,32 +181,42 @@ public class GameManager : SingletonAutoMono EventMgr.EventTrigger(Enum_EventType.UpdateProgress, 0.9f); }); } + ///

- /// 重新学习 + /// 练习 /// - public void ResetStudy() + public void Practice() { - ResetUIPanelAndEvent(); + ResetStateAndEvent(); + RunModelMgr.ModeType = E_ModeType.Practice; + EventMgr.EventTrigger(Enum_EventType.SwitchMode); + ProcessMgr.Init(RunModelMgr.schemeID, RunModelMgr.ModeType); UIMgr.ShowPanel(E_UI_Layer.System, (panel) => { + UIMgr.ShowPanel(E_UI_Layer.Bot, (panel) => + { + panel.Init(); + }); + + panel.Init(); EventMgr.EventTrigger(Enum_EventType.UpdateProgress, 0.1f); ScenesMgr.LoadSceneAsyn("03_OfficeScene", () => - { - EventMgr.EventTrigger(Enum_EventType.UpdateProgress, 0.9f); - }); + { + UIMgr.HidePanel(); + UIMgr.HidePanel(); + EventMgr.EventTrigger(Enum_EventType.UpdateProgress, 0.9f); + }); }); } - - public void StartPractice() - { - - } - - private void ResetUIPanelAndEvent() + /// + /// 清除一些动态 + /// + private void ResetStateAndEvent() { UIMgr.HidePanel(); UIMgr.HidePanel(); UIMgr.HidePanel(); + PacksackBagMgr.ClearAllData(); EventMgr.Clear(); } diff --git a/Assets/Scripts/Project/Manager/OfficeManager.cs b/Assets/Scripts/Project/Manager/OfficeManager.cs index 628cb2a..07c48ae 100644 --- a/Assets/Scripts/Project/Manager/OfficeManager.cs +++ b/Assets/Scripts/Project/Manager/OfficeManager.cs @@ -58,20 +58,17 @@ public class OfficeManager : SingletonMono } private void InitializationUI() { + if (!GameManager.UIMgr.GetPanel()) + { + GameManager.UIMgr.ShowPanel(E_UI_Layer.Bot, (panel) => + { + panel.Init(GameManager.ProcessMgr.subProcessId); + }); + } if (GameManager.RunModelMgr.ModeType == E_ModeType.Study) { - if (!GameManager.UIMgr.GetPanel()) - { - GameManager.UIMgr.ShowPanel(E_UI_Layer.Bot, (panel) => - { - panel.Init(GameManager.ProcessMgr.subProcessId); - }); - } - if (GameManager.RunModelMgr.ModeType == E_ModeType.Study) - { - GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchSubProcessStepTriggerID, ProcessManager.Instance.subProcessStepTriggerID); - GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchSubProcess, GameManager.ProcessMgr.subProcessId); - } + GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchSubProcessStepTriggerID, ProcessManager.Instance.subProcessStepTriggerID); + GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchSubProcess, GameManager.ProcessMgr.subProcessId); } if (!GameManager.UIMgr.GetPanel()) { diff --git a/Assets/Scripts/Project/UI/UI_Item/UI_SubProcessItem.cs b/Assets/Scripts/Project/UI/UI_Item/UI_SubProcessItem.cs index f2a2f45..1401c4f 100644 --- a/Assets/Scripts/Project/UI/UI_Item/UI_SubProcessItem.cs +++ b/Assets/Scripts/Project/UI/UI_Item/UI_SubProcessItem.cs @@ -38,7 +38,10 @@ public class UI_SubProcessItem : BaseItem else GetControl("learningTips").gameObject.SetActive(false); } - + public void OnResetClick() + { + OnClick("subProcessBtn"); + } protected override void OnClick(string btnName) { base.OnClick(btnName); diff --git a/Assets/Scripts/Project/UI/UI_Panel/UI_SelectDevicePanel.cs b/Assets/Scripts/Project/UI/UI_Panel/UI_SelectDevicePanel.cs index 7c9cc45..f6a7b79 100644 --- a/Assets/Scripts/Project/UI/UI_Panel/UI_SelectDevicePanel.cs +++ b/Assets/Scripts/Project/UI/UI_Panel/UI_SelectDevicePanel.cs @@ -56,7 +56,6 @@ public class UI_SelectDevicePanel : BasePanel GameManager.UIMgr.AddEventTriggerListener(deviceBtnAComponent, EventTriggerType.PointerEnter, _ => { - //deviceBtnAComponent.transform.DOScale(1.3f, 0.2f); this.GetControl("DeviceShowImg").sprite = GameManager.ResourcesMgr.Load(Const.UI_SelectDevicePanel + mapName); this.GetControl("DeviceShowImg").color = new Color(1, 1, 1, 1); @@ -64,13 +63,12 @@ public class UI_SelectDevicePanel : BasePanel GameManager.UIMgr.AddEventTriggerListener(deviceBtnAComponent, EventTriggerType.PointerExit, _ => { - //deviceBtnAComponent.transform.DOScale(1f, 0.2f); this.GetControl("DeviceShowImg").color = new Color(1, 1, 1, 0); }); deviceBtnAComponent.onClick.AddListener(() => { GameManager.RunModelMgr.schemeID = int.Parse(deviceBtnAComponent.name); - GameManager.ProcessMgr.Init(GameManager.RunModelMgr.schemeID, E_ModeType.Study); + GameManager.ProcessMgr.Init(GameManager.RunModelMgr.schemeID, GameManager.RunModelMgr.ModeType); GameManager.UIMgr.ShowPanel(E_UI_Layer.System, (panel) => { GameManager.UIMgr.ShowPanel(E_UI_Layer.Bot, (panel) => diff --git a/Assets/Scripts/Project/UI/UI_Panel/UI_TaskListPanel.cs b/Assets/Scripts/Project/UI/UI_Panel/UI_TaskListPanel.cs index a35b420..4b2cf16 100644 --- a/Assets/Scripts/Project/UI/UI_Panel/UI_TaskListPanel.cs +++ b/Assets/Scripts/Project/UI/UI_Panel/UI_TaskListPanel.cs @@ -18,6 +18,7 @@ public class UI_TaskListPanel : BasePanel rePractice.SetActive(GameManager.RunModelMgr.ModeType == E_ModeType.Practice); reStudy.SetActive(GameManager.RunModelMgr.ModeType == E_ModeType.Study); taskListScrollView.SetActive(GameManager.RunModelMgr.ModeType == E_ModeType.Study); + GetControl