diff --git a/Assets/Resources/UIPrefabs/SelectToolsPanel.prefab b/Assets/Resources/UIPrefabs/SelectToolsPanel.prefab index d3660bf..3b39575 100644 --- a/Assets/Resources/UIPrefabs/SelectToolsPanel.prefab +++ b/Assets/Resources/UIPrefabs/SelectToolsPanel.prefab @@ -145,12 +145,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 5620602097183159484} + - {fileID: 2561756446048467453} m_Father: {fileID: 1268146011552982959} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 44.5, y: -45.200012} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 90, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6043192170571497128 @@ -181,7 +181,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a27445b223f04d348990d4dd94393bbd, type: 3} + m_Sprite: {fileID: 21300000, guid: 64329bcd6b65cd54b90f804e8152136e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -227,6 +227,85 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: -20} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1392434350692912896 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4818743487007697694} + - component: {fileID: 3087651668690973377} + - component: {fileID: 6375770380175283115} + m_Layer: 5 + m_Name: Text (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4818743487007697694 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1392434350692912896} + 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: 360123184562560727} + 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 &3087651668690973377 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1392434350692912896} + m_CullTransparentMesh: 1 +--- !u!114 &6375770380175283115 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1392434350692912896} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData: + m_Font: {fileID: 12800000, guid: 6682f39107ec959478d15f6ada28f19a, type: 3} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u5DF2\u4F7F\u7528" --- !u!1 &1486425856871024164 GameObject: m_ObjectHideFlags: 0 @@ -319,7 +398,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &360123184562560727 RectTransform: m_ObjectHideFlags: 0 @@ -332,14 +411,15 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 4818743487007697694} - {fileID: 4227473381142745640} - {fileID: 7089152116390608351} m_Father: {fileID: 1268146011552982959} 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_AnchoredPosition: {x: 0, y: -0.1996994} + m_SizeDelta: {x: -8.9834, y: -13.8756} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8610133033662512830 CanvasRenderer: @@ -362,7 +442,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 0.44705883} + m_Color: {r: 0, g: 0, b: 0, a: 0.29803923} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -876,7 +956,7 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 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} @@ -886,7 +966,8 @@ MonoBehaviour: m_ColorMultiplier: 1 m_FadeDuration: 0.1 m_SpriteState: - m_HighlightedSprite: {fileID: 0} + m_HighlightedSprite: {fileID: 21300000, guid: a27445b223f04d348990d4dd94393bbd, + type: 3} m_PressedSprite: {fileID: 0} m_SelectedSprite: {fileID: 0} m_DisabledSprite: {fileID: 0} @@ -897,10 +978,89 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 8968904500091023851} + m_TargetGraphic: {fileID: 5643011260235786368} m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!1 &6449986576521136693 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2561756446048467453} + - component: {fileID: 8764318918424393149} + - component: {fileID: 4346931271053321811} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2561756446048467453 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6449986576521136693} + 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: 2072720798957037725} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: -44.893234, y: -19.9093} + m_SizeDelta: {x: 90.5865, y: 39.3524} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &8764318918424393149 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6449986576521136693} + m_CullTransparentMesh: 1 +--- !u!114 &4346931271053321811 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6449986576521136693} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData: + m_Font: {fileID: 12800000, guid: 20ebdb412ee9aec4a9d3005965d9c962, type: 3} + m_FontSize: 13 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 13 + m_MaxSize: 14 + m_Alignment: 1 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u5B55\u9A6C\u8840\u6E05\u4FC3\u6027\u817A\u6FC0\u7D20(PMSG)" --- !u!1 &6878953837592996270 GameObject: m_ObjectHideFlags: 0 @@ -935,7 +1095,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -0.4319, y: -0.1439} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 73.2246, y: 73.8005} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5171306679504763465 @@ -976,85 +1136,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &7159491769822383528 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5620602097183159484} - - component: {fileID: 4427150667529931224} - - component: {fileID: 3788261656787179229} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5620602097183159484 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7159491769822383528} - 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: 2072720798957037725} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -44.893234, y: -26} - m_SizeDelta: {x: 90.5865, y: 47.1709} - m_Pivot: {x: 0, y: 0.5} ---- !u!222 &4427150667529931224 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7159491769822383528} - m_CullTransparentMesh: 1 ---- !u!114 &3788261656787179229 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7159491769822383528} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData: - m_Font: {fileID: 12800000, guid: 20ebdb412ee9aec4a9d3005965d9c962, type: 3} - m_FontSize: 13 - m_FontStyle: 0 - m_BestFit: 1 - m_MinSize: 13 - m_MaxSize: 14 - m_Alignment: 1 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u5B55\u9A6C\u8840\u6E05\u4FC3\u6027\u817A\u6FC0\u7D20(PMSG)" --- !u!1 &7259109648107715389 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/_Scripts/Application/UI/SelectToolsPanel.cs b/Assets/_Scripts/Application/UI/SelectToolsPanel.cs index ec8bee1..efd345b 100644 --- a/Assets/_Scripts/Application/UI/SelectToolsPanel.cs +++ b/Assets/_Scripts/Application/UI/SelectToolsPanel.cs @@ -28,8 +28,9 @@ namespace ZXK.LouDiXvMuNiu { for (int i = 0; i < _toolBtnArray.Count; i++) { - _toolBtnArray[i].transform.Find("BeUseImg/ChoseRight").gameObject.SetActive(false); - _toolBtnArray[i].transform.Find("BeUseImg/ChoseError").gameObject.SetActive(false); + _toolBtnArray[i].transform.Find("BeUseImg").gameObject.SetActive(false); + //_toolBtnArray[i].transform.Find("BeUseImg/ChoseRight").gameObject.SetActive(false); + //_toolBtnArray[i].transform.Find("BeUseImg/ChoseError").gameObject.SetActive(false); } } private void CreateTool() @@ -71,13 +72,15 @@ namespace ZXK.LouDiXvMuNiu if (curTools[i].Equals(toolItemGeo.name)) rightSelect = true; } if (rightSelect) - { + { + toolItemGeo.transform.Find("BeUseImg").gameObject.SetActive(true); toolItemGeo.transform.Find("BeUseImg/ChoseRight").gameObject.SetActive(true); GameManager.Instance._EventManager.Raise(new ClickToolArgs() { SelectTool = toolItemGeo.name }); GameManager.Instance._DataNiuHandler.AddScore(curStep.ModuleName, curStep.ThreeTaskName, 1); } else { + toolItemGeo.transform.Find("BeUseImg").gameObject.SetActive(true); toolItemGeo.transform.Find("BeUseImg/ChoseError").gameObject.SetActive(true); } });