From 372b74eb05e4c6ebbd97a912630a8cf6f3e9d030 Mon Sep 17 00:00:00 2001 From: guowei Date: Mon, 11 Jan 2021 11:03:06 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=B8=BF=E8=92=99=E9=98=B5=E8=A1=A5?= =?UTF-8?q?=E9=BD=90=E8=B5=84=E6=BA=90=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../h_hongmengzheng_mugang.png.meta | 4 +- .../PopupAtlas/r_renwu_tiao_004.png.meta | 2 +- .../PublicAtlas/r_lianzao_jiahao.png.meta | 88 +++++++++++++++++++ .../UI/Harmony/HongMengEnvoyPanel.prefab | 10 +-- .../Modules/Harmony/View/HarmonyScrllow.lua | 2 +- 5 files changed, 97 insertions(+), 9 deletions(-) create mode 100644 Assets/ManagedResources/Atlas/PublicAtlas/r_lianzao_jiahao.png.meta diff --git a/Assets/ManagedResources/Atlas/HongMengZhenAtlas/h_hongmengzheng_mugang.png.meta b/Assets/ManagedResources/Atlas/HongMengZhenAtlas/h_hongmengzheng_mugang.png.meta index 9d683381a5..541190cff3 100644 --- a/Assets/ManagedResources/Atlas/HongMengZhenAtlas/h_hongmengzheng_mugang.png.meta +++ b/Assets/ManagedResources/Atlas/HongMengZhenAtlas/h_hongmengzheng_mugang.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f854b3f4acc30ca4f8cef4dc5181728a +guid: 1dd8d4c8eca3fcd42ae1403ba03f440c TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -75,7 +75,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 1df1f87d1cc804b4299fb743010a9f9c + spriteID: 430127e7737c6f648863c92c4858ab38 vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/Atlas/PopupAtlas/r_renwu_tiao_004.png.meta b/Assets/ManagedResources/Atlas/PopupAtlas/r_renwu_tiao_004.png.meta index abc81b73a9..6e9f1eb5da 100644 --- a/Assets/ManagedResources/Atlas/PopupAtlas/r_renwu_tiao_004.png.meta +++ b/Assets/ManagedResources/Atlas/PopupAtlas/r_renwu_tiao_004.png.meta @@ -46,7 +46,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 239, y: 0, z: 238, w: 0} + spriteBorder: {x: 239, y: 2, z: 240, w: 2} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/Assets/ManagedResources/Atlas/PublicAtlas/r_lianzao_jiahao.png.meta b/Assets/ManagedResources/Atlas/PublicAtlas/r_lianzao_jiahao.png.meta new file mode 100644 index 0000000000..3dc585717f --- /dev/null +++ b/Assets/ManagedResources/Atlas/PublicAtlas/r_lianzao_jiahao.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 3d49dff9e68d99042b98190141718524 +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: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - 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: ce10d0f4b93811f4f9027d4d0f0d4910 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: PublicAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/Harmony/HongMengEnvoyPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Harmony/HongMengEnvoyPanel.prefab index 043e42948b..396be024b6 100644 --- a/Assets/ManagedResources/Prefabs/UI/Harmony/HongMengEnvoyPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Harmony/HongMengEnvoyPanel.prefab @@ -189,7 +189,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: 469.3025, y: -527} + m_AnchoredPosition: {x: 495, y: -527} m_SizeDelta: {x: 21.4, y: 635.69} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8176204793046969229 @@ -2970,7 +2970,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.65882355, g: 0.65882355, b: 0.654902, a: 1} + m_Color: {r: 0.88235295, g: 0.33333334, b: 0.34509805, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -3385,8 +3385,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -8, y: -526} - m_SizeDelta: {x: 936.95, y: -1263.9} + m_AnchoredPosition: {x: -8.8, y: -531.6} + m_SizeDelta: {x: 954.9, y: -1275.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4914418831466616219 CanvasRenderer: @@ -3580,7 +3580,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.65882355, g: 0.65882355, b: 0.654902, a: 1} + m_Color: {r: 0.88235295, g: 0.33333334, b: 0.34509805, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/View/HarmonyScrllow.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/View/HarmonyScrllow.lua index 3b53de55d2..75285f9be4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/View/HarmonyScrllow.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/View/HarmonyScrllow.lua @@ -70,7 +70,7 @@ function this:InitComponent(gameObject,Golds,DemonCrystals,stage) this.NumText = Util.GetGameObject(gameObject,"HarmonyPanel/itemNumText"):GetComponent("Text") this.ScrollView=SubUIManager.Open(SubUIConfig.ScrollCycleView,Util.GetGameObject(gameObject,"HarmonyPanel/scroll").transform, - this.item,this.scrollbar,Vector2.New(-scrollParent.x*2,-scrollParent.y*2),1,5,Vector2.New(35,15)) + this.item,this.scrollbar,Vector2.New(-scrollParent.x*2,-scrollParent.y*2),1,5,Vector2.New(42,15)) this.ScrollView.moveTween.MomentumAmount = 1 this.ScrollView.moveTween.Strength = 1