From 39f355c0d18bee2ca21bd5a4588e8f8d2bb19e50 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 12 Aug 2021 18:35:23 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D=E4=BF=AE=E6=94=B9=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TaiChuMiJuan/t_taichumijuan_zhezhao.png | Bin 0 -> 16822 bytes .../t_taichumijuan_zhezhao.png.meta | 110 ++++++++ .../UI/Carbon/TaiChuMiJuanPanel.prefab | 242 +++++++++++++----- .../~Lua/Modules/Carbon/TaiChuMiJuanPanel.lua | 4 +- 4 files changed, 286 insertions(+), 70 deletions(-) create mode 100644 Assets/ManagedResources/Atlas/TaiChuMiJuan/t_taichumijuan_zhezhao.png create mode 100644 Assets/ManagedResources/Atlas/TaiChuMiJuan/t_taichumijuan_zhezhao.png.meta diff --git a/Assets/ManagedResources/Atlas/TaiChuMiJuan/t_taichumijuan_zhezhao.png b/Assets/ManagedResources/Atlas/TaiChuMiJuan/t_taichumijuan_zhezhao.png new file mode 100644 index 0000000000000000000000000000000000000000..76ce4f3e06c82140aaf74416c24d6233b71c0cc2 GIT binary patch literal 16822 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 literal 0 HcmV?d00001 diff --git a/Assets/ManagedResources/Atlas/TaiChuMiJuan/t_taichumijuan_zhezhao.png.meta b/Assets/ManagedResources/Atlas/TaiChuMiJuan/t_taichumijuan_zhezhao.png.meta new file mode 100644 index 0000000000..37966af44b --- /dev/null +++ b/Assets/ManagedResources/Atlas/TaiChuMiJuan/t_taichumijuan_zhezhao.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 7e20cdcea47b9244a9e92181e5623155 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + 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: 369, y: 754, z: 379, w: 708} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: f71240a50b2a54d4093622b25e9f7535 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: TaiChuMiJuan + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/Carbon/TaiChuMiJuanPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Carbon/TaiChuMiJuanPanel.prefab index 3d51142970..f9b2163f65 100644 --- a/Assets/ManagedResources/Prefabs/UI/Carbon/TaiChuMiJuanPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Carbon/TaiChuMiJuanPanel.prefab @@ -276,9 +276,8 @@ GameObject: - component: {fileID: 406736504860049708} - component: {fileID: 3185371786180165057} - component: {fileID: 7889429126755572255} - - component: {fileID: 5836517051863684561} m_Layer: 5 - m_Name: bgDi + m_Name: bg2 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -296,12 +295,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4857275258040740634} - m_RootOrder: 2 + m_RootOrder: 1 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1058, y: 1730} + m_SizeDelta: {x: 6, y: -4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3185371786180165057 CanvasRenderer: @@ -340,19 +339,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!114 &5836517051863684561 +--- !u!1 &3420353409682233932 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6530436724874562378} + - component: {fileID: 7925922119824935525} + - component: {fileID: 7620967168405209386} + m_Layer: 5 + m_Name: bg1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6530436724874562378 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3420353409682233932} + 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_Children: [] + m_Father: {fileID: 4857275258040740634} + m_RootOrder: 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!222 &7925922119824935525 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3420353409682233932} + m_CullTransparentMesh: 0 +--- !u!114 &7620967168405209386 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3010540953488580419} + m_GameObject: {fileID: 3420353409682233932} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -1200242548, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_ShowMaskGraphic: 1 + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: d59ff4e348a69dd45bbd0200e84e635f, 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 --- !u!1 &3492201459980204313 GameObject: m_ObjectHideFlags: 0 @@ -384,7 +444,7 @@ RectTransform: m_Children: - {fileID: 1571689631556293182} m_Father: {fileID: 4857275258040740634} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -612,6 +672,96 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &5143250450895369028 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4272200930178280742} + - component: {fileID: 2306413220748044173} + - component: {fileID: 4831993410177471165} + - component: {fileID: 1012576465748368819} + m_Layer: 5 + m_Name: mask + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4272200930178280742 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5143250450895369028} + 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_Children: + - {fileID: 1915107041368105942} + - {fileID: 292383046426468324} + m_Father: {fileID: 4857275258040740634} + m_RootOrder: 3 + 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.2000122} + m_SizeDelta: {x: 29, y: 62} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2306413220748044173 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5143250450895369028} + m_CullTransparentMesh: 0 +--- !u!114 &4831993410177471165 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5143250450895369028} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 7e20cdcea47b9244a9e92181e5623155, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &1012576465748368819 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5143250450895369028} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1200242548, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 --- !u!1 &6340862063794165982 GameObject: m_ObjectHideFlags: 0 @@ -700,8 +850,6 @@ GameObject: m_Component: - component: {fileID: 4857275258040740634} - component: {fileID: 8890730762987158791} - - component: {fileID: 2198781733884664743} - - component: {fileID: 2370921431435215492} m_Layer: 5 m_Name: bg m_TagString: Untagged @@ -720,10 +868,10 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 292383046426468324} - - {fileID: 1915107041368105942} + - {fileID: 6530436724874562378} - {fileID: 406736504860049708} - {fileID: 5996894655896650309} + - {fileID: 4272200930178280742} m_Father: {fileID: 5665718498097657906} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -740,48 +888,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6531145027874733707} m_CullTransparentMesh: 0 ---- !u!114 &2198781733884664743 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6531145027874733707} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: d59ff4e348a69dd45bbd0200e84e635f, 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 ---- !u!114 &2370921431435215492 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6531145027874733707} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -1200242548, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShowMaskGraphic: 1 --- !u!1 &6783067781988425480 GameObject: m_ObjectHideFlags: 0 @@ -948,7 +1054,7 @@ GameObject: - component: {fileID: 4577208638755532487} - component: {fileID: 947173779260489847} m_Layer: 5 - m_Name: mask + m_Name: mask1 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -965,12 +1071,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 4857275258040740634} - m_RootOrder: 0 + m_Father: {fileID: 4272200930178280742} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 5.9986286, y: -10} + m_AnchoredPosition: {x: -0.00002861, y: 34} m_SizeDelta: {x: 1046, y: 203.7} m_Pivot: {x: 0.5, y: 0} --- !u!222 &4577208638755532487 @@ -1220,7 +1326,7 @@ 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: 0} + m_AnchoredPosition: {x: 0, y: -0.00006856167} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &921486100088032325 @@ -1238,8 +1344,8 @@ MonoBehaviour: m_Padding: m_Left: 0 m_Right: 0 - m_Top: 71 - m_Bottom: 0 + m_Top: 92 + m_Bottom: 34 m_ChildAlignment: 0 m_Spacing: 23.12 m_ChildForceExpandWidth: 1 @@ -1278,7 +1384,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1915107041368105942 RectTransform: m_ObjectHideFlags: 0 @@ -1291,13 +1397,13 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 9193158905020371500} - m_Father: {fileID: 4857275258040740634} - m_RootOrder: 1 + m_Father: {fileID: 4272200930178280742} + m_RootOrder: 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.0006713867, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: -29, y: -61.599976} m_Pivot: {x: 0.50000006, y: 0.5} --- !u!222 &3006324354038409040 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/TaiChuMiJuanPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/TaiChuMiJuanPanel.lua index 0cd288520a..91e9de9861 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/TaiChuMiJuanPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/TaiChuMiJuanPanel.lua @@ -12,10 +12,10 @@ function TaiChuMiJuanPanel:InitComponent() this.itemPre = Util.GetGameObject(this.btnRoot, "itemPre") this.title = Util.GetGameObject(this.btnRoot, "title") - this.grid = Util.GetGameObject(this.btnRoot, "bg/circle/root") + this.grid = Util.GetGameObject(this.btnRoot, "bg/mask/circle/root") this.backBtn = Util.GetGameObject(this.btnRoot, "backBtn") this.NoneImage = Util.GetGameObject(this.btnRoot, "bg/NoneImage") - this.cir = Util.GetGameObject(this.btnRoot, "bg/circle") + this.cir = Util.GetGameObject(this.btnRoot, "bg/mask/circle") this.itemPres = {} this.upview = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform, { showType = UpViewOpenType.ShowLeft })