diff --git a/Assets/Res/ui/connectdevicepage/connectDevicePage.prefab b/Assets/Res/ui/connectdevicepage/connectDevicePage.prefab index 8ca2a2e..39231b8 100644 --- a/Assets/Res/ui/connectdevicepage/connectDevicePage.prefab +++ b/Assets/Res/ui/connectdevicepage/connectDevicePage.prefab @@ -5070,7 +5070,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b08869b93d99a1546a03191d462816dc, type: 3} + m_Sprite: {fileID: 21300000, guid: e182ae7621f55ef4d8bb3bfbcc4e1e12, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/Res/ui/connectdevicepage/icon.png b/Assets/Res/ui/connectdevicepage/icon.png deleted file mode 100644 index c5172d0..0000000 Binary files a/Assets/Res/ui/connectdevicepage/icon.png and /dev/null differ diff --git a/Assets/Res/ui/connectdevicepage/设备icon.png b/Assets/Res/ui/connectdevicepage/设备icon.png new file mode 100644 index 0000000..589890c Binary files /dev/null and b/Assets/Res/ui/connectdevicepage/设备icon.png differ diff --git a/Assets/Res/ui/connectdevicepage/icon.png.meta b/Assets/Res/ui/connectdevicepage/设备icon.png.meta similarity index 98% rename from Assets/Res/ui/connectdevicepage/icon.png.meta rename to Assets/Res/ui/connectdevicepage/设备icon.png.meta index b387031..e20a5da 100644 --- a/Assets/Res/ui/connectdevicepage/icon.png.meta +++ b/Assets/Res/ui/connectdevicepage/设备icon.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b08869b93d99a1546a03191d462816dc +guid: e182ae7621f55ef4d8bb3bfbcc4e1e12 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Res/ui/homepage/homePage.prefab b/Assets/Res/ui/homepage/homePage.prefab index 35f94d4..5cd01d2 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: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 55, y: -20} m_SizeDelta: {x: 0, y: 40} m_Pivot: {x: 0, y: 0.5} --- !u!222 &244985182926712396 @@ -2543,7 +2543,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &6744263492203110024 RectTransform: m_ObjectHideFlags: 0 @@ -2557,6 +2557,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1131486964997105202} + - {fileID: 3865607413793628376} m_Father: {fileID: 3505955939844419362} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -3031,8 +3032,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 3736882174475946360} + m_Children: [] m_Father: {fileID: 8108654959424632030} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -5321,10 +5321,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 1846093831662304367} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 120, y: 10} + m_SizeDelta: {x: 36, y: 45} m_Pivot: {x: 0.5, y: 1} --- !u!222 &3749378162026232689 CanvasRenderer: @@ -5662,10 +5662,10 @@ RectTransform: - {fileID: 4929160862756643459} m_Father: {fileID: 1069437048745146005} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - 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_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_Pivot: {x: 0, y: 0.5} --- !u!222 &6545400438610870076 CanvasRenderer: @@ -6290,9 +6290,9 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 6744263492203110024} - {fileID: 281041426051862978} - {fileID: 1121656133766426305} + - {fileID: 6744263492203110024} m_Father: {fileID: 5019459736209175623} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} @@ -7453,10 +7453,10 @@ RectTransform: - {fileID: 327602628975355249} m_Father: {fileID: 1069437048745146005} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - 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_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_Pivot: {x: 0, y: 0.5} --- !u!222 &1430460842267038712 CanvasRenderer: @@ -8416,10 +8416,10 @@ RectTransform: - {fileID: 1666632072748462393} m_Father: {fileID: 3113186033587881318} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - 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_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_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1208559727036824385 CanvasRenderer: @@ -9017,10 +9017,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 4568515400396789170} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 20, y: -20} + m_SizeDelta: {x: 40, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5333284508431453442 CanvasRenderer: @@ -9763,10 +9763,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 4568515400396789170} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 70, y: -20} + m_SizeDelta: {x: 36, y: 36} m_Pivot: {x: 0, y: 0.5} --- !u!222 &2163933620157744377 CanvasRenderer: @@ -11132,10 +11132,10 @@ RectTransform: - {fileID: 2975297560480716843} m_Father: {fileID: 1069437048745146005} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - 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_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_Pivot: {x: 0, y: 0.5} --- !u!222 &1781978324875051918 CanvasRenderer: @@ -12000,10 +12000,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 1846093831662304367} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 51, y: 10} + m_SizeDelta: {x: 102, y: 45} m_Pivot: {x: 0.5, y: 1} --- !u!222 &1255502245993973393 CanvasRenderer: @@ -12639,7 +12639,7 @@ RectTransform: 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: -40, y: -40} + m_AnchoredPosition: {x: -49, y: -35.4} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8379037123785794455 @@ -12853,85 +12853,6 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 06:00 ---- !u!1 &6815537487450196335 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3736882174475946360} - - component: {fileID: 215957445622957478} - - component: {fileID: 4858844598173331319} - m_Layer: 5 - m_Name: Text (Legacy) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3736882174475946360 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6815537487450196335} - 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: 9116104516561067873} - 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 &215957445622957478 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6815537487450196335} - m_CullTransparentMesh: 1 ---- !u!114 &4858844598173331319 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6815537487450196335} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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_FontData: - m_Font: {fileID: 12800000, guid: f4c31d68e7cd3454685bb4c132a52f58, type: 3} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Button --- !u!1 &6820937290013067873 GameObject: m_ObjectHideFlags: 0 @@ -13079,10 +13000,10 @@ RectTransform: - {fileID: 6020472513220436764} m_Father: {fileID: 1069437048745146005} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - 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_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_Pivot: {x: 0, y: 0.5} --- !u!222 &7222490346232352863 CanvasRenderer: @@ -13918,10 +13839,10 @@ RectTransform: - {fileID: 3973224289061388720} m_Father: {fileID: 3113186033587881318} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - 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_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_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5747587932164273453 CanvasRenderer: @@ -15221,7 +15142,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7190469845234229913 RectTransform: m_ObjectHideFlags: 0 @@ -15887,10 +15808,10 @@ RectTransform: - {fileID: 4828275562546024043} m_Father: {fileID: 3113186033587881318} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - 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_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_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2323428145332649792 CanvasRenderer: @@ -17791,10 +17712,10 @@ RectTransform: - {fileID: 1538898088399718538} m_Father: {fileID: 3113186033587881318} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - 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_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_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4295980959046441324 CanvasRenderer: @@ -17878,6 +17799,81 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!1 &9150017839874774055 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3865607413793628376} + - component: {fileID: 7003777409236910687} + - component: {fileID: 3272040585680790790} + m_Layer: 5 + m_Name: icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3865607413793628376 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9150017839874774055} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.0003841, y: 1.0003841, z: 1.0003841} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6744263492203110024} + 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: 40.000004, y: -5.0000296} + m_SizeDelta: {x: 101, y: 83} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &7003777409236910687 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9150017839874774055} + m_CullTransparentMesh: 1 +--- !u!114 &3272040585680790790 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9150017839874774055} + 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: 9ab32885bcd4e434bbeeef077448b68d, 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 &9156801513400440097 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Res/ui/homepage/texture/产品图.png b/Assets/Res/ui/homepage/texture/产品图.png index e0c63a7..f1864a5 100644 Binary files a/Assets/Res/ui/homepage/texture/产品图.png and b/Assets/Res/ui/homepage/texture/产品图.png differ diff --git a/Assets/Res/ui/homepage/texture/设备icon-选中.png b/Assets/Res/ui/homepage/texture/设备icon-选中.png new file mode 100644 index 0000000..1533cb8 Binary files /dev/null and b/Assets/Res/ui/homepage/texture/设备icon-选中.png differ diff --git a/Assets/Res/ui/homepage/texture/设备icon-选中.png.meta b/Assets/Res/ui/homepage/texture/设备icon-选中.png.meta new file mode 100644 index 0000000..99ec95b --- /dev/null +++ b/Assets/Res/ui/homepage/texture/设备icon-选中.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 9ab32885bcd4e434bbeeef077448b68d +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/texture/设备icon.png b/Assets/Res/ui/homepage/texture/设备icon.png index c5172d0..589890c 100644 Binary files a/Assets/Res/ui/homepage/texture/设备icon.png and b/Assets/Res/ui/homepage/texture/设备icon.png differ diff --git a/Assets/Scripts/Network/NetworkCtrl.cs b/Assets/Scripts/Network/NetworkCtrl.cs index 718a2ea..ac8c771 100644 --- a/Assets/Scripts/Network/NetworkCtrl.cs +++ b/Assets/Scripts/Network/NetworkCtrl.cs @@ -82,11 +82,9 @@ namespace Kill.Network async void Start() { -#if UNITY_IOS + platform = "IOS"; -#else - platform = "ANDROID"; -#endif + Debug.Log("Init"); await Init(); } diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index a0ca176..24728cb 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -301,8 +301,4 @@ QualitySettings: terrainMaxTrees: 50 excludedTargetPlatforms: [] m_TextureMipmapLimitGroupNames: [] - m_PerPlatformDefaultQuality: - Android: 4 - Server: 4 - Standalone: 4 - iPhone: 4 + m_PerPlatformDefaultQuality: {}