diff --git a/Assets/Art/UIPrefab/UI3DObjShow.prefab b/Assets/Art/UIPrefab/UI3DObjShow.prefab index 06410a52..b6e0a459 100644 --- a/Assets/Art/UIPrefab/UI3DObjShow.prefab +++ b/Assets/Art/UIPrefab/UI3DObjShow.prefab @@ -338,7 +338,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -378,6 +378,7 @@ GameObject: - component: {fileID: 1915876869541640623} - component: {fileID: 7277770534815806214} - component: {fileID: 5964642934946449171} + - component: {fileID: 5887092968505518654} m_Layer: 0 m_Name: Right m_TagString: Untagged @@ -443,6 +444,22 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &5887092968505518654 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1587529206278800681} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0d51f3a7c41ab0346b49ae50d456bece, type: 3} + m_Name: + m_EditorClassIdentifier: + MarkType: 0 + CustomComponentName: + CustomComment: + mComponentName: UnityEngine.UI.Image --- !u!1 &3408871029033640143 GameObject: m_ObjectHideFlags: 0 @@ -743,8 +760,9 @@ GameObject: - component: {fileID: 826586917723392204} - component: {fileID: 1954549762747143972} - component: {fileID: 2228057524689582266} + - component: {fileID: 4892270682288098217} m_Layer: 0 - m_Name: Bg + m_Name: ObjBg m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -791,7 +809,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -804,6 +822,22 @@ MonoBehaviour: y: 0 width: 1 height: 1 +--- !u!114 &4892270682288098217 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6704188004419676826} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0d51f3a7c41ab0346b49ae50d456bece, type: 3} + m_Name: + m_EditorClassIdentifier: + MarkType: 0 + CustomComponentName: + CustomComment: + mComponentName: UnityEngine.UI.RawImage --- !u!1 &6831573971870136393 GameObject: m_ObjectHideFlags: 0 @@ -967,8 +1001,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2922fa71b7d60e942b5b06b785dc37c0, type: 3} m_Name: m_EditorClassIdentifier: + Right: {fileID: 5964642934946449171} Scroll: {fileID: 4147329925826600491} Content: {fileID: 7417210800730282872} + ObjBg: {fileID: 2228057524689582266} DeviceRawImage: {fileID: 7397484820841873523} ItemPrefab: {fileID: 1826394720132835709} --- !u!1 &7986150287571393044 diff --git a/Assets/Art/UIPrefab/UIBackPack.prefab b/Assets/Art/UIPrefab/UIBackPack.prefab new file mode 100644 index 00000000..bfdf34a8 --- /dev/null +++ b/Assets/Art/UIPrefab/UIBackPack.prefab @@ -0,0 +1,1293 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &865389473552926307 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8469335301577901446} + - component: {fileID: 720179284218664828} + - component: {fileID: 8627238894211572052} + - component: {fileID: 5534949437245616353} + m_Layer: 0 + m_Name: Viewport + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8469335301577901446 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 865389473552926307} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1989947853826432621} + m_Father: {fileID: 1044310049044569993} + 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: 0} + m_SizeDelta: {x: 0, y: -17} + m_Pivot: {x: 0, y: 1} +--- !u!222 &720179284218664828 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 865389473552926307} + m_CullTransparentMesh: 1 +--- !u!114 &8627238894211572052 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 865389473552926307} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &5534949437245616353 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 865389473552926307} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 +--- !u!1 &915435281130992246 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1179437840221257607} + - component: {fileID: 5993226364604944433} + - component: {fileID: 7589938469968452857} + m_Layer: 0 + m_Name: CurSelect + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1179437840221257607 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 915435281130992246} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 754347308026317973} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 95, y: 95} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5993226364604944433 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 915435281130992246} + m_CullTransparentMesh: 1 +--- !u!114 &7589938469968452857 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 915435281130992246} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 08b0c37e0d92e4e42b0fe3be81ad0074, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1500130395211906341 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9218867318420357793} + - component: {fileID: 1831670476936566405} + - component: {fileID: 1965798369331663024} + - component: {fileID: 7103229461446632614} + m_Layer: 0 + m_Name: bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9218867318420357793 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1500130395211906341} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1044310049044569993} + m_Father: {fileID: 8884541322144313253} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 111.5, y: 0} + m_SizeDelta: {x: 223, y: 653} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1831670476936566405 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1500130395211906341} + m_CullTransparentMesh: 1 +--- !u!114 &1965798369331663024 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1500130395211906341} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: b1a4b3d0c79a92441b20bcde609ea123, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &7103229461446632614 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1500130395211906341} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0d51f3a7c41ab0346b49ae50d456bece, type: 3} + m_Name: + m_EditorClassIdentifier: + MarkType: 0 + CustomComponentName: bg + CustomComment: + mComponentName: UnityEngine.UI.Image +--- !u!1 &2569260798568207873 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1044310049044569993} + - component: {fileID: 8745459931871036108} + - component: {fileID: 254227601228506374} + - component: {fileID: 1040135018577296874} + - component: {fileID: 7356074359862289526} + m_Layer: 0 + m_Name: Scroll + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1044310049044569993 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2569260798568207873} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8469335301577901446} + m_Father: {fileID: 9218867318420357793} + 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: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8745459931871036108 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2569260798568207873} + m_CullTransparentMesh: 1 +--- !u!114 &254227601228506374 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2569260798568207873} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &1040135018577296874 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2569260798568207873} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 1989947853826432621} + m_Horizontal: 0 + m_Vertical: 1 + m_MovementType: 1 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 1 + m_Viewport: {fileID: 8469335301577901446} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 0} + m_HorizontalScrollbarVisibility: 2 + m_VerticalScrollbarVisibility: 2 + m_HorizontalScrollbarSpacing: -3 + m_VerticalScrollbarSpacing: -3 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &7356074359862289526 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2569260798568207873} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0d51f3a7c41ab0346b49ae50d456bece, type: 3} + m_Name: + m_EditorClassIdentifier: + MarkType: 0 + CustomComponentName: + CustomComment: + mComponentName: UnityEngine.UI.ScrollRect +--- !u!1 &2662000469537181459 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2689415831119182590} + - component: {fileID: 3273573817221224419} + - component: {fileID: 6436825421739101952} + m_Layer: 0 + m_Name: Selected + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &2689415831119182590 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2662000469537181459} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4298471471318501847} + 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: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3273573817221224419 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2662000469537181459} + m_CullTransparentMesh: 1 +--- !u!114 &6436825421739101952 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2662000469537181459} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\u5DF2\u4F7F\u7528" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: e7da174c677019b49aa681250aa4ded8, type: 2} + m_sharedMaterial: {fileID: -7878122246201655599, guid: e7da174c677019b49aa681250aa4ded8, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294638327 + m_fontColor: {r: 0.96862745, g: 0.98039216, b: 0.98039216, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 14 + m_fontSizeBase: 14 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 2048 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: -33.94 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &4015016748535796567 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1989947853826432621} + - component: {fileID: 5912537021221064421} + - component: {fileID: 3560637060377120700} + - component: {fileID: 3136112080371682209} + m_Layer: 0 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1989947853826432621 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4015016748535796567} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8469335301577901446} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0.00082623755} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!114 &5912537021221064421 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4015016748535796567} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 17 + m_Right: 5 + m_Top: 27 + m_Bottom: 60 + m_ChildAlignment: 0 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 95, y: 95} + m_Spacing: {x: 3, y: 26.52} + m_Constraint: 0 + m_ConstraintCount: 2 +--- !u!114 &3560637060377120700 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4015016748535796567} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0d51f3a7c41ab0346b49ae50d456bece, type: 3} + m_Name: + m_EditorClassIdentifier: + MarkType: 0 + CustomComponentName: Content + CustomComment: + mComponentName: RectTransform +--- !u!114 &3136112080371682209 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4015016748535796567} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 +--- !u!1 &4624701333271542154 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2829940346850861066} + m_Layer: 0 + m_Name: Prefabs + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &2829940346850861066 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4624701333271542154} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 754347308026317973} + m_Father: {fileID: 8884541322144313253} + 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: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &4921407662715934933 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4298471471318501847} + - component: {fileID: 4876354504712037638} + - component: {fileID: 500444381068990267} + m_Layer: 0 + m_Name: Icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4298471471318501847 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4921407662715934933} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1359517404646008911} + - {fileID: 8432229706393150763} + - {fileID: 2689415831119182590} + m_Father: {fileID: 8156089695026575318} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 76, y: 76} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4876354504712037638 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4921407662715934933} + m_CullTransparentMesh: 1 +--- !u!114 &500444381068990267 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4921407662715934933} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &4927632029027464854 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 754347308026317973} + - component: {fileID: 1414729062474568754} + - component: {fileID: 261913458870464226} + - component: {fileID: 3997541015826516678} + - component: {fileID: 2942751017101116083} + - component: {fileID: 852343187983825115} + m_Layer: 0 + m_Name: ItemPrefab + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &754347308026317973 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4927632029027464854} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1179437840221257607} + - {fileID: 8156089695026575318} + - {fileID: 2858233519595284804} + m_Father: {fileID: 2829940346850861066} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 95, y: 95} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1414729062474568754 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4927632029027464854} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 3997541015826516678} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!222 &261913458870464226 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4927632029027464854} + m_CullTransparentMesh: 1 +--- !u!114 &3997541015826516678 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4927632029027464854} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &2942751017101116083 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4927632029027464854} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0d51f3a7c41ab0346b49ae50d456bece, type: 3} + m_Name: + m_EditorClassIdentifier: + MarkType: 0 + CustomComponentName: ItemPrefab + CustomComment: + mComponentName: UnityEngine.UI.Button +--- !u!114 &852343187983825115 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4927632029027464854} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 456e447344348cf4680f6e09405e7b79, type: 3} + m_Name: + m_EditorClassIdentifier: + objs: + - {fileID: 915435281130992246} +--- !u!1 &6509165694814418320 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2858233519595284804} + - component: {fileID: 7470382041958119283} + - component: {fileID: 6908862309512493659} + m_Layer: 0 + m_Name: Name + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2858233519595284804 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6509165694814418320} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 754347308026317973} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: -15.4} + m_SizeDelta: {x: 0, y: 19.2425} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7470382041958119283 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6509165694814418320} + m_CullTransparentMesh: 1 +--- !u!114 &6908862309512493659 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6509165694814418320} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: e7da174c677019b49aa681250aa4ded8, type: 2} + m_sharedMaterial: {fileID: -7878122246201655599, guid: e7da174c677019b49aa681250aa4ded8, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294638327 + m_fontColor: {r: 0.96862745, g: 0.98039216, b: 0.98039216, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 14 + m_fontSizeBase: 14 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 2048 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: -33.94 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &8227249053242976169 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8884541322144313253} + - component: {fileID: -9076045857728266771} + m_Layer: 0 + m_Name: UIBackPack + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8884541322144313253 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8227249053242976169} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 9218867318420357793} + - {fileID: 2829940346850861066} + m_Father: {fileID: 0} + 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: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &-9076045857728266771 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8227249053242976169} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 10936952f7d03a849933486ae2d33b90, type: 3} + m_Name: + m_EditorClassIdentifier: + bg: {fileID: 1965798369331663024} + Scroll: {fileID: 1040135018577296874} + Content: {fileID: 1989947853826432621} + ItemPrefab: {fileID: 1414729062474568754} +--- !u!1 &8334247972244847875 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8156089695026575318} + - component: {fileID: 6830142910111002741} + - component: {fileID: 8183087573598537193} + m_Layer: 0 + m_Name: IconBg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8156089695026575318 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8334247972244847875} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4298471471318501847} + m_Father: {fileID: 754347308026317973} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 76, y: 76} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6830142910111002741 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8334247972244847875} + m_CullTransparentMesh: 1 +--- !u!114 &8183087573598537193 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8334247972244847875} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.07058824, g: 0.15686275, b: 0.19607843, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8582824004095176519 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8432229706393150763} + - component: {fileID: 7998702343858188311} + - component: {fileID: 4826648473444851839} + m_Layer: 0 + m_Name: Wrong + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &8432229706393150763 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8582824004095176519} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4298471471318501847} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -14, y: 14} + m_SizeDelta: {x: 28, y: 28} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7998702343858188311 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8582824004095176519} + m_CullTransparentMesh: 1 +--- !u!114 &4826648473444851839 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8582824004095176519} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 776de2f20acf6494b81cfcfdc56dc29c, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8839473401389748479 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1359517404646008911} + - component: {fileID: 8909650154369111679} + - component: {fileID: 5855586488784585236} + m_Layer: 0 + m_Name: Right + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1359517404646008911 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8839473401389748479} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4298471471318501847} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -14, y: 14} + m_SizeDelta: {x: 28, y: 28} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8909650154369111679 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8839473401389748479} + m_CullTransparentMesh: 1 +--- !u!114 &5855586488784585236 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8839473401389748479} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 23fb7ce8987cef54f971e40ccf40c9a0, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 diff --git a/Assets/Art/UIPrefab/UIBackPack.prefab.meta b/Assets/Art/UIPrefab/UIBackPack.prefab.meta new file mode 100644 index 00000000..c209f726 --- /dev/null +++ b/Assets/Art/UIPrefab/UIBackPack.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 310f51a2e0ce8db40b698f99e78ae145 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: uibackpack_prefab + assetBundleVariant: diff --git a/Assets/Art/UIPrefab/UITextTip.prefab b/Assets/Art/UIPrefab/UITextTip.prefab index 0055e7f4..47cee5b6 100644 --- a/Assets/Art/UIPrefab/UITextTip.prefab +++ b/Assets/Art/UIPrefab/UITextTip.prefab @@ -460,6 +460,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5ed9b43aa6da2fd49af65b4ab0b85fc2, type: 3} m_Name: m_EditorClassIdentifier: + Mask: {fileID: 1168405647267019539} Title: {fileID: 3613689092755446169} Des: {fileID: 5150898215778594440} BtnContent: {fileID: 8598386973860236803} @@ -626,6 +627,7 @@ GameObject: - component: {fileID: 7621766697555444520} - component: {fileID: 5831602004918006429} - component: {fileID: 1168405647267019539} + - component: {fileID: 6844797422068731548} m_Layer: 5 m_Name: Mask m_TagString: Untagged @@ -692,6 +694,22 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &6844797422068731548 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4085354983340029108} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0d51f3a7c41ab0346b49ae50d456bece, type: 3} + m_Name: + m_EditorClassIdentifier: + MarkType: 0 + CustomComponentName: + CustomComment: + mComponentName: UnityEngine.UI.Image --- !u!1 &4287411951672065129 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Art/UIPrefab/UITools.prefab b/Assets/Art/UIPrefab/UITools.prefab index afe4cab3..46e40b08 100644 --- a/Assets/Art/UIPrefab/UITools.prefab +++ b/Assets/Art/UIPrefab/UITools.prefab @@ -51,6 +51,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: answers: [] + bg: {fileID: 2575765536656914917} Scroll: {fileID: 3666318679728618663} Content: {fileID: 8229723427790603414} ItemPrefab: {fileID: 3266964766418377106} @@ -870,6 +871,7 @@ GameObject: - component: {fileID: 4604846658045866225} - component: {fileID: 7995524027316056123} - component: {fileID: 2575765536656914917} + - component: {fileID: 7995406576721174090} m_Layer: 0 m_Name: bg m_TagString: Untagged @@ -892,10 +894,17 @@ RectTransform: - {fileID: 9189599814967438796} m_Father: {fileID: 4477385101412774245} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +<<<<<<< HEAD m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} m_AnchoredPosition: {x: -179.30054, y: 0} m_SizeDelta: {x: 315.6011, y: 653} +======= + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 111.5, y: 0} + m_SizeDelta: {x: 223, y: 653} +>>>>>>> origin/master m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7995524027316056123 CanvasRenderer: @@ -935,6 +944,22 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &7995406576721174090 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3256755621147846471} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0d51f3a7c41ab0346b49ae50d456bece, type: 3} + m_Name: + m_EditorClassIdentifier: + MarkType: 0 + CustomComponentName: bg + CustomComment: + mComponentName: UnityEngine.UI.Image --- !u!1 &3509989120642977392 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/HighlightPlus/Runtime/Scripts/HighlightTrigger.cs b/Assets/HighlightPlus/Runtime/Scripts/HighlightTrigger.cs index a8c12a15..ae7d6125 100644 --- a/Assets/HighlightPlus/Runtime/Scripts/HighlightTrigger.cs +++ b/Assets/HighlightPlus/Runtime/Scripts/HighlightTrigger.cs @@ -306,8 +306,6 @@ namespace HighlightPlus { if (isActiveAndEnabled && triggerMode == TriggerMode.ColliderEventsOnlyOnThisObject) { if (!CanInteract()) return; - Debug.Log("进入"); - hb.outline = 1; Highlight(true); } } @@ -317,8 +315,6 @@ namespace HighlightPlus { if (isActiveAndEnabled && triggerMode == TriggerMode.ColliderEventsOnlyOnThisObject) { if (!CanInteract()) return; - Debug.Log("退出"); - hb.outline = 1; Highlight(false); } } diff --git a/Assets/Plugins/System.Windows.Forms.dll b/Assets/Plugins/System.Windows.Forms.dll deleted file mode 100644 index 3a6eff82..00000000 Binary files a/Assets/Plugins/System.Windows.Forms.dll and /dev/null differ diff --git a/Assets/Plugins/System.Windows.Forms.dll.meta b/Assets/Plugins/System.Windows.Forms.dll.meta deleted file mode 100644 index 278d5520..00000000 --- a/Assets/Plugins/System.Windows.Forms.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 82549cd4bc10d654d876aaf0f7f4b64d -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/QFramework/Toolkits/_CoreKit/ActionKit/Scripts/Utility/Utility.cs b/Assets/QFramework/Toolkits/_CoreKit/ActionKit/Scripts/Utility/Utility.cs index 6ff7d928..359c8d97 100644 --- a/Assets/QFramework/Toolkits/_CoreKit/ActionKit/Scripts/Utility/Utility.cs +++ b/Assets/QFramework/Toolkits/_CoreKit/ActionKit/Scripts/Utility/Utility.cs @@ -411,5 +411,16 @@ public class Utility } } - + // 使用Unity的Random实现洗牌 + public static void Shuffle(IList list) + { + int n = list.Count; + for (int i = n - 1; i > 0; i--) + { + int j = UnityEngine.Random.Range(0, i + 1); + T temp = list[i]; + list[i] = list[j]; + list[j] = temp; + } + } } \ No newline at end of file diff --git a/Assets/Scripts/Actions/ActionHelper.cs b/Assets/Scripts/Actions/ActionHelper.cs index 0db5a7fc..aab8dd92 100644 --- a/Assets/Scripts/Actions/ActionHelper.cs +++ b/Assets/Scripts/Actions/ActionHelper.cs @@ -118,6 +118,11 @@ public class ActionHelper var strAction = (XMLTool.DictionaryAction)act; return UIToolsAction.Allocate(strAction.args); } + case "UIBackPack": + { + var strAction = (XMLTool.DictionaryAction)act; + return UIBackPackAction.Allocate(strAction.args); + } case "PointQuestion": return PointQuestionAction.Allocate(act.Value); case "Point3DQuestion": diff --git a/Assets/Scripts/Actions/AnimationAction.cs b/Assets/Scripts/Actions/AnimationAction.cs index fd96f1ee..af81c646 100644 --- a/Assets/Scripts/Actions/AnimationAction.cs +++ b/Assets/Scripts/Actions/AnimationAction.cs @@ -79,8 +79,9 @@ namespace QFramework int.TryParse(frame, out curFrame); anim.clip = anim[animName].clip; anim[animName].time = curFrame / anim.clip.frameRate; - anim[animName].speed = 0; anim.Play(animName); + anim[animName].speed = 0; + anim.Sample(); this.Finish(); } else diff --git a/Assets/Scripts/Actions/TextTipAction.cs b/Assets/Scripts/Actions/TextTipAction.cs index 4fb06b14..2ed2e770 100644 --- a/Assets/Scripts/Actions/TextTipAction.cs +++ b/Assets/Scripts/Actions/TextTipAction.cs @@ -53,6 +53,15 @@ public class TextTipAction : IAction data.audio = datas.ContainsKey("audio") ? datas["audio"] : string.Empty; data.title = datas.ContainsKey("title") ? datas["title"] : string.Empty; data.btns = datas.ContainsKey("btns") ? datas["btns"].Split(',').ToList() : null; + if (datas.ContainsKey("alpha")) + { + if (float.TryParse(datas["alpha"], out data.alpha) == false) + { + data.alpha = 0; + } + } + + UIKit.OpenPanelAsync(uiData: data, canvasLevel: UILevel.PopUI).ToAction().StartGlobal(() => this.Finish()); } diff --git a/Assets/Scripts/Actions/UIBackPackAction.cs b/Assets/Scripts/Actions/UIBackPackAction.cs new file mode 100644 index 00000000..173a1017 --- /dev/null +++ b/Assets/Scripts/Actions/UIBackPackAction.cs @@ -0,0 +1,74 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using QFramework; +using System; +using QFramework.Example; +using System.Linq; +public class UIBackPackAction : IAction +{ + public ulong ActionID { get; set; } + public bool Deinited { get; set; } + public bool Paused { get; set; } + public ActionStatus Status { get; set; } + + private static readonly SimpleObjectPool mPool = + new SimpleObjectPool(() => new UIBackPackAction(), null, 10); + string devices; + string random; + string scrollSpeed; + string position; + public static UIBackPackAction Allocate(Dictionary datas, System.Action onDelayFinish = null) + { + var retNode = mPool.Allocate(); + retNode.ActionID = ActionKit.ID_GENERATOR++; + retNode.Deinited = false; + retNode.Reset(); + retNode.devices = datas.ContainsKey("devices") ? datas["devices"] : ""; + retNode.random = datas.ContainsKey("random") ? datas["random"] : ""; + retNode.scrollSpeed = datas.ContainsKey("scrollSpeed") ? datas["scrollSpeed"] : ""; + retNode.position = datas.ContainsKey("position") ? datas["position"] : ""; + return retNode; + } + + + + public void Deinit() + { + if (!Deinited) + { + Deinited = true; + mPool.Recycle(this); + } + } + + public void OnExecute(float dt) + { + } + + public void OnFinish() + { + } + + public void OnStart() + { + UIBackPackData data = new UIBackPackData(); + data.devices = devices.Split(',').ToList(); + if (bool.TryParse(random, out data.random) == false) + { + data.random = false; + } + if (float.TryParse(scrollSpeed, out data.scrollSpeed) == false) + { + data.scrollSpeed = 25; + } + data.position = position; + UIKit.OpenPanelAsync(uiData: data, canvasLevel: UILevel.PopUI).ToAction().StartGlobal(() => this.Finish()); + } + + public void Reset() + { + Status = ActionStatus.NotStart; + Paused = false; + } +} diff --git a/Assets/Scripts/Actions/UIBackPackAction.cs.meta b/Assets/Scripts/Actions/UIBackPackAction.cs.meta new file mode 100644 index 00000000..7062f0c9 --- /dev/null +++ b/Assets/Scripts/Actions/UIBackPackAction.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e766ada0be55001488d4a5368bb7e63d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Actions/UIToolsAction.cs b/Assets/Scripts/Actions/UIToolsAction.cs index df5ebfab..b230c731 100644 --- a/Assets/Scripts/Actions/UIToolsAction.cs +++ b/Assets/Scripts/Actions/UIToolsAction.cs @@ -26,6 +26,9 @@ public class UIToolsAction : IAction string totalScore; string scoreStepName; string autoHide; + string random; + string scrollSpeed; + string position; public static UIToolsAction Allocate(Dictionary datas, System.Action onDelayFinish = null) { var retNode = mPool.Allocate(); @@ -44,6 +47,9 @@ public class UIToolsAction : IAction retNode.totalScore = datas.ContainsKey("totalScore") ? datas["totalScore"] : ""; retNode.scoreStepName = datas.ContainsKey("scoreStepName") ? datas["scoreStepName"] : ""; retNode.autoHide = datas.ContainsKey("autoHide") ? datas["autoHide"] : ""; + retNode.random = datas.ContainsKey("random") ? datas["random"] : ""; + retNode.scrollSpeed = datas.ContainsKey("scrollSpeed") ? datas["scrollSpeed"] : ""; + retNode.position = datas.ContainsKey("position") ? datas["position"] : ""; return retNode; } @@ -80,10 +86,20 @@ public class UIToolsAction : IAction float.TryParse(totalScore, out data.totalScore); data.scoreStepName = scoreStepName; bool.TryParse(setActive, out data.SetActive); + if (bool.TryParse(random, out data.random) == false) + { + data.random = false; + } + if (float.TryParse(scrollSpeed, out data.scrollSpeed) == false) + { + data.scrollSpeed = 25; + } + if (float.TryParse(autoHide, out data.autoHideResult) == false) { data.autoHideResult = -1; } + data.position = position; UIKit.OpenPanelAsync(uiData: data, canvasLevel: UILevel.PopUI).ToAction().StartGlobal(() => this.Finish()); } diff --git a/Assets/Scripts/Item/DeviceItem.cs b/Assets/Scripts/Item/DeviceItem.cs index ec87a0f6..144067df 100644 --- a/Assets/Scripts/Item/DeviceItem.cs +++ b/Assets/Scripts/Item/DeviceItem.cs @@ -19,7 +19,6 @@ public class DeviceItem : MonoBehaviour var effect = gameObject.GetOrAddComponent(); gameObject.GetOrAddComponent(); //ȡxmlɫת - //effect.outline = 1; effect.outlineColor = Utility.ToColor(device.HighColor); StringEventSystem.Global.Register(Global.HighLightTrigger, OnHighLightTriggerEvent); TypeEventSystem.Global.Register(OnStepChanged); diff --git a/Assets/Scripts/Tools/AsposeHelper.cs b/Assets/Scripts/Tools/AsposeHelper.cs index f0bafae1..2fdf7b4a 100644 --- a/Assets/Scripts/Tools/AsposeHelper.cs +++ b/Assets/Scripts/Tools/AsposeHelper.cs @@ -1,17 +1,15 @@ using Aspose.Words; using Aspose.Words.Replacing; -using QFramework; -using System.IO; using UnityEngine; -using System.Windows.Forms; using Newtonsoft.Json.Linq; using System; +using System.IO; public class AsposeHelper : MonoBehaviour { - public static void Writer(string json, Action callback = null) + public static void Writer(string json, Action callback = null) { // Wordĵ Document doc = new Document(Global.reportDemoPath); @@ -24,25 +22,32 @@ public class AsposeHelper : MonoBehaviour string value = property.Value.ToString(); doc.Range.Replace($"{{{key}}}", $"{value}", new FindReplaceOptions()); } + + string filePath = ChinarFileController.SaveProject(Path.GetFileName(Global.reportDemoPath).Split('.')[1]); + if (string.IsNullOrEmpty(filePath) == false) + { + doc.Save(filePath); + } + callback?.Invoke(); // 滻ı - SaveWithDialog(doc, callback); + //SaveWithDialog(doc, callback); //Debug.Log("ĵɣĵѱ浽: " + outputFilePath); } - private static void SaveWithDialog(Document doc, Action callback) - { - SaveFileDialog dialog = new SaveFileDialog(); - dialog.Filter = "Wordĵ|*.docx"; - var result = dialog.ShowDialog(); - if (result == DialogResult.OK) - { - doc.Save(dialog.FileName); - } - callback?.Invoke(result); - } + //private static void SaveWithDialog(Document doc, Action callback) + //{ + // SaveFileDialog dialog = new SaveFileDialog(); + // dialog.Filter = "Wordĵ|*.docx"; + // var result = dialog.ShowDialog(); + // if (result == DialogResult.OK) + // { + // doc.Save(dialog.FileName); + // } + // callback?.Invoke(result); + //} } diff --git a/Assets/Scripts/Tools/ChinarFileController.cs b/Assets/Scripts/Tools/ChinarFileController.cs new file mode 100644 index 00000000..1e6c7dc0 --- /dev/null +++ b/Assets/Scripts/Tools/ChinarFileController.cs @@ -0,0 +1,65 @@ +using UnityEngine; +using System.Runtime.InteropServices; +using System; + + +/// +/// ļƽű +/// +public class ChinarFileController : MonoBehaviour +{ + /// + /// Ŀ + /// + public static string OpenProject() + { + string originalDir = Environment.CurrentDirectory; + string filepath = string.Empty; + OpenFileDlg pth = new OpenFileDlg(); + pth.structSize = Marshal.SizeOf(pth); + // ʽƳĩβߣ + //pth.filter = @"All Files (*.*)|*.jpg"; + pth.file = new string(new char[256]); + pth.maxFile = pth.file.Length; + pth.fileTitle = new string(new char[64]); + pth.maxFileTitle = pth.fileTitle.Length; + pth.initialDir = Application.dataPath.Replace("/", "\\") + "\\Resources"; + pth.title = "Ŀ"; + pth.defExt = "dat"; + // Flagsãؼѡ + pth.flags = 0x00080000 | 0x00001000 | 0x00000800; // OFN_EXPLORER | OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST + + if (OpenFileDialog.GetOpenFileName(pth)) + { + filepath = pth.file; + } + Environment.CurrentDirectory = originalDir; + return filepath; + } + + + /// + /// ļĿ + /// + public static string SaveProject(string ext) + { + string filepath = string.Empty; + SaveFileDlg pth = new SaveFileDlg(); + pth.structSize = Marshal.SizeOf(pth); + pth.filter = "All files (*.*)|*.*"; + pth.file = new string(new char[256]); + pth.maxFile = pth.file.Length; + pth.fileTitle = new string(new char[64]); + pth.maxFileTitle = pth.fileTitle.Length; + pth.initialDir = Application.dataPath; //Ĭ· + pth.title = "Ŀ"; + pth.defExt = ext; + pth.flags = 0x00080000 | 0x00001000 | 0x00000800 | 0x00000200 | 0x00000008; + if (SaveFileDialog.GetSaveFileName(pth)) + { + filepath = pth.file; //ѡļ·; + } + return filepath; + } +} + diff --git a/Assets/Scripts/Tools/ChinarFileController.cs.meta b/Assets/Scripts/Tools/ChinarFileController.cs.meta new file mode 100644 index 00000000..bf809f53 --- /dev/null +++ b/Assets/Scripts/Tools/ChinarFileController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6ff1bbdf3a991ec45bbf4e8be1ca5b91 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Tools/ChinarFileDlog.cs b/Assets/Scripts/Tools/ChinarFileDlog.cs new file mode 100644 index 00000000..607f0996 --- /dev/null +++ b/Assets/Scripts/Tools/ChinarFileDlog.cs @@ -0,0 +1,57 @@ +using System.Runtime.InteropServices; +using System; + + +/// +/// ļ־ +/// +// [(.,ַ=ַ.Զ)] +[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)] +public class ChinarFileDlog +{ + public int structSize = 0; + public IntPtr dlgOwner = IntPtr.Zero; + public IntPtr instance = IntPtr.Zero; + public String filter = null; + public String customFilter = null; + public int maxCustFilter = 0; + public int filterIndex = 0; + public String file = null; + public int maxFile = 0; + public String fileTitle = null; + public int maxFileTitle = 0; + public String initialDir = null; + public String title = null; + public int flags = 0; + public short fileOffset = 0; + public short fileExtension = 0; + public String defExt = null; + public IntPtr custData = IntPtr.Zero; + public IntPtr hook = IntPtr.Zero; + public String templateName = null; + public IntPtr reservedPtr = IntPtr.Zero; + public int reservedInt = 0; + public int flagsEx = 0; +} + +[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)] +public class OpenFileDlg : ChinarFileDlog +{ +} + +public class OpenFileDialog +{ + [DllImport("Comdlg32.dll", SetLastError = true, ThrowOnUnmappableChar = true, CharSet = CharSet.Auto)] + public static extern bool GetOpenFileName([In, Out] OpenFileDlg ofd); +} + +public class SaveFileDialog +{ + [DllImport("Comdlg32.dll", SetLastError = true, ThrowOnUnmappableChar = true, CharSet = CharSet.Auto)] + public static extern bool GetSaveFileName([In, Out] SaveFileDlg ofd); +} + +[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)] +public class SaveFileDlg : ChinarFileDlog +{ +} \ No newline at end of file diff --git a/Assets/Scripts/Tools/ChinarFileDlog.cs.meta b/Assets/Scripts/Tools/ChinarFileDlog.cs.meta new file mode 100644 index 00000000..8b41be2c --- /dev/null +++ b/Assets/Scripts/Tools/ChinarFileDlog.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9824f58b2cf6cc64ab2ef5d8ec6153b3 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/UI3DObjShow.Designer.cs b/Assets/Scripts/UI/UI3DObjShow.Designer.cs index 5c81badf..d47d23c8 100644 --- a/Assets/Scripts/UI/UI3DObjShow.Designer.cs +++ b/Assets/Scripts/UI/UI3DObjShow.Designer.cs @@ -5,16 +5,20 @@ using QFramework; namespace QFramework.Example { - // Generate Id:5590b0b6-d056-4a95-a14d-4e5b14aedaac + // Generate Id:1419ca94-de6c-4a9d-9a3d-b2f838aea3ba public partial class UI3DObjShow { public const string Name = "UI3DObjShow"; + [SerializeField] + public UnityEngine.UI.Image Right; [SerializeField] public UnityEngine.UI.ScrollRect Scroll; [SerializeField] public RectTransform Content; [SerializeField] + public UnityEngine.UI.RawImage ObjBg; + [SerializeField] public UnityEngine.UI.RawImage DeviceRawImage; [SerializeField] public UnityEngine.UI.Image ItemPrefab; @@ -23,8 +27,10 @@ namespace QFramework.Example protected override void ClearUIComponents() { + Right = null; Scroll = null; Content = null; + ObjBg = null; DeviceRawImage = null; ItemPrefab = null; diff --git a/Assets/Scripts/UI/UI3DObjShow.cs b/Assets/Scripts/UI/UI3DObjShow.cs index 8c01c049..c4058761 100644 --- a/Assets/Scripts/UI/UI3DObjShow.cs +++ b/Assets/Scripts/UI/UI3DObjShow.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using TMPro; using GCSeries.Core; using UnityEngine.EventSystems; +using System; namespace QFramework.Example { @@ -82,8 +83,14 @@ namespace QFramework.Example }); } - loader.LoadAsync(); + loader.LoadAsync(() => + { + Right.gameObject.SetActive(mData.datas.Count > 1); + Content.GetChild(0).GetComponent().isOn = true; + }); } + + protected override void OnShow() { } diff --git a/Assets/Scripts/UI/UIBackPack.Designer.cs b/Assets/Scripts/UI/UIBackPack.Designer.cs new file mode 100644 index 00000000..2b22ecd9 --- /dev/null +++ b/Assets/Scripts/UI/UIBackPack.Designer.cs @@ -0,0 +1,55 @@ +using System; +using UnityEngine; +using UnityEngine.UI; +using QFramework; + +namespace QFramework.Example +{ + // Generate Id:df731f7c-b33b-4edd-ac53-d859f4d06272 + public partial class UIBackPack + { + public const string Name = "UIBackPack"; + + [SerializeField] + public UnityEngine.UI.Image bg; + [SerializeField] + public UnityEngine.UI.ScrollRect Scroll; + [SerializeField] + public RectTransform Content; + [SerializeField] + public UnityEngine.UI.Button ItemPrefab; + + private UIBackPackData mPrivateData = null; + + protected override void ClearUIComponents() + { + bg = null; + Scroll = null; + Content = null; + ItemPrefab = null; + + mData = null; + } + + public UIBackPackData Data + { + get + { + return mData; + } + } + + UIBackPackData mData + { + get + { + return mPrivateData ?? (mPrivateData = new UIBackPackData()); + } + set + { + mUIData = value; + mPrivateData = value; + } + } + } +} diff --git a/Assets/Scripts/UI/UIBackPack.Designer.cs.meta b/Assets/Scripts/UI/UIBackPack.Designer.cs.meta new file mode 100644 index 00000000..52439300 --- /dev/null +++ b/Assets/Scripts/UI/UIBackPack.Designer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7c10e0cf42fc507478eb8da812616766 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/UIBackPack.cs b/Assets/Scripts/UI/UIBackPack.cs new file mode 100644 index 00000000..cfbb880b --- /dev/null +++ b/Assets/Scripts/UI/UIBackPack.cs @@ -0,0 +1,110 @@ +using UnityEngine; +using UnityEngine.UI; +using QFramework; +using System.Collections.Generic; +using TMPro; +using static OperationController; + +namespace QFramework.Example +{ + public class UIBackPackData : UIPanelData + { + public List devices; + public bool random = false; + public float scrollSpeed = 25; + public string position; + } + public partial class UIBackPack : UIPanel + { + ResLoader mResLoader; + protected override void OnInit(IUIData uiData = null) + { + mData = uiData as UIBackPackData ?? new UIBackPackData(); + mResLoader = ResLoader.Allocate(); + TypeEventSystem.Global.Register(OnModuleQuit).UnRegisterWhenGameObjectDestroyed(gameObject); + // please add init code here + } + + protected override void OnOpen(IUIData uiData = null) + { + Content.RemoveAllChildren(); + + foreach (var device in mData.devices) + { + var item = DeviceController.Instance.GetDevice(device); + if (item == null) + { + Debug.LogError(device + ":ûҵӦDevice"); + return; + } + GameObject obj = GameObject.Instantiate(ItemPrefab.gameObject, Content); + obj.name = item.Name; + obj.transform.Find("Name").GetComponent().text = item.Name; + Image icon = obj.transform.Find("IconBg/Icon").GetComponent(); + var localImageUrl = Global.deviceIconsPath + item.Icon; + GameObject right = icon.transform.Find("Right").gameObject; + GameObject wrong = icon.transform.Find("Wrong").gameObject; + GameObject Selected = icon.transform.Find("Selected").gameObject; + mResLoader.Add2Load(localImageUrl.ToNetImageResName(), + (bool success, IRes res) => + { + if (success) + { + icon.sprite = Utility.GetSprite(res.Asset as Texture2D); + } + }); + Button btn = obj.GetComponent