wulongxiao/_xiaofang
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zzz

Browse Source
This commit is contained in:
liuliang 2024-12-27 20:33:32 +08:00
parent 42e3c76d7c
commit 3018ea3fdd
10 changed files with 1165 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xiaofang/Assets/Prefabs/HYLPrefabs/Items.prefab
View File

@ -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:

10
xiaofang/Assets/Prefabs/HYLPrefabs/Panel/FreePanel02.prefab
View File

@ -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

122
xiaofang/Assets/Prefabs/HYLPrefabs/Panel/FreePanel09.prefab
View File

@ -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

24
xiaofang/Assets/Prefabs/HYLPrefabs/Panel/FreePanel14.prefab
View File

@ -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

4
xiaofang/Assets/Prefabs/HYLPrefabs/txt.prefab
View File

@ -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:

48
xiaofang/Assets/Prefabs/PanelPrefabs/DistributionPanel.prefab
View File

@ -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

40
xiaofang/Assets/Prefabs/PanelPrefabs/scheduled_5.prefab
View File

@ -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

895
xiaofang/Assets/Res/gsj/10_slices/FreeAction_02 3.unity
View File

File diff suppressed because it is too large Load Diff

152
xiaofang/Assets/Res/gsj/scripts/UseObjects.cs
View File

@ -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<string, EmergencyItem> itemConfigs = new Dictionary<string, EmergencyItem>();
public Dictionary<int, MatialData> itemConfigs = new Dictionary<int, MatialData>(); // 根据ID存储物品信息
// 模拟物品的字段配置
public Dictionary<string, EmergencyItem> itemConfigs = new Dictionary<string, EmergencyItem>();
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<Button>();
Button useButton = buttonPanel.Find("UseButton").GetComponent<Button>();
Button discardButton = buttonPanel.Find("ThrowButton").GetComponent<Button>();
// 清除之前绑定的事件，避免重复添加事件
viewButton.onClick.RemoveAllListeners();
useButton.onClick.RemoveAllListeners();
discardButton.onClick.RemoveAllListeners();
// 按规则显示或隐藏按钮
if (item.isConsumable && item.validTime == -1)
bool isConsumable = itemData.ConsumableType == 1; // 是否消耗品
int validTime = itemData.Durations; // 有效时间
if (isConsumable && validTime == -1)
{
// 规则1：直接使用，不弹出按钮
buttonPanel.gameObject.SetActive(false);
UseItem(item);
UseItem(itemData);
}
else if (item.isConsumable && item.validTime >= 0)
else if (isConsumable && validTime >= 0)
{
buttonPanel.gameObject.SetActive(true);
// 规则2：弹出【查看】【使用】【丢弃】
@ -195,11 +207,11 @@ public class UseObjects : MonoBehaviour
discardButton.gameObject.SetActive(true);
// 绑定事件
viewButton.onClick.AddListener(() => ViewItem(item));
useButton.onClick.AddListener(() => UseItem(item));
discardButton.onClick.AddListener(() => DiscardItem(item));
viewButton.onClick.AddListener(() => ViewItem(itemData));
useButton.onClick.AddListener(() => UseItem(itemData));
discardButton.onClick.AddListener(() => DiscardItem(itemData));
}
else if (!item.isConsumable && item.validTime >= 0)
else if (!isConsumable && validTime >= 0)
{
buttonPanel.gameObject.SetActive(true);
// 规则3：弹出【查看】【丢弃】
@ -208,27 +220,27 @@ public class UseObjects : MonoBehaviour
discardButton.gameObject.SetActive(true);
// 绑定事件
viewButton.onClick.AddListener(() => ViewItem(item));
discardButton.onClick.AddListener(() => DiscardItem(item));
viewButton.onClick.AddListener(() => ViewItem(itemData));
discardButton.onClick.AddListener(() => DiscardItem(itemData));
}
}
// 查看物品逻辑
void ViewItem(EmergencyItem item)
void ViewItem(MatialData item)
{
Debug.Log($"查看物品：{item.itemName}");
Debug.Log($"查看物品：{item.Name}");
}
// 使用物品逻辑
void UseItem(EmergencyItem item)
void UseItem(MatialData item)
{
Debug.Log($"使用物品：{item.itemName}");
Debug.Log($"使用物品：{item.Name}");
}
// 丢弃物品逻辑
void DiscardItem(EmergencyItem item)
void DiscardItem(MatialData item)
{
Debug.Log($"丢弃物品：{item.itemName}");
Debug.Log($"丢弃物品：{item.Name}");
}
//使用警戒物品
void UseCautionaryitems(Vector3 playerPosition,GameObject gameObject)

1
xiaofang/Assets/Scenes/loginscene.unity
View File

@ -864,6 +864,7 @@ MonoBehaviour:
gameRoomListInstance: {fileID: 0}
js: {fileID: 7695717545649794843}
isenter: 0
isadministrator: 0
--- !u!114 &252707977
MonoBehaviour:
m_ObjectHideFlags: 0