From 3018ea3fdd4e26ef0e74ead7e4cd063d85df8fe9 Mon Sep 17 00:00:00 2001 From: liuliang <597380732@qq.com> Date: Fri, 27 Dec 2024 20:33:32 +0800 Subject: [PATCH] zzz --- .../Assets/Prefabs/HYLPrefabs/Items.prefab | 2 +- .../HYLPrefabs/Panel/FreePanel02.prefab | 10 +- .../HYLPrefabs/Panel/FreePanel09.prefab | 122 ++- .../HYLPrefabs/Panel/FreePanel14.prefab | 24 +- xiaofang/Assets/Prefabs/HYLPrefabs/txt.prefab | 4 +- .../PanelPrefabs/DistributionPanel.prefab | 48 +- .../Prefabs/PanelPrefabs/scheduled_5.prefab | 40 + .../Res/gsj/10_slices/FreeAction_02 3.unity | 895 +++++++++++++++++- xiaofang/Assets/Res/gsj/scripts/UseObjects.cs | 152 +-- xiaofang/Assets/Scenes/loginscene.unity | 1 + 10 files changed, 1165 insertions(+), 133 deletions(-) diff --git a/xiaofang/Assets/Prefabs/HYLPrefabs/Items.prefab b/xiaofang/Assets/Prefabs/HYLPrefabs/Items.prefab index b86152a7..e5bbe0c9 100644 --- a/xiaofang/Assets/Prefabs/HYLPrefabs/Items.prefab +++ b/xiaofang/Assets/Prefabs/HYLPrefabs/Items.prefab @@ -114,7 +114,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 88, y: -27.164} - m_SizeDelta: {x: 176, y: 54.328} + m_SizeDelta: {x: 0, y: 54.328} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7616883479488263580 CanvasRenderer: diff --git a/xiaofang/Assets/Prefabs/HYLPrefabs/Panel/FreePanel02.prefab b/xiaofang/Assets/Prefabs/HYLPrefabs/Panel/FreePanel02.prefab index 2fa8d40f..cca09b6e 100644 --- a/xiaofang/Assets/Prefabs/HYLPrefabs/Panel/FreePanel02.prefab +++ b/xiaofang/Assets/Prefabs/HYLPrefabs/Panel/FreePanel02.prefab @@ -975,7 +975,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2855068880506871865, guid: 29c73bc687a198749af78a190ec7e6a0, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2855068880506871865, guid: 29c73bc687a198749af78a190ec7e6a0, type: 3} propertyPath: m_AnchorMin.x @@ -983,11 +983,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2855068880506871865, guid: 29c73bc687a198749af78a190ec7e6a0, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2855068880506871865, guid: 29c73bc687a198749af78a190ec7e6a0, type: 3} propertyPath: m_SizeDelta.x - value: 354 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2855068880506871865, guid: 29c73bc687a198749af78a190ec7e6a0, type: 3} propertyPath: m_SizeDelta.y @@ -1023,11 +1023,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2855068880506871865, guid: 29c73bc687a198749af78a190ec7e6a0, type: 3} propertyPath: m_AnchoredPosition.x - value: 177 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2855068880506871865, guid: 29c73bc687a198749af78a190ec7e6a0, type: 3} propertyPath: m_AnchoredPosition.y - value: -32.2326 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2855068880506871865, guid: 29c73bc687a198749af78a190ec7e6a0, type: 3} propertyPath: m_LocalEulerAnglesHint.x diff --git a/xiaofang/Assets/Prefabs/HYLPrefabs/Panel/FreePanel09.prefab b/xiaofang/Assets/Prefabs/HYLPrefabs/Panel/FreePanel09.prefab index 77dafaf8..1a91411f 100644 --- a/xiaofang/Assets/Prefabs/HYLPrefabs/Panel/FreePanel09.prefab +++ b/xiaofang/Assets/Prefabs/HYLPrefabs/Panel/FreePanel09.prefab @@ -1367,7 +1367,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2855068880506871865, guid: 29c73bc687a198749af78a190ec7e6a0, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2855068880506871865, guid: 29c73bc687a198749af78a190ec7e6a0, type: 3} propertyPath: m_AnchorMin.x @@ -1375,11 +1375,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2855068880506871865, guid: 29c73bc687a198749af78a190ec7e6a0, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2855068880506871865, guid: 29c73bc687a198749af78a190ec7e6a0, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 354 objectReference: {fileID: 0} - target: {fileID: 2855068880506871865, guid: 29c73bc687a198749af78a190ec7e6a0, type: 3} propertyPath: m_SizeDelta.y @@ -1415,11 +1415,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2855068880506871865, guid: 29c73bc687a198749af78a190ec7e6a0, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 177 objectReference: {fileID: 0} - target: {fileID: 2855068880506871865, guid: 29c73bc687a198749af78a190ec7e6a0, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -32.2326 objectReference: {fileID: 0} - target: {fileID: 2855068880506871865, guid: 29c73bc687a198749af78a190ec7e6a0, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1559,6 +1559,26 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -33 objectReference: {fileID: 0} + - target: {fileID: 8816828714074580885, guid: a3a1e4241d39b294b88b81e8d5caa7cc, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8816828714074580885, guid: a3a1e4241d39b294b88b81e8d5caa7cc, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8816828714074580885, guid: a3a1e4241d39b294b88b81e8d5caa7cc, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8816828714074580885, guid: a3a1e4241d39b294b88b81e8d5caa7cc, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8816828714074580885, guid: a3a1e4241d39b294b88b81e8d5caa7cc, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a3a1e4241d39b294b88b81e8d5caa7cc, type: 3} --- !u!224 &1220397016120795828 stripped @@ -1667,7 +1687,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6027365138068452571, guid: c9f46e89412676f4399860ac4bf9c422, type: 3} propertyPath: m_AnchoredPosition.x - value: 1061.75 + value: 1114.5472 objectReference: {fileID: 0} - target: {fileID: 6027365138068452571, guid: c9f46e89412676f4399860ac4bf9c422, type: 3} propertyPath: m_AnchoredPosition.y @@ -1788,7 +1808,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6027365138068452571, guid: c9f46e89412676f4399860ac4bf9c422, type: 3} propertyPath: m_AnchoredPosition.x - value: 274.7 + value: 291.59442 objectReference: {fileID: 0} - target: {fileID: 6027365138068452571, guid: c9f46e89412676f4399860ac4bf9c422, type: 3} propertyPath: m_AnchoredPosition.y @@ -1909,7 +1929,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6027365138068452571, guid: c9f46e89412676f4399860ac4bf9c422, type: 3} propertyPath: m_AnchoredPosition.x - value: 1061.75 + value: 1114.5472 objectReference: {fileID: 0} - target: {fileID: 6027365138068452571, guid: c9f46e89412676f4399860ac4bf9c422, type: 3} propertyPath: m_AnchoredPosition.y @@ -2030,7 +2050,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6027365138068452571, guid: c9f46e89412676f4399860ac4bf9c422, type: 3} propertyPath: m_AnchoredPosition.x - value: 186 + value: 291.59442 objectReference: {fileID: 0} - target: {fileID: 6027365138068452571, guid: c9f46e89412676f4399860ac4bf9c422, type: 3} propertyPath: m_AnchoredPosition.y @@ -2151,7 +2171,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6027365138068452571, guid: c9f46e89412676f4399860ac4bf9c422, type: 3} propertyPath: m_AnchoredPosition.x - value: 623.875 + value: 703.0708 objectReference: {fileID: 0} - target: {fileID: 6027365138068452571, guid: c9f46e89412676f4399860ac4bf9c422, type: 3} propertyPath: m_AnchoredPosition.y @@ -2272,7 +2292,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6027365138068452571, guid: c9f46e89412676f4399860ac4bf9c422, type: 3} propertyPath: m_AnchoredPosition.x - value: 186 + value: 291.59442 objectReference: {fileID: 0} - target: {fileID: 6027365138068452571, guid: c9f46e89412676f4399860ac4bf9c422, type: 3} propertyPath: m_AnchoredPosition.y @@ -2411,6 +2431,26 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 8816828714074580885, guid: a3a1e4241d39b294b88b81e8d5caa7cc, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8816828714074580885, guid: a3a1e4241d39b294b88b81e8d5caa7cc, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8816828714074580885, guid: a3a1e4241d39b294b88b81e8d5caa7cc, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8816828714074580885, guid: a3a1e4241d39b294b88b81e8d5caa7cc, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8816828714074580885, guid: a3a1e4241d39b294b88b81e8d5caa7cc, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a3a1e4241d39b294b88b81e8d5caa7cc, type: 3} --- !u!224 &1220397015027634309 stripped @@ -2519,7 +2559,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6027365138068452571, guid: c9f46e89412676f4399860ac4bf9c422, type: 3} propertyPath: m_AnchoredPosition.x - value: 623.875 + value: 703.0708 objectReference: {fileID: 0} - target: {fileID: 6027365138068452571, guid: c9f46e89412676f4399860ac4bf9c422, type: 3} propertyPath: m_AnchoredPosition.y @@ -2634,6 +2674,26 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8816828714074580885, guid: a3a1e4241d39b294b88b81e8d5caa7cc, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8816828714074580885, guid: a3a1e4241d39b294b88b81e8d5caa7cc, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8816828714074580885, guid: a3a1e4241d39b294b88b81e8d5caa7cc, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8816828714074580885, guid: a3a1e4241d39b294b88b81e8d5caa7cc, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8816828714074580885, guid: a3a1e4241d39b294b88b81e8d5caa7cc, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a3a1e4241d39b294b88b81e8d5caa7cc, type: 3} --- !u!224 &1220397015138772854 stripped @@ -2742,7 +2802,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6027365138068452571, guid: c9f46e89412676f4399860ac4bf9c422, type: 3} propertyPath: m_AnchoredPosition.x - value: 623.875 + value: 703.0708 objectReference: {fileID: 0} - target: {fileID: 6027365138068452571, guid: c9f46e89412676f4399860ac4bf9c422, type: 3} propertyPath: m_AnchoredPosition.y @@ -2857,6 +2917,26 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8816828714074580885, guid: a3a1e4241d39b294b88b81e8d5caa7cc, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8816828714074580885, guid: a3a1e4241d39b294b88b81e8d5caa7cc, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8816828714074580885, guid: a3a1e4241d39b294b88b81e8d5caa7cc, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8816828714074580885, guid: a3a1e4241d39b294b88b81e8d5caa7cc, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8816828714074580885, guid: a3a1e4241d39b294b88b81e8d5caa7cc, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a3a1e4241d39b294b88b81e8d5caa7cc, type: 3} --- !u!224 &1220397015154958199 stripped @@ -2965,7 +3045,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6027365138068452571, guid: c9f46e89412676f4399860ac4bf9c422, type: 3} propertyPath: m_AnchoredPosition.x - value: 186 + value: 291.59442 objectReference: {fileID: 0} - target: {fileID: 6027365138068452571, guid: c9f46e89412676f4399860ac4bf9c422, type: 3} propertyPath: m_AnchoredPosition.y @@ -3086,7 +3166,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6027365138068452571, guid: c9f46e89412676f4399860ac4bf9c422, type: 3} propertyPath: m_AnchoredPosition.x - value: 1061.75 + value: 1114.5472 objectReference: {fileID: 0} - target: {fileID: 6027365138068452571, guid: c9f46e89412676f4399860ac4bf9c422, type: 3} propertyPath: m_AnchoredPosition.y @@ -3207,7 +3287,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6027365138068452571, guid: c9f46e89412676f4399860ac4bf9c422, type: 3} propertyPath: m_AnchoredPosition.x - value: 1499.625 + value: 1526.0237 objectReference: {fileID: 0} - target: {fileID: 6027365138068452571, guid: c9f46e89412676f4399860ac4bf9c422, type: 3} propertyPath: m_AnchoredPosition.y @@ -3328,7 +3408,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6027365138068452571, guid: c9f46e89412676f4399860ac4bf9c422, type: 3} propertyPath: m_AnchoredPosition.x - value: 1106.1001 + value: 1114.5472 objectReference: {fileID: 0} - target: {fileID: 6027365138068452571, guid: c9f46e89412676f4399860ac4bf9c422, type: 3} propertyPath: m_AnchoredPosition.y @@ -3449,7 +3529,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6027365138068452571, guid: c9f46e89412676f4399860ac4bf9c422, type: 3} propertyPath: m_AnchoredPosition.x - value: 1499.625 + value: 1526.0237 objectReference: {fileID: 0} - target: {fileID: 6027365138068452571, guid: c9f46e89412676f4399860ac4bf9c422, type: 3} propertyPath: m_AnchoredPosition.y @@ -3570,7 +3650,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6027365138068452571, guid: c9f46e89412676f4399860ac4bf9c422, type: 3} propertyPath: m_AnchoredPosition.x - value: 1521.8 + value: 1526.0237 objectReference: {fileID: 0} - target: {fileID: 6027365138068452571, guid: c9f46e89412676f4399860ac4bf9c422, type: 3} propertyPath: m_AnchoredPosition.y @@ -3691,7 +3771,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6027365138068452571, guid: c9f46e89412676f4399860ac4bf9c422, type: 3} propertyPath: m_AnchoredPosition.x - value: 1499.625 + value: 1526.0237 objectReference: {fileID: 0} - target: {fileID: 6027365138068452571, guid: c9f46e89412676f4399860ac4bf9c422, type: 3} propertyPath: m_AnchoredPosition.y @@ -3812,7 +3892,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6027365138068452571, guid: c9f46e89412676f4399860ac4bf9c422, type: 3} propertyPath: m_AnchoredPosition.x - value: 690.4 + value: 703.0708 objectReference: {fileID: 0} - target: {fileID: 6027365138068452571, guid: c9f46e89412676f4399860ac4bf9c422, type: 3} propertyPath: m_AnchoredPosition.y diff --git a/xiaofang/Assets/Prefabs/HYLPrefabs/Panel/FreePanel14.prefab b/xiaofang/Assets/Prefabs/HYLPrefabs/Panel/FreePanel14.prefab index c547c9c9..d92c8e13 100644 --- a/xiaofang/Assets/Prefabs/HYLPrefabs/Panel/FreePanel14.prefab +++ b/xiaofang/Assets/Prefabs/HYLPrefabs/Panel/FreePanel14.prefab @@ -3106,7 +3106,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7616883480756649446, guid: f454d0adf137b454692b75edd05ffa82, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7616883480756649446, guid: f454d0adf137b454692b75edd05ffa82, type: 3} propertyPath: m_AnchorMin.x @@ -3114,15 +3114,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7616883480756649446, guid: f454d0adf137b454692b75edd05ffa82, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7616883480756649446, guid: f454d0adf137b454692b75edd05ffa82, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 164.4106 objectReference: {fileID: 0} - target: {fileID: 7616883480756649446, guid: f454d0adf137b454692b75edd05ffa82, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 211.6133 objectReference: {fileID: 0} - target: {fileID: 7616883480756649446, guid: f454d0adf137b454692b75edd05ffa82, type: 3} propertyPath: m_LocalPosition.x @@ -3154,11 +3154,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7616883480756649446, guid: f454d0adf137b454692b75edd05ffa82, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 275.2659 objectReference: {fileID: 0} - target: {fileID: 7616883480756649446, guid: f454d0adf137b454692b75edd05ffa82, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -112 objectReference: {fileID: 0} - target: {fileID: 7616883480756649446, guid: f454d0adf137b454692b75edd05ffa82, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -3746,7 +3746,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7616883480756649446, guid: f454d0adf137b454692b75edd05ffa82, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7616883480756649446, guid: f454d0adf137b454692b75edd05ffa82, type: 3} propertyPath: m_AnchorMin.x @@ -3754,15 +3754,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7616883480756649446, guid: f454d0adf137b454692b75edd05ffa82, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7616883480756649446, guid: f454d0adf137b454692b75edd05ffa82, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 164.4106 objectReference: {fileID: 0} - target: {fileID: 7616883480756649446, guid: f454d0adf137b454692b75edd05ffa82, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 211.6133 objectReference: {fileID: 0} - target: {fileID: 7616883480756649446, guid: f454d0adf137b454692b75edd05ffa82, type: 3} propertyPath: m_LocalPosition.x @@ -3794,11 +3794,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7616883480756649446, guid: f454d0adf137b454692b75edd05ffa82, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 82.2053 objectReference: {fileID: 0} - target: {fileID: 7616883480756649446, guid: f454d0adf137b454692b75edd05ffa82, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -112 objectReference: {fileID: 0} - target: {fileID: 7616883480756649446, guid: f454d0adf137b454692b75edd05ffa82, type: 3} propertyPath: m_LocalEulerAnglesHint.x diff --git a/xiaofang/Assets/Prefabs/HYLPrefabs/txt.prefab b/xiaofang/Assets/Prefabs/HYLPrefabs/txt.prefab index bdd21642..c5ac12b0 100644 --- a/xiaofang/Assets/Prefabs/HYLPrefabs/txt.prefab +++ b/xiaofang/Assets/Prefabs/HYLPrefabs/txt.prefab @@ -36,8 +36,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 186, y: -33} - m_SizeDelta: {x: 315, y: 66} + m_AnchoredPosition: {x: 186, y: -31.50375} + m_SizeDelta: {x: 315, y: 63.0075} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6027365138031870383 CanvasRenderer: diff --git a/xiaofang/Assets/Prefabs/PanelPrefabs/DistributionPanel.prefab b/xiaofang/Assets/Prefabs/PanelPrefabs/DistributionPanel.prefab index 190501d0..336f70a1 100644 --- a/xiaofang/Assets/Prefabs/PanelPrefabs/DistributionPanel.prefab +++ b/xiaofang/Assets/Prefabs/PanelPrefabs/DistributionPanel.prefab @@ -157,7 +157,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 560.5, y: -164.5} + m_AnchoredPosition: {x: 560.5, y: -0} m_SizeDelta: {x: 1121, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1031840001252021432 @@ -630,7 +630,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 560.5, y: -164.5} + m_AnchoredPosition: {x: 560.5, y: -5} m_SizeDelta: {x: 1121, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1031840002269525502 @@ -1467,7 +1467,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5900002971020626570, guid: 297444ab6ae692b4dbcb38d34e0c5716, type: 3} propertyPath: m_AnchoredPosition.y - value: -164.5 + value: -93.5 objectReference: {fileID: 0} - target: {fileID: 5900002971020626570, guid: 297444ab6ae692b4dbcb38d34e0c5716, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1791,7 +1791,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5900002971599260874, guid: 297444ab6ae692b4dbcb38d34e0c5716, type: 3} propertyPath: m_AnchoredPosition.y - value: -186.5 + value: -109 objectReference: {fileID: 0} - target: {fileID: 5900002971613278954, guid: 297444ab6ae692b4dbcb38d34e0c5716, type: 3} propertyPath: m_AnchorMax.y @@ -1961,6 +1961,46 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -35 objectReference: {fileID: 0} + - target: {fileID: 7531194149634478661, guid: 297444ab6ae692b4dbcb38d34e0c5716, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7531194149634478661, guid: 297444ab6ae692b4dbcb38d34e0c5716, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7531194149634478661, guid: 297444ab6ae692b4dbcb38d34e0c5716, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7531194149634478661, guid: 297444ab6ae692b4dbcb38d34e0c5716, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7531194149634478661, guid: 297444ab6ae692b4dbcb38d34e0c5716, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8838300892937481870, guid: 297444ab6ae692b4dbcb38d34e0c5716, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8838300892937481870, guid: 297444ab6ae692b4dbcb38d34e0c5716, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8838300892937481870, guid: 297444ab6ae692b4dbcb38d34e0c5716, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8838300892937481870, guid: 297444ab6ae692b4dbcb38d34e0c5716, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8838300892937481870, guid: 297444ab6ae692b4dbcb38d34e0c5716, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 297444ab6ae692b4dbcb38d34e0c5716, type: 3} --- !u!224 &1031840001516944377 stripped diff --git a/xiaofang/Assets/Prefabs/PanelPrefabs/scheduled_5.prefab b/xiaofang/Assets/Prefabs/PanelPrefabs/scheduled_5.prefab index cd450286..e1005109 100644 --- a/xiaofang/Assets/Prefabs/PanelPrefabs/scheduled_5.prefab +++ b/xiaofang/Assets/Prefabs/PanelPrefabs/scheduled_5.prefab @@ -2120,6 +2120,46 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2672644105302302717, guid: f7e3ba3643cbe834083789575336030d, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2672644105302302717, guid: f7e3ba3643cbe834083789575336030d, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2672644105302302717, guid: f7e3ba3643cbe834083789575336030d, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2672644105302302717, guid: f7e3ba3643cbe834083789575336030d, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2672644105302302717, guid: f7e3ba3643cbe834083789575336030d, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3978082958181212982, guid: f7e3ba3643cbe834083789575336030d, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3978082958181212982, guid: f7e3ba3643cbe834083789575336030d, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3978082958181212982, guid: f7e3ba3643cbe834083789575336030d, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3978082958181212982, guid: f7e3ba3643cbe834083789575336030d, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3978082958181212982, guid: f7e3ba3643cbe834083789575336030d, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f7e3ba3643cbe834083789575336030d, type: 3} --- !u!224 &7318934475707780983 stripped diff --git a/xiaofang/Assets/Res/gsj/10_slices/FreeAction_02 3.unity b/xiaofang/Assets/Res/gsj/10_slices/FreeAction_02 3.unity index d9ba6616..5e327c5b 100644 --- a/xiaofang/Assets/Res/gsj/10_slices/FreeAction_02 3.unity +++ b/xiaofang/Assets/Res/gsj/10_slices/FreeAction_02 3.unity @@ -320,6 +320,290 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 108294506} m_CullTransparentMesh: 1 +--- !u!1001 &157972373 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 749743820} + m_Modifications: + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_SizeDelta.x + value: 169.7412 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchoredPosition.x + value: 17 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchoredPosition.y + value: 150 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1344565523992887896, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1344565523992887896, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1344565523992887896, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1344565523992887896, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1344565523992887896, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3188402660528916100, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3188402660528916100, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3188402660528916100, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3188402660528916100, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3188402660528916100, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7296586638788422419, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_Name + value: deliver + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} +--- !u!224 &157972374 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + m_PrefabInstance: {fileID: 157972373} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &163114396 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 8255892007278688296} + m_Modifications: + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_SizeDelta.x + value: 169.7412 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchoredPosition.x + value: 17 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchoredPosition.y + value: 150 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1344565523992887896, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1344565523992887896, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1344565523992887896, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1344565523992887896, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1344565523992887896, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3188402660528916100, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3188402660528916100, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3188402660528916100, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3188402660528916100, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3188402660528916100, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7296586638788422419, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_Name + value: deliver + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} +--- !u!224 &163114397 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + m_PrefabInstance: {fileID: 163114396} + m_PrefabAsset: {fileID: 0} --- !u!1 &215397887 GameObject: m_ObjectHideFlags: 0 @@ -373,6 +657,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: js: {fileID: 2682777834338715495} + retrievedDataList: [] warningPrefab: {fileID: 0} polePrefab: {fileID: 0} tapePrefab: {fileID: 0} @@ -381,6 +666,148 @@ MonoBehaviour: potentialTargets: [] deliverButton: {fileID: 0} deliveryRange: 1 +--- !u!1001 &217032295 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1816094560} + m_Modifications: + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_SizeDelta.x + value: 169.7412 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchoredPosition.x + value: 17 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchoredPosition.y + value: 150 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1344565523992887896, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1344565523992887896, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1344565523992887896, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1344565523992887896, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1344565523992887896, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3188402660528916100, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3188402660528916100, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3188402660528916100, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3188402660528916100, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3188402660528916100, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7296586638788422419, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_Name + value: deliver + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} +--- !u!224 &217032296 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + m_PrefabInstance: {fileID: 217032295} + m_PrefabAsset: {fileID: 0} --- !u!1 &250457369 GameObject: m_ObjectHideFlags: 0 @@ -595,7 +1022,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1246986426} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -676,6 +1103,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1993534577} + - {fileID: 1601306223} - {fileID: 3209384261635006821} - {fileID: 869521731} - {fileID: 1938234402} @@ -971,6 +1399,148 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 509890576} m_CullTransparentMesh: 1 +--- !u!1001 &680866710 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3814301861727866561} + m_Modifications: + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_SizeDelta.x + value: 169.7412 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchoredPosition.x + value: 17 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchoredPosition.y + value: 150 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1344565523992887896, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1344565523992887896, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1344565523992887896, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1344565523992887896, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1344565523992887896, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3188402660528916100, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3188402660528916100, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3188402660528916100, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3188402660528916100, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3188402660528916100, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7296586638788422419, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_Name + value: deliver + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} +--- !u!224 &680866711 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + m_PrefabInstance: {fileID: 680866710} + m_PrefabAsset: {fileID: 0} --- !u!1 &687666220 GameObject: m_ObjectHideFlags: 0 @@ -1166,7 +1736,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1816094560} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1243,6 +1813,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1978393781} + - {fileID: 157972374} - {fileID: 981019204} - {fileID: 2316456463103735370} - {fileID: 7990339584791949091} @@ -1447,7 +2018,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 337627101} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1603,7 +2174,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 749743820} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -1762,7 +2333,7 @@ RectTransform: - {fileID: 509890577} - {fileID: 73790985} m_Father: {fileID: 1816094560} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1839,6 +2410,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1614222928} + - {fileID: 1505258073} - {fileID: 334433604} - {fileID: 814831600316573130} - {fileID: 7679343039193144534} @@ -2228,6 +2800,290 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1001 &1505258072 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1246986426} + m_Modifications: + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_SizeDelta.x + value: 169.7412 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchoredPosition.x + value: 17 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchoredPosition.y + value: 150 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1344565523992887896, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1344565523992887896, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1344565523992887896, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1344565523992887896, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1344565523992887896, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3188402660528916100, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3188402660528916100, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3188402660528916100, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3188402660528916100, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3188402660528916100, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7296586638788422419, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_Name + value: deliver + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} +--- !u!224 &1505258073 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + m_PrefabInstance: {fileID: 1505258072} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &1601306222 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 337627101} + m_Modifications: + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_SizeDelta.x + value: 169.7412 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchoredPosition.x + value: 17 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchoredPosition.y + value: 150 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1344565523992887896, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1344565523992887896, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1344565523992887896, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1344565523992887896, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1344565523992887896, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3188402660528916100, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3188402660528916100, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3188402660528916100, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3188402660528916100, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3188402660528916100, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7296586638788422419, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + propertyPath: m_Name + value: deliver + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} +--- !u!224 &1601306223 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 140804409796972766, guid: 5190d8784d9f43e44875d0255c22e69e, type: 3} + m_PrefabInstance: {fileID: 1601306222} + m_PrefabAsset: {fileID: 0} --- !u!1 &1614222927 GameObject: m_ObjectHideFlags: 0 @@ -2335,7 +3191,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1816094560} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -2496,6 +3352,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 108294507} + - {fileID: 217032296} - {fileID: 1738846339} - {fileID: 747231015} - {fileID: 1145534396} @@ -2625,7 +3482,7 @@ RectTransform: - {fileID: 2126998743} - {fileID: 1276062951} m_Father: {fileID: 8255892007278688296} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2701,7 +3558,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 337627101} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -3283,7 +4140,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8255892007278688296} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -3530,7 +4387,7 @@ RectTransform: - {fileID: 393926141613015695} - {fileID: 393926141844243135} m_Father: {fileID: 3814301861727866561} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -4216,7 +5073,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3814301861727866561} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -4803,7 +5660,7 @@ RectTransform: - {fileID: 814831600042803080} - {fileID: 814831599812624312} m_Father: {fileID: 1246986426} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -5037,7 +5894,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 749743820} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -5690,7 +6547,7 @@ RectTransform: - {fileID: 3209384261367528231} - {fileID: 3209384262134545175} m_Father: {fileID: 337627101} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -5927,7 +6784,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3814301861727866561} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -5965,6 +6822,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5340865517094014824} + - {fileID: 680866711} - {fileID: 716309271404761864} - {fileID: 393926141341341901} - {fileID: 3628983565824187139} @@ -6165,7 +7023,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8255892007278688296} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -6327,7 +7185,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1246986426} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -6501,7 +7359,7 @@ RectTransform: - {fileID: 7990339585067824481} - {fileID: 7990339585299051857} m_Father: {fileID: 749743820} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -7127,6 +7985,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 892660197887457665} + - {fileID: 163114397} - {fileID: 5732266628756137441} - {fileID: 2023705588} - {fileID: 1849095829} diff --git a/xiaofang/Assets/Res/gsj/scripts/UseObjects.cs b/xiaofang/Assets/Res/gsj/scripts/UseObjects.cs index 3cdde2a0..99debc53 100644 --- a/xiaofang/Assets/Res/gsj/scripts/UseObjects.cs +++ b/xiaofang/Assets/Res/gsj/scripts/UseObjects.cs @@ -26,23 +26,25 @@ public class UseObjects : MonoBehaviour private GameObject currentTarget; // 当前最近的交付目标 private bool islogistics;//角色是否为后勤保障组; private bool isdelivery;//是否开启交付 - [System.Serializable] - public class EmergencyItem - { - public string itemName; // 道具名称 - public bool isConsumable; // 是否消耗品 (1=是，0=否) - public int validTime; // 有效时间：-1（无限），0 或正数（有限时间） - } + //[System.Serializable] + //public class EmergencyItem + //{ + // public string itemName; // 道具名称 + // public bool isConsumable; // 是否消耗品 (1=是，0=否) + // public int validTime; // 有效时间：-1（无限），0 或正数（有限时间） + //} + + //// 模拟物品的字段配置 + //public Dictionary itemConfigs = new Dictionary(); + public Dictionary itemConfigs = new Dictionary(); // 根据ID存储物品信息 - // 模拟物品的字段配置 - public Dictionary itemConfigs = new Dictionary(); void Start() { parentObject = transform.Find("fireEquip"); player=GameObject.FindGameObjectWithTag("Player"); // 初始化模拟物品数据 - InitializeItemConfigs(3001); + InitializeItemConfigs(3001,3002,3003,3004,3005,3006); // 隐藏交付按钮 //deliverButton.gameObject.SetActive(false); @@ -80,7 +82,7 @@ public class UseObjects : MonoBehaviour { potentialTargets.Add(player.gameObject); } - UseCautionaryitems(player.transform.position, polePrefab); + //UseCautionaryitems(player.transform.position, polePrefab); } private void Update() { @@ -103,30 +105,34 @@ public class UseObjects : MonoBehaviour } } // 初始化模拟物品数据 - void InitializeItemConfigs(int id) + void InitializeItemConfigs(params int[] ids) { - itemConfigs.Add("1", new EmergencyItem { itemName = "1", isConsumable = true, validTime = -1 }); - itemConfigs.Add("2", new EmergencyItem { itemName = "2", isConsumable = true, validTime = 30 }); - itemConfigs.Add("3", new EmergencyItem { itemName = "3", isConsumable = false, validTime = 15 }); + //itemConfigs.Add("1", new EmergencyItem { itemName = "1", isConsumable = true, validTime = -1 }); + //itemConfigs.Add("2", new EmergencyItem { itemName = "2", isConsumable = true, validTime = 30 }); + //itemConfigs.Add("3", new EmergencyItem { itemName = "3", isConsumable = false, validTime = 15 }); - itemConfigs.Add("4", new EmergencyItem { itemName = "4", isConsumable = true, validTime = -1 }); - itemConfigs.Add("5", new EmergencyItem { itemName = "5", isConsumable = true, validTime = 30 }); - itemConfigs.Add("6", new EmergencyItem { itemName = "6", isConsumable = false, validTime = 15 }); - // 添加更多物品配置... - foreach (var key in js.matialDictionary) + //itemConfigs.Add("4", new EmergencyItem { itemName = "4", isConsumable = true, validTime = -1 }); + //itemConfigs.Add("5", new EmergencyItem { itemName = "5", isConsumable = true, validTime = 30 }); + //itemConfigs.Add("6", new EmergencyItem { itemName = "6", isConsumable = false, validTime = 15 }); + // 遍历传入的 ID 数组 + foreach (int id in ids) { - MatialData matialData = key.Value; - if (matialData.ID==id) + // 添加更多物品配置... + foreach (var key in js.matialDictionary) { - //获取物品数据 - retrievedDataList.Add(matialData); // 将匹配的数据添加到容器中 - Debug.Log($"数据已找到: ID={matialData.ID}, Note={matialData.Note}, Type={matialData.Type}, Name={matialData.Name}"); - } - } - // 如果未找到数据 - if (retrievedDataList.Count == 0) - { - Debug.LogWarning("未找到对应 ID 的数据！"); + MatialData matialData = key.Value; + if (matialData.ID == id) + { + //获取物品数据 + itemConfigs[id] = matialData; // 将匹配的数据添加到字典中 + Debug.Log($"数据已找到: ID={matialData.ID}, Note={matialData.Note}, Type={matialData.Type}, Name={matialData.Name}"); + } + } + // 如果未找到数据 + if (retrievedDataList.Count == 0) + { + Debug.LogWarning("未找到对应 ID 的数据！"); + } } } @@ -142,51 +148,57 @@ public class UseObjects : MonoBehaviour if (highlight != null) highlight.gameObject.SetActive(false); } - // 获取当前点击的子物体名称 - string itemName = clickedChild.name; - Debug.Log(itemName); - if (!itemConfigs.ContainsKey(itemName)) + // 获取当前点击的子物体的名称并尝试转换为 ID + if (int.TryParse(clickedChild.name, out int itemId) && itemConfigs.TryGetValue(itemId, out MatialData itemData)) { - Debug.LogWarning($"未找到物品 {itemName} 的配置！"); - return; + Debug.Log($"点击的物品ID: {itemId}"); + + // 获取子物体中的按钮面板和高光框 + Transform clickedButtonPanel = clickedChild.transform.Find("informationImage"); + Transform clickedHighlight = clickedChild.transform.Find("Image"); + + // 根据物品数据显示按钮面板和按钮 + if (clickedButtonPanel != null) + { + UpdateButtonPanel(clickedButtonPanel, itemData); + } + + // 显示当前子物体的高光框 + if (clickedHighlight != null) + { + clickedHighlight.gameObject.SetActive(true); + } } - - // 根据配置判断显示按钮 - EmergencyItem item = itemConfigs[itemName]; - Transform clickedButtonPanel = clickedChild.transform.Find("informationImage"); - Transform clickedHighlight = clickedChild.transform.Find("Image"); - - if (clickedButtonPanel != null) + else { - //clickedButtonPanel.gameObject.SetActive(true); - // 显示对应的按钮 - UpdateButtonPanel(clickedButtonPanel, item); - - } - - // 显示当前子物体的高光框 - if (clickedHighlight != null) - { - clickedHighlight.gameObject.SetActive(true); + Debug.LogWarning($"未找到物品配置，物品名称: {clickedChild.name}"); } } // 根据物品配置更新按钮面板 - void UpdateButtonPanel(Transform buttonPanel, EmergencyItem item) + void UpdateButtonPanel(Transform buttonPanel, MatialData itemData) { // 获取按钮 Button viewButton = buttonPanel.Find("LookButton").GetComponent