From bea43936f3e8524bbda682355bd483fa20af2a8c Mon Sep 17 00:00:00 2001
From: LMZ <1477077658@qq.com>
Date: Thu, 26 Dec 2024 23:18:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=A5=E4=BA=96=E7=9A=84=E5=BC=B5=E5=8F=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Prefabs/PanelPrefabs/Command_End.prefab | 270 ++++++++----------
.../Assets/Prefabs/PanelPrefabs/TimeBg.prefab | 159 +++++++++++
.../Prefabs/PanelPrefabs/TimeBg.prefab.meta | 7 +
xiaofang/Assets/Scenes/HylScene/Test.unity | 195 ++++++++++++-
.../Assets/Script/UI/ZZZZZZ/Chooselitem8.cs | 68 ++++-
.../Script/UI/ZZZZZZ/FreePanelManager.cs | 5 +
xiaofang/Assets/Script/UI/ZZZZZZ/OpcOrder2.cs | 1 +
7 files changed, 544 insertions(+), 161 deletions(-)
create mode 100644 xiaofang/Assets/Prefabs/PanelPrefabs/TimeBg.prefab
create mode 100644 xiaofang/Assets/Prefabs/PanelPrefabs/TimeBg.prefab.meta
diff --git a/xiaofang/Assets/Prefabs/PanelPrefabs/Command_End.prefab b/xiaofang/Assets/Prefabs/PanelPrefabs/Command_End.prefab
index 48ecffb3..d273817f 100644
--- a/xiaofang/Assets/Prefabs/PanelPrefabs/Command_End.prefab
+++ b/xiaofang/Assets/Prefabs/PanelPrefabs/Command_End.prefab
@@ -1933,86 +1933,6 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
---- !u!1 &1986279547569029179
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1986279547569029156}
- - component: {fileID: 1986279547569029158}
- - component: {fileID: 1986279547569029157}
- m_Layer: 5
- m_Name: TimeText
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &1986279547569029156
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1986279547569029179}
- 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: 1986279548104501600}
- 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}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 126.6915, y: 44.1044}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &1986279547569029158
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1986279547569029179}
- m_CullTransparentMesh: 1
---- !u!114 &1986279547569029157
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1986279547569029179}
- 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: 0.74509805, g: 0.9607843, 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: 10102, guid: 0000000000000000e000000000000000, type: 0}
- m_FontSize: 36
- m_FontStyle: 0
- m_BestFit: 0
- m_MinSize: 3
- m_MaxSize: 40
- m_Alignment: 4
- m_AlignByGeometry: 0
- m_RichText: 1
- m_HorizontalOverflow: 0
- m_VerticalOverflow: 0
- m_LineSpacing: 1
- m_Text: 00:02
--- !u!1 &1986279547577871129
GameObject:
m_ObjectHideFlags: 0
@@ -3672,83 +3592,6 @@ MonoBehaviour:
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "4\u5E74\u7EA72\u73ED"
---- !u!1 &1986279548104501607
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1986279548104501600}
- - component: {fileID: 1986279548104501602}
- - component: {fileID: 1986279548104501601}
- m_Layer: 5
- m_Name: TimeBg
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 0
---- !u!224 &1986279548104501600
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1986279548104501607}
- 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: 1986279547569029156}
- m_Father: {fileID: 1986279549173157411}
- m_RootOrder: 9
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0.5, y: 1}
- m_AnchorMax: {x: 0.5, y: 1}
- m_AnchoredPosition: {x: 0, y: -37}
- m_SizeDelta: {x: 488, y: 74}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &1986279548104501602
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1986279548104501607}
- m_CullTransparentMesh: 1
---- !u!114 &1986279548104501601
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1986279548104501607}
- 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: f38af4ec5b0f5bb438566eda1e69c392, 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 &1986279548140014199
GameObject:
m_ObjectHideFlags: 0
@@ -11927,3 +11770,116 @@ RectTransform:
m_CorrespondingSourceObject: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3}
m_PrefabInstance: {fileID: 7441083856479355707}
m_PrefabAsset: {fileID: 0}
+--- !u!1001 &8774897054539564635
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 1986279549173157411}
+ m_Modifications:
+ - target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
+ propertyPath: m_Pivot.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
+ propertyPath: m_Pivot.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
+ propertyPath: m_RootOrder
+ value: 9
+ objectReference: {fileID: 0}
+ - target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 488
+ objectReference: {fileID: 0}
+ - target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 74
+ objectReference: {fileID: 0}
+ - target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: -37
+ objectReference: {fileID: 0}
+ - target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7085882780388142908, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
+ propertyPath: m_Name
+ value: TimeBg
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
+--- !u!114 &1986279547569029157 stripped
+MonoBehaviour:
+ m_CorrespondingSourceObject: {fileID: 7085882780924118654, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
+ m_PrefabInstance: {fileID: 8774897054539564635}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+--- !u!224 &1986279548104501600 stripped
+RectTransform:
+ m_CorrespondingSourceObject: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
+ m_PrefabInstance: {fileID: 8774897054539564635}
+ m_PrefabAsset: {fileID: 0}
diff --git a/xiaofang/Assets/Prefabs/PanelPrefabs/TimeBg.prefab b/xiaofang/Assets/Prefabs/PanelPrefabs/TimeBg.prefab
new file mode 100644
index 00000000..087d951f
--- /dev/null
+++ b/xiaofang/Assets/Prefabs/PanelPrefabs/TimeBg.prefab
@@ -0,0 +1,159 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &7085882780388142908
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 7085882780388142907}
+ - component: {fileID: 7085882780388142905}
+ - component: {fileID: 7085882780388142906}
+ m_Layer: 5
+ m_Name: TimeBg
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!224 &7085882780388142907
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7085882780388142908}
+ 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: 7085882780924118655}
+ m_Father: {fileID: 0}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 1}
+ m_AnchorMax: {x: 0.5, y: 1}
+ m_AnchoredPosition: {x: 0, y: -37}
+ m_SizeDelta: {x: 488, y: 74}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7085882780388142905
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7085882780388142908}
+ m_CullTransparentMesh: 1
+--- !u!114 &7085882780388142906
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7085882780388142908}
+ 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: f38af4ec5b0f5bb438566eda1e69c392, 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 &7085882780924118624
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 7085882780924118655}
+ - component: {fileID: 7085882780924118653}
+ - component: {fileID: 7085882780924118654}
+ m_Layer: 5
+ m_Name: TimeText
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &7085882780924118655
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7085882780924118624}
+ 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: 7085882780388142907}
+ 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}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 126.6915, y: 44.1044}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7085882780924118653
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7085882780924118624}
+ m_CullTransparentMesh: 1
+--- !u!114 &7085882780924118654
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7085882780924118624}
+ 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: 0.74509805, g: 0.9607843, 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: 10102, guid: 0000000000000000e000000000000000, type: 0}
+ m_FontSize: 36
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 3
+ m_MaxSize: 40
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: 00:02
diff --git a/xiaofang/Assets/Prefabs/PanelPrefabs/TimeBg.prefab.meta b/xiaofang/Assets/Prefabs/PanelPrefabs/TimeBg.prefab.meta
new file mode 100644
index 00000000..7b539fa9
--- /dev/null
+++ b/xiaofang/Assets/Prefabs/PanelPrefabs/TimeBg.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: a80b522907f38514cb5d501fa8d84b10
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/xiaofang/Assets/Scenes/HylScene/Test.unity b/xiaofang/Assets/Scenes/HylScene/Test.unity
index 34cc6851..b6440980 100644
--- a/xiaofang/Assets/Scenes/HylScene/Test.unity
+++ b/xiaofang/Assets/Scenes/HylScene/Test.unity
@@ -301,6 +301,11 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 288056020}
m_CullTransparentMesh: 1
+--- !u!224 &349546248 stripped
+RectTransform:
+ m_CorrespondingSourceObject: {fileID: 4641918897582544614, guid: 940be89243a038b4090a77556e45a06d, type: 3}
+ m_PrefabInstance: {fileID: 3077635299975306478}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &373930957
GameObject:
m_ObjectHideFlags: 0
@@ -378,6 +383,11 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 373930957}
m_CullTransparentMesh: 1
+--- !u!1 &378331772 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 7085882780388142908, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
+ m_PrefabInstance: {fileID: 998498727}
+ m_PrefabAsset: {fileID: 0}
--- !u!224 &396693239 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 3077635299444999927, guid: 940be89243a038b4090a77556e45a06d, type: 3}
@@ -501,6 +511,123 @@ MonoBehaviour:
rectTransform: {fileID: 1248276359}
secondMenu: {fileID: 1185717110}
firstToggle: {fileID: 571027941}
+--- !u!1001 &998498727
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 396693239}
+ m_Modifications:
+ - target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
+ propertyPath: m_Pivot.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
+ propertyPath: m_Pivot.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
+ propertyPath: m_RootOrder
+ value: 13
+ objectReference: {fileID: 0}
+ - target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 103.247
+ objectReference: {fileID: 0}
+ - target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 34.157
+ objectReference: {fileID: 0}
+ - target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
+ propertyPath: m_LocalScale.x
+ value: 2.0146906
+ objectReference: {fileID: 0}
+ - target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
+ propertyPath: m_LocalScale.y
+ value: 2.0146906
+ objectReference: {fileID: 0}
+ - target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
+ propertyPath: m_LocalScale.z
+ value: 2.0146906
+ objectReference: {fileID: 0}
+ - target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: -821
+ objectReference: {fileID: 0}
+ - target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: -44
+ objectReference: {fileID: 0}
+ - target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7085882780388142908, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
+ propertyPath: m_Name
+ value: TimeBg
+ objectReference: {fileID: 0}
+ - target: {fileID: 7085882780388142908, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7085882780924118654, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
+ propertyPath: m_Text
+ value: 00:00
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
--- !u!1 &1185717110
GameObject:
m_ObjectHideFlags: 0
@@ -617,6 +744,17 @@ MonoBehaviour:
m_Spacing: {x: 0, y: 0}
m_Constraint: 0
m_ConstraintCount: 2
+--- !u!114 &1194367126 stripped
+MonoBehaviour:
+ m_CorrespondingSourceObject: {fileID: 7085882780924118654, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
+ m_PrefabInstance: {fileID: 998498727}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
--- !u!1 &1248276358
GameObject:
m_ObjectHideFlags: 0
@@ -1337,6 +1475,17 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
+--- !u!114 &1581607076 stripped
+MonoBehaviour:
+ m_CorrespondingSourceObject: {fileID: 46083688438047258, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
+ m_PrefabInstance: {fileID: 1579681314}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
--- !u!1 &1617184227
GameObject:
m_ObjectHideFlags: 0
@@ -1591,6 +1740,29 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2059853627}
m_CullTransparentMesh: 1
+--- !u!1 &2079617932 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 1809610721369072281, guid: 940be89243a038b4090a77556e45a06d, type: 3}
+ m_PrefabInstance: {fileID: 3077635299975306478}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &2079617935
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2079617932}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 9e290b8487ad64d4b930e0475ed31321, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ prefab: {fileID: 1811662063}
+ PrefabTransform: {fileID: 349546248}
+ text: {fileID: 1581607076}
+ JSONReader: {fileID: 2009348684}
+ Time: {fileID: 1194367126}
+ Timeobject: {fileID: 378331772}
--- !u!1 &2118804391
GameObject:
m_ObjectHideFlags: 0
@@ -1922,5 +2094,26 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: -43.38
objectReference: {fileID: 0}
- m_RemovedComponents: []
+ - target: {fileID: 5860341746553965686, guid: 940be89243a038b4090a77556e45a06d, type: 3}
+ propertyPath: m_Spacing.y
+ value: 35.8
+ objectReference: {fileID: 0}
+ - target: {fileID: 5860341746553965686, guid: 940be89243a038b4090a77556e45a06d, type: 3}
+ propertyPath: m_CellSize.x
+ value: 280
+ objectReference: {fileID: 0}
+ - target: {fileID: 5860341746553965686, guid: 940be89243a038b4090a77556e45a06d, type: 3}
+ propertyPath: m_CellSize.y
+ value: 154.49
+ objectReference: {fileID: 0}
+ - target: {fileID: 5860341746553965686, guid: 940be89243a038b4090a77556e45a06d, type: 3}
+ propertyPath: m_Padding.m_Top
+ value: 50
+ objectReference: {fileID: 0}
+ - target: {fileID: 5860341746553965686, guid: 940be89243a038b4090a77556e45a06d, type: 3}
+ propertyPath: m_Padding.m_Left
+ value: 30
+ objectReference: {fileID: 0}
+ m_RemovedComponents:
+ - {fileID: 1956227571865497318, guid: 940be89243a038b4090a77556e45a06d, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: 940be89243a038b4090a77556e45a06d, type: 3}
diff --git a/xiaofang/Assets/Script/UI/ZZZZZZ/Chooselitem8.cs b/xiaofang/Assets/Script/UI/ZZZZZZ/Chooselitem8.cs
index 033dae46..077d0296 100644
--- a/xiaofang/Assets/Script/UI/ZZZZZZ/Chooselitem8.cs
+++ b/xiaofang/Assets/Script/UI/ZZZZZZ/Chooselitem8.cs
@@ -10,21 +10,83 @@ public class Chooselitem8 : MonoBehaviour
public Text text;
public static Chooselitem8 Instance;
public JSONReader JSONReader;
+
+ public Text Time;// 要改变颜色的Text组件
+ private bool isRed = false; // 当前颜色是否是红色
+ private float timeInSeconds; // 当前时间，单位为秒
+ public GameObject Timeobject;
+ private bool isRunning = true; // 控制计时是否继续运行
public void Start()
{
Instance = this;
+ InvokeRepeating(nameof(UpdateTimeDisplay), 0f, 1f);
}
public void CreateItem(int ID)
{
- GameObject newitem=Instantiate(prefab,PrefabTransform);
+ GameObject newitem = Instantiate(prefab, PrefabTransform);
foreach (var item in JSONReader.LanguageDictionary)
{
Language languageData = item.Value;
- if (languageData.ID==ID)
+ if (languageData.ID == ID)
{
- text.text=languageData.Text;
+ text.text = languageData.Text;
}
}
}
+ private void UpdateTimeDisplay()
+ {
+ if (!isRunning) return;
+ // 将时间格式化为 "MM:SS"
+ string formattedTime = FormatTime(timeInSeconds);
+ if (Time != null)
+ {
+ Time.text = formattedTime;
+ }
+
+ // 增加时间（每秒）
+ timeInSeconds++;
+ // 检查是否达到10秒
+ if (timeInSeconds >= 12)
+ {
+ isRunning = false; // 停止计时
+ CancelInvoke(nameof(UpdateTimeDisplay)); // 停止Invoke调用
+ Timeobject.SetActive(false);
+ }
+
+ }
+ public void ColorText()
+ {
+ StartCoroutine(ChangeTextColor());
+ }
+ ///
+ /// 协程：每秒切换Text的颜色
+ ///
+ private IEnumerator ChangeTextColor()
+ {
+ while (true)
+ {
+ if (Time != null)
+ {
+ // 切换颜色
+ Time.color = isRed ? Color.white : Color.red;
+ isRed = !isRed;
+ }
+
+ // 等待1秒
+ yield return new WaitForSeconds(1f);
+ }
+ }
+ ///
+ /// 格式化时间为 "MM:SS"
+ ///
+ /// 时间（秒）
+ /// 格式化后的时间字符串
+ private string FormatTime(float time)
+ {
+ int minutes = Mathf.FloorToInt(time / 60); // 分钟
+ int seconds = Mathf.FloorToInt(time % 60); // 秒
+ return $"{minutes:00}:{seconds:00}";
+ }
+
}
diff --git a/xiaofang/Assets/Script/UI/ZZZZZZ/FreePanelManager.cs b/xiaofang/Assets/Script/UI/ZZZZZZ/FreePanelManager.cs
index 33767c09..4885555a 100644
--- a/xiaofang/Assets/Script/UI/ZZZZZZ/FreePanelManager.cs
+++ b/xiaofang/Assets/Script/UI/ZZZZZZ/FreePanelManager.cs
@@ -93,6 +93,11 @@ public class FreePanelManager : MonoBehaviour
{
Z = this;
ContainsValue(11002);
+ //
+ Chooselitem8.Instance.CreateItem(10800);
+ Chooselitem8.Instance.CreateItem(10060);
+ Chooselitem8.Instance.ColorText();
+ //
if (DirectChildren.Count>=5)
{
OpcRight.gameObject.SetActive(true);
diff --git a/xiaofang/Assets/Script/UI/ZZZZZZ/OpcOrder2.cs b/xiaofang/Assets/Script/UI/ZZZZZZ/OpcOrder2.cs
index 1ea0788c..95c96904 100644
--- a/xiaofang/Assets/Script/UI/ZZZZZZ/OpcOrder2.cs
+++ b/xiaofang/Assets/Script/UI/ZZZZZZ/OpcOrder2.cs
@@ -144,6 +144,7 @@ public class OpcOrder2 : MonoBehaviour
int a = 0;
private void Start()
{
+
GetOpcID(8006);
hylCS = this;
btn.onClick.AddListener(() =>