Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang
This commit is contained in:
huyulong
commit
d3e1749fc2
File diff suppressed because it is too large
Load Diff
@ -657,6 +657,8 @@ RectTransform:
|
||||
- {fileID: 3077635298785468484}
|
||||
- {fileID: 1834348372}
|
||||
- {fileID: 3032695104264456879}
|
||||
- {fileID: 3032695105467395617}
|
||||
- {fileID: 5252296846619923058}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
@ -1684,6 +1686,10 @@ PrefabInstance:
|
||||
propertyPath: m_Name
|
||||
value: progress
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 155093939668964445, guid: 67c25fa7ef0990c4fbc1f37ac1ecb3ec, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 67c25fa7ef0990c4fbc1f37ac1ecb3ec, type: 3}
|
||||
--- !u!224 &1834348372 stripped
|
||||
@ -2982,6 +2988,309 @@ RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 2595414684036832497, guid: 6dcbd78e23916b142bcfe72c4a2a708c, type: 3}
|
||||
m_PrefabInstance: {fileID: 3077635298643823765}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &3077635298798279372
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 3077635299444999927}
|
||||
m_Modifications:
|
||||
- target: {fileID: 46083686991999376, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083687380014704, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083687380014704, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083687645065382, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083687645065382, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083687645065382, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083687645065382, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083687645065382, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083687645065382, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083687645065385, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083688438047261, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -0.5000076
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083688657597676, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: OpcOrder2 1 (1)
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083688657597676, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083688657597677, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083688657597677, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083688657597677, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 12
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083688657597677, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083688657597677, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083688657597677, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083688657597677, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083688657597677, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083688657597677, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083688657597677, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_LocalScale.x
|
||||
value: 0.9
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083688657597677, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_LocalScale.y
|
||||
value: 0.8
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083688657597677, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_LocalScale.z
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083688657597677, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083688657597677, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083688657597677, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083688657597677, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083688657597677, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083688657597677, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083688657597677, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083688657597677, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 1828
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083688657597677, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 249
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083688657597677, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083688657597677, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083688657597677, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 823124465897836687, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_TargetGraphic
|
||||
value:
|
||||
objectReference: {fileID: 3032695105215659132}
|
||||
- target: {fileID: 823124465897836687, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_Colors.m_PressedColor.b
|
||||
value: 0.09718761
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 823124465897836687, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_Colors.m_PressedColor.g
|
||||
value: 0.09718761
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 823124465897836687, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_Colors.m_PressedColor.r
|
||||
value: 0.9811321
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2109125590881905030, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2109125590881905030, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2109125590881905030, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2109125590881905030, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2109125590881905030, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2109125590881905030, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2166922752449803930, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_Spacing.y
|
||||
value: 8.88
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2166922752449803930, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_CellSize.y
|
||||
value: 86.76
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2166922752449803930, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_Padding.m_Bottom
|
||||
value: 44
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2410299759049940670, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: Tip
|
||||
value:
|
||||
objectReference: {fileID: 3032695104053365951}
|
||||
- target: {fileID: 2410299759049940670, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2410299759049940670, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: itemPrefab
|
||||
value:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2410299759049940670, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: jsonReader
|
||||
value:
|
||||
objectReference: {fileID: 3077635298785468485}
|
||||
- target: {fileID: 2410299759049940670, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: ItemList.Array.size
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2410299759049940670, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: ItemList.Array.data[0]
|
||||
value:
|
||||
objectReference: {fileID: 3032695104320383589}
|
||||
- target: {fileID: 6987064875164557437, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_FontData.m_MaxSize
|
||||
value: 90
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6987064875164557437, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_FontData.m_MinSize
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6987064875164557437, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_FontData.m_FontSize
|
||||
value: 65
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6987064875164557437, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_FontData.m_Alignment
|
||||
value: 6
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
--- !u!1 &3032695104053365951 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 46083687380014707, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
m_PrefabInstance: {fileID: 3077635298798279372}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &1723929264
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3032695104053365951}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_IgnoreReversedGraphics: 1
|
||||
m_BlockingObjects: 0
|
||||
m_BlockingMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
--- !u!1 &3032695104320383589 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 46083687645065385, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
m_PrefabInstance: {fileID: 3077635298798279372}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &3032695105214036182 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 46083688438047258, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
m_PrefabInstance: {fileID: 3077635298798279372}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &3032695105215659132 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 46083688439670448, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
m_PrefabInstance: {fileID: 3077635298798279372}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!224 &3032695105467395617 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 46083688657597677, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
m_PrefabInstance: {fileID: 3077635298798279372}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &3077635299161429467
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -4057,23 +4366,23 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2368487729759097803, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2368487729759097803, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2368487729759097803, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 354
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2368487729759097803, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 177
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2368487729759097803, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -32.2326
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2368487729838770152, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
@ -5000,39 +5309,47 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083687380014704, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
value: 68.100006
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083687380014704, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 504
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083687380014707, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083687645065382, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083687645065382, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083687645065382, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
value: 344.1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083687645065382, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 86.76
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083687645065382, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
value: 203.05
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083687645065382, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
value: -139.02
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083687645065385, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083688438047258, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_Text
|
||||
value: "\u4E3B\u6301\u4EBA"
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083688438047261, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
@ -5112,11 +5429,11 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083688657597677, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: -2.1685
|
||||
value: 1828
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083688657597677, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 124.91885
|
||||
value: 249
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083688657597677, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
@ -5134,29 +5451,41 @@ PrefabInstance:
|
||||
propertyPath: m_TargetGraphic
|
||||
value:
|
||||
objectReference: {fileID: 3032695104012622066}
|
||||
- target: {fileID: 823124465897836687, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_Colors.m_PressedColor.b
|
||||
value: 0.09718761
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 823124465897836687, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_Colors.m_PressedColor.g
|
||||
value: 0.09718761
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 823124465897836687, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_Colors.m_PressedColor.r
|
||||
value: 0.9811321
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2109125590881905030, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2109125590881905030, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2109125590881905030, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
value: 344.1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2109125590881905030, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 86.76
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2109125590881905030, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
value: 198.05
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2109125590881905030, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
value: -43.38
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2166922752449803930, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_Spacing.y
|
||||
@ -5174,13 +5503,17 @@ PrefabInstance:
|
||||
propertyPath: Tip
|
||||
value:
|
||||
objectReference: {fileID: 3032695105273604145}
|
||||
- target: {fileID: 2410299759049940670, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: itemPrefab
|
||||
value:
|
||||
objectReference: {fileID: 3032695104320383589}
|
||||
- target: {fileID: 2410299759049940670, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: jsonReader
|
||||
value:
|
||||
objectReference: {fileID: 3077635298785468485}
|
||||
- target: {fileID: 2410299759049940670, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: ItemList.Array.size
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2410299759049940670, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: ItemList.Array.data[0]
|
||||
@ -5202,6 +5535,10 @@ PrefabInstance:
|
||||
propertyPath: m_FontData.m_Alignment
|
||||
value: 6
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7447428907058131879, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_Sprite
|
||||
value:
|
||||
objectReference: {fileID: 21300000, guid: ba5ef465c8665424588726a1530fe84a, type: 3}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
--- !u!114 &3032695104012622066 stripped
|
||||
@ -5385,7 +5722,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 21300000, guid: ba5ef465c8665424588726a1530fe84a, type: 3}
|
||||
- target: {fileID: 3722492973014331314, guid: 08fc835d9ef4e9443b98f9a0adb9b051, type: 3}
|
||||
propertyPath: m_Text
|
||||
value: 'aaa '
|
||||
value: "\u5F15\u5BFC\u758F\u6563"
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7700764329385295554, guid: 08fc835d9ef4e9443b98f9a0adb9b051, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
@ -5400,11 +5737,56 @@ PrefabInstance:
|
||||
value: 0.000061035156
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8926672376694514770, guid: 08fc835d9ef4e9443b98f9a0adb9b051, type: 3}
|
||||
propertyPath: m_CellSize.x
|
||||
value: 320
|
||||
propertyPath: m_Spacing.y
|
||||
value: 35.8
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
- target: {fileID: 8926672376694514770, guid: 08fc835d9ef4e9443b98f9a0adb9b051, type: 3}
|
||||
propertyPath: m_CellSize.x
|
||||
value: 280
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8926672376694514770, guid: 08fc835d9ef4e9443b98f9a0adb9b051, type: 3}
|
||||
propertyPath: m_CellSize.y
|
||||
value: 154.49
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8926672376694514770, guid: 08fc835d9ef4e9443b98f9a0adb9b051, type: 3}
|
||||
propertyPath: m_Padding.m_Top
|
||||
value: 50
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8926672376694514770, guid: 08fc835d9ef4e9443b98f9a0adb9b051, type: 3}
|
||||
propertyPath: m_Padding.m_Left
|
||||
value: 30
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents:
|
||||
- {fileID: 3571387917039879874, guid: 08fc835d9ef4e9443b98f9a0adb9b051, type: 3}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 08fc835d9ef4e9443b98f9a0adb9b051, type: 3}
|
||||
--- !u!1 &1809610721369072281 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 3722492972393548477, guid: 08fc835d9ef4e9443b98f9a0adb9b051, type: 3}
|
||||
m_PrefabInstance: {fileID: 3077635299763218468}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &2079617935
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1809610721369072281}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 9e290b8487ad64d4b930e0475ed31321, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
prefab: {fileID: 3032695104320383589}
|
||||
PrefabTransform: {fileID: 4641918897582544614}
|
||||
text: {fileID: 3032695105214036182}
|
||||
JSONReader: {fileID: 3077635298785468485}
|
||||
Time: {fileID: 5252296846083291959}
|
||||
Timeobject: {fileID: 5252296846619923061}
|
||||
--- !u!224 &4641918897582544614 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 7700764329385295554, guid: 08fc835d9ef4e9443b98f9a0adb9b051, type: 3}
|
||||
m_PrefabInstance: {fileID: 3077635299763218468}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &3077635300062283026
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -5515,6 +5897,144 @@ RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 7180589680218067505, guid: c30f7bda295b57043a7e3ed22fcf622b, type: 3}
|
||||
m_PrefabInstance: {fileID: 3077635300062283026}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &3077635300335877449
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 3077635299444999927}
|
||||
m_Modifications:
|
||||
- target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
|
||||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 13
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 103.247
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 34.157
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
|
||||
propertyPath: m_LocalScale.x
|
||||
value: 2.0146906
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
|
||||
propertyPath: m_LocalScale.y
|
||||
value: 2.0146906
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
|
||||
propertyPath: m_LocalScale.z
|
||||
value: 2.0146906
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: -821
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -44
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7085882780388142908, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: TimeBg
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7085882780388142908, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7085882780924118654, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
|
||||
propertyPath: m_Text
|
||||
value: 00:00
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
|
||||
--- !u!114 &5252296846083291959 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 7085882780924118654, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
|
||||
m_PrefabInstance: {fileID: 3077635300335877449}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!224 &5252296846619923058 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
|
||||
m_PrefabInstance: {fileID: 3077635300335877449}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &5252296846619923061 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 7085882780388142908, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
|
||||
m_PrefabInstance: {fileID: 3077635300335877449}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &8391770447932332817
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@ -20,7 +20,7 @@ GameObject:
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &46083687380014704
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -41,7 +41,7 @@ RectTransform:
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 353.025, y: 188}
|
||||
m_SizeDelta: {x: 101, y: 203.15999}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!114 &2166922752449803930
|
||||
MonoBehaviour:
|
||||
@ -56,7 +56,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Padding:
|
||||
m_Left: 31
|
||||
m_Left: 26
|
||||
m_Right: 0
|
||||
m_Top: 0
|
||||
m_Bottom: 0
|
||||
@ -175,10 +175,10 @@ RectTransform:
|
||||
m_Father: {fileID: 46083687380014704}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 203.04999, y: -155.06}
|
||||
m_SizeDelta: {x: 344.1, y: 96.2}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &823124465897836687
|
||||
MonoBehaviour:
|
||||
@ -339,7 +339,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0.024810791, y: -0.5000038}
|
||||
m_AnchoredPosition: {x: -5, y: -0.5000038}
|
||||
m_SizeDelta: {x: -15.6273, y: -3}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &46083688438047259
|
||||
@ -419,7 +419,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 1.381897}
|
||||
m_AnchoredPosition: {x: 1, y: 1.381897}
|
||||
m_SizeDelta: {x: 0, y: 2.764}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &46083688439670449
|
||||
@ -652,10 +652,10 @@ RectTransform:
|
||||
m_Father: {fileID: 46083687380014704}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 203.05, y: -48.1}
|
||||
m_SizeDelta: {x: 344.1, y: 96.2}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4602151241506608
|
||||
CanvasRenderer:
|
||||
|
||||
@ -115,7 +115,8 @@ public class TaskPanel : Base
|
||||
Debug.Log(2222);
|
||||
taskItem.gameObject.SetActive(true);
|
||||
}
|
||||
|
||||
//´«ÈÎÎñID
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -1089,7 +1089,7 @@
|
||||
"PlayerSpawnPoint": "1.2,7.88,0.21,-41.28",
|
||||
"LabelPos": "7.88,0.21,-41.28",
|
||||
"ShowRadius": "38",
|
||||
"Oversee": "-1",
|
||||
"Oversee": "8010,1",
|
||||
"EndPoint": "-1",
|
||||
"RoleLimit": "2001,1,8008,-1|2001,2,8008,-1|2001,6,8008,-1|2001,6,8006,-1|2001,1,8004,-1|2001,2,8004,-1|2001,6,8004,-1|2001,6,8010,-1",
|
||||
"Level": "1,20042"
|
||||
@ -1104,7 +1104,7 @@
|
||||
"PlayerSpawnPoint": "1.2,7.88,3.45,-41.28",
|
||||
"LabelPos": "7.88,3.45,-41.28",
|
||||
"ShowRadius": "38",
|
||||
"Oversee": "-1",
|
||||
"Oversee": "8010,1",
|
||||
"EndPoint": "-1",
|
||||
"RoleLimit": "2001,1,8008,-1|2001,2,8008,-1|2001,6,8008,-1|2001,6,8006,-1|2001,1,8004,-1|2001,2,8004,-1|2001,6,8004,-1|2001,6,8010,-1",
|
||||
"Level": "2,20043"
|
||||
@ -1119,7 +1119,7 @@
|
||||
"PlayerSpawnPoint": "1.2,7.94,6.69,-36.68",
|
||||
"LabelPos": "7.94,6.69,-36.68",
|
||||
"ShowRadius": "38",
|
||||
"Oversee": "-1",
|
||||
"Oversee": "8010,1",
|
||||
"EndPoint": "-1",
|
||||
"RoleLimit": "2001,1,8008,-1|2001,2,8008,-1|2001,6,8008,-1|2001,6,8006,-1|2001,1,8004,-1|2001,2,8004,-1|2001,6,8004,-1|2001,6,8010,-1",
|
||||
"Level": "3,20044"
|
||||
@ -1134,7 +1134,7 @@
|
||||
"PlayerSpawnPoint": "1.2,7.88,6.69,-41.28",
|
||||
"LabelPos": "7.88,6.69,-41.28",
|
||||
"ShowRadius": "38",
|
||||
"Oversee": "-1",
|
||||
"Oversee": "8010,1",
|
||||
"EndPoint": "-1",
|
||||
"RoleLimit": "2001,1,8008,-1|2001,2,8008,-1|2001,6,8008,-1|2001,6,8006,-1|2001,1,8004,-1|2001,2,8004,-1|2001,6,8004,-1|2001,6,8010,-1",
|
||||
"Level": "3,20044"
|
||||
@ -1149,7 +1149,7 @@
|
||||
"PlayerSpawnPoint": "1.2,7.88,9.93,-41.28",
|
||||
"LabelPos": "7.88,9.93,-41.28",
|
||||
"ShowRadius": "38",
|
||||
"Oversee": "-1",
|
||||
"Oversee": "8010,1",
|
||||
"EndPoint": "-1",
|
||||
"RoleLimit": "2001,1,8008,-1|2001,2,8008,-1|2001,6,8008,-1|2001,6,8006,-1|2001,1,8004,-1|2001,2,8004,-1|2001,6,8004,-1|2001,6,8010,-1",
|
||||
"Level": "4,20045"
|
||||
@ -1164,7 +1164,7 @@
|
||||
"PlayerSpawnPoint": "1.2,7.88,13.17,-41.28",
|
||||
"LabelPos": "7.88,13.17,-41.28",
|
||||
"ShowRadius": "38",
|
||||
"Oversee": "-1",
|
||||
"Oversee": "8010,1",
|
||||
"EndPoint": "-1",
|
||||
"RoleLimit": "2001,1,8008,-1|2001,2,8008,-1|2001,6,8008,-1|2001,6,8006,-1|2001,1,8004,-1|2001,2,8004,-1|2001,6,8004,-1|2001,6,8010,-1",
|
||||
"Level": "5,20046"
|
||||
|
||||
@ -1239,35 +1239,35 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083687380014704, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 101
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083687380014704, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 226.40001
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083687645065382, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083687645065382, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083687645065382, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 344.1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083687645065382, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 86.76
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083687645065382, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 203.05
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083687645065382, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -139.02
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 46083687645065385, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
@ -1399,27 +1399,27 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2109125590881905030, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2109125590881905030, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2109125590881905030, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 344.1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2109125590881905030, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 86.76
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2109125590881905030, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 203.05
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2109125590881905030, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -43.38
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2166922752449803930, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
|
||||
propertyPath: m_Spacing.y
|
||||
@ -1940,15 +1940,15 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3032695105273604145, guid: 940be89243a038b4090a77556e45a06d, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3032695105273604146, guid: 940be89243a038b4090a77556e45a06d, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 101
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3032695105273604146, guid: 940be89243a038b4090a77556e45a06d, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 226.40001
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3032695105541230308, guid: 940be89243a038b4090a77556e45a06d, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
@ -2072,28 +2072,32 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4030979446590429124, guid: 940be89243a038b4090a77556e45a06d, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4030979446590429124, guid: 940be89243a038b4090a77556e45a06d, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4030979446590429124, guid: 940be89243a038b4090a77556e45a06d, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 344.1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4030979446590429124, guid: 940be89243a038b4090a77556e45a06d, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 86.76
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4030979446590429124, guid: 940be89243a038b4090a77556e45a06d, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 203.05
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4030979446590429124, guid: 940be89243a038b4090a77556e45a06d, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -43.38
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5615814867453939173, guid: 940be89243a038b4090a77556e45a06d, type: 3}
|
||||
propertyPath: m_Sprite
|
||||
value:
|
||||
objectReference: {fileID: 21300000, guid: ba5ef465c8665424588726a1530fe84a, type: 3}
|
||||
- target: {fileID: 5860341746553965686, guid: 940be89243a038b4090a77556e45a06d, type: 3}
|
||||
propertyPath: m_Spacing.y
|
||||
value: 35.8
|
||||
|
||||
@ -11492,7 +11492,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9196293257107006892, guid: 86668fbe8407a8741bb903177bc93fdb, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9196293257107006895, guid: 86668fbe8407a8741bb903177bc93fdb, type: 3}
|
||||
propertyPath: panel
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -3795,7 +3795,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_UiScaleMode: 1
|
||||
m_UiScaleMode: 0
|
||||
m_ReferencePixelsPerUnit: 100
|
||||
m_ScaleFactor: 1
|
||||
m_ReferenceResolution: {x: 1920, y: 1080}
|
||||
|
||||
@ -25,6 +25,7 @@ public class PlayerTask : MonoBehaviour
|
||||
Debug.Log(1111111111111111111);
|
||||
Debug.Log(id);
|
||||
TaskPanel.instance.displaytask(id);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
61
xiaofang/Assets/Script/UI/ZZZZZZ/Player.cs
Normal file
61
xiaofang/Assets/Script/UI/ZZZZZZ/Player.cs
Normal file
@ -0,0 +1,61 @@
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
public class Player : MonoBehaviour
|
||||
{
|
||||
|
||||
public static Player CSZS;
|
||||
|
||||
public Dictionary<string, List<string>> PlayerID = new Dictionary<string, List<string>>()
|
||||
{
|
||||
{ "主持人", new List<string>() },
|
||||
{ "总指挥", new List<string>() },
|
||||
{ "抢险救援组", new List<string>() },
|
||||
{ "(组长)抢险救援组", new List<string>() },
|
||||
{ "医疗救护组", new List<string>() },
|
||||
{ "(组长)医疗救护", new List<string>() },
|
||||
{ "疏散引导组1", new List<string>() },
|
||||
{ "疏散引导组2", new List<string>() },
|
||||
{ "后勤保障组", new List<string>() },
|
||||
{ "(组长)后期保障", new List<string>() },
|
||||
{ "搜寻组", new List<string>() },
|
||||
{ "学生寝室长", new List<string>() }
|
||||
};
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
CSZS = this;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 接收玩家接受的任务
|
||||
/// </summary>
|
||||
public void SetPlayerID(string ID, string Task)
|
||||
{
|
||||
if (PlayerID.ContainsKey(ID))
|
||||
{
|
||||
PlayerID[ID].Add(Task); // 添加任务
|
||||
}
|
||||
else
|
||||
{
|
||||
Debug.Log("颠仔没有这个职业");
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 返回一个职业接取的任务
|
||||
/// </summary>
|
||||
public List<string> GetPlayerID(string ID)
|
||||
{
|
||||
if (PlayerID.TryGetValue(ID, out List<string> value))
|
||||
{
|
||||
return value; // 返回对应的 List<string>
|
||||
}
|
||||
else
|
||||
{
|
||||
Debug.Log("颠仔找不到");
|
||||
return new List<string>(); // 返回空列表
|
||||
}
|
||||
}
|
||||
}
|
||||
11
xiaofang/Assets/Script/UI/ZZZZZZ/Player.cs.meta
Normal file
11
xiaofang/Assets/Script/UI/ZZZZZZ/Player.cs.meta
Normal file
@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: c4ed3303e02a8594c8bac0747d38a1b9
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
21
xiaofang/Assets/Script/UI/ZZZZZZ/Test.cs
Normal file
21
xiaofang/Assets/Script/UI/ZZZZZZ/Test.cs
Normal file
@ -0,0 +1,21 @@
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
public class Test : MonoBehaviour
|
||||
{
|
||||
// Start is called before the first frame update
|
||||
void Start()
|
||||
{
|
||||
Player.CSZS.SetPlayerID("主持人", "123");
|
||||
List<string> strings = Player.CSZS.GetPlayerID("主持人");
|
||||
Debug.Log("aaaaa"+strings[0]);
|
||||
|
||||
}
|
||||
|
||||
// Update is called once per frame
|
||||
void Update()
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
11
xiaofang/Assets/Script/UI/ZZZZZZ/Test.cs.meta
Normal file
11
xiaofang/Assets/Script/UI/ZZZZZZ/Test.cs.meta
Normal file
@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 81338ca084d869c4e976bdd2a14ecbdd
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -24,6 +24,7 @@ public class JueseChoicePop : MonoBehaviour
|
||||
public string s;
|
||||
public JSONReader jsonReader;
|
||||
public Panel panel;
|
||||
public WarningPopPanel WarningPopPanel;
|
||||
//Start is called before the first frame update
|
||||
void Start()
|
||||
{
|
||||
@ -39,6 +40,7 @@ public class JueseChoicePop : MonoBehaviour
|
||||
}
|
||||
void CLosePop()
|
||||
{
|
||||
ClearAll();
|
||||
this.gameObject.SetActive(false);
|
||||
}
|
||||
public void openPop()
|
||||
@ -67,7 +69,8 @@ public class JueseChoicePop : MonoBehaviour
|
||||
foreach(var all in panel.sceneDataDictionary)
|
||||
{
|
||||
foreach (var info in all.Value)
|
||||
{Debug.LogError("-------------------------"+ info.sceneId);
|
||||
{
|
||||
Debug.LogError("-------------------------"+ info.sceneId);
|
||||
LocationData locationData = jsonReader.GetAreaDateById(int.Parse(info.sceneId));
|
||||
if (locationData.Oversee == "-1")
|
||||
{
|
||||
@ -77,7 +80,7 @@ public class JueseChoicePop : MonoBehaviour
|
||||
string[] overseeParts = locationData.Oversee.Split(',');
|
||||
string firstElement = overseeParts[0];
|
||||
string lastElement = overseeParts[1];
|
||||
|
||||
|
||||
if (overseeParts.Length > 0)
|
||||
{
|
||||
|
||||
@ -86,10 +89,10 @@ public class JueseChoicePop : MonoBehaviour
|
||||
GameObject item = GameObject.Instantiate(classmatePrefab, content);
|
||||
ClassMate classMate = item.GetComponent<ClassMate>();
|
||||
Button button = item.GetComponent<Button>();
|
||||
//button.onClick.AddListener(() =>
|
||||
//{
|
||||
button.onClick.AddListener(() =>
|
||||
{
|
||||
// SetClassMate(classMate, scnenName);
|
||||
//});
|
||||
});
|
||||
classMate.name = info.name;
|
||||
classMate.classmatename.text = classMate.name;
|
||||
//classMate.id = info.dutyId;
|
||||
@ -98,6 +101,10 @@ public class JueseChoicePop : MonoBehaviour
|
||||
}
|
||||
}
|
||||
}
|
||||
if(panel.sceneDataDictionary.Count==0)
|
||||
{
|
||||
WarningPopPanel.OpenPanel("请先添加对应的应急人员配置");
|
||||
}
|
||||
}
|
||||
//点击人员后设置位置的方法
|
||||
public void SetClassMate(ClassMate classMate, string a = "")
|
||||
@ -111,4 +118,13 @@ public class JueseChoicePop : MonoBehaviour
|
||||
{
|
||||
this.classItem = classItem;
|
||||
}
|
||||
|
||||
//关闭界面的时候删除子物体
|
||||
public void ClearAll()
|
||||
{
|
||||
foreach(Transform child in content)
|
||||
{
|
||||
Destroy(child.gameObject);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user