diff --git a/Assets/Res/language/language.json b/Assets/Res/language/language.json index dfc30ea..619e5d8 100644 --- a/Assets/Res/language/language.json +++ b/Assets/Res/language/language.json @@ -586,8 +586,8 @@ }, { "key": "100118", - "zh": "Visual Aid", - "en": "Person & Pet Detection" + "zh": "视觉辅助", + "en": "Visual Aid" }, { "key": "100119", diff --git a/Assets/Res/ui/homepage/homePage.prefab b/Assets/Res/ui/homepage/homePage.prefab index 5f4a59d..b74a9bb 100644 --- a/Assets/Res/ui/homepage/homePage.prefab +++ b/Assets/Res/ui/homepage/homePage.prefab @@ -360,9 +360,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 4568515400396789170} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 55, y: -20} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 40} m_Pivot: {x: 0, y: 0.5} --- !u!222 &244985182926712396 @@ -2615,6 +2615,7 @@ GameObject: - component: {fileID: 2522958872087521260} - component: {fileID: 5707581869988270634} - component: {fileID: 5110207866664163532} + - component: {fileID: 2472106093602191441} m_Layer: 5 m_Name: Button m_TagString: Untagged @@ -2633,13 +2634,14 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 4549641389805951800} m_Father: {fileID: 8329422327455280038} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} m_AnchoredPosition: {x: -24, y: 0} - m_SizeDelta: {x: 61, y: 61} + m_SizeDelta: {x: 80, y: 80} m_Pivot: {x: 1, y: 0.5} --- !u!222 &2522958872087521260 CanvasRenderer: @@ -2669,7 +2671,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a5d8f0e5437461b4abf22cf27c34ba6d, type: 3} + m_Sprite: {fileID: 21300000, guid: a41dd79bd2d21cb4ea440482fe486c1b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2723,6 +2725,23 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!111 &2472106093602191441 +Animation: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1528268016797059463} + m_Enabled: 1 + serializedVersion: 3 + m_Animation: {fileID: 0} + m_Animations: + - {fileID: 7400000, guid: 5019704754ed30848b6ee9a49de93b33, type: 2} + - {fileID: 7400000, guid: 5fab539a4ce44fb469fbaf4b4c892c08, type: 2} + m_WrapMode: 0 + m_PlayAutomatically: 0 + m_AnimatePhysics: 0 + m_CullingType: 0 --- !u!1 &1576138000093902441 GameObject: m_ObjectHideFlags: 0 @@ -4321,6 +4340,82 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 +--- !u!1 &2072789493408150862 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4549641389805951800} + - component: {fileID: 1336686806192021963} + - component: {fileID: 5806023291857184733} + m_Layer: 5 + m_Name: "\u9501\u8EAB" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4549641389805951800 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2072789493408150862} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.2, y: 1.2, z: 1.2} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7301429371568280684} + m_Father: {fileID: 4918584386673552785} + 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: -4} + m_SizeDelta: {x: 23, y: 16} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1336686806192021963 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2072789493408150862} + m_CullTransparentMesh: 1 +--- !u!114 &5806023291857184733 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2072789493408150862} + 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: 6e746ec12e0581e488ee439466ced117, 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 &2156901436133826188 GameObject: m_ObjectHideFlags: 0 @@ -5321,10 +5416,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 1846093831662304367} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 120, y: 10} - m_SizeDelta: {x: 36, y: 45} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 45} m_Pivot: {x: 0.5, y: 1} --- !u!222 &3749378162026232689 CanvasRenderer: @@ -5662,10 +5757,10 @@ RectTransform: - {fileID: 4929160862756643459} m_Father: {fileID: 1069437048745146005} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 6, y: -35.5} - m_SizeDelta: {x: 155.5, y: 60} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 60} m_Pivot: {x: 0, y: 0.5} --- !u!222 &6545400438610870076 CanvasRenderer: @@ -7453,10 +7548,10 @@ RectTransform: - {fileID: 327602628975355249} m_Father: {fileID: 1069437048745146005} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 472.5, y: -35.5} - m_SizeDelta: {x: 155.5, y: 60} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 60} m_Pivot: {x: 0, y: 0.5} --- !u!222 &1430460842267038712 CanvasRenderer: @@ -8416,10 +8511,10 @@ RectTransform: - {fileID: 1666632072748462393} m_Father: {fileID: 3113186033587881318} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 79.875, y: -55.5} - m_SizeDelta: {x: 159.75, y: 111} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 111} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1208559727036824385 CanvasRenderer: @@ -9017,10 +9112,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 4568515400396789170} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 20, y: -20} - m_SizeDelta: {x: 40, y: 40} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5333284508431453442 CanvasRenderer: @@ -9763,10 +9858,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 4568515400396789170} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 70, y: -20} - m_SizeDelta: {x: 36, y: 36} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 36} m_Pivot: {x: 0, y: 0.5} --- !u!222 &2163933620157744377 CanvasRenderer: @@ -11132,10 +11227,10 @@ RectTransform: - {fileID: 2975297560480716843} m_Father: {fileID: 1069437048745146005} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 317, y: -35.5} - m_SizeDelta: {x: 155.5, y: 60} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 60} m_Pivot: {x: 0, y: 0.5} --- !u!222 &1781978324875051918 CanvasRenderer: @@ -12000,10 +12095,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 1846093831662304367} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 51, y: 10} - m_SizeDelta: {x: 102, y: 45} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 45} m_Pivot: {x: 0.5, y: 1} --- !u!222 &1255502245993973393 CanvasRenderer: @@ -13000,10 +13095,10 @@ RectTransform: - {fileID: 6020472513220436764} m_Father: {fileID: 1069437048745146005} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 161.5, y: -35.5} - m_SizeDelta: {x: 155.5, y: 60} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 60} m_Pivot: {x: 0, y: 0.5} --- !u!222 &7222490346232352863 CanvasRenderer: @@ -13839,10 +13934,10 @@ RectTransform: - {fileID: 3973224289061388720} m_Father: {fileID: 3113186033587881318} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 256.625, y: -55.5} - m_SizeDelta: {x: 159.75, y: 111} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 111} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5747587932164273453 CanvasRenderer: @@ -14252,6 +14347,81 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: textKey: 100091 +--- !u!1 &7520608409584025081 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7301429371568280684} + - component: {fileID: 3467792466590047464} + - component: {fileID: 8598241692950229233} + m_Layer: 5 + m_Name: "\u9501\u5934" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7301429371568280684 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7520608409584025081} + 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: 4549641389805951800} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 6.0000095, y: -1} + m_SizeDelta: {x: 15, y: 10} + m_Pivot: {x: 0.9, y: 0} +--- !u!222 &3467792466590047464 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7520608409584025081} + m_CullTransparentMesh: 1 +--- !u!114 &8598241692950229233 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7520608409584025081} + 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: d681360ee4eab174f9a05f3ce1d1575b, 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 &7568027519537787283 GameObject: m_ObjectHideFlags: 0 @@ -15123,7 +15293,6 @@ MonoBehaviour: tipPoint: {fileID: 81902936719861509} setWifiPage: {fileID: 8038532572982553104, guid: e7ef5081212dfe9469c40678baa2b0ac, type: 3} - scrollRect: {fileID: 7398385099859628837} --- !u!1 &8115864904787809625 GameObject: m_ObjectHideFlags: 0 @@ -15143,7 +15312,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &7190469845234229913 RectTransform: m_ObjectHideFlags: 0 @@ -15809,10 +15978,10 @@ RectTransform: - {fileID: 4828275562546024043} m_Father: {fileID: 3113186033587881318} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 433.375, y: -55.5} - m_SizeDelta: {x: 159.75, y: 111} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 111} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2323428145332649792 CanvasRenderer: @@ -16170,8 +16339,8 @@ RectTransform: 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: -718} - m_SizeDelta: {x: -60, y: 90} + m_AnchoredPosition: {x: 0, y: -708} + m_SizeDelta: {x: -60, y: 100} m_Pivot: {x: 0.5, y: 1} --- !u!222 &3725448806178526700 CanvasRenderer: @@ -16234,8 +16403,9 @@ MonoBehaviour: - {fileID: 8380278350344021491} deviceCtrlIcon: {fileID: 5707581869988270634} deviceCtrlIconSprites: - - {fileID: 21300000, guid: 270b7498d8c874846a217490545c892e, type: 3} - - {fileID: 21300000, guid: 2c5e038c22ef43e48973192016a329d0, type: 3} + - {fileID: 21300000, guid: a41dd79bd2d21cb4ea440482fe486c1b, type: 3} + - {fileID: 21300000, guid: 72ba6b45a4eaf984ca833c9496fdc5f8, type: 3} + lockImage: {fileID: 7520608409584025081} valueColors: - {r: 0.6156863, g: 0.6117647, b: 0.61960787, a: 1} - {r: 0.18039216, g: 1, b: 0.88235295, a: 1} @@ -17713,10 +17883,10 @@ RectTransform: - {fileID: 1538898088399718538} m_Father: {fileID: 3113186033587881318} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 610.125, y: -55.5} - m_SizeDelta: {x: 159.75, y: 111} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 111} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4295980959046441324 CanvasRenderer: diff --git a/Assets/Res/ui/homepage/texture/关闭 (1).png b/Assets/Res/ui/homepage/texture/关闭 (1).png deleted file mode 100644 index 7eeda49..0000000 Binary files a/Assets/Res/ui/homepage/texture/关闭 (1).png and /dev/null differ diff --git a/Assets/Res/ui/homepage/texture/关闭.png b/Assets/Res/ui/homepage/texture/关闭.png deleted file mode 100644 index fc86609..0000000 Binary files a/Assets/Res/ui/homepage/texture/关闭.png and /dev/null differ diff --git a/Assets/Res/ui/homepage/texture/锁头.png b/Assets/Res/ui/homepage/texture/锁头.png new file mode 100644 index 0000000..174f7fc Binary files /dev/null and b/Assets/Res/ui/homepage/texture/锁头.png differ diff --git a/Assets/Res/ui/homepage/texture/关闭.png.meta b/Assets/Res/ui/homepage/texture/锁头.png.meta similarity index 98% rename from Assets/Res/ui/homepage/texture/关闭.png.meta rename to Assets/Res/ui/homepage/texture/锁头.png.meta index 6751585..cd42b1c 100644 --- a/Assets/Res/ui/homepage/texture/关闭.png.meta +++ b/Assets/Res/ui/homepage/texture/锁头.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a5d8f0e5437461b4abf22cf27c34ba6d +guid: d681360ee4eab174f9a05f3ce1d1575b TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Res/ui/homepage/texture/锁身.png b/Assets/Res/ui/homepage/texture/锁身.png new file mode 100644 index 0000000..4d0cb04 Binary files /dev/null and b/Assets/Res/ui/homepage/texture/锁身.png differ diff --git a/Assets/Res/ui/homepage/texture/锁身.png.meta b/Assets/Res/ui/homepage/texture/锁身.png.meta new file mode 100644 index 0000000..b12e291 --- /dev/null +++ b/Assets/Res/ui/homepage/texture/锁身.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 6e746ec12e0581e488ee439466ced117 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Res/ui/homepage/关闭 (1).png b/Assets/Res/ui/homepage/关闭 (1).png new file mode 100644 index 0000000..650b52a Binary files /dev/null and b/Assets/Res/ui/homepage/关闭 (1).png differ diff --git a/Assets/Res/ui/homepage/texture/关闭 (1).png.meta b/Assets/Res/ui/homepage/关闭 (1).png.meta similarity index 98% rename from Assets/Res/ui/homepage/texture/关闭 (1).png.meta rename to Assets/Res/ui/homepage/关闭 (1).png.meta index 4ef4c87..37d66f7 100644 --- a/Assets/Res/ui/homepage/texture/关闭 (1).png.meta +++ b/Assets/Res/ui/homepage/关闭 (1).png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2736dafec7d1ffd49b8312e35504a511 +guid: a41dd79bd2d21cb4ea440482fe486c1b TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Res/ui/homepage/关闭 (2).png b/Assets/Res/ui/homepage/关闭 (2).png new file mode 100644 index 0000000..7143cad Binary files /dev/null and b/Assets/Res/ui/homepage/关闭 (2).png differ diff --git a/Assets/Res/ui/homepage/关闭 (2).png.meta b/Assets/Res/ui/homepage/关闭 (2).png.meta new file mode 100644 index 0000000..88dbe0d --- /dev/null +++ b/Assets/Res/ui/homepage/关闭 (2).png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 72ba6b45a4eaf984ca833c9496fdc5f8 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Res/ui/safetylearningpage/safetylearningPage.prefab b/Assets/Res/ui/safetylearningpage/safetylearningPage.prefab index aceba2b..dd75a83 100644 --- a/Assets/Res/ui/safetylearningpage/safetylearningPage.prefab +++ b/Assets/Res/ui/safetylearningpage/safetylearningPage.prefab @@ -959,7 +959,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8382277429442476649 RectTransform: m_ObjectHideFlags: 0 @@ -1127,10 +1127,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 117609739584280572} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 85.71515, y: -25} - m_SizeDelta: {x: 7.3818183, y: 24.606062} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &675289110399218761 CanvasRenderer: @@ -1295,7 +1295,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &6417805335571029577 RectTransform: m_ObjectHideFlags: 0 @@ -1938,10 +1938,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 117609739584280572} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 117.70303, y: -25} - m_SizeDelta: {x: 56.59394, y: 24.606062} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1134572147549595745 CanvasRenderer: @@ -2324,10 +2324,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 117609739584280572} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 53.72727, y: -25} - m_SizeDelta: {x: 56.59394, y: 24.606062} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7654916660386741782 CanvasRenderer: @@ -2723,10 +2723,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 4893620826974573006} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 187, y: -27} - m_SizeDelta: {x: 200, y: 28} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4217088321203893506 CanvasRenderer: @@ -3331,7 +3331,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: -725} - m_SizeDelta: {x: 337, y: 54} + m_SizeDelta: {x: 0, y: 54} m_Pivot: {x: 0.5, y: 1} --- !u!222 &453616341432893762 CanvasRenderer: @@ -3850,10 +3850,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 4893620826974573006} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 50, y: -27} - m_SizeDelta: {x: 27, y: 27} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0.5} --- !u!222 &9182794380181841639 CanvasRenderer: @@ -4564,7 +4564,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2273952858735001378 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/UI/Pages/HomePage/HomePageDeviceCtrl.cs b/Assets/Scripts/UI/Pages/HomePage/HomePageDeviceCtrl.cs index 6054686..0b417e5 100644 --- a/Assets/Scripts/UI/Pages/HomePage/HomePageDeviceCtrl.cs +++ b/Assets/Scripts/UI/Pages/HomePage/HomePageDeviceCtrl.cs @@ -1,6 +1,7 @@ using System; using System.Collections; using System.Collections.Generic; +using DG.Tweening; using Kill.Bluetooth; using Kill.Bluetooth.Protocol; using Kill.Managers; @@ -26,6 +27,7 @@ namespace Kill.UI.Pages public void InitDeviceControl(bool isOn) { deviceCtrlIcon.sprite=deviceCtrlIconSprites[isOn?1:0]; + PlayLockAnimation(isOn); foreach(var button in deviceCtrlButtons) { button.interactable=isOn; @@ -41,6 +43,27 @@ namespace Kill.UI.Pages InitWrokMode(-1); } } + public GameObject lockImage; + public void PlayLockAnimation(bool isOn) + { + if(isOn) + { + Tweener t1=lockImage.GetComponent().DOAnchorPosY(0,0.5f); + t1.onComplete = () => + { + lockImage.GetComponent().DOLocalRotate(new Vector3(0,180,0),0.8f); + }; + } + else + { + Tweener t1=lockImage.GetComponent().DOLocalRotate(new Vector3(0,0,0),0.8f); + t1.onComplete = () => + { + lockImage.GetComponent().DOAnchorPosY(-1,0.5f); + }; + + } + } /// /// 0:未连接无值 1:有值 ///