Compare commits

..

No commits in common. "42e3c76d7cd470479ee2e2002c6727d56892534c" and "a6e3b947522af2d8ac33c7f4c489b95697ceba2f" have entirely different histories.

10 changed files with 2435 additions and 2235 deletions

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -301,6 +301,11 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 288056020} m_GameObject: {fileID: 288056020}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!224 &349546248 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 4641918897582544614, guid: 940be89243a038b4090a77556e45a06d, type: 3}
m_PrefabInstance: {fileID: 3077635299975306478}
m_PrefabAsset: {fileID: 0}
--- !u!1 &373930957 --- !u!1 &373930957
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -378,6 +383,16 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 373930957} m_GameObject: {fileID: 373930957}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!1 &378331772 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7085882780388142908, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
m_PrefabInstance: {fileID: 998498727}
m_PrefabAsset: {fileID: 0}
--- !u!224 &396693239 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 3077635299444999927, guid: 940be89243a038b4090a77556e45a06d, type: 3}
m_PrefabInstance: {fileID: 3077635299975306478}
m_PrefabAsset: {fileID: 0}
--- !u!1 &571027939 --- !u!1 &571027939
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -496,6 +511,123 @@ MonoBehaviour:
rectTransform: {fileID: 1248276359} rectTransform: {fileID: 1248276359}
secondMenu: {fileID: 1185717110} secondMenu: {fileID: 1185717110}
firstToggle: {fileID: 571027941} firstToggle: {fileID: 571027941}
--- !u!1001 &998498727
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 396693239}
m_Modifications:
- target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
propertyPath: m_RootOrder
value: 13
objectReference: {fileID: 0}
- target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
propertyPath: m_SizeDelta.x
value: 103.247
objectReference: {fileID: 0}
- target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
propertyPath: m_SizeDelta.y
value: 34.157
objectReference: {fileID: 0}
- target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
propertyPath: m_LocalScale.x
value: 2.0146906
objectReference: {fileID: 0}
- target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
propertyPath: m_LocalScale.y
value: 2.0146906
objectReference: {fileID: 0}
- target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
propertyPath: m_LocalScale.z
value: 2.0146906
objectReference: {fileID: 0}
- target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
propertyPath: m_AnchoredPosition.x
value: -821
objectReference: {fileID: 0}
- target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
propertyPath: m_AnchoredPosition.y
value: -44
objectReference: {fileID: 0}
- target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7085882780388142907, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7085882780388142908, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
propertyPath: m_Name
value: TimeBg
objectReference: {fileID: 0}
- target: {fileID: 7085882780388142908, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7085882780924118654, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
propertyPath: m_Text
value: 00:00
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
--- !u!1 &1185717110 --- !u!1 &1185717110
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -612,6 +744,17 @@ MonoBehaviour:
m_Spacing: {x: 0, y: 0} m_Spacing: {x: 0, y: 0}
m_Constraint: 0 m_Constraint: 0
m_ConstraintCount: 2 m_ConstraintCount: 2
--- !u!114 &1194367126 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 7085882780924118654, guid: a80b522907f38514cb5d501fa8d84b10, type: 3}
m_PrefabInstance: {fileID: 998498727}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1248276358 --- !u!1 &1248276358
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -916,7 +1059,6 @@ GameObject:
- component: {fileID: 1416567126} - component: {fileID: 1416567126}
- component: {fileID: 1416567125} - component: {fileID: 1416567125}
- component: {fileID: 1416567124} - component: {fileID: 1416567124}
- component: {fileID: 1416567127}
m_Layer: 0 m_Layer: 0
m_Name: Main Camera m_Name: Main Camera
m_TagString: MainCamera m_TagString: MainCamera
@ -990,19 +1132,6 @@ Transform:
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1416567127
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1416567123}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9b2ff411b5e682c439d271893fe57cf2, type: 3}
m_Name:
m_EditorClassIdentifier:
jSONReader: {fileID: 2009348684}
--- !u!1 &1509783291 --- !u!1 &1509783291
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1097,6 +1226,266 @@ Transform:
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!1001 &1579681314
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 396693239}
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: 1916291583}
- 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: 1723929262}
- 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: 2009348684}
- 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: 1811662063}
- 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!114 &1581607076 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 46083688438047258, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
m_PrefabInstance: {fileID: 1579681314}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1617184227 --- !u!1 &1617184227
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1177,6 +1566,44 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1617184227} m_GameObject: {fileID: 1617184227}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!1 &1723929262 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 46083687380014707, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
m_PrefabInstance: {fileID: 1579681314}
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: 1723929262}
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 &1811662063 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 46083687645065385, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
m_PrefabInstance: {fileID: 1579681314}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1916291583 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 46083688439670448, guid: 09ab129ab15635d4482ae5617eb97556, type: 3}
m_PrefabInstance: {fileID: 1579681314}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1946593407 --- !u!1 &1946593407
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1313,6 +1740,29 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2059853627} m_GameObject: {fileID: 2059853627}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!1 &2079617932 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1809610721369072281, guid: 940be89243a038b4090a77556e45a06d, type: 3}
m_PrefabInstance: {fileID: 3077635299975306478}
m_PrefabAsset: {fileID: 0}
--- !u!114 &2079617935
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2079617932}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9e290b8487ad64d4b930e0475ed31321, type: 3}
m_Name:
m_EditorClassIdentifier:
prefab: {fileID: 1811662063}
PrefabTransform: {fileID: 349546248}
text: {fileID: 1581607076}
JSONReader: {fileID: 2009348684}
Time: {fileID: 1194367126}
Timeobject: {fileID: 378331772}
--- !u!1 &2118804391 --- !u!1 &2118804391
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1388,93 +1838,109 @@ PrefabInstance:
m_Modification: m_Modification:
m_TransformParent: {fileID: 0} m_TransformParent: {fileID: 0}
m_Modifications: m_Modifications:
- target: {fileID: 1036384108419493601, guid: 940be89243a038b4090a77556e45a06d, type: 3} - target: {fileID: 1834348371, guid: 940be89243a038b4090a77556e45a06d, type: 3}
propertyPath: m_Name
value: progress
objectReference: {fileID: 0}
- target: {fileID: 1834348371, guid: 940be89243a038b4090a77556e45a06d, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 750830055985094909, guid: 940be89243a038b4090a77556e45a06d, type: 3}
propertyPath: m_AnchorMax.y propertyPath: m_AnchorMax.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1036384108419493601, guid: 940be89243a038b4090a77556e45a06d, type: 3} - target: {fileID: 750830055985094909, guid: 940be89243a038b4090a77556e45a06d, type: 3}
propertyPath: m_AnchorMin.y propertyPath: m_AnchorMin.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1036384108419493601, guid: 940be89243a038b4090a77556e45a06d, type: 3} - target: {fileID: 750830055985094909, guid: 940be89243a038b4090a77556e45a06d, type: 3}
propertyPath: m_SizeDelta.x propertyPath: m_SizeDelta.x
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1036384108419493601, guid: 940be89243a038b4090a77556e45a06d, type: 3} - target: {fileID: 750830055985094909, guid: 940be89243a038b4090a77556e45a06d, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1036384108419493601, guid: 940be89243a038b4090a77556e45a06d, type: 3}
propertyPath: m_AnchoredPosition.x propertyPath: m_AnchoredPosition.x
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1036384108419493601, guid: 940be89243a038b4090a77556e45a06d, type: 3} - target: {fileID: 750830055985094909, guid: 940be89243a038b4090a77556e45a06d, type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1407198451904434455, guid: 940be89243a038b4090a77556e45a06d, type: 3} - target: {fileID: 750830056760490095, guid: 940be89243a038b4090a77556e45a06d, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1407198451904434455, guid: 940be89243a038b4090a77556e45a06d, type: 3}
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1407198452705769409, guid: 940be89243a038b4090a77556e45a06d, type: 3} - target: {fileID: 848627416208138492, guid: 940be89243a038b4090a77556e45a06d, type: 3}
propertyPath: itemPrefab
value:
objectReference: {fileID: 1811662063}
- target: {fileID: 848627416208138492, guid: 940be89243a038b4090a77556e45a06d, type: 3}
propertyPath: ItemList.Array.size
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1809610721369072280, guid: 940be89243a038b4090a77556e45a06d, type: 3}
propertyPath: m_AnchorMax.y propertyPath: m_AnchorMax.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1407198452705769409, guid: 940be89243a038b4090a77556e45a06d, type: 3} - target: {fileID: 1809610721369072280, guid: 940be89243a038b4090a77556e45a06d, type: 3}
propertyPath: m_AnchorMin.y propertyPath: m_AnchorMin.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1407198452705769409, guid: 940be89243a038b4090a77556e45a06d, type: 3} - target: {fileID: 1809610721369072280, guid: 940be89243a038b4090a77556e45a06d, type: 3}
propertyPath: m_SizeDelta.x propertyPath: m_SizeDelta.x
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1407198452705769409, guid: 940be89243a038b4090a77556e45a06d, type: 3} - target: {fileID: 1809610721369072280, guid: 940be89243a038b4090a77556e45a06d, type: 3}
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1407198452705769409, guid: 940be89243a038b4090a77556e45a06d, type: 3} - target: {fileID: 1809610721369072280, guid: 940be89243a038b4090a77556e45a06d, type: 3}
propertyPath: m_AnchoredPosition.x propertyPath: m_AnchoredPosition.x
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1407198452705769409, guid: 940be89243a038b4090a77556e45a06d, type: 3} - target: {fileID: 1809610721369072280, guid: 940be89243a038b4090a77556e45a06d, type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3032695104053365948, guid: 940be89243a038b4090a77556e45a06d, type: 3} - target: {fileID: 1809610721856505750, guid: 940be89243a038b4090a77556e45a06d, type: 3}
propertyPath: m_Text
value: "\u5F15\u5BFC\u758F\u6563"
objectReference: {fileID: 0}
- target: {fileID: 2439165017323073229, guid: 940be89243a038b4090a77556e45a06d, type: 3}
propertyPath: m_Colors.m_PressedColor.b
value: 0.09718761
objectReference: {fileID: 0}
- target: {fileID: 2439165017323073229, guid: 940be89243a038b4090a77556e45a06d, type: 3}
propertyPath: m_Colors.m_PressedColor.g
value: 0.09718761
objectReference: {fileID: 0}
- target: {fileID: 2439165017323073229, guid: 940be89243a038b4090a77556e45a06d, type: 3}
propertyPath: m_Colors.m_PressedColor.r
value: 0.9811321
objectReference: {fileID: 0}
- target: {fileID: 3032695104010050648, guid: 940be89243a038b4090a77556e45a06d, type: 3}
propertyPath: m_Text
value: "\u4E3B\u6301\u4EBA"
objectReference: {fileID: 0}
- target: {fileID: 3032695104264456879, guid: 940be89243a038b4090a77556e45a06d, type: 3}
propertyPath: m_SizeDelta.x propertyPath: m_SizeDelta.x
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3032695104053365948, guid: 940be89243a038b4090a77556e45a06d, type: 3} - target: {fileID: 3032695104264456879, guid: 940be89243a038b4090a77556e45a06d, type: 3}
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3032695104320383594, guid: 940be89243a038b4090a77556e45a06d, type: 3} - target: {fileID: 3032695104264456879, guid: 940be89243a038b4090a77556e45a06d, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3032695104320383594, guid: 940be89243a038b4090a77556e45a06d, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3032695104320383594, guid: 940be89243a038b4090a77556e45a06d, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3032695104320383594, guid: 940be89243a038b4090a77556e45a06d, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3032695104320383594, guid: 940be89243a038b4090a77556e45a06d, type: 3}
propertyPath: m_AnchoredPosition.x propertyPath: m_AnchoredPosition.x
value: 0 value: 1828
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3032695104320383594, guid: 940be89243a038b4090a77556e45a06d, type: 3} - target: {fileID: 3032695104264456879, guid: 940be89243a038b4090a77556e45a06d, type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 0 value: 249
objectReference: {fileID: 0}
- target: {fileID: 3032695105273604145, guid: 940be89243a038b4090a77556e45a06d, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3032695105273604146, guid: 940be89243a038b4090a77556e45a06d, type: 3} - target: {fileID: 3032695105273604146, guid: 940be89243a038b4090a77556e45a06d, type: 3}
propertyPath: m_SizeDelta.x propertyPath: m_SizeDelta.x
@ -1484,6 +1950,38 @@ PrefabInstance:
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3032695105541230308, guid: 940be89243a038b4090a77556e45a06d, type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3032695105541230308, guid: 940be89243a038b4090a77556e45a06d, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3032695105541230308, guid: 940be89243a038b4090a77556e45a06d, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3032695105541230308, guid: 940be89243a038b4090a77556e45a06d, type: 3}
propertyPath: m_SizeDelta.x
value: 344.1
objectReference: {fileID: 0}
- target: {fileID: 3032695105541230308, guid: 940be89243a038b4090a77556e45a06d, type: 3}
propertyPath: m_SizeDelta.y
value: 86.76
objectReference: {fileID: 0}
- target: {fileID: 3032695105541230308, guid: 940be89243a038b4090a77556e45a06d, type: 3}
propertyPath: m_AnchoredPosition.x
value: 203.05
objectReference: {fileID: 0}
- target: {fileID: 3032695105541230308, guid: 940be89243a038b4090a77556e45a06d, type: 3}
propertyPath: m_AnchoredPosition.y
value: -139.02
objectReference: {fileID: 0}
- target: {fileID: 3032695105541230315, guid: 940be89243a038b4090a77556e45a06d, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3077635299444999927, guid: 940be89243a038b4090a77556e45a06d, type: 3} - target: {fileID: 3077635299444999927, guid: 940be89243a038b4090a77556e45a06d, type: 3}
propertyPath: m_Pivot.x propertyPath: m_Pivot.x
value: 0 value: 0
@ -1596,29 +2094,30 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4030979447516607306, guid: 940be89243a038b4090a77556e45a06d, type: 3} - target: {fileID: 5615814867453939173, guid: 940be89243a038b4090a77556e45a06d, type: 3}
propertyPath: m_AnchorMax.y propertyPath: m_Sprite
value: 0 value:
objectReference: {fileID: 21300000, guid: ba5ef465c8665424588726a1530fe84a, type: 3}
- target: {fileID: 5860341746553965686, guid: 940be89243a038b4090a77556e45a06d, type: 3}
propertyPath: m_Spacing.y
value: 35.8
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4030979447516607306, guid: 940be89243a038b4090a77556e45a06d, type: 3} - target: {fileID: 5860341746553965686, guid: 940be89243a038b4090a77556e45a06d, type: 3}
propertyPath: m_AnchorMin.y propertyPath: m_CellSize.x
value: 0 value: 280
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4030979447516607306, guid: 940be89243a038b4090a77556e45a06d, type: 3} - target: {fileID: 5860341746553965686, guid: 940be89243a038b4090a77556e45a06d, type: 3}
propertyPath: m_SizeDelta.x propertyPath: m_CellSize.y
value: 0 value: 154.49
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4030979447516607306, guid: 940be89243a038b4090a77556e45a06d, type: 3} - target: {fileID: 5860341746553965686, guid: 940be89243a038b4090a77556e45a06d, type: 3}
propertyPath: m_SizeDelta.y propertyPath: m_Padding.m_Top
value: 0 value: 50
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4030979447516607306, guid: 940be89243a038b4090a77556e45a06d, type: 3} - target: {fileID: 5860341746553965686, guid: 940be89243a038b4090a77556e45a06d, type: 3}
propertyPath: m_AnchoredPosition.x propertyPath: m_Padding.m_Left
value: 0 value: 30
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4030979447516607306, guid: 940be89243a038b4090a77556e45a06d, type: 3} m_RemovedComponents:
propertyPath: m_AnchoredPosition.y - {fileID: 1956227571865497318, guid: 940be89243a038b4090a77556e45a06d, type: 3}
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 940be89243a038b4090a77556e45a06d, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 940be89243a038b4090a77556e45a06d, type: 3}

File diff suppressed because it is too large Load Diff

View File

@ -455,19 +455,7 @@ public class JSONReader : MonoBehaviour
return null; return null;
} }
} }
public string GetOcpID(int id)
{
Task_ info = null;
if (TaskDictionary.TryGetValue(id.ToString(), out info))
{
return info.Role;
}
else
{
Debug.Log($"No Select found with ID: {id}");
return null;
}
}
} }
// 帮助类,用于解析 JSON 数组 // 帮助类,用于解析 JSON 数组

View File

@ -25,7 +25,7 @@ public class PlayerTask : MonoBehaviour
Debug.Log(1111111111111111111); Debug.Log(1111111111111111111);
Debug.Log(id); Debug.Log(id);
TaskPanel.instance.displaytask(id); TaskPanel.instance.displaytask(id);
Player.CSZS.SetPlayerID(id.ToString());
} }
} }

View File

@ -25,9 +25,6 @@ public class FreePanelManager : MonoBehaviour
public GameObject EvacuateSurePanel; public GameObject EvacuateSurePanel;
//Êèɢ˳ÐòÃæ°å //Êèɢ˳ÐòÃæ°å
public GameObject EvacuatePanel; public GameObject EvacuatePanel;
//职业介绍面板
public GameObject OpcPanel1;
public GameObject OpcPanelTime;
[Header("ͼÏñ")] [Header("ͼÏñ")]
//ÌØÊâÇé¿öµ¯´°±³¾°Í¼ //ÌØÊâÇé¿öµ¯´°±³¾°Í¼
public Image TipBg; public Image TipBg;
@ -95,6 +92,12 @@ public class FreePanelManager : MonoBehaviour
public void Start() public void Start()
{ {
Z = this; Z = this;
ContainsValue(11002);
//
Chooselitem8.Instance.CreateItem(10800);
Chooselitem8.Instance.CreateItem(10060);
Chooselitem8.Instance.ColorText();
//
if (DirectChildren.Count>=5) if (DirectChildren.Count>=5)
{ {
OpcRight.gameObject.SetActive(true); OpcRight.gameObject.SetActive(true);
@ -611,16 +614,4 @@ public class FreePanelManager : MonoBehaviour
} }
} }
/// <summary>
/// 打开关闭职业任务面板
/// </summary>
public void OpenOpcPanel()
{
OpenOpcPanel(OpcPanel1, OpcPanelTime);
}
public void OpenOpcPanel(GameObject a,GameObject b)
{
a.SetActive(!OpcPanel1.activeSelf);
b.SetActive(!OpcPanelTime.activeSelf);
}
} }

View File

@ -6,37 +6,40 @@ public class Player : MonoBehaviour
{ {
public static Player CSZS; public static Player CSZS;
public JSONReader jSONReader;
public Dictionary<string, List<string>> PlayerID = new Dictionary<string, List<string>>() public Dictionary<string, List<string>> PlayerID = new Dictionary<string, List<string>>()
{ {
{ "8000", new List<string>() }, { "主持人", new List<string>() },
{ "8001", new List<string>() }, { "总指挥", new List<string>() },
{ "8002", new List<string>() }, { "抢险救援组", new List<string>() },
{ "8003", new List<string>() }, { "(组长)抢险救援组", new List<string>() },
{ "8004", new List<string>() }, { "医疗救护组", new List<string>() },
{ "8005", new List<string>() }, { "(组长)医疗救护", new List<string>() },
{ "8006", new List<string>() }, { "疏散引导组1", new List<string>() },
{ "8007", new List<string>() }, { "疏散引导组2", new List<string>() },
{ "8008", new List<string>() }, { "后勤保障组", new List<string>() },
{ "8009", new List<string>() }, { "(组长)后期保障", new List<string>() },
{ "8010", new List<string>() }, { "搜寻组", new List<string>() },
{ "8011", new List<string>() } { "学生寝室长", new List<string>() }
}; };
private void Awake() private void Awake()
{ {
CSZS = this; CSZS = this;
} }
/// <summary> /// <summary>
/// 接收玩家接受的任务 /// 接收玩家接受的任务
/// </summary> /// </summary>
public void SetPlayerID(string TaskID) public void SetPlayerID(string ID, string Task)
{ {
var a=ParseString(jSONReader.GetOcpID(int.Parse(TaskID))); if (PlayerID.ContainsKey(ID))
for (int i=0;i<a.Count;i++)
{ {
PlayerID[a[i]].Add(TaskID); PlayerID[ID].Add(Task); // 添加任务
}
else
{
Debug.Log("颠仔没有这个职业");
} }
} }
@ -55,37 +58,4 @@ public class Player : MonoBehaviour
return new List<string>(); // 返回空列表 return new List<string>(); // 返回空列表
} }
} }
/// <summary>
/// 解析以 "|" 分隔的字符串并返回一个 List
/// </summary>
/// <param name="input">输入的字符串</param>
/// <returns>解析后的 List如果输入为空则返回空列表</returns>
public static List<string> ParseString(string input)
{
// 如果输入为空或 null返回空列表
if (string.IsNullOrEmpty(input))
{
return new List<string>();
}
// 按 "|" 分割字符串,并返回结果列表
return new List<string>(input.Split('|'));
}
public void Start()
{
SetPlayerID("11007");
////遍历字典
//foreach (KeyValuePair<string, List<string>> kvp in PlayerID)
//{
// Debug.Log($"职业: {kvp.Key}");
// // 遍历值List<string>
// foreach (string task in kvp.Value)
// {
// Debug.Log($"任务: {task}");
// }
//}
}
} }

View File

@ -7,7 +7,7 @@ public class Test : MonoBehaviour
// Start is called before the first frame update // Start is called before the first frame update
void Start() void Start()
{ {
//Player.CSZS.SetPlayerID("主持人", "123"); Player.CSZS.SetPlayerID("主持人", "123");
List<string> strings = Player.CSZS.GetPlayerID("主持人"); List<string> strings = Player.CSZS.GetPlayerID("主持人");
Debug.Log("aaaaa"+strings[0]); Debug.Log("aaaaa"+strings[0]);

View File

@ -6,6 +6,10 @@ using UnityEngine;
public class PlayerState : MonoBehaviour public class PlayerState : MonoBehaviour
{ {
[Header("鯤소悧沂좆")] [Header("鯤소悧沂좆")]
public float totalHp = 100; public float totalHp = 100;
[Header("鯤소뎠품沂좆")] [Header("鯤소뎠품沂좆")]