diff --git a/xiaofang/Assets/Res/FreeAction/03/btn_sssx02.png b/xiaofang/Assets/Res/FreeAction/03/btn_sssx02.png new file mode 100644 index 00000000..f488caf4 Binary files /dev/null and b/xiaofang/Assets/Res/FreeAction/03/btn_sssx02.png differ diff --git a/xiaofang/Assets/Res/FreeAction/03/img_commontip_frame.png b/xiaofang/Assets/Res/FreeAction/03/img_commontip_frame.png new file mode 100644 index 00000000..3ae03df7 Binary files /dev/null and b/xiaofang/Assets/Res/FreeAction/03/img_commontip_frame.png differ diff --git a/xiaofang/Assets/Scenes/LL_Command_Action_1.unity b/xiaofang/Assets/Scenes/LL_Command_Action_1.unity index 9c8b4552..67736a33 100644 --- a/xiaofang/Assets/Scenes/LL_Command_Action_1.unity +++ b/xiaofang/Assets/Scenes/LL_Command_Action_1.unity @@ -178,82 +178,103 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &240169305 -GameObject: +--- !u!1001 &148709854 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 240169308} - - component: {fileID: 240169307} - - component: {fileID: 240169306} - m_Layer: 0 - m_Name: GameObject (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &240169306 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 240169305} - 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: 45104c6091103e14d9b116cfa493c4c8, 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!222 &240169307 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 240169305} - m_CullTransparentMesh: 1 ---- !u!224 &240169308 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 240169305} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.05723057} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 6 - 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: 492.0705, y: 204.81587} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1538443767} + m_Modifications: + - target: {fileID: 5642274089642939526, guid: 9121e9998ce2e2c4fb34d50a3d9953d3, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5642274089642939526, guid: 9121e9998ce2e2c4fb34d50a3d9953d3, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5642274089642939526, guid: 9121e9998ce2e2c4fb34d50a3d9953d3, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5642274089642939526, guid: 9121e9998ce2e2c4fb34d50a3d9953d3, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5642274089642939526, guid: 9121e9998ce2e2c4fb34d50a3d9953d3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5642274089642939526, guid: 9121e9998ce2e2c4fb34d50a3d9953d3, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5642274089642939526, guid: 9121e9998ce2e2c4fb34d50a3d9953d3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5642274089642939526, guid: 9121e9998ce2e2c4fb34d50a3d9953d3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5642274089642939526, guid: 9121e9998ce2e2c4fb34d50a3d9953d3, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5642274089642939526, guid: 9121e9998ce2e2c4fb34d50a3d9953d3, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5642274089642939526, guid: 9121e9998ce2e2c4fb34d50a3d9953d3, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5642274089642939526, guid: 9121e9998ce2e2c4fb34d50a3d9953d3, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5642274089642939526, guid: 9121e9998ce2e2c4fb34d50a3d9953d3, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5642274089642939526, guid: 9121e9998ce2e2c4fb34d50a3d9953d3, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5642274089642939526, guid: 9121e9998ce2e2c4fb34d50a3d9953d3, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5642274089642939526, guid: 9121e9998ce2e2c4fb34d50a3d9953d3, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5642274089642939526, guid: 9121e9998ce2e2c4fb34d50a3d9953d3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5642274089642939526, guid: 9121e9998ce2e2c4fb34d50a3d9953d3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5642274089642939526, guid: 9121e9998ce2e2c4fb34d50a3d9953d3, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5642274089642939526, guid: 9121e9998ce2e2c4fb34d50a3d9953d3, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5642274089642939526, guid: 9121e9998ce2e2c4fb34d50a3d9953d3, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5642274089642939527, guid: 9121e9998ce2e2c4fb34d50a3d9953d3, type: 3} + propertyPath: m_Name + value: Choose_1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9121e9998ce2e2c4fb34d50a3d9953d3, type: 3} --- !u!1 &298877719 GameObject: m_ObjectHideFlags: 0 @@ -416,82 +437,11 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!1 &2021236887 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2021236890} - - component: {fileID: 2021236889} - - component: {fileID: 2021236888} - m_Layer: 0 - m_Name: GameObject (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &2021236888 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2021236887} - 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: 76645fdfb41111d40a2d5e5f30140ed2, 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!222 &2021236889 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2021236887} - m_CullTransparentMesh: 1 ---- !u!224 &2021236890 +--- !u!224 &1538443767 stripped RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 1100707197, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + m_PrefabInstance: {fileID: 1986279549016710772} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2021236887} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.08606074} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 5 - 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: 496.36884, y: 205.19366} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2053376435 GameObject: m_ObjectHideFlags: 0 @@ -583,6 +533,262 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 261402557, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 261402557, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 261402557, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 261402557, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 261402557, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 261402557, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 570685014, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_SizeDelta.x + value: 573.032 + objectReference: {fileID: 0} + - target: {fileID: 570685014, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 570685014, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchoredPosition.x + value: -572 + objectReference: {fileID: 0} + - target: {fileID: 919949400, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: Image1 + value: + objectReference: {fileID: 21300000, guid: 76ff30bd66ac4af49b2ed9c1a1ecbc88, type: 3} + - target: {fileID: 919949400, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: Image2 + value: + objectReference: {fileID: 21300000, guid: 57606afbff7bfab40a1dad2c26004420, type: 3} + - target: {fileID: 1100707197, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_SizeDelta.x + value: -582 + objectReference: {fileID: 0} + - target: {fileID: 1100707197, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_SizeDelta.y + value: 734.136 + objectReference: {fileID: 0} + - target: {fileID: 1100707197, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchoredPosition.x + value: 582 + objectReference: {fileID: 0} + - target: {fileID: 1100707198, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_StartAxis + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1100707198, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_CellSize.x + value: 74.71 + objectReference: {fileID: 0} + - target: {fileID: 1100707198, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_ChildAlignment + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1100707198, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_Padding.m_Left + value: -16 + objectReference: {fileID: 0} + - target: {fileID: 1605163136, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1605163136, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1605163136, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1605163136, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1605163136, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1605163136, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1634927331, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_SizeDelta.x + value: 1080.8 + objectReference: {fileID: 0} + - target: {fileID: 1634927331, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchoredPosition.x + value: 11.839 + objectReference: {fileID: 0} + - target: {fileID: 1634927332, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_MovementType + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1741092114, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1741092114, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1741092114, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1741092114, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1741092114, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1741092114, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1854268889, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1854268889, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1854268889, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1854268889, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1854268889, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1854268889, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 948396698034575733, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 948396698034575733, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 948396698034575733, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 948396698034575733, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 948396698140814702, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 948396698140814702, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 948396698140814702, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 948396698140814702, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 948396698298198961, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 948396698298198961, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 948396698298198961, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 948396698298198961, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 948396698323786033, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 948396698323786033, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 948396698323786033, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 948396698323786033, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 948396698339676344, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 948396698339676344, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 948396698339676344, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 948396698339676344, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 948396699256012633, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 948396699256012633, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 948396699256012633, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 948396699256012633, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1986279548675747996, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1986279549173157411, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_Pivot.x value: 0 @@ -671,5 +877,17 @@ PrefabInstance: propertyPath: m_Name value: Command_End objectReference: {fileID: 0} + - target: {fileID: 2991637681471873777, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6389238419783627009, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8231224075310808718, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} diff --git a/xiaofang/Assets/Script/UI/ZZZZZZ/ZZUIManager.cs b/xiaofang/Assets/Script/UI/ZZZZZZ/ZZUIManager.cs index 2c247460..9bd352de 100644 --- a/xiaofang/Assets/Script/UI/ZZZZZZ/ZZUIManager.cs +++ b/xiaofang/Assets/Script/UI/ZZZZZZ/ZZUIManager.cs @@ -269,6 +269,10 @@ public class ZZUIManager : MonoBehaviour /// public Text Area; public Text NPCName; + /// + /// 撤离方案选择框文本信息 + /// + public Text DiaLogBoxTitle; public Sprite Image1; public Sprite Image2; @@ -775,18 +779,18 @@ public class ZZUIManager : MonoBehaviour GameObject newItem = Instantiate(itemPrefab, content3.transform); Text left = newItem.transform.Find("Choose_Bg/Choose_BgLeft/Left").GetComponent(); Text Right = newItem.transform.Find("Choose_Bg/Choose_BgLeft/Right").GetComponent(); - left.text = jsonReader.SetUIText(20000); - str = jsonReader.GetGlobal(1, 90016); - string[] str1 = str.Split('|'); - Right.text = jsonReader.GetEvacuate(str1[i]); - Toggle toggle = newItem.gameObject.GetComponent(); - toggle.group = toggleGroup; + //left.text = jsonReader.SetUIText(20000); + //// str = jsonReader.GetGlobal(1, 90016); + // string[] str1 = str.Split('|'); + // Right.text = jsonReader.GetEvacuate(str1[i]); + // Toggle toggle = newItem.gameObject.GetComponent(); + // toggle.group = toggleGroup; - // 绑定点击事件 - int index = i; // 保证每个 Toggle 有不同的 index - toggle.onValueChanged.AddListener((bool isOn) => OnToggleClicked(isOn, index)); - // left.text=js - createdItems.Add(newItem); // 将新创建的物体添加到列表中 + // // 绑定点击事件 + // int index = i; // 保证每个 Toggle 有不同的 index + // toggle.onValueChanged.AddListener((bool isOn) => OnToggleClicked(isOn, index)); + // // left.text=js + // createdItems.Add(newItem); // 将新创建的物体添加到列表中 } // 打乱顺序（使用 Fisher-Yates 算法） @@ -1127,9 +1131,13 @@ public class ZZUIManager : MonoBehaviour { NPCName.text = str; } + public void FixTitle(string str) + { + str= DiaLogBoxTitle.text; + } #endregion /// - /// 撤离教师的方案选择 + /// 撤离教室的方案选择 /// /// /// @@ -1141,6 +1149,7 @@ public class ZZUIManager : MonoBehaviour Debug.Log("Toggle " + index + " is On"); } } + private void Close() { DiaLogBox2?.SetActive(false);