From ddb16c2c536539344d69d51143bd235184589aa1 Mon Sep 17 00:00:00 2001 From: gaoguozheng Date: Thu, 9 May 2024 09:18:48 +0800 Subject: [PATCH] tb --- .../告警图标/本地告警/本地报警.prefab | 38 +- .../OtherPrefabs/筛选图标/筛选图标.prefab | 2 +- .../GQ/Assets/Scenes/SampleSceneG_URP4.unity | 2127 +++++++++++++++-- .../Scripts/WJ/Robot/RobotDataManager.cs | 226 +- .../GQ/Assets/Scripts/WJ/Robot/RobotObject.cs | 21 +- GQ_URP/GQ/Assets/Scripts/WJ/UIToCabinet.cs | 1 + .../GQ/Assets/Scripts/WJ/Utilities/Classes.cs | 13 +- GQ_URP/GQ/Assets/script/JSON/CombineJSON.cs | 2 +- GQ_URP/GQ/Assets/script/LocalVideo.cs | 10 +- GQ_URP/GQ/Assets/script/NewBehaviourScript.cs | 21 + .../Assets/script/NewBehaviourScript.cs.meta | 11 + .../GQ/Assets/script/巡检/RobotReturnData.cs | 8 +- .../Assets/script/巡检/SaveCoordinateRobot.cs | 8 +- .../GQ/Assets/script/摄像头/ClickEventLens.cs | 16 +- .../Assets/script/摄像头/LocalVideoAlarm.cs | 16 + .../script/摄像头/LocalVideoAlarmItem.cs | 2 +- GQ_URP/GQ/Assets/script/红外监测/IRPopup.cs | 164 +- .../Assets/script/红外监测/Infraredsensor.cs | 32 +- GQ_URP/GQ/BestHTTP.csproj | 9 + GQ_URP/GQ/app.config | 23 + 20 files changed, 2441 insertions(+), 309 deletions(-) create mode 100644 GQ_URP/GQ/Assets/script/NewBehaviourScript.cs create mode 100644 GQ_URP/GQ/Assets/script/NewBehaviourScript.cs.meta create mode 100644 GQ_URP/GQ/app.config diff --git a/GQ_URP/GQ/Assets/GameAssets/Prefabs/OtherPrefabs/告警图标/本地告警/本地报警.prefab b/GQ_URP/GQ/Assets/GameAssets/Prefabs/OtherPrefabs/告警图标/本地告警/本地报警.prefab index a7e20a852..5f3ee4d04 100644 --- a/GQ_URP/GQ/Assets/GameAssets/Prefabs/OtherPrefabs/告警图标/本地告警/本地报警.prefab +++ b/GQ_URP/GQ/Assets/GameAssets/Prefabs/OtherPrefabs/告警图标/本地告警/本地报警.prefab @@ -672,6 +672,12 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 8003116978871882199} m_Modifications: + - target: {fileID: 656055431512136447, guid: dbdb920525eb2e24e83426e575435d16, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: f945cd23a57e99b46ac65684d5bb3be8, + type: 3} - target: {fileID: 5563585228302549198, guid: dbdb920525eb2e24e83426e575435d16, type: 3} propertyPath: m_AnchorMax.x @@ -702,10 +708,40 @@ PrefabInstance: propertyPath: m_Size value: 0.9999998 objectReference: {fileID: 0} + - target: {fileID: 5726857653261026372, guid: dbdb920525eb2e24e83426e575435d16, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5726857653261026372, guid: dbdb920525eb2e24e83426e575435d16, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5726857653261026372, guid: dbdb920525eb2e24e83426e575435d16, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5726857653261026372, guid: dbdb920525eb2e24e83426e575435d16, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5726857653261026372, guid: dbdb920525eb2e24e83426e575435d16, + type: 3} + propertyPath: m_SizeDelta.x + value: 304.5813 + objectReference: {fileID: 0} + - target: {fileID: 5726857653261026372, guid: dbdb920525eb2e24e83426e575435d16, + type: 3} + propertyPath: m_SizeDelta.y + value: 363.69 + objectReference: {fileID: 0} - target: {fileID: 5726857653261026372, guid: dbdb920525eb2e24e83426e575435d16, type: 3} propertyPath: m_AnchoredPosition.x - value: 5.100896 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5726857653602639248, guid: dbdb920525eb2e24e83426e575435d16, type: 3} diff --git a/GQ_URP/GQ/Assets/GameAssets/Prefabs/OtherPrefabs/筛选图标/筛选图标.prefab b/GQ_URP/GQ/Assets/GameAssets/Prefabs/OtherPrefabs/筛选图标/筛选图标.prefab index b0e58f0e9..b97c7b01b 100644 --- a/GQ_URP/GQ/Assets/GameAssets/Prefabs/OtherPrefabs/筛选图标/筛选图标.prefab +++ b/GQ_URP/GQ/Assets/GameAssets/Prefabs/OtherPrefabs/筛选图标/筛选图标.prefab @@ -276,7 +276,7 @@ MonoBehaviour: m_ChildAlignment: 0 m_StartCorner: 0 m_StartAxis: 0 - m_CellSize: {x: 315, y: 33.4} + m_CellSize: {x: 295, y: 33.4} m_Spacing: {x: 0, y: 0} m_Constraint: 1 m_ConstraintCount: 1 diff --git a/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP4.unity b/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP4.unity index 39d0ca302..8d44e05a4 100644 --- a/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP4.unity +++ b/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP4.unity @@ -742,6 +742,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -825,12 +845,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: 155.00003 + value: 163.00003 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: -64 + value: -62 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -1502,6 +1522,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -1585,12 +1625,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: 155.00003 + value: 163.00003 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: 36 + value: 38 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -1967,6 +2007,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -2050,12 +2110,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: 155.00003 + value: 163.00003 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: -39 + value: -37 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -2497,6 +2557,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -2580,12 +2660,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: -158 + value: -163 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: -40 + value: -37 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -2643,6 +2723,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -2726,12 +2826,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: 76 + value: 80 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: -39 + value: -37 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -5262,6 +5362,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -5345,12 +5465,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: -158 + value: -163 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: 61 + value: 64 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -6176,6 +6296,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -6259,12 +6399,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: -315 + value: -327 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: -2.291687 + value: 0.708313 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -7733,6 +7873,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -7816,12 +7976,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: 155.00003 + value: 163.00003 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: -89 + value: -87 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -8367,6 +8527,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -8450,12 +8630,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: -79 + value: -81 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: -39 + value: -37 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -9122,6 +9302,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -9205,12 +9405,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: 233.00003 + value: 245.00003 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: -40 + value: -36 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -9469,6 +9669,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -9552,12 +9772,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: -315 + value: -327 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: -56.371094 + value: -53.371094 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -9603,6 +9823,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -9686,12 +9926,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: 312.00003 + value: 326.00003 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: -14 + value: -12 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -10150,6 +10390,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -10233,12 +10493,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: -236 + value: -246 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: -40 + value: -36 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -10284,6 +10544,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -10367,12 +10647,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: -236 + value: -246 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: -65 + value: -61 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -12887,6 +13167,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -12970,12 +13270,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: 233.00003 + value: 245.00003 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: 88 + value: 92 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -13438,6 +13738,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -13521,12 +13841,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: 233.00003 + value: 245.00003 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: -90 + value: -86 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -13665,6 +13985,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -13748,12 +14088,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: 76 + value: 80 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: 62 + value: 64 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -14502,6 +14842,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -14585,12 +14945,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: 155.00003 + value: 163.00003 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: 11 + value: 13 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -17612,6 +17972,7 @@ Transform: - {fileID: 177587014} - {fileID: 1675120013} - {fileID: 611096075} + - {fileID: 1634789566} - {fileID: 1412671294} - {fileID: 1540445286} m_Father: {fileID: 0} @@ -17634,6 +17995,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -17717,12 +18098,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: -79 + value: -81 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: 89 + value: 91 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -18661,6 +19042,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -18744,12 +19145,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: -236 + value: -246 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: 10 + value: 14 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -19068,7 +19469,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1901191839, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3} propertyPath: m_Text - value: "\u7EA2\u591601" + value: "\u7EA2\u5916\u4F20\u611F-2" objectReference: {fileID: 0} - target: {fileID: 70541696378742185, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3} @@ -20678,6 +21079,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -20761,12 +21182,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: 155.00003 + value: 163 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: -14 + value: -12 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -20942,7 +21363,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &561618860 RectTransform: m_ObjectHideFlags: 0 @@ -20984,10 +21405,10 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: f945cd23a57e99b46ac65684d5bb3be8, type: 3} m_FontSize: 14 m_FontStyle: 0 - m_BestFit: 0 + m_BestFit: 1 m_MinSize: 10 m_MaxSize: 40 m_Alignment: 4 @@ -20996,7 +21417,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Button + m_Text: "\u4E0B\u4E00\u5F20" --- !u!222 &561618862 CanvasRenderer: m_ObjectHideFlags: 0 @@ -22082,6 +22503,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -22165,12 +22606,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: -2 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: -89.40991 + value: -85 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -22314,6 +22755,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -22397,12 +22858,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: -79 + value: -81 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: -64 + value: -62 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -22483,17 +22944,17 @@ PrefabInstance: - target: {fileID: -8679921383154817045, guid: 62768c305813eeb47b2e77173026ef48, type: 3} propertyPath: m_LocalPosition.x - value: 11.007943 + value: 17.96 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 62768c305813eeb47b2e77173026ef48, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 62768c305813eeb47b2e77173026ef48, type: 3} propertyPath: m_LocalPosition.z - value: -14.754973 + value: -7.114 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 62768c305813eeb47b2e77173026ef48, type: 3} @@ -22508,17 +22969,17 @@ PrefabInstance: - target: {fileID: -8679921383154817045, guid: 62768c305813eeb47b2e77173026ef48, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 62768c305813eeb47b2e77173026ef48, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 62768c305813eeb47b2e77173026ef48, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: -90 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 62768c305813eeb47b2e77173026ef48, type: 3} @@ -23938,6 +24399,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -24021,12 +24502,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: -315 + value: -327 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: -107.51489 + value: -104.51489 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -24350,6 +24831,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -24433,12 +24934,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: -2 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: 59 + value: 63.409912 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -24484,6 +24985,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -24567,12 +25088,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: 76 + value: 80 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: 89 + value: 91 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -25498,7 +26019,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &697431079 RectTransform: m_ObjectHideFlags: 0 @@ -25540,10 +26061,10 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: f945cd23a57e99b46ac65684d5bb3be8, type: 3} m_FontSize: 14 m_FontStyle: 0 - m_BestFit: 0 + m_BestFit: 1 m_MinSize: 10 m_MaxSize: 40 m_Alignment: 4 @@ -25552,7 +26073,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Button + m_Text: "\u4E0A\u4E00\u5F20" --- !u!222 &697431081 CanvasRenderer: m_ObjectHideFlags: 0 @@ -26191,6 +26712,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -26274,12 +26815,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: -79 + value: -81 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: -14 + value: -12 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -26989,6 +27530,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -27072,12 +27633,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: -236 + value: -246 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: -90 + value: -86 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -28120,6 +28681,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -28203,12 +28784,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: -236 + value: -246 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: 61 + value: 65 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -29151,6 +29732,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -29234,12 +29835,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: -79 + value: -81 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: 11 + value: 13 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -30565,6 +31166,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -30648,12 +31269,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: 155 + value: 163.00003 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: 62 + value: 64 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -31115,6 +31736,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -31198,12 +31839,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: 312.00003 + value: 326.00003 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: 36 + value: 38 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -31501,6 +32142,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -31584,12 +32245,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: 312.00003 + value: 326.00003 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: -64 + value: -62 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -32514,6 +33175,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -32597,12 +33278,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: -158 + value: -163 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: -65 + value: -62 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -33171,6 +33852,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -33254,12 +33955,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: 76 + value: 80 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: -64 + value: -62 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -35840,6 +36541,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -35923,12 +36644,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: -2 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: 88.59009 + value: 93 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -37024,6 +37745,7 @@ MonoBehaviour: - {fileID: 3156090} - {fileID: 648510698} - {fileID: 754700592} + - {fileID: 1634789567} - {fileID: 1412671296} - {fileID: 1412671295} peiDianShi: @@ -37280,6 +38002,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1675120013} m_Modifications: + - target: {fileID: 1901191839, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3} + propertyPath: m_Text + value: "\u7EA2\u5916\u4F20\u611F-1" + objectReference: {fileID: 0} - target: {fileID: 3608763260073886438, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3} propertyPath: m_Enabled @@ -37652,6 +38378,224 @@ LightProbeGroup: - {x: -1, y: -1, z: 1} - {x: -1, y: -1, z: -1} m_Dering: 1 +--- !u!1001 &979394494 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1634789566} + m_Modifications: + - target: {fileID: 1901191838, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1901191839, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3} + propertyPath: m_Text + value: "\u7EA2\u5916\u4F20\u611F-3" + objectReference: {fileID: 0} + - target: {fileID: 70541696378742185, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 2224874554742167492, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, + type: 3} + propertyPath: m_text + value: "\u7EA2\u591603" + objectReference: {fileID: 0} + - target: {fileID: 2224874554742167492, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, + type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, + type: 2} + - target: {fileID: 2224874554742167492, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, + type: 3} + propertyPath: m_hasFontAssetChanged + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2773670996583366210, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, + type: 3} + propertyPath: maodian + value: + objectReference: {fileID: 979394495} + - target: {fileID: 3083355702494639820, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: f945cd23a57e99b46ac65684d5bb3be8, + type: 3} + - target: {fileID: 3608763260073886438, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4568529563820045235, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4568529563820045235, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 6206996799658441959, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, + type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, + type: 2} + - target: {fileID: 6206996799658441959, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, + type: 3} + propertyPath: m_hasFontAssetChanged + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6206996799658441977, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 6206996799779127825, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 6206996799779127839, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, + type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 2100000, guid: 3a3b5242babc65a4c898f644975a9f50, type: 2} + - target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, + type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, + type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, + type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.9 + objectReference: {fileID: 0} + - target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6206996799886426827, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, + type: 3} + propertyPath: m_Name + value: "\u7EA2\u5916\u7EBF" + objectReference: {fileID: 0} + - target: {fileID: 6206996799886426827, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, + type: 3} + propertyPath: m_Layer + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 6206996799886426827, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6206996799886426827, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 6206996800221561051, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 6206996800505932347, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3} +--- !u!224 &979394495 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6206996800505932346, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, + type: 3} + m_PrefabInstance: {fileID: 979394494} + m_PrefabAsset: {fileID: 0} +--- !u!1 &979394496 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6206996799886426827, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, + type: 3} + m_PrefabInstance: {fileID: 979394494} + m_PrefabAsset: {fileID: 0} +--- !u!114 &979394497 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 979394496} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: -494081480, guid: 3a9d3f7be36426143afceebeda50a49d, type: 3} + m_Name: + m_EditorClassIdentifier: + targetCamera: {fileID: 0} + distanceMultiplier: 0.05 + button: {fileID: 0} + text: {fileID: 0} --- !u!1 &979444513 GameObject: m_ObjectHideFlags: 0 @@ -38957,6 +39901,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -39040,12 +40004,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: -2 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: -64.40991 + value: -60 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -40138,6 +41102,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -40221,12 +41205,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: 312.00003 + value: 326.00003 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: 11 + value: 13 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -40896,6 +41880,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -40979,12 +41983,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: -315 + value: -327 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: 28.951004 + value: 31.951004 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -41487,6 +42491,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -41570,12 +42594,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: 312.00003 + value: 326 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: -39 + value: -37 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -43884,6 +44908,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -43967,12 +45011,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: -2 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: 24.63507 + value: 29.044983 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -44210,6 +45254,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -44293,12 +45357,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: 312.00003 + value: 326.00003 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: 89 + value: 91 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -47293,6 +48357,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -47376,12 +48460,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: 312 + value: 326.00003 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: 62 + value: 64 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -47877,6 +48961,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -47960,12 +49064,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: -315 + value: -327 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: -32.762268 + value: -29.762268 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -48378,6 +49482,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -48461,12 +49585,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: 76 + value: 80 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: -14 + value: -12 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -49416,6 +50540,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -49499,12 +50643,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: -236 + value: -246 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: 35 + value: 39 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -49550,6 +50694,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -49633,12 +50797,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: -79 + value: -81 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: -89 + value: -87 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -52994,7 +54158,7 @@ PrefabInstance: - target: {fileID: -8679921383154817045, guid: 6a232e65ffa772346a7a8f7413a84a24, type: 3} propertyPath: m_RootOrder - value: 8 + value: 9 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 6a232e65ffa772346a7a8f7413a84a24, type: 3} @@ -53264,6 +54428,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -53347,12 +54531,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: 233 + value: 245.00003 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: -65 + value: -61 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -54624,7 +55808,7 @@ PrefabInstance: - target: {fileID: 2343540343115360071, guid: 5dd155ad4acfbc64893307901581cdea, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2343540343115360071, guid: 5dd155ad4acfbc64893307901581cdea, type: 3} @@ -54634,17 +55818,17 @@ PrefabInstance: - target: {fileID: 2343540343115360071, guid: 5dd155ad4acfbc64893307901581cdea, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2343540343115360071, guid: 5dd155ad4acfbc64893307901581cdea, type: 3} propertyPath: m_SizeDelta.x - value: 780.4545 + value: 815 objectReference: {fileID: 0} - target: {fileID: 2343540343115360071, guid: 5dd155ad4acfbc64893307901581cdea, type: 3} propertyPath: m_SizeDelta.y - value: 325.9091 + value: 326 objectReference: {fileID: 0} - target: {fileID: 2343540343115360071, guid: 5dd155ad4acfbc64893307901581cdea, type: 3} @@ -54684,12 +55868,12 @@ PrefabInstance: - target: {fileID: 2343540343115360071, guid: 5dd155ad4acfbc64893307901581cdea, type: 3} propertyPath: m_AnchoredPosition.x - value: 37.5 + value: 21.56 objectReference: {fileID: 0} - target: {fileID: 2343540343115360071, guid: 5dd155ad4acfbc64893307901581cdea, type: 3} propertyPath: m_AnchoredPosition.y - value: -36.49997 + value: 362.3 objectReference: {fileID: 0} - target: {fileID: 2343540343115360071, guid: 5dd155ad4acfbc64893307901581cdea, type: 3} @@ -54706,6 +55890,46 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2343540343882131946, guid: 5dd155ad4acfbc64893307901581cdea, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2343540343882131946, guid: 5dd155ad4acfbc64893307901581cdea, + type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2343540343882131946, guid: 5dd155ad4acfbc64893307901581cdea, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2343540343882131946, guid: 5dd155ad4acfbc64893307901581cdea, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2343540343882131946, guid: 5dd155ad4acfbc64893307901581cdea, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2343540343882131946, guid: 5dd155ad4acfbc64893307901581cdea, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2343540343882131946, guid: 5dd155ad4acfbc64893307901581cdea, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2343540343882131946, guid: 5dd155ad4acfbc64893307901581cdea, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 50 + objectReference: {fileID: 0} - target: {fileID: 2343540343882131948, guid: 5dd155ad4acfbc64893307901581cdea, type: 3} propertyPath: m_Sprite @@ -55073,6 +56297,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -55156,12 +56400,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: -158 + value: -163 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: -15 + value: -12 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -55778,7 +57022,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1495903753 RectTransform: m_ObjectHideFlags: 0 @@ -57063,6 +58307,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -57146,12 +58410,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: -79 + value: -81 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: 62 + value: 64 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -57331,6 +58595,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -57414,12 +58698,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: 233.00003 + value: 245.00003 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: 61 + value: 65 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -57605,6 +58889,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -57688,12 +58992,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: 233.00003 + value: 245.00003 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: 35 + value: 39 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -57836,6 +59140,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -57919,12 +59243,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: -158 + value: -163 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: -90 + value: -87 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -57984,7 +59308,7 @@ Transform: - {fileID: 310043893} - {fileID: 3156089} m_Father: {fileID: 469675410} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1544016513 stripped GameObject: @@ -58736,6 +60060,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -58819,12 +60163,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: -236 + value: -246 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: 88 + value: 92 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -59489,6 +60833,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -59572,12 +60936,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: -2 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: -39.409912 + value: -35 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -60209,6 +61573,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -60292,12 +61676,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: -315 + value: -327 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: 88 + value: 91 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -61015,6 +62399,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -61098,12 +62502,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: 76 + value: 80 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: 11 + value: 13 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -61579,6 +62983,92 @@ LightProbeGroup: - {x: -1, y: -1, z: 1} - {x: -1, y: -1, z: -1} m_Dering: 1 +--- !u!1001 &1634789565 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 469675410} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 62768c305813eeb47b2e77173026ef48, + type: 3} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 62768c305813eeb47b2e77173026ef48, + type: 3} + propertyPath: m_LocalPosition.x + value: 7.26 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 62768c305813eeb47b2e77173026ef48, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 62768c305813eeb47b2e77173026ef48, + type: 3} + propertyPath: m_LocalPosition.z + value: -6.772 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 62768c305813eeb47b2e77173026ef48, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 62768c305813eeb47b2e77173026ef48, + type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 62768c305813eeb47b2e77173026ef48, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 62768c305813eeb47b2e77173026ef48, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 62768c305813eeb47b2e77173026ef48, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 62768c305813eeb47b2e77173026ef48, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 62768c305813eeb47b2e77173026ef48, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 62768c305813eeb47b2e77173026ef48, + type: 3} + propertyPath: m_Name + value: "\u8865\u9F20\u76D2 (2)" + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 62768c305813eeb47b2e77173026ef48, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 62768c305813eeb47b2e77173026ef48, type: 3} +--- !u!4 &1634789566 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 62768c305813eeb47b2e77173026ef48, + type: 3} + m_PrefabInstance: {fileID: 1634789565} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1634789567 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 62768c305813eeb47b2e77173026ef48, + type: 3} + m_PrefabInstance: {fileID: 1634789565} + m_PrefabAsset: {fileID: 0} --- !u!224 &1637162845 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, @@ -62686,6 +64176,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -62769,12 +64279,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: 76 + value: 80 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: -89 + value: -87 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -62868,7 +64378,7 @@ PrefabInstance: - target: {fileID: -8679921383154817045, guid: 62768c305813eeb47b2e77173026ef48, type: 3} propertyPath: m_LocalPosition.x - value: 4.330813 + value: 17.622 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 62768c305813eeb47b2e77173026ef48, type: 3} @@ -64132,9 +65642,12 @@ MonoBehaviour: myroot: code: message: - data: - personFlag: serverTime: + root_Data: + result: 0 + remark: + data: [] + data: [] content: {fileID: 413199002} content_ret: {fileID: 413199002} content_grid: {fileID: 413199003} @@ -65183,6 +66696,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -65266,12 +66799,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: -158 + value: -163 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: 88 + value: 91 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -68632,7 +70165,7 @@ MonoBehaviour: jqr_bctp: bdsp: arguments: - token: eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE3MTQwMDYzMTIsInVzZXJuYW1lIjoiYWRtaW4ifQ.5nMgEaPv9j5L66ENj-G0vZ0w07qR9DTS-rPnwLufhIc + token: eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE3MTQzNzQ1OTEsInVzZXJuYW1lIjoiYWRtaW4ifQ.KrfJgxyWFBNcUvUPTKhgshd0fSojt-ELtbcoMZ5ASAg heatThresholdValueMax: heatThresholdValueMin: humidityThresholdValueMax: @@ -68986,7 +70519,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1815567661} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 9549e6a4fca18be48b80136058101dc2, type: 3} m_Name: @@ -68999,12 +70532,8 @@ MonoBehaviour: bg_img: {fileID: 824769397} start_img: {fileID: 94838352} end_img: {fileID: 2060153283} - inputMin_x: 0 - inputMax_x: 0 outputMin_x: 0 outputMax_x: 0 - inputMin_y: 0 - inputMax_y: 0 outputMin_y: 0 outputMax_y: 0 --- !u!1 &1816534963 @@ -69477,6 +71006,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -69560,12 +71109,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: -315 + value: -327 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: 60.238007 + value: 63.238007 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -70616,6 +72165,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -70699,12 +72268,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: -79 + value: -81 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: 36 + value: 38 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -71264,6 +72833,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -71347,12 +72936,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: -2 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: -9.774902 + value: -5.36499 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -73090,6 +74679,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -73173,12 +74782,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: -315 + value: -327 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: -82.816345 + value: -79.816345 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -74107,6 +75716,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -74190,12 +75819,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: -236 + value: -246 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: -15 + value: -11 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -74851,7 +76480,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -221, y: -365} - m_SizeDelta: {x: 160, y: 30} + m_SizeDelta: {x: 100, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1945553832 MonoBehaviour: @@ -75780,7 +77409,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 215, y: -361} - m_SizeDelta: {x: 160, y: 30} + m_SizeDelta: {x: 100, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1971722748 MonoBehaviour: @@ -76370,6 +77999,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -76453,12 +78102,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: 233.00003 + value: 245 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: -15 + value: -11 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -79266,6 +80915,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -79349,12 +81018,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: 76 + value: 80 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: 36 + value: 38 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -80098,6 +81767,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -80181,12 +81870,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: -158 + value: -163 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: 35 + value: 38 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -80698,6 +82387,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -80781,12 +82490,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: 233.00003 + value: 245.00003 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: 10 + value: 14 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -80989,6 +82698,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -81072,12 +82801,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: -158 + value: -163 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: 10 + value: 13 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -81172,6 +82901,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -81255,12 +83004,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: 155.00003 + value: 163.00003 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: 89 + value: 91 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} @@ -99416,7 +101165,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -63.99994, y: 487} + m_AnchoredPosition: {x: -64, y: 487} m_SizeDelta: {x: -1303.1125, y: -1040} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1332666221677478668 @@ -125852,7 +127601,7 @@ PrefabInstance: - target: {fileID: 1907843774066353948, guid: f12e732b7b6c24e489ac02c8af4e7a78, type: 3} propertyPath: m_AnchoredPosition.y - value: 0.000002945374 + value: 0.0000029989264 objectReference: {fileID: 0} - target: {fileID: 1907843774098386396, guid: f12e732b7b6c24e489ac02c8af4e7a78, type: 3} @@ -133972,6 +135721,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 15271022823392547, guid: cfa16bd5e782e264e9dc6857484d2551, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_Pivot.x @@ -134055,12 +135824,12 @@ PrefabInstance: - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.x - value: 312.00003 + value: 326.00003 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} propertyPath: m_AnchoredPosition.y - value: -89 + value: -87 objectReference: {fileID: 0} - target: {fileID: 2070078800726626112, guid: cfa16bd5e782e264e9dc6857484d2551, type: 3} diff --git a/GQ_URP/GQ/Assets/Scripts/WJ/Robot/RobotDataManager.cs b/GQ_URP/GQ/Assets/Scripts/WJ/Robot/RobotDataManager.cs index 5573dd985..b39bafd91 100644 --- a/GQ_URP/GQ/Assets/Scripts/WJ/Robot/RobotDataManager.cs +++ b/GQ_URP/GQ/Assets/Scripts/WJ/Robot/RobotDataManager.cs @@ -1,4 +1,3 @@ -using BestHTTP.WebSocket; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using System; @@ -9,10 +8,8 @@ using System.Linq; using System.Net.WebSockets; using System.Text; using System.Threading; -using Unity.VisualScripting; using UnityEngine; using static InterfaceManager; -using UnityEngine.Networking; public class RobotDataManager : MonoBehaviour @@ -113,6 +110,11 @@ public class RobotDataManager : MonoBehaviour bool restart_WS; public WebSocketT socketT = new WebSocketT(); + /// + /// IDID + /// + public Dictionary id_insId = new Dictionary(); + private void Awake() { Inst = this; @@ -144,9 +146,10 @@ public class RobotDataManager : MonoBehaviour { if (string.IsNullOrEmpty(_base64) || string.IsNullOrEmpty(_id)) return; + Debug.Log("׼ϴȳݿ⣡"); BASE64_INTERFACE bASE64_ = new BASE64_INTERFACE { - instructId = int.Parse(_id), + instructId = _id, inspectionResult = _base64, }; _base64 = JsonConvert.SerializeObject(bASE64_); @@ -154,9 +157,10 @@ public class RobotDataManager : MonoBehaviour { if (x != null) { - if (GameManager.Inst.Jk_URL != null) - RobotReturnData.Inst.init(); + Debug.Log("ϴȳݿɹ"); } + else + Debug.Log("ϴȳݿʧܣ"); })); } @@ -548,66 +552,93 @@ public class RobotDataManager : MonoBehaviour { if (_error != null) { - Debug.Log(_error); + Debug.Log("ѯʧܣ" + _error); return; } - Debug.Log("ѲɣʼȡѯѲ챨ݣ"); - //ִеIJ鿴ѯѲ챨ݡpicֶεֵӡ thermal ʼ֣thermalĽȡ͵̨б - GetInsReport((_error, _success) => + Debug.Log("ѲɣʼȡѯѲ챨ݣ" + System.DateTime.Now.ToString()); + StartCoroutine(DelayedAction(20.0f, () => { - if (_error != null) + Debug.Log("ȴ20ִСѯѲ챨ݡ" + System.DateTime.Now.ToString()); + // ִк + //ִеIJ鿴ѯѲ챨ݡpicֶεֵӡ thermal ʼ֣thermalĽȡ͵̨б + GetInsReport((_error, _success) => { - Debug.Log("Ѳ챨ݴ" + _error); - return; - } - - Dictionary> _pics = new Dictionary>(); - string head_url = http_ip_address + "/jk"; - for (int i = 0; i < InsReport.thermal.Count; i++) - { - var _ps = new List(); - var pic1 = InsReport.thermal[i].pic1.Split("images")[1]; - var pic2 = InsReport.thermal[i].pic2.Split("images")[1]; - var pic3 = InsReport.thermal[i].pic3.Split("images")[1]; - var pic4 = InsReport.thermal[i].pic4.Split("images")[1]; - var pic5 = InsReport.thermal[i].pic5.Split("images")[1]; - var pic6 = InsReport.thermal[i].pic6.Split("images")[1]; - var pic7 = InsReport.thermal[i].pic7.Split("images")[1]; - - _ps.Add(head_url + pic1); - _ps.Add(head_url + pic2); - _ps.Add(head_url + pic3); - _ps.Add(head_url + pic4); - _ps.Add(head_url + pic5); - _ps.Add(head_url + pic6); - _ps.Add(head_url + pic7); - - _pics.Add(InsReport.thermal[i].id, _ps); - } - //ToDo - //õݷ͸̨ - //... - /*foreach (var pair in _pics) - { - string key = pair.Key; - List valueList = pair.Value; - for (int i = 0; i < valueList.Count; i++) + if (_error != null) { - StartCoroutine(CombineJSON.SaveImageAsBase64(valueList[i], pair.Key, action_Base64)); + Debug.Log("Ѳ챨ݴ" + _error); + return; } - } - Debug.Log("ͼƬ·ɣ");*/ - StartCoroutine(ProcessImages(_pics, () => - { - Debug.Log("ͼƬ·ɣ"); - })); - }); + Dictionary> _pics = new Dictionary>(); + string head_url = http_ip_address + "/jk"; + for (int i = 0; i < InsReport.thermal.Count; i++) + { + var _ps = new List(); + var pic1 = InsReport.thermal[i].pic1.Split("images")[1]; + var pic2 = InsReport.thermal[i].pic2.Split("images")[1]; + var pic3 = InsReport.thermal[i].pic3.Split("images")[1]; + var pic4 = InsReport.thermal[i].pic4.Split("images")[1]; + var pic5 = InsReport.thermal[i].pic5.Split("images")[1]; + var pic6 = InsReport.thermal[i].pic6.Split("images")[1]; + var pic7 = InsReport.thermal[i].pic7.Split("images")[1]; + + _ps.Add(head_url + pic1); + _ps.Add(head_url + pic2); + _ps.Add(head_url + pic3); + _ps.Add(head_url + pic4); + _ps.Add(head_url + pic5); + _ps.Add(head_url + pic6); + _ps.Add(head_url + pic7); + + _pics.Add(InsReport.thermal[i].id, _ps); + } + //ToDo + //õݷ͸̨ + //... + /*foreach (var pair in _pics) + { + string key = pair.Key; + List valueList = pair.Value; + for (int i = 0; i < valueList.Count; i++) + { + StartCoroutine(CombineJSON.SaveImageAsBase64(valueList[i], pair.Key, action_Base64)); + } + + } + Debug.Log("ͼƬ·ɣ");*/ + StartCoroutine(ProcessImages(_pics, () => + { + Debug.Log("ȴ2ʼѲʷݣ" + System.DateTime.Now.ToString()); + StartCoroutine(DelayedAction(2.0f, () => + { + if (GameManager.Inst.Jk_URL != null) + { + RobotReturnData.Inst.init((x) => + { + Debug.Log("ͼƬ·ɣ" + System.DateTime.Now.ToString()); + }); + } + })); + })); + }); + })); })); }); }); } + public IEnumerator DelayedAction(float delayTime, Action action) + { + yield return new WaitForSeconds(delayTime); + action?.Invoke(); + } + + /// + /// ͼƬ + /// + /// + /// + /// IEnumerator ProcessImages(Dictionary> _pics, Action _callback = null) { foreach (var pair in _pics) @@ -660,6 +691,19 @@ public class RobotDataManager : MonoBehaviour { if (!string.IsNullOrEmpty(RobotTask.data[i].Task_type)) { + // ӻIDIDֵ + if (!string.IsNullOrEmpty(RobotTask.data[i].Ins_Id)) + { + if (id_insId.ContainsKey(RobotTask.robotId)) + { + id_insId[RobotTask.robotId] = RobotTask.data[i].Ins_Id; + } + else + { + id_insId.Add(RobotTask.robotId, RobotTask.data[i].Ins_Id); + } + } + Debug.Log($"ȡֵrobotId{RobotTask.robotId}ID{RobotTask.data[i].Ins_Id}"); is_fixed = true; break; } @@ -681,27 +725,44 @@ public class RobotDataManager : MonoBehaviour /// public void PostRobotTask(List _point_no, Action _callback = null) { - //var p = new PointList(); - //for (int i = 0; i < _point_no.Count; i++) - //{ - // if (i != _point_no.Count - 1) - // p.pointList.Add(new PointNo(_point_no[i] + ",")); - // else - // p.pointList.Add(new PointNo(_point_no[i])); - //} - - //var _pointList = JsonConvert.SerializeObject(p.pointList); - - var p = new RootObjectPoin(); - p.robotIp = RobotObject.robotClass.ipAddr; - - List pl = new List(); ; + /*var p = new PointList(); for (int i = 0; i < _point_no.Count; i++) - pl.Add(new PointData { pointNo = _point_no[i] }); - p.pointList = pl; + { + if (i != _point_no.Count - 1) + p.pointList.Add(new PointNo(_point_no[i] + ",")); + else + p.pointList.Add(new PointNo(_point_no[i])); + } - var _pointList = JsonConvert.SerializeObject(p); - string _json_data = "{\r\n \"robotIp\": \"" + RobotObject.robotClass.ipAddr + "\",\r\n \"pointList\": [" + _pointList + " ]\r\n}"; + var _pointList = JsonConvert.SerializeObject(p.pointList);*/ + + //var p = new RootObjectPoin(); + //p.robotIp = RobotObject.robotClass.ipAddr; + + //List pl = new List(); ; + //for (int i = 0; i < _point_no.Count; i++) + // pl.Add(new PointData { pointNo = _point_no[i] }); + //p.pointList = pl; + + //var _pointList = JsonConvert.SerializeObject(p); + + List _pointList = new List(); + for (int i = 0; i < _point_no.Count; i++) + { + _pointList.Add(new PointData().BackToString(_point_no[i])); + } + + string pointList = string.Empty; + if (_pointList.Count > 1) + { + pointList = string.Join(",", _pointList); + } + else + pointList = _pointList[0]; + + var _json_data = string.Format("{{\"robotIp\":\"{0}\",\"pointList\":[{1}]}}", RobotObject.robotClass.ipAddr, pointList); + + //string _json_data = "{\r\n \"robotIp\": \"" + RobotObject.robotClass.ipAddr + "\",\r\n \"pointList\": [" + _pointList + " ]\r\n}"; //string _json_data = "{\r\n \"robotIp\": \"192.168.8.198\",\r\n \"pointList\": [\r\n {\r\n \"pointNo\": \"" + _point_no + "\",\r\n \"04\": \"0\",\r\n \"06\": \"0\",\r\n \"01\": \"1\",\r\n \"cabinType\": \"1\",\r\n \"03\": \"0\",\r\n \"05\": \"0\"\r\n }\r\n ]\r\n}"; StartCoroutine(PostRequest(http_ip_address + post_robot_fixed_point, _json_data, request_header, (_error, _data) => @@ -743,22 +804,22 @@ public class RobotDataManager : MonoBehaviour if (_finish) break; //ѭѯ쳣һֵѯѭ಻ҪĿ - if (_error_time > 40) + if (_error_time > 120) { _callback?.Invoke("ѯ쳣"); break; } - yield return new WaitForSeconds(3); + yield return new WaitForSeconds(5); if (_call_time != _response_time) continue; #region - if (_response_time == 40) + if (_response_time == 120) { - Debug.Log("ԣȴ"); - _callback?.Invoke(null); + //Debug.Log("ԣȴ"); + _callback?.Invoke("ȴ࣡"); break; } @@ -798,8 +859,15 @@ public class RobotDataManager : MonoBehaviour /// public void GetInsReport(Action _callback) { + if (!id_insId.ContainsKey(RobotObject.robotClass.robot_id)) + { + _callback?.Invoke("δȡID", false); + } + else + Debug.Log($"ȡѲ챨ݻID{RobotObject.robotClass.robot_id}ID{id_insId[RobotObject.robotClass.robot_id]}"); //貹еIns_Id,ҵɸѡ - StartCoroutine(GetRequest(http_ip_address + get_record_ins_report, request_header, new Dictionary() { { "insId", RobotTask.data[0].Ins_Id } }, (_error, _data) => + //StartCoroutine(GetRequest(http_ip_address + get_record_ins_report, request_header, new Dictionary() { { "insId", RobotTask.data[0].Ins_Id } }, (_error, _data) => + StartCoroutine(GetRequest(http_ip_address + get_record_ins_report, request_header, new Dictionary() { { "insId", id_insId[RobotObject.robotClass.robot_id] } }, (_error, _data) => { if (_error != null) { diff --git a/GQ_URP/GQ/Assets/Scripts/WJ/Robot/RobotObject.cs b/GQ_URP/GQ/Assets/Scripts/WJ/Robot/RobotObject.cs index f6cd647f3..8e58cddd0 100644 --- a/GQ_URP/GQ/Assets/Scripts/WJ/Robot/RobotObject.cs +++ b/GQ_URP/GQ/Assets/Scripts/WJ/Robot/RobotObject.cs @@ -31,6 +31,7 @@ public class RobotObject : MonoBehaviour /// /// ǰִеĻλϢ + /// map_xmap_y /// private RobotPos current_robot_pos = null; @@ -83,15 +84,27 @@ public class RobotObject : MonoBehaviour current_robot_pos = RobotPosQueue.Peek(); //Debug.Log(Newtonsoft.Json.JsonConvert.SerializeObject(current_robot_pos)); - display_x = (current_robot_pos.current_pose.x - origin_x) / resolution; + /*display_x = (current_robot_pos.current_pose.x - origin_x) / resolution; display_y = (current_robot_pos.current_pose.x - origin_y) / resolution; display_x *= (rect_transform.sizeDelta.x / pixel_width); - display_y *= (rect_transform.sizeDelta.y / pixel_height); + display_y *= (rect_transform.sizeDelta.y / pixel_height);*/ - rect_transform.DOAnchorPos(new Vector2((float)display_x, (float)display_y), 0.5f).OnComplete(() => + + // display_x = - bmp_x + map_x/resolution + display_x = -origin_x + current_robot_pos.current_pose.x / resolution; + // display _y= -bmp_h - bmp_y + map_y/resolution + display_y = -(pixel_height - origin_y + current_robot_pos.current_pose.y / resolution); + + var _display_y = (display_x / pixel_width) * (296) + 50; + //var _display_x = MathF.Abs(((float)display_y / (float)pixel_height) * 750) - 790; + var _display_x = MathF.Abs(790 - MathF.Abs(((float)display_y / (float)pixel_height) * 785)); + + //rect_transform.DOAnchorPos(new Vector2((float)display_x, (float)display_y), 0.5f).OnComplete(() => + rect_transform.DOAnchorPos(new Vector2((float)_display_x + 24, (float)_display_y + 24), 0.5f).OnComplete(() => { - Debug.Log($"robotλù켣{new Vector2((float)display_x, (float)display_y)}"); + //Debug.Log($"robotλù켣{new Vector2((float)display_x, (float)display_y)}"); + Debug.Log($"robotλù켣{new Vector2((float)_display_x + 24, (float)_display_y + 24)}"); RobotPosQueue.Dequeue(); current_robot_pos = null; }); diff --git a/GQ_URP/GQ/Assets/Scripts/WJ/UIToCabinet.cs b/GQ_URP/GQ/Assets/Scripts/WJ/UIToCabinet.cs index c1159e883..eb7e5b6a6 100644 --- a/GQ_URP/GQ/Assets/Scripts/WJ/UIToCabinet.cs +++ b/GQ_URP/GQ/Assets/Scripts/WJ/UIToCabinet.cs @@ -395,6 +395,7 @@ public class UIToCabinet : MonoBehaviour if (clickEventLens[i].coroutine == null) StartCoroutine(clickEventLens[i].TwinkleLens(0.25f)); } + LocalVideo.Inst.AlarmFlashing(); LocalVideo.Inst.RecoveryUI(); LocalVideo.Inst.AssignDataToUI(); isContinue_menu = true; diff --git a/GQ_URP/GQ/Assets/Scripts/WJ/Utilities/Classes.cs b/GQ_URP/GQ/Assets/Scripts/WJ/Utilities/Classes.cs index 495292882..2e4630640 100644 --- a/GQ_URP/GQ/Assets/Scripts/WJ/Utilities/Classes.cs +++ b/GQ_URP/GQ/Assets/Scripts/WJ/Utilities/Classes.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Drawing; +using System.Reflection; using Unity.VisualScripting; using UnityEngine; using static UnityEngine.Rendering.DebugUI; @@ -1097,6 +1098,16 @@ public class PointData public string cabinType = "1"; public string _03 = "0"; public string _05 = "0"; + + + public string BackToString(string pointNo) + { + // + //{\"robotIp\":\"10.145.133.140\",\"pointList\":[{\"pointNo\":\"xj45\",\"04\":\"0\",\"06\":\"0\",\"01\":\"1\",\"cabinType\":\"1\",\"03\":\"0\",\"05\":\"0\"}]} + //string temp = $"{"{\"pointNo\":\"{pointNo}\",\"04\":\"0\",\"06\":\"0\",\"01\":\"1\",\"cabinType\":\"1\",\"03\":\"0\",\"05\":\"0\"}"}"; + string temp = string.Format("{{\"pointNo\":\"{0}\",\"04\":\"0\",\"06\":\"0\",\"01\":\"1\",\"cabinType\":\"1\",\"03\":\"0\",\"05\":\"0\"}}", pointNo); + return temp; + } } /// @@ -1134,6 +1145,6 @@ public class RootCabinDictionary public class BASE64_INTERFACE { - public int? instructId; + public string instructId; public string inspectionResult; } diff --git a/GQ_URP/GQ/Assets/script/JSON/CombineJSON.cs b/GQ_URP/GQ/Assets/script/JSON/CombineJSON.cs index f22feb4a3..7c5e95fff 100644 --- a/GQ_URP/GQ/Assets/script/JSON/CombineJSON.cs +++ b/GQ_URP/GQ/Assets/script/JSON/CombineJSON.cs @@ -512,7 +512,7 @@ public static class CombineJSON Texture2D texture = ((DownloadHandlerTexture)request.downloadHandler).texture; byte[] imageBytes = texture.EncodeToJPG(); // 根据实际需要选择其他格式进行编码 string base64String = System.Convert.ToBase64String(imageBytes); - Debug.Log(base64String); + Debug.Log($"base64String：{base64String}，热成像数据记录id：{id}"); _callback?.Invoke(base64String, id); } } diff --git a/GQ_URP/GQ/Assets/script/LocalVideo.cs b/GQ_URP/GQ/Assets/script/LocalVideo.cs index 77ebc2c7d..9241cbd1a 100644 --- a/GQ_URP/GQ/Assets/script/LocalVideo.cs +++ b/GQ_URP/GQ/Assets/script/LocalVideo.cs @@ -108,6 +108,14 @@ public class LocalVideo : MonoBehaviour AssignDataToUI(); + if (clickEventLens != null) + { + var localVideoAlarm_list = GameObject.FindObjectsOfType(true).ToList(); + for (int i = 0; i < localVideoAlarm_list.Count; i++) + { + localVideoAlarm_list[i].EnterTheCameraModule(); + } + } } catch (Exception e) { @@ -200,7 +208,7 @@ public class LocalVideo : MonoBehaviour { var _item = AlarmObjectPool.instance.GetItemFromPool(localVideoAlarmUI.preform); _item.gameObject.SetActive(true); - _item.transform.parent = localVideoAlarmUI.Content.transform; + _item.transform.SetParent(localVideoAlarmUI.Content.transform); _item.textMeshPro_object.text = list_Confs[j].sourceName + "쳣"; _item.textMeshPro_time.text = GetTime(long.Parse(list_Confs[j].timeStamp)).ToString(); var t = CombineJSON.Base64StringToTexture(list_Confs[j].alarmPicture); diff --git a/GQ_URP/GQ/Assets/script/NewBehaviourScript.cs b/GQ_URP/GQ/Assets/script/NewBehaviourScript.cs new file mode 100644 index 000000000..d7fdfb0b2 --- /dev/null +++ b/GQ_URP/GQ/Assets/script/NewBehaviourScript.cs @@ -0,0 +1,21 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class NewBehaviourScript : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + //print(new PointData().BackToString("xj45")); + //print(string.Format("{{\"robotIp\":\"10.145.133.140\",\"pointList\":[{0}]}}", new PointData().BackToString("xj45"))); + //string s = $"{{\"robotIp\":\"10.145.133.140\",\"pointList\":[{new PointData().BackToString("xj45")}]}}"; + CombineJSON.Base64StringToTexture("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"); + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/GQ_URP/GQ/Assets/script/NewBehaviourScript.cs.meta b/GQ_URP/GQ/Assets/script/NewBehaviourScript.cs.meta new file mode 100644 index 000000000..ef6e44621 --- /dev/null +++ b/GQ_URP/GQ/Assets/script/NewBehaviourScript.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0429bb659211915418326611277658a1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/GQ_URP/GQ/Assets/script/巡检/RobotReturnData.cs b/GQ_URP/GQ/Assets/script/巡检/RobotReturnData.cs index 1c0508908..8d95a4015 100644 --- a/GQ_URP/GQ/Assets/script/巡检/RobotReturnData.cs +++ b/GQ_URP/GQ/Assets/script/巡检/RobotReturnData.cs @@ -76,6 +76,7 @@ public class RobotReturnData : MonoBehaviour public void init(Action _callback = null) { + Debug.Log("׼Ѳʷݣ"); gameObject.SetActive(true); dropdown.value = -1; CalendarDetails.Inst.close(); @@ -94,7 +95,7 @@ public class RobotReturnData : MonoBehaviour inspectionDictionary.Clear(); /// У instructId createTime - Dictionary check = new Dictionary(); + Dictionary check = new Dictionary(); for (int i = 0; i < myroot.data.Count; i++) { @@ -118,6 +119,7 @@ public class RobotReturnData : MonoBehaviour //dropdown.options.Add(new Dropdown.OptionData(myroot.data[i].createTime)); } //CalendarDetails.Inst.delContent(); + Debug.Log("Ѳʷɣ"); _callback?.Invoke("1"); } else @@ -127,7 +129,7 @@ public class RobotReturnData : MonoBehaviour } catch (Exception e) { - Debug.LogError(e.StackTrace); + Debug.LogError("˷ͼƬл" + e.StackTrace); SecondConfirmPanel.DeleteConform(null, "˷ͼƬл"); } } @@ -148,7 +150,7 @@ public class RobotReturnData : MonoBehaviour /// /// /// - public int instructId; + public string instructId; /// /// /// diff --git a/GQ_URP/GQ/Assets/script/巡检/SaveCoordinateRobot.cs b/GQ_URP/GQ/Assets/script/巡检/SaveCoordinateRobot.cs index 23df2ad24..d14cb06dd 100644 --- a/GQ_URP/GQ/Assets/script/巡检/SaveCoordinateRobot.cs +++ b/GQ_URP/GQ/Assets/script/巡检/SaveCoordinateRobot.cs @@ -19,11 +19,11 @@ public class SaveCoordinateRobot : MonoBehaviour /// /// X뷶ΧС /// - [SerializeField] float inputMin_x; + [SerializeField] float inputMin_x => 0; /// /// X뷶Χ /// - [SerializeField] float inputMax_x; + [SerializeField] float inputMax_x => 320; /// /// XΧС /// @@ -36,11 +36,11 @@ public class SaveCoordinateRobot : MonoBehaviour /// /// Y뷶ΧС /// - [SerializeField] float inputMin_y; + [SerializeField] float inputMin_y => 0; /// /// Y뷶Χ /// - [SerializeField] float inputMax_y; + [SerializeField] float inputMax_y => 800; /// /// YΧС /// diff --git a/GQ_URP/GQ/Assets/script/摄像头/ClickEventLens.cs b/GQ_URP/GQ/Assets/script/摄像头/ClickEventLens.cs index 6411439a5..ed5293f80 100644 --- a/GQ_URP/GQ/Assets/script/摄像头/ClickEventLens.cs +++ b/GQ_URP/GQ/Assets/script/摄像头/ClickEventLens.cs @@ -153,14 +153,14 @@ public class ClickEventLens : MonoBehaviour { while (true) { - for (int i = 0; i < 3; i++) - { - ChangeMaterialColor(gameObject, 1); - yield return new WaitForSeconds(looptime); - ChangeMaterialColor(gameObject, 99); - yield return new WaitForSeconds(looptime); - } - yield return null; + //for (int i = 0; i < 3; i++) + //{ + ChangeMaterialColor(gameObject, 1); + yield return new WaitForSeconds(looptime); + ChangeMaterialColor(gameObject, 99); + yield return new WaitForSeconds(looptime); + //} } + //yield return null; } } diff --git a/GQ_URP/GQ/Assets/script/摄像头/LocalVideoAlarm.cs b/GQ_URP/GQ/Assets/script/摄像头/LocalVideoAlarm.cs index 4e5a4667f..f54023f65 100644 --- a/GQ_URP/GQ/Assets/script/摄像头/LocalVideoAlarm.cs +++ b/GQ_URP/GQ/Assets/script/摄像头/LocalVideoAlarm.cs @@ -2,6 +2,7 @@ using System.Collections; using System.Collections.Generic; using Unity.VisualScripting; using UnityEngine; +using UnityEngine.UI; /// /// Ƶ澯UI @@ -30,9 +31,24 @@ public class LocalVideoAlarm : CabinetUIBase void Update() { transform.eulerAngles = Camera.eulerAngles; + + if (localVideoAlarmUI.Content && localVideoAlarmUI.Content.gameObject.activeSelf) + { + // Grid ĸ = ͼ * + м * ( - 1) + var content = localVideoAlarmUI.Content; + var grid = content.GetComponent(); + var x = content.sizeDelta.x; + var y = grid.cellSize.y * content.childCount; + content.sizeDelta = new Vector2(x, y); + } } public override void OnMenuChanged(Menu menu) + { + EnterTheCameraModule(menu); + } + + public void EnterTheCameraModule(Menu menu = Menu.M_ȫ_ͷ) { base.OnMenuChanged(menu); if (menu == Menu.M_ȫ_ͷ && baseConf.conf1.alarmEntities.Count > 0) diff --git a/GQ_URP/GQ/Assets/script/摄像头/LocalVideoAlarmItem.cs b/GQ_URP/GQ/Assets/script/摄像头/LocalVideoAlarmItem.cs index 315399415..85d5490ff 100644 --- a/GQ_URP/GQ/Assets/script/摄像头/LocalVideoAlarmItem.cs +++ b/GQ_URP/GQ/Assets/script/摄像头/LocalVideoAlarmItem.cs @@ -24,7 +24,7 @@ public class LocalVideoAlarmItem : MonoBehaviour var l = (LocalVideo.Inst.clickEventLens).SelectMany(x => x.GetComponentsInChildren(true)).ToList(); for (int i = 0; i < l.Count; i++) { - l[i].canvas.transform.GetChild(0).gameObject.SetActive(false); + l[i].canvas./*transform.GetChild(0).*/gameObject.SetActive(false); } }); } diff --git a/GQ_URP/GQ/Assets/script/红外监测/IRPopup.cs b/GQ_URP/GQ/Assets/script/红外监测/IRPopup.cs index 859311626..3b70641cd 100644 --- a/GQ_URP/GQ/Assets/script/红外监测/IRPopup.cs +++ b/GQ_URP/GQ/Assets/script/红外监测/IRPopup.cs @@ -5,6 +5,9 @@ using System.Collections.Generic; using Unity.VisualScripting; using UnityEngine; using UnityEngine.UI; +using static IRPopup; +using System.Linq; +using Newtonsoft.Json.Linq; /// /// @@ -12,6 +15,11 @@ using UnityEngine.UI; public class IRPopup : MonoBehaviour { public Root myroot = new Root(); + //public Msg msg = new Msg(); + public JObject msg; + public Root_Data root_Data = new Root_Data(); + public List data = new List(); + public static IRPopup Inst; public Transform content; public RectTransform content_ret; @@ -57,46 +65,152 @@ public class IRPopup : MonoBehaviour /// public void LoadmoreDetails() { - StartCoroutine(CombineJSON.GetJson_GET(GameManager.Inst.Jk_URL.hwjc_cx, GameManager.Inst.arguments.token, (jsonResult) => + //StartCoroutine(CombineJSON.GetJson_GET(GameManager.Inst.Jk_URL.hwjc_cx, GameManager.Inst.arguments.token, (jsonResult) => + //{ + var jsonResult = "{\"code\":\"000000\",\"message\":\"ɹ\",\"data\":{\"personFlag\":\"1\",\"data\":\"{\\\"result\\\":0,\\\"remark\\\":\\\"\\\",\\\"data\\\":[{\\\"alarmid\\\":\\\"A6304521252331213883\\\",\\\"alarmcode\\\":\\\"1\\\",\\\"typeflag\\\":1,\\\"title\\\":\\\"someone intrusion!\\\",\\\"deveui\\\":\\\"1@004a770062c0042f\\\",\\\"devtype\\\":\\\"sensor_infrared_intrusion\\\",\\\"alarmlevel\\\":1,\\\"alarmtime\\\":\\\"2024-04-28 16:15:07\\\",\\\"descp\\\":\\\"\\\",\\\"cleartime\\\":null,\\\"confirmstate\\\":0,\\\"confirmtime\\\":null,\\\"confirmer\\\":null,\\\"remark\\\":null,\\\"devname\\\":\\\"⴫-3\\\",\\\"addr\\\":\\\"\\\",\\\"relaobjid\\\":null,\\\"relaobjtype\\\":0,\\\"relaobjname\\\":null},{\\\"alarmid\\\":\\\"A4800272191298919822\\\",\\\"alarmcode\\\":\\\"1\\\",\\\"typeflag\\\":1,\\\"title\\\":\\\"someone intrusion!\\\",\\\"deveui\\\":\\\"1@004a770062c004e7\\\",\\\"devtype\\\":\\\"sensor_infrared_intrusion\\\",\\\"alarmlevel\\\":1,\\\"alarmtime\\\":\\\"2024-04-28 16:14:01\\\",\\\"descp\\\":\\\"\\\",\\\"cleartime\\\":null,\\\"confirmstate\\\":0,\\\"confirmtime\\\":null,\\\"confirmer\\\":null,\\\"remark\\\":null,\\\"devname\\\":\\\"⴫-2\\\",\\\"addr\\\":\\\"\\\",\\\"relaobjid\\\":null,\\\"relaobjtype\\\":0,\\\"relaobjname\\\":null},{\\\"alarmid\\\":\\\"A8060430184138534773\\\",\\\"alarmcode\\\":\\\"1\\\",\\\"typeflag\\\":1,\\\"title\\\":\\\"someone intrusion!\\\",\\\"deveui\\\":\\\"1@004a770062c001a2\\\",\\\"devtype\\\":\\\"sensor_infrared_intrusion\\\",\\\"alarmlevel\\\":1,\\\"alarmtime\\\":\\\"2024-04-28 16:12:24\\\",\\\"descp\\\":\\\"\\\",\\\"cleartime\\\":null,\\\"confirmstate\\\":0,\\\"confirmtime\\\":null,\\\"confirmer\\\":null,\\\"remark\\\":null,\\\"devname\\\":\\\"⴫-1\\\",\\\"addr\\\":\\\"\\\",\\\"relaobjid\\\":null,\\\"relaobjtype\\\":0,\\\"relaobjname\\\":null}]}\"},\"serverTime\":\"1714291536526\"}"; + if (jsonResult != null) { - if (jsonResult != null) + try { - try + myroot = JsonConvert.DeserializeObject(jsonResult); + if (myroot.message == "ɹ") { - myroot = JsonConvert.DeserializeObject(jsonResult); - if (myroot.message == "ɹ") + Debug.Log("ȡݳɹ"); + //for (int i = 0; i < myroot.data.Count; i++) { - //for (int i = 0; i < myroot.data.Count; i++) - { - var go = GameObject.Instantiate(prefab, content); - var t = go.GetComponent(); - var txt = myroot.data.personFlag; - if (txt == "1") t.text1.text = ""; - else if (txt == "0") t.text1.text = ""; - //t.text1.text = myroot.data[i].personFlag; - //t.text2.text = myroot.data[i].particulars; - } - } - else - { - SecondConfirmPanel.DeleteConform(null, myroot.message); + //var go = GameObject.Instantiate(prefab, content); + //var t = go.GetComponent(); + msg = JObject.Parse(myroot.data.ToString()); + + //var txt = myroot.data.personFlag; + //var txt = msg["personFlag"].ToString(); + root_Data = JsonConvert.DeserializeObject(msg["data"].ToString().Trim()); + data = root_Data.data; + //if (txt == "1") t.text1.text = ""; + //else if (txt == "0") t.text1.text = ""; + //t.text1.text = myroot.data[i].personFlag; + //t.text2.text = myroot.data[i].particulars; } } - catch (Exception e) + else { - SecondConfirmPanel.DeleteConform(null, "л"); + SecondConfirmPanel.DeleteConform(null, myroot.message); } } - })); + catch (Exception e) + { + SecondConfirmPanel.DeleteConform(null, "л" + e.Message + "" + e.StackTrace); + } + } + //})); + } + + [System.Serializable] + public class Msg + { + /// + /// 1-ˣ0- + /// + public string personFlag; + public Root_Data data; + } + + [System.Serializable] + public class Root_Data + { + /// + /// + /// + public int result; + /// + /// 澯עϢ + /// + public string remark; + /// + /// + /// + public List data; } [System.Serializable] public class Data { /// - /// 1-ˣ0- + /// 澯ˮ /// - public string personFlag; + public string alarmid; + /// + /// 澯 + /// + public string alarmcode; + /// + /// ͱ: 0: 澯ָ1: 澯2: ֪ͨϢ + /// + public int typeflag; + /// + /// 澯 + /// + public string title; + /// + /// 澯豸ʶ + /// + public string deveui; + /// + /// 澯豸 + /// + public string devtype; + /// + /// 澯 + /// + public int alarmlevel; + /// + /// 澯ʱ + /// + public DateTime alarmtime; + /// + /// 澯ϸ + /// + public string descp; + /// + /// 澯ָʱ + /// + public string cleartime; + /// + /// 澯ȷ״̬: 0-δȷϣ1-ȷ + /// + public int confirmstate; + /// + /// 澯ȷʱ, ֵΪ yyyy-MM-dd HH:mm:ss ʽ + /// + public string confirmtime; + /// + /// 澯ȷ + /// + public string confirmer; + /// + /// + /// + public string remark; + /// + /// + /// + public string devname; + /// + /// + /// + public string addr; + /// + /// + /// + public string relaobjid; + /// + /// + /// + public int relaobjtype; + /// + /// + /// + public string relaobjname; } [System.Serializable] @@ -113,7 +227,7 @@ public class IRPopup : MonoBehaviour /// /// /// - public Data data; + public object data; /// /// /// diff --git a/GQ_URP/GQ/Assets/script/红外监测/Infraredsensor.cs b/GQ_URP/GQ/Assets/script/红外监测/Infraredsensor.cs index b1d1a0aad..20aa70eab 100644 --- a/GQ_URP/GQ/Assets/script/红外监测/Infraredsensor.cs +++ b/GQ_URP/GQ/Assets/script/红外监测/Infraredsensor.cs @@ -5,6 +5,10 @@ using UnityEditor; using UnityEngine; using UnityEngine.UI; using UnityEngine.EventSystems; +using Newtonsoft.Json.Linq; +using static IRPopup; +using Newtonsoft.Json; +using System; public class Infraredsensor : MonoBehaviour, IPointerDownHandler { @@ -37,7 +41,33 @@ public class Infraredsensor : MonoBehaviour, IPointerDownHandler { //if (text) // WebInteraction.Inst.Infraredsensor_open(text.text.Replace("", "")); - IRPopup.Inst.popup.SetActive(true); + try + { + IRPopup.Inst.msg = JObject.Parse(IRPopup.Inst.myroot.data.ToString()); + // 0 1 + if (IRPopup.Inst && IRPopup.Inst.msg["personFlag"].ToString() == "1") + { + var data = IRPopup.Inst.data.Where(x => x.devname.Contains(text.text.Split('-')[1])).ToList(); + + for (int i = IRPopup.Inst.content.childCount - 1; i >= 0; i--) + DestroyImmediate(IRPopup.Inst.content.GetChild(i).gameObject); + + for (int i = 0; i < data.Count; i++) + { + var go = GameObject.Instantiate(IRPopup.Inst.prefab, IRPopup.Inst.content); + var t = go.GetComponent(); + t.text1.text = data[i].alarmtime.ToString(); + t.text2.text = ""; + } + + IRPopup.Inst.popup.SetActive(true); + } + } + catch (System.Exception e) + { + Debug.Log("⸳ֵ" + e.Message + ",дΣ" + e.StackTrace); + } + } //public static void ChangeMenu(Menu menu) diff --git a/GQ_URP/GQ/BestHTTP.csproj b/GQ_URP/GQ/BestHTTP.csproj index 42ec1dbbe..b39ee903d 100644 --- a/GQ_URP/GQ/BestHTTP.csproj +++ b/GQ_URP/GQ/BestHTTP.csproj @@ -2305,6 +2305,9 @@ D:\unity\2021.3.2f1c1\Editor\Data\PlaybackEngines\WebGLSupport\UnityEditor.WebGL.Extensions.dll + + D:\unity\2021.3.2f1c1\Editor\Data\PlaybackEngines\AndroidPlayer\UnityEditor.Android.Extensions.dll + D:\unity\2021.3.2f1c1\Editor\Data\PlaybackEngines\WindowsStandaloneSupport\UnityEditor.WindowsStandalone.Extensions.dll @@ -2392,6 +2395,12 @@ Library\PackageCache\com.unity.collab-proxy@1.15.16\Lib\Editor\PlasticSCM\unityplastic.dll + + D:\unity\2021.3.2f1c1\Editor\Data\PlaybackEngines\AndroidPlayer\Unity.Android.Types.dll + + + D:\unity\2021.3.2f1c1\Editor\Data\PlaybackEngines\AndroidPlayer\Unity.Android.Gradle.dll + D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\ref\2.1.0\netstandard.dll diff --git a/GQ_URP/GQ/app.config b/GQ_URP/GQ/app.config new file mode 100644 index 000000000..fc328f223 --- /dev/null +++ b/GQ_URP/GQ/app.config @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file