From a4bd6fb4411f73742fe90ff228e64d52fb79633e Mon Sep 17 00:00:00 2001 From: gaoxin Date: Sat, 8 Jan 2022 14:23:44 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E3=80=90=E6=97=A5=E5=B8=B8=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8A=A8=E7=94=BB=E5=AF=BC=E8=87=B4=E6=88=90?= =?UTF-8?q?=E5=B0=B1=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Mission/MissionDailyPanel.prefab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Mission/MissionDailyPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Mission/MissionDailyPanel.prefab index 3db63668d3..ad8994d8af 100644 --- a/Assets/ManagedResources/Prefabs/UI/Mission/MissionDailyPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Mission/MissionDailyPanel.prefab @@ -84414,7 +84414,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3419202398703480616 RectTransform: m_ObjectHideFlags: 0 From e12ddf56c684844db047ce694a0ae8d34b834bd7 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Sat, 8 Jan 2022 14:50:34 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E3=80=90=E7=BC=96=E9=98=9F=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E3=80=91=E4=BF=AE=E5=A4=8D=E5=91=BC=E5=90=B8=E9=97=AA?= =?UTF-8?q?=E7=83=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Formation/View/FightLevelFormation.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/FightLevelFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/FightLevelFormation.lua index ffaaaeed5b..d2c8e916c6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/FightLevelFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/FightLevelFormation.lua @@ -359,8 +359,8 @@ function this.HeroItemAdapter(_go, _heroData) local con = _showConfig[loopList[index]] if con then txt.text = con.text - txt.color = Color.New(con.color.r, con.color.g, con.color.b, 0) - highlight.color = Color.New(con.color.r, con.color.g, con.color.b, 0) + txt.color = Color.New(con.color.r, con.color.g, con.color.b, 0.5) + highlight.color = Color.New(con.color.r, con.color.g, con.color.b, 0.5) end end) -- loopFadeText(txt, highlight:GetComponent("Image"), loopList, 0) From 0a4c24520c6fb4ff99e48b886a5eaa54a026dbf2 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Sat, 8 Jan 2022 15:03:06 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E3=80=90=E7=BC=96=E9=98=9F=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E3=80=91=E7=BA=A2=E5=8F=89=E8=B5=84=E6=BA=90=E6=9B=BF?= =?UTF-8?q?=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FormationAtlas/r_tongyong_chacha.png | Bin 0 -> 2183 bytes .../FormationAtlas/r_tongyong_chacha.png.meta | 99 ++++++++++++++++++ .../UI/Formation/FormationPanelV2.prefab | 12 +-- 3 files changed, 105 insertions(+), 6 deletions(-) create mode 100644 Assets/ManagedResources/Atlas/FormationAtlas/r_tongyong_chacha.png create mode 100644 Assets/ManagedResources/Atlas/FormationAtlas/r_tongyong_chacha.png.meta diff --git a/Assets/ManagedResources/Atlas/FormationAtlas/r_tongyong_chacha.png b/Assets/ManagedResources/Atlas/FormationAtlas/r_tongyong_chacha.png new file mode 100644 index 0000000000000000000000000000000000000000..242460f66c3aa5850eb1a593d9efc2f6c8db99a0 GIT binary patch literal 2183 zcmV;22zd92P)Vfio-0_y4(K>e9ei|P7F(+p9TY_!s$dJWw%92} zUUmjbJ4_p^Vw);`i4|StwG;+KSU?^IwJhwqk34VgEBAIzxM8v(+0C+)_M6E}a?Z&) z-}(Rl{O3DAHOtH5e*_x<7XTVS7(g6=nNH<{fR28%^95Xe8sFdzu@ucO;pYvP*c{Bf`#`4ZIAqEsd=5~h^}w!7um z_lnwDufiO&4xW}iPq#GV3%Dr1TS@&SU)uJF+7YkHPOQ}EvP=?#RHib-nDlvD;<(?f zMCJws(;`QLeA1I`jt!Gz+_?1r5O*3tLZMCd&qc}`JBpN_0r)(~np)=kB+Yaqm_{xI z6~Nc~MeT64#*DAhn2K(@1DM)4H~tGg5x&G3C;e_E=65SRfN`r@#NUmHvm-MnY~zf! zcGl>4&!uepyGvb%q$88-T!pI$<^b7Q`vIrc#Dc1*QP>(L$?Y&C{piT@I{voYHI z0zm0~UBZv+W8AdN>4;m8IJHk-FP2~U#G(5Ev}C%pM+^2wve~X5>R?UBM2V|Q@8nI2 zuamf2-gT+x+zEQZ;x@-3I&BjKVa5#a7qzCXp7?VS#ykih=nJ@vEMDtIurFePxZ&I$ zQT%&5nCRe_N-_TS2+#J&YH;^=n4`P^p8Y!*PF%iN&u&Q0hgTbqIsDw4df0! zy}nFZe8{1Fn%Ox_VTKOS=mDASZ@Fdvo5eB_1E2MU+_exSkN_P1jVHdmg)>@u8{Al+ z?)|GvSqO2fg*b&Un;fvukSvzFzup49&qL4wZ1 z4sGWe8R2WQb#f-STO<4oq9-jyb3+Ldl{$9$ zMd#Y8EQcb6IbnWQsZP%%>gYxiOe*7t+U=`HT9Q2lol2haD{vT;b8(wv1%TQHZzw;il)7N;+mmnE8_}(sIS*cE!rW(op>MM~q z?DOYJY&j^Wwezy`P`mr~$kdFmj)hctxciQcXY$in>-q=;BHf}DBKi+*QmwMBKJ+Tu@bh>^? zt7FX|m8m8Tr-j7X-+JQDTZbX9i=SvdBBb9hR5!otQg-6&?Xpdc+Ww8CZ9EB5i&c4i1J+XWfHVK&?QW}J7{~fFhLR9(x2NB=U=LfJrQBdMr)_n3`^BC z`-_y7jRop%he0_8X!K-~C6Mt%$VHHkQ|3^?phgc-nL(|b(YmHQ_6(48Yu3m4HCU49 z!c*jJa=@v*KRe9dd0T{^X{ni`iYk-VvmIxvvF>hkX4lSgCw!! zv5jTYa~C;dcb$}c0hU;&m5N5^WwJmOE+JuL|H4 z@~sbM`Je80E1?5U?O=t*#AikLn;9VdZ{CQeikGQFLJyOfq9v`4`^QOa{UN8e?bR}g zq>`gnNj4|B{=#}dwfNog#~N+6)A=dx^002ov JPDHLkV1n4*FopmC literal 0 HcmV?d00001 diff --git a/Assets/ManagedResources/Atlas/FormationAtlas/r_tongyong_chacha.png.meta b/Assets/ManagedResources/Atlas/FormationAtlas/r_tongyong_chacha.png.meta new file mode 100644 index 0000000000..1461cc767c --- /dev/null +++ b/Assets/ManagedResources/Atlas/FormationAtlas/r_tongyong_chacha.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 96507c7d33a95834ab2e3cf8d31c85dd +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: 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: c02fe6cb16feb0a4a8fc1aa9de52fb2f + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: FormationAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab b/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab index 7c794a13f0..01ce93fede 100644 --- a/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab @@ -63302,17 +63302,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8903392646292273362} - m_LocalRotation: {x: -0, y: -0, z: 0.38268343, w: 0.92387956} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 100} - m_LocalScale: {x: 1.0002141, y: 1.0002141, z: 1.0002141} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 491038039515440220} m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 45} + 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: 60, y: -55.000015} - m_SizeDelta: {x: 60, y: 60} + m_SizeDelta: {x: 40, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4972066190102128193 CanvasRenderer: @@ -63335,14 +63335,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0, b: 0, a: 1} + 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: 3d49dff9e68d99042b98190141718524, type: 3} + m_Sprite: {fileID: 21300000, guid: 96507c7d33a95834ab2e3cf8d31c85dd, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 From a0baa2e1c0e5a322684e5521a9fc7d6e22e91f65 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Sat, 8 Jan 2022 17:47:18 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=B3=95=E5=AE=9D=E8=81=9A=E7=81=B5?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=9F=E7=BA=A7=E5=8A=A0=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/TailsManSoul/TailsManSouPanel.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsManSouPanel.lua b/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsManSouPanel.lua index de6715907c..87113ce137 100644 --- a/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsManSouPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsManSouPanel.lua @@ -115,7 +115,7 @@ function TailsManSouPanel:BindEvent() if star >= starNum then color = "00FF00" end - str = string.format("%s星:%s",color,starNum,proStr) + str = string.format("%s/%s星:%s",color,star,starNum,proStr) return str end for k,v in ConfigPairs(ConfigManager.GetConfig(ConfigName.TrumpStar)) do