From 919f64cf4a5735de764829aee818a102417d49ae Mon Sep 17 00:00:00 2001 From: huqibin <762612145@qq.com> Date: Tue, 20 May 2025 17:21:07 +0800 Subject: [PATCH] =?UTF-8?q?UI=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + Assets/HQB/Models/Materials/fa.mat | 38 +- .../HQB/Scene/10002_2002_03_LiveScene.unity | 6 +- .../HQB/Scene/10002_2002_03_OfficeScene.unity | 17 +- .../UI/UI_Panel/UI_GrowthPeriodPanel.prefab | 653 ++++++++++++++++++ .../UI_Panel/UI_GrowthPeriodPanel.prefab.meta | 7 + .../UI/UI_Panel/UI_SelectDevicePanel.prefab | 2 +- Assets/Scenes/Common/01_InitScene.unity | 4 +- .../CXX/StepState/2002/StepState_2002.cs | 322 +-------- .../Scripts/Project/Manager/OfficeManager.cs | 28 +- .../UI/UI_Panel/UI_GrowthPeriodPanel.cs | 32 + .../UI/UI_Panel/UI_GrowthPeriodPanel.cs.meta | 11 + .../UI/UI_Panel/UI_SelectWorkTicketPanel.cs | 2 +- .../ScenesManager/ScenesManager.cs | 2 +- .../科目/10002/10002_2002_计量装置轮换.xml | 9 +- Assets/StreamingAssets/Setting/设备类型.xml | 4 +- 16 files changed, 785 insertions(+), 353 deletions(-) create mode 100644 Assets/Resources/UI/UI_Panel/UI_GrowthPeriodPanel.prefab create mode 100644 Assets/Resources/UI/UI_Panel/UI_GrowthPeriodPanel.prefab.meta create mode 100644 Assets/Scripts/Project/UI/UI_Panel/UI_GrowthPeriodPanel.cs create mode 100644 Assets/Scripts/Project/UI/UI_Panel/UI_GrowthPeriodPanel.cs.meta diff --git a/.gitignore b/.gitignore index f7c783d..ba79769 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ /Library /Logs /Temp +/obj /.vsconfig /Assembly-CSharp.csproj /CultivationOfBrewing-2.sln diff --git a/Assets/HQB/Models/Materials/fa.mat b/Assets/HQB/Models/Materials/fa.mat index 94f8a9d..abdfb63 100644 --- a/Assets/HQB/Models/Materials/fa.mat +++ b/Assets/HQB/Models/Materials/fa.mat @@ -21,20 +21,29 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: fa - m_Shader: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3} - m_ValidKeywords: [] + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ValidKeywords: + - _NORMALMAP + - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: + - DepthOnly + - SHADOWCASTER m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: b4108af5bca8a6c4cba6b20d9b1e6202, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _BumpMap: - m_Texture: {fileID: 2800000, guid: 2aa43e076a9f5ce4ab9c27ee7782b662, type: 3} + m_Texture: {fileID: 2800000, guid: 7a301173b25c5db45ba9f9dab16de56e, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _DetailAlbedoMap: @@ -54,7 +63,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 421e241f26d628b4dac63bb640432cb4, type: 3} + m_Texture: {fileID: 2800000, guid: b4108af5bca8a6c4cba6b20d9b1e6202, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -87,10 +96,17 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AlphaClip: 0 + - _Blend: 0 - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 10 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.6727171 - _GlossyReflections: 1 @@ -100,9 +116,12 @@ Material: - _Parallax: 0.02 - _QueueControl: 0 - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 + - _Surface: 1 - _UVSec: 0 - _UseAoMap: 0 - _UseColorMap: 1 @@ -110,10 +129,13 @@ Material: - _UseMetallicMap: 0 - _UseNormalMap: 0 - _UseRoughnessMap: 0 + - _WorkflowMode: 1 - _ZWrite: 0 m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 0} + - _BaseColor: {r: 0, g: 0, b: 0, a: 1} + - _Color: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _UvOffset: {r: 0, g: 0, b: 0, a: 0} - _UvTiling: {r: 1, g: 1, b: 0, a: 0} m_BuildTextureStacks: [] diff --git a/Assets/HQB/Scene/10002_2002_03_LiveScene.unity b/Assets/HQB/Scene/10002_2002_03_LiveScene.unity index 63b52cf..531025f 100644 --- a/Assets/HQB/Scene/10002_2002_03_LiveScene.unity +++ b/Assets/HQB/Scene/10002_2002_03_LiveScene.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.20464736, g: 0.26801568, b: 0.30485883, a: 1} + m_IndirectSpecularColor: {r: 0.20464769, g: 0.268016, b: 0.30485913, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -254,6 +254,10 @@ PrefabInstance: propertyPath: m_Name value: "\u6559\u5E08\uFF08\u5F85\u673A\u52A8\u753B\uFF09" objectReference: {fileID: 0} + - target: {fileID: 7751996367803956135, guid: 7b9fb3597fb5dc04faa55be08321ef65, type: 3} + propertyPath: m_Materials.Array.data[4] + value: + objectReference: {fileID: 2100000, guid: de88c1d475d9ae040a97b00afaf830e1, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7b9fb3597fb5dc04faa55be08321ef65, type: 3} --- !u!1 &479279932 stripped diff --git a/Assets/HQB/Scene/10002_2002_03_OfficeScene.unity b/Assets/HQB/Scene/10002_2002_03_OfficeScene.unity index 7a9f8c0..1f362ef 100644 --- a/Assets/HQB/Scene/10002_2002_03_OfficeScene.unity +++ b/Assets/HQB/Scene/10002_2002_03_OfficeScene.unity @@ -140,19 +140,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2399593117452945566, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 5.6683784 objectReference: {fileID: 0} - target: {fileID: 2399593117452945566, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3} propertyPath: m_LocalPosition.y - value: 0.998 + value: 3.258 objectReference: {fileID: 0} - target: {fileID: 2399593117452945566, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3} propertyPath: m_LocalPosition.z - value: 0.678 + value: -133.369 objectReference: {fileID: 0} - target: {fileID: 2399593117452945566, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3} propertyPath: m_LocalRotation.w - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2399593117452945566, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3} propertyPath: m_LocalRotation.x @@ -160,7 +160,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2399593117452945566, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3} propertyPath: m_LocalRotation.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2399593117452945566, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3} propertyPath: m_LocalRotation.z @@ -172,7 +172,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2399593117452945566, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 180 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2399593117452945566, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3} propertyPath: m_LocalEulerAnglesHint.z @@ -354,6 +354,10 @@ PrefabInstance: propertyPath: m_Name value: "\u6559\u5E08\uFF08\u5F85\u673A\u52A8\u753B\uFF09 (1)" objectReference: {fileID: 0} + - target: {fileID: 7751996367803956135, guid: 7b9fb3597fb5dc04faa55be08321ef65, type: 3} + propertyPath: m_Materials.Array.data[4] + value: + objectReference: {fileID: 2100000, guid: de88c1d475d9ae040a97b00afaf830e1, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7b9fb3597fb5dc04faa55be08321ef65, type: 3} --- !u!1 &851143855 @@ -818,7 +822,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e84b5b8de3a3f154ba32f7748599c99d, type: 3} m_Name: m_EditorClassIdentifier: - mobileController: {fileID: 0} --- !u!64 &2003267450 MeshCollider: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/UI/UI_Panel/UI_GrowthPeriodPanel.prefab b/Assets/Resources/UI/UI_Panel/UI_GrowthPeriodPanel.prefab new file mode 100644 index 0000000..04e2fdb --- /dev/null +++ b/Assets/Resources/UI/UI_Panel/UI_GrowthPeriodPanel.prefab @@ -0,0 +1,653 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &81079331972360132 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5745333813618640542} + - component: {fileID: 6129136287768016152} + - component: {fileID: 9206247092112634596} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5745333813618640542 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 81079331972360132} + 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: 8475930151962144877} + 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: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6129136287768016152 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 81079331972360132} + m_CullTransparentMesh: 1 +--- !u!114 &9206247092112634596 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 81079331972360132} + 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: "\u6210\u719F\u671F" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: f8ef5cb2ab4d4da4093d3fe60f978c99, type: 2} + m_sharedMaterial: {fileID: -4829118149068189727, guid: f8ef5cb2ab4d4da4093d3fe60f978c99, 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: 25 + m_fontSizeBase: 25 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &641121924057155500 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7238815188366205512} + - component: {fileID: 4378162763038745285} + - component: {fileID: 7853886024892134159} + - component: {fileID: 8226756767879125371} + m_Layer: 5 + m_Name: SeedlingBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7238815188366205512 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 641121924057155500} + 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: 6774147572330445906} + m_Father: {fileID: 6778838047764411791} + 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: 1332, y: -110} + m_SizeDelta: {x: 140.2748, y: 43.657} + m_Pivot: {x: 0, y: 1} +--- !u!222 &4378162763038745285 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 641121924057155500} + m_CullTransparentMesh: 1 +--- !u!114 &7853886024892134159 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 641121924057155500} + 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: 59047f1925f69b34d9feaf26a9723e0b, 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 &8226756767879125371 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 641121924057155500} + 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: e5833786c4c54374c9ccc0441cde8f2d, type: 3} + m_PressedSprite: {fileID: 21300000, guid: e5833786c4c54374c9ccc0441cde8f2d, 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: 7853886024892134159} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &2835752076838751178 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2835752076838751179} + - component: {fileID: 2835752076838751181} + - component: {fileID: -4506834606133869381} + m_Layer: 5 + m_Name: UI_GrowthPeriodPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2835752076838751179 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2835752076838751178} + 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: 6778838047764411791} + m_Father: {fileID: 0} + 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: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2835752076838751181 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2835752076838751178} + m_CullTransparentMesh: 1 +--- !u!114 &-4506834606133869381 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2835752076838751178} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ad88ffb4237bd304a94301b52aee497a, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &4949309966512139251 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6778838047764411791} + - component: {fileID: 6714845129155922548} + - component: {fileID: 3595262918318334253} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6778838047764411791 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4949309966512139251} + 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: 8475930151962144877} + - {fileID: 7238815188366205512} + m_Father: {fileID: 2835752076838751179} + 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: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6714845129155922548 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4949309966512139251} + m_CullTransparentMesh: 1 +--- !u!114 &3595262918318334253 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4949309966512139251} + 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: 0} + 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_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 &6856024348011914405 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6774147572330445906} + - component: {fileID: 894964449068632200} + - component: {fileID: 8341797848000430324} + m_Layer: 5 + m_Name: 'Text (TMP) ' + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6774147572330445906 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6856024348011914405} + 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: 7238815188366205512} + 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: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &894964449068632200 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6856024348011914405} + m_CullTransparentMesh: 1 +--- !u!114 &8341797848000430324 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6856024348011914405} + 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: "\u5E7C\u82D7\u671F" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: f8ef5cb2ab4d4da4093d3fe60f978c99, type: 2} + m_sharedMaterial: {fileID: -4829118149068189727, guid: f8ef5cb2ab4d4da4093d3fe60f978c99, 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: 25 + m_fontSizeBase: 25 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &7596700646783650278 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8475930151962144877} + - component: {fileID: 6263590680643393419} + - component: {fileID: 3715344694614571732} + - component: {fileID: 1660069315683500890} + m_Layer: 5 + m_Name: MaturationBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8475930151962144877 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7596700646783650278} + 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: 5745333813618640542} + m_Father: {fileID: 6778838047764411791} + 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: 1127, y: -110} + m_SizeDelta: {x: 140.2748, y: 43.657} + m_Pivot: {x: 0, y: 1} +--- !u!222 &6263590680643393419 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7596700646783650278} + m_CullTransparentMesh: 1 +--- !u!114 &3715344694614571732 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7596700646783650278} + 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: 46e4474fe41cf9f4bb87d0cd4f6b5091, 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 &1660069315683500890 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7596700646783650278} + 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: 4fbab97bec78c1c40998ad19c53c393e, type: 3} + m_PressedSprite: {fileID: 21300000, guid: 4fbab97bec78c1c40998ad19c53c393e, 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: 3715344694614571732} + m_OnClick: + m_PersistentCalls: + m_Calls: [] diff --git a/Assets/Resources/UI/UI_Panel/UI_GrowthPeriodPanel.prefab.meta b/Assets/Resources/UI/UI_Panel/UI_GrowthPeriodPanel.prefab.meta new file mode 100644 index 0000000..903e0f3 --- /dev/null +++ b/Assets/Resources/UI/UI_Panel/UI_GrowthPeriodPanel.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: fd347e72edc486f4b93d31f43272ffe7 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/UI/UI_Panel/UI_SelectDevicePanel.prefab b/Assets/Resources/UI/UI_Panel/UI_SelectDevicePanel.prefab index d05bde2..3e6aade 100644 --- a/Assets/Resources/UI/UI_Panel/UI_SelectDevicePanel.prefab +++ b/Assets/Resources/UI/UI_Panel/UI_SelectDevicePanel.prefab @@ -650,7 +650,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: 96.03613, y: -50.940918} + m_AnchoredPosition: {x: 1704, y: -50.940918} m_SizeDelta: {x: 138.8723, y: 44.2819} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4267848746142626731 diff --git a/Assets/Scenes/Common/01_InitScene.unity b/Assets/Scenes/Common/01_InitScene.unity index 97cca20..cff22c1 100644 --- a/Assets/Scenes/Common/01_InitScene.unity +++ b/Assets/Scenes/Common/01_InitScene.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.20464736, g: 0.26801568, b: 0.30485883, a: 1} + m_IndirectSpecularColor: {r: 0.20464694, g: 0.26801512, b: 0.30485857, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -277,7 +277,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: systemId: 10002 - startSceneName: 03_LiveScene + startSceneName: 03_OfficeScene --- !u!114 &1686064644 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/CXX/StepState/2002/StepState_2002.cs b/Assets/Scripts/CXX/StepState/2002/StepState_2002.cs index e89bf0d..3b9107a 100644 --- a/Assets/Scripts/CXX/StepState/2002/StepState_2002.cs +++ b/Assets/Scripts/CXX/StepState/2002/StepState_2002.cs @@ -16,6 +16,7 @@ public class StepState_2002 : StepState { steps.Add(1, E_SceneType.Office); steps.Add(2, E_SceneType.Office); + steps.Add(3, E_SceneType.Office); } public override void SetDeviceControl(Device_Control device_Control) @@ -39,334 +40,21 @@ public class StepState_2002 : StepState { //칫ҳ׸ //鿴 - OfficeManager.Instance.mobileController.downIndex = 0; + //OfficeManager.Instance.mobileController.downIndex = 0; PacksackBagMgr.Instance.ClearAllData(); GameManager.Instance.ClearTicketsInfo();//HQB չƱ } else if (num == 2) { //ԤԼ - OfficeManager.Instance.mobileController.downIndex = 1; + //OfficeManager.Instance.mobileController.downIndex = 1; } else if (num == 3) { - //Ʊ - OfficeManager.Instance.mobileController.downIndex = 2; + //ԤԼ + //OfficeManager.Instance.mobileController.downIndex = 1; } - else if (num == 4) - { - //дװ𹤵 - - } - else if (num == 5) - { - //׸ - //ȷװ - - TooRoomMannger.Instance.SetFirstPersonTransform(new Vector3(8.268f, 1.01f, 4.011f), new Vector3(0, 180, 0)); - TooRoomMannger.Instance.cabinetController.Init(); - //ձ - TooRoomMannger.Instance.CreateTool(); - PacksackBagMgr.Instance.ClearAllToolAndDiveceAndMaterial(); - TooRoomMannger.Instance.CheckWearByWearDic(); - //ɵһȥ߼ - if (num == lastNum) - { - E_SceneType curret = GameManager.RunModelMgr.SceneType; - GameManager.RunModelMgr.SceneType = E_SceneType.Office; - if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID("߼䰴ť", true) == 0) - { - Debug.Log("߼䰴ťԶ"); - } - GameManager.RunModelMgr.SceneType = curret; - } - } - else if (num == 6) - { - - //ѡȡ - - TooRoomMannger.Instance.SetFirstPersonTransform(new Vector3(2.2f, 1.01f, 4.011f), new Vector3(0, 180, 0)); - - //װõ - List items = TooRoomMannger.Instance.GetItemInfoByName(new List { "ȫñ", "", "֯", "Եѥ","Ŀ" }); - items.ForEach(item => - { - PacksackBagMgr.Instance.AddOneToolOrMater(item.itemInfo); - Destroy(item.gameObject); - // - PacksackBagMgr.Instance.WearItemState(item.itemInfo, true); - }); - } - else if (num == 7) - { - //׸ - //ͻͨ - - - //ƶλ - LiveSceneManager.Instance.SetFirstPersonTransform(new Vector3(-43.02f, 1.07f, -90.08f), new Vector3(0, -181.643f, 0)); - //ɵһȥ߼ - if (num == lastNum) - { - E_SceneType curret = GameManager.RunModelMgr.SceneType; - GameManager.RunModelMgr.SceneType = E_SceneType.ToolRoom; - if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID("ֳť", true) == 0) - { - Debug.Log("ֳťԶ"); - } - GameManager.RunModelMgr.SceneType = curret; - } - - - #region òȷװ - - //ձ - PacksackBagMgr.Instance.ClearAllData(); - ////ɷװ - //List items = ToolAndmaterialMgr.Instance.CreateItemInfoByName(new List { "ȫñ", "", "֯", "Եѥ", "Ŀ" }); - ////뱳 - //items.ForEach(item => - //{ - // PacksackBagMgr.Instance.AddOneToolOrMater(item); - // // - // PacksackBagMgr.Instance.WearItemState(item, true); - //}); - //ɹ - List items2 = ToolAndmaterialMgr.Instance.CreateItemInfoByName(new List { "ǯ", "Ե˿", "", "֤", "װӡ", "Ե", "߷ѿܱܵ","Χ", "_Ӵ˽", "_ڴ˹" }); - items2.ForEach(item => - { - PacksackBagMgr.Instance.AddOneToolOrMater(item); - }); - - - #endregion - - //ԭ - device_Control.Init(); - - //ԭnpcԻ - LiveSceneManager.Instance.transform.GetComponent().Init(); - } - else if (num == 8) - { - //ǰ - - //ͻͨ - LiveSceneManager.Instance.transform.GetComponent().custom.spriteRenderer.gameObject.SetActive(false); - LiveSceneManager.Instance.transform.GetComponent().customIndex = 1; - } - else if (num == 9) - { - // - - //ƶλ - LiveSceneManager.Instance.SetFirstPersonTransform(new Vector3(-42.91014f, 0.8813875f, -99.69319f), new Vector3(0, -180.343f, 0)); - //ǰ - LiveSceneManager.Instance.transform.GetComponent().header.spriteRenderer.gameObject.SetActive(false); - LiveSceneManager.Instance.transform.GetComponent().headTalkIndex = 1; - //Χ - device_Control.trigger_weiLans.ForEach(trigger => - { - GameObject weilan = GameObject.Instantiate(Resources.Load("Prefabs/Objects/Tools/Χ")); - Tool_Fence fence = weilan.GetComponent(); - fence.SetInstallState(trigger, isinstalled => - { - if (isinstalled) - { - device_Control.tool_Fences.Add(fence); - } - else - { - device_Control.tool_Fences.Remove(fence); - } - }); - }); - //ɹ - if (device_Control.current_workCard_InAndOut == null) - { - GameObject workinout = GameObject.Instantiate(Resources.Load("Prefabs/Objects/Tools/_Ӵ˽")); - device_Control.current_workCard_InAndOut = workinout.transform.GetComponent(); - device_Control.current_workCard_InAndOut.SetInstallState(device_Control.workCard_Ӵ˽_trigger); - } - if (device_Control.current_workCard_Workthere == null) - { - GameObject workthere = GameObject.Instantiate(Resources.Load("Prefabs/Objects/Tools/_ڴ˹")); - device_Control.current_workCard_Workthere = workthere.transform.GetComponent(); - device_Control.current_workCard_Workthere.SetInstallState(device_Control.workCard_ڴ˹_trigger); - } - } - else if (num == 10) - { - //߼鲢ϿԴ - - //ſ - device_Control.cabinetDoor.SetState(true); - device_Control.door_screw.isInstall = false; - device_Control.door_screw.transform.localPosition = new Vector3(device_Control.door_screw.transform.localPosition.x, device_Control.door_screw.initPostionY-0.03f, device_Control.door_screw.transform.localPosition.z); - device_Control.door_seal.isCut = true; - device_Control.door_seal.gameObject.SetActive(false); - device_Control.door_cover.SetState(true); - - - //Ӳ - device_Control.meteringDevice.CoverUnstallState(); - //ӡ - device_Control.meteringDevice.CoverSealUninstallState(); - } - else if (num == 11) - { - //˶Ժͳ¼豸Ϣ - - //ԴϿ - device_Control.inSwitch.CloseState(); - device_Control.outSwitch.CloseState(); - device_Control.p2Switch.CloseState(); - //ˢ´״̬ - device_Control.CheckHasElectricity(); - //npcϵ - LiveSceneManager.Instance.transform.GetComponent().customIndex = 2; - } - else if (num == 12) - { - //ܼװ - //Ѷȡ - device_Control.meteringDevice.namePlate.isChecked = true; - } - else if (num == 13) - { - //װܱ - - //ܱ - DestroyImmediate(device_Control.meteringDevice.gameObject); - device_Control.meteringDevice = null; - //ʾ - device_Control.sundries.gameObject.SetActive(true); - - //ܱȡ - device_Control.jieXian_lines.ForEach(line => - { - line.SetConenctState(false); - }); - //ȡ - device_Control.collect_lines.ForEach(line => - { - line.SetConenctState(false); - }); - //ˢ´״̬ - device_Control.CheckHasElectricity(); - } - else if (num == 14) - { - //ֳͨ缰 - - //ܱװ - if (device_Control.meteringDevice == null) - { - device_Control.meteringDevice = GameObject.Instantiate(Resources.Load("Prefabs/Objects/Tools/߷ѿܱܵ")).GetComponent(); - device_Control.meteringDevice.cover.openLocalPos = new Vector3(0.295f, 0.121f, -0.067f); - device_Control.meteringDevice.transform.GetComponent().enabled = false; - device_Control.meteringDevice.SetAddState(device_Control.dianTrigger, new Vector3(-0.02999878f, -0.028f, 0.168f)); - device_Control.meteringDevice.screemControl.ShowPanel(new List { ScreenType.ʱ, ScreenType.й, ScreenType.й, ScreenType.й }); - //߹˿ - device_Control.SetLineScrew(); - //˿װص - device_Control.meteringDevice.jieXian_screws.ForEach(screw => - { - screw.AddinstallAction(isinstalled => - { - //ˢ´״̬ - device_Control.CheckHasElectricity(); - }); - - //ıǶ - screw.TestPenAng = screw.installPos.localEulerAngles + new Vector3(0, 180, 0); ; - }); - //̶˿ص - device_Control.meteringDevice.fix_screw_left.AddinstallAction(isinstall => { device_Control.CheckܱTriggerShow(); }); - device_Control.meteringDevice.fix_screw_right.AddinstallAction(isinstall => { device_Control.CheckܱTriggerShow(); }); - //̶˿š - device_Control.meteringDevice.FixScrewInstall(); - //˿š - device_Control.meteringDevice.JieXianScrewInstallState(); - } - - - - // - device_Control.meteringDevice.isolationBoard.SetState(false); - //ܱ - device_Control.jieXian_lines.ForEach(line => - { - line.SetConenctState(true); - }); - //ɼ - device_Control.collect_lines.ForEach(line => - { - line.SetConenctState(true); - }); - //ˢ´״̬ - device_Control.CheckHasElectricity(); - } - else if (num == 15) - { - //ʵʩӡ - - //ش - device_Control.inSwitch.OpenState(); - device_Control.outSwitch.OpenState(); - device_Control.p2Switch.OpenState(); - //ˢ´״̬ - device_Control.CheckHasElectricity(); - //Ӹ - device_Control.meteringDevice.CoverInstallState(); - } - else if (num == 16) - { - //ֳ - device_Control.meteringDevice.cover.cover_seal_Left.Install(); - device_Control.meteringDevice.cover.cover_seal_Right.Install(); - } - else if (num == 17) - { - //ֳ깤 - - //ԭ - device_Control.sundries.gameObject.SetActive(false); - device_Control.cabinetDoor.SetState(false); - device_Control.door_cover.SetState(false); - device_Control.door_screw.isInstall = true; - device_Control.door_screw.transform.localPosition = new Vector3(device_Control.door_screw.transform.localPosition.x, device_Control.door_screw.initPostionY, device_Control.door_screw.transform.localPosition.z); - device_Control.door_seal.isCut = false; - device_Control.door_seal.gameObject.SetActive(true); - - //ɾΧ - device_Control.tool_Fences.ForEach(fence => - { - DestroyImmediate(fence.gameObject); - }); - device_Control.tool_Fences.Clear(); - - //ɾ - if (device_Control.current_workCard_InAndOut != null) - { - DestroyImmediate(device_Control.current_workCard_InAndOut.gameObject); - device_Control.current_workCard_InAndOut = null; - } - if (device_Control.current_workCard_Workthere != null) - { - DestroyImmediate(device_Control.current_workCard_Workthere.gameObject); - device_Control.current_workCard_Workthere = null; - } - } - else if (num == 18) - { - //Ʊս - - //ͻ깤 - LiveSceneManager.Instance.transform.GetComponent().customIndex = 3; - } } } diff --git a/Assets/Scripts/Project/Manager/OfficeManager.cs b/Assets/Scripts/Project/Manager/OfficeManager.cs index 68ff446..814a89e 100644 --- a/Assets/Scripts/Project/Manager/OfficeManager.cs +++ b/Assets/Scripts/Project/Manager/OfficeManager.cs @@ -12,24 +12,25 @@ public class OfficeManager : SingletonMono /// /// ֻ /// - public MobileController mobileController; - private FirstPersonController firstPersonController; + //public MobileController mobileController; + //private FirstPersonController firstPersonController; private void Start() { - firstPersonController = GameObject.FindGameObjectWithTag("Player").GetComponent(); - firstPersonController.gameObject.SetActive(false); - GameManager.EventMgr.AddEventListener(Enum_EventType.OfficeTimeLineOver, OfficeTimeLineOver); - GameManager.EventMgr.AddEventListener(Enum_EventType.PlayerCanMove, SwitchFirstPersonControllerMove); + //firstPersonController = GameObject.FindGameObjectWithTag("Player").GetComponent(); + //firstPersonController.gameObject.SetActive(false); + //GameManager.EventMgr.AddEventListener(Enum_EventType.OfficeTimeLineOver, OfficeTimeLineOver); + //GameManager.EventMgr.AddEventListener(Enum_EventType.PlayerCanMove, SwitchFirstPersonControllerMove); GameManager.EventMgr.AddEventListener(Enum_EventType.InitializationUI, InitializationUI); if (GameManager.RunModelMgr.ModeType == E_ModeType.Study) { GameManager.EventMgr.AddEventListener(Enum_EventType.SwitchSubProcess, SwitchSubProcess); } + InitializationUI(); } public void SwitchFirstPersonControllerMove(bool isMove) { - firstPersonController.playerCanMove = isMove; + //firstPersonController.playerCanMove = isMove; } private void SwitchSubProcess(int subProcess) @@ -81,15 +82,22 @@ public class OfficeManager : SingletonMono GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchScene, GameManager.RunModelMgr.SceneType); }); } - firstPersonController.gameObject.SetActive(true); + if (!GameManager.UIMgr.GetPanel()) + { + GameManager.UIMgr.ShowPanel(E_UI_Layer.Mid, (panel) => + { + panel.Init(); + }); + } + //firstPersonController.gameObject.SetActive(true); } private void OnDestroy() { - GameManager.EventMgr.RemoveEventListener(Enum_EventType.OfficeTimeLineOver, OfficeTimeLineOver); + //GameManager.EventMgr.RemoveEventListener(Enum_EventType.OfficeTimeLineOver, OfficeTimeLineOver); GameManager.EventMgr.RemoveEventListener(Enum_EventType.InitializationUI, InitializationUI); - GameManager.EventMgr.RemoveEventListener(Enum_EventType.PlayerCanMove, SwitchFirstPersonControllerMove); + //GameManager.EventMgr.RemoveEventListener(Enum_EventType.PlayerCanMove, SwitchFirstPersonControllerMove); if (GameManager.UIMgr.GetPanel()) { GameManager.UIMgr.HidePanel(); diff --git a/Assets/Scripts/Project/UI/UI_Panel/UI_GrowthPeriodPanel.cs b/Assets/Scripts/Project/UI/UI_Panel/UI_GrowthPeriodPanel.cs new file mode 100644 index 0000000..d7e5087 --- /dev/null +++ b/Assets/Scripts/Project/UI/UI_Panel/UI_GrowthPeriodPanel.cs @@ -0,0 +1,32 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class UI_GrowthPeriodPanel : BasePanel +{ + public void Init() + { + + } + public override void ShowMe() + { + + } + + + protected override void OnClick(string btnName) + { + base.OnClick(btnName); + switch (btnName) + { + case "MaturationBtn": + + break; + case "SeedlingBtn": + + break; + default: + break; + } + } +} diff --git a/Assets/Scripts/Project/UI/UI_Panel/UI_GrowthPeriodPanel.cs.meta b/Assets/Scripts/Project/UI/UI_Panel/UI_GrowthPeriodPanel.cs.meta new file mode 100644 index 0000000..96a249b --- /dev/null +++ b/Assets/Scripts/Project/UI/UI_Panel/UI_GrowthPeriodPanel.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ad88ffb4237bd304a94301b52aee497a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Project/UI/UI_Panel/UI_SelectWorkTicketPanel.cs b/Assets/Scripts/Project/UI/UI_Panel/UI_SelectWorkTicketPanel.cs index 90498d3..69a0b7f 100644 --- a/Assets/Scripts/Project/UI/UI_Panel/UI_SelectWorkTicketPanel.cs +++ b/Assets/Scripts/Project/UI/UI_Panel/UI_SelectWorkTicketPanel.cs @@ -24,7 +24,7 @@ public class UI_SelectWorkTicketPanel : BasePanel public override void ShowMe() { base.ShowMe(); - GameManager.EventMgr.EventTrigger(Enum_EventType.PlayerCanMove, false); + //GameManager.EventMgr.Enum_EventType.PlayerCanMove); if (GameManager.RunModelMgr.ModeType == E_ModeType.Study) GetControl