From 4b522dd9eae9230f02f2b6568feaf5e8c3562762 Mon Sep 17 00:00:00 2001 From: JieLing Date: Tue, 27 Oct 2020 13:51:11 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=90=E7=A7=AF=E5=A4=A9=E8=B1=AA?= =?UTF-8?q?=E7=A4=BC=E3=80=91$1=20->=20$0.99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Expert/ExpertPanel.prefab | 106 +++++++++--------- 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab index 1d5d594aee..7465c285c3 100644 --- a/Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab @@ -5010,7 +5010,7 @@ ParticleSystem: --- !u!199 &391347278 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -11402,7 +11402,7 @@ ParticleSystem: --- !u!199 &85288511972748413 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -16145,7 +16145,7 @@ ParticleSystem: --- !u!199 &85288512077974317 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -20843,7 +20843,7 @@ ParticleSystem: --- !u!199 &85288512168349841 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -25541,7 +25541,7 @@ ParticleSystem: --- !u!199 &85288512214742610 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -30404,7 +30404,7 @@ ParticleSystem: --- !u!199 &85288513168343927 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -35102,7 +35102,7 @@ ParticleSystem: --- !u!199 &85288513351305705 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -40871,7 +40871,7 @@ ParticleSystem: --- !u!199 &414691610813295580 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -45569,7 +45569,7 @@ ParticleSystem: --- !u!199 &414691611028988226 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -50267,7 +50267,7 @@ ParticleSystem: --- !u!199 &414691612045800100 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -55010,7 +55010,7 @@ ParticleSystem: --- !u!199 &414691612085578008 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -59708,7 +59708,7 @@ ParticleSystem: --- !u!199 &414691612257095240 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -64406,7 +64406,7 @@ ParticleSystem: --- !u!199 &5899601245091579705 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -69652,7 +69652,7 @@ ParticleSystem: --- !u!199 &5567085447044821671 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -74513,7 +74513,7 @@ ParticleSystem: --- !u!199 &5045489869960765571 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -81453,7 +81453,7 @@ ParticleSystem: --- !u!199 &7424551215614179344 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -87611,7 +87611,7 @@ ParticleSystem: --- !u!199 &6924675644743089439 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -88868,7 +88868,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 0.9 - m_Text: "\u6BCF\n\u65E5\n\u4EC5\n\u9700\n\u5145\n\u503C\n$1" + m_Text: "\u6BCF\n\u65E5\n\u4EC5\n\u9700\n\u5145\n\u503C\n$0.99" --- !u!1 &1599836006760387995 GameObject: m_ObjectHideFlags: 0 @@ -93991,7 +93991,7 @@ ParticleSystem: --- !u!199 &7275324880265961258 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -99671,7 +99671,7 @@ ParticleSystem: --- !u!199 &7918083443768115927 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -104992,7 +104992,7 @@ ParticleSystem: --- !u!199 &4249202741276730180 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -109818,7 +109818,7 @@ ParticleSystem: --- !u!199 &7446892149717719861 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -116444,7 +116444,7 @@ ParticleSystem: --- !u!199 &7994448136678369462 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -121891,7 +121891,7 @@ ParticleSystem: --- !u!199 &6366831406703767530 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -126706,7 +126706,7 @@ ParticleSystem: --- !u!199 &7647035856671918723 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -132563,7 +132563,7 @@ ParticleSystem: --- !u!199 &3442100318452166299 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -137528,7 +137528,7 @@ ParticleSystem: --- !u!199 &6225703503371946647 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -144029,7 +144029,7 @@ ParticleSystem: --- !u!199 &3736263280892008042 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -148801,7 +148801,7 @@ ParticleSystem: --- !u!199 &3736263281027369366 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -153719,7 +153719,7 @@ ParticleSystem: --- !u!199 &3736263281144678159 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -158417,7 +158417,7 @@ ParticleSystem: --- !u!199 &3736263281160650038 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -163120,7 +163120,7 @@ ParticleSystem: --- !u!199 &3736263281325203082 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -168258,7 +168258,7 @@ ParticleSystem: --- !u!199 &3736263282101879313 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -172956,7 +172956,7 @@ ParticleSystem: --- !u!199 &3736263282140865173 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -177729,7 +177729,7 @@ ParticleSystem: --- !u!199 &3736263282223057855 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -182472,7 +182472,7 @@ ParticleSystem: --- !u!199 &3736263282260434226 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -188067,7 +188067,7 @@ ParticleSystem: --- !u!199 &8736007889913585379 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -193068,7 +193068,7 @@ ParticleSystem: --- !u!199 &6218818886541518366 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -199933,7 +199933,7 @@ ParticleSystem: --- !u!199 &3061375693970565652 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -205362,7 +205362,7 @@ ParticleSystem: --- !u!199 &6371239923318808130 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -213838,7 +213838,7 @@ ParticleSystem: --- !u!199 &1315029844154324974 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -218637,7 +218637,7 @@ ParticleSystem: --- !u!199 &8071948387418332622 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -225578,7 +225578,7 @@ ParticleSystem: --- !u!199 &3296716962752466389 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -230978,7 +230978,7 @@ ParticleSystem: --- !u!199 &5208671054231575281 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -235814,7 +235814,7 @@ ParticleSystem: --- !u!199 &6800295426981046828 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -246840,7 +246840,7 @@ ParticleSystem: --- !u!199 &7443524496537394543 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -253314,7 +253314,7 @@ ParticleSystem: --- !u!199 &3952339559707849751 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -259703,7 +259703,7 @@ ParticleSystem: --- !u!199 &2759699216698959261 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -266791,7 +266791,7 @@ ParticleSystem: --- !u!199 &4947693289891535506 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -275608,7 +275608,7 @@ ParticleSystem: --- !u!199 &2910122108993515360 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -280872,7 +280872,7 @@ ParticleSystem: --- !u!199 &2442695948598551547 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -288146,7 +288146,7 @@ ParticleSystem: --- !u!199 &2047885427326027412 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -292844,7 +292844,7 @@ ParticleSystem: --- !u!199 &7335579053258334880 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} From 9add8d8dbf8b0fe199b17ea6b059fff3270ebce1 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Tue, 27 Oct 2020 12:02:28 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=90=E5=95=86=E5=BA=97=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E5=A4=8DShopView=E9=94=80=E6=AF=81=E6=97=B6=E4=BC=9A?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E5=85=B6=E4=BB=96shopview=E7=89=A9=E5=93=81?= =?UTF-8?q?=E5=9B=9E=E6=94=B6=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=88=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=95=86=E5=BA=97=E5=81=B6=E7=8E=B0=E7=89=A9=E5=93=81?= =?UTF-8?q?=E6=B6=88=E5=A4=B1=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TagAtlas/r_shangdian_xuanyuan.png.meta | 88 +++++++++++++++++++ .../ManagedResources/~Lua/View/ShopView.lua | 71 ++++++++------- 2 files changed, 129 insertions(+), 30 deletions(-) create mode 100644 Assets/ManagedResources/Atlas/TagAtlas/r_shangdian_xuanyuan.png.meta diff --git a/Assets/ManagedResources/Atlas/TagAtlas/r_shangdian_xuanyuan.png.meta b/Assets/ManagedResources/Atlas/TagAtlas/r_shangdian_xuanyuan.png.meta new file mode 100644 index 0000000000..ea9c656bf5 --- /dev/null +++ b/Assets/ManagedResources/Atlas/TagAtlas/r_shangdian_xuanyuan.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 0becfb702d9034b42a066aa225fdeb27 +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: c9e50b79681466840af4ae85b937b4d3 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: TagAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/View/ShopView.lua b/Assets/ManagedResources/~Lua/View/ShopView.lua index 4f4177ee27..dd20c54e7b 100644 --- a/Assets/ManagedResources/~Lua/View/ShopView.lua +++ b/Assets/ManagedResources/~Lua/View/ShopView.lua @@ -4,8 +4,7 @@ local _ShopTypeConfig = ConfigManager.GetConfig(ConfigName.StoreTypeConfig) local ShopView = {} local this = ShopView this.sortingOrder = 0 --- 保存商品中的物品节点 -local _GoodsItemList = {} +local isPlayShow = true ---===============================生命周期函数================================ function this:New(gameObject) local o = {} @@ -80,6 +79,8 @@ end function this:BindEvent() local localSelf = self Util.AddOnceClick(self.refreshBtn, function() + PlaySoundWithoutClick("UI_refresh") + isPlayShow = true local isPopUp = RedPointManager.PlayerPrefsGetStr(PlayerManager.uid .. localSelf.ShopType) local currentTime = os.date("%Y%m%d", PlayerManager.serverTime) local shopType = localSelf.ShopType @@ -136,12 +137,14 @@ function this:OnClose() -- 物品节点回收 - for _, item in pairs(_GoodsItemList) do - Util.SetColor(item.gameObject, Color.New(1,1,1,1)) - Util.SetGray(item.gameObject, false) - SubUIManager.Close(item) + if self._GoodsItemList then + for _, item in pairs(self._GoodsItemList) do + Util.SetColor(item.gameObject, Color.New(1,1,1,1)) + Util.SetGray(item.gameObject, false) + SubUIManager.Close(item) + end + self._GoodsItemList = {} end - _GoodsItemList = {} -- 红点销毁 -- if self.ShopType == SHOP_TYPE.GENERAL_SHOP then @@ -189,8 +192,10 @@ function this:RefreshShopInfo(isRefresh, isTop) if isRefresh then -- 物品节点播放特效 - for _, item in pairs(_GoodsItemList) do - item:OnShowUIeffectItemViewSaoguang() + if self._GoodsItemList then + for _, item in pairs(self._GoodsItemList) do + item:OnShowUIeffectItemViewSaoguang() + end end end end @@ -382,17 +387,17 @@ function this:RefreshItemList(isTop) self.RechargeScrollView:SetData(itemlist, function(index, shopItem) local itemData = itemlist[index] self:RechargeShopItemAdapter(shopItem, itemData) + if isPlayShow then + shopItem.gameObject:SetActive(false) + end end) if isTop then self.RechargeScrollView:SetIndex(1) end - self.RechargeScrollView:ForeachItemGO(function (index, go) - Timer.New(function () - go.gameObject:SetActive(true) - PlayUIAnim(go.gameObject) - end, 0.03*(index-1)):Start() - end) - + if isPlayShow then + SecTorPlayAnimByScroll(self.RechargeScrollView,0.03) + isPlayShow = false + end else -- 重置列表 self.RechargeScrollView.gameObject:SetActive(false) @@ -401,17 +406,17 @@ function this:RefreshItemList(isTop) self.ScrollView:SetData(itemlist, function(index, shopItem) local itemData = itemlist[index] self:ShopItemAdapter(shopItem, itemData) + if isPlayShow then + shopItem.gameObject:SetActive(false) + end end) if isTop then self.ScrollView:SetIndex(1) end - self.ScrollView:ForeachItemGO(function (index, go) - Timer.New(function () - go.gameObject:SetActive(true) - PlayUIAnim(go.gameObject) - end, 0.03*(index-1)):Start() - end) - + if isPlayShow then + SecTorPlayAnimByScroll(self.ScrollView,0.03) + isPlayShow = false + end end end @@ -481,14 +486,17 @@ function this:ShopItemAdapter(shopItem, itemData) empty:SetActive(isEmpty) -- 数据匹配 - if not _GoodsItemList[shopItem] then - _GoodsItemList[shopItem] = SubUIManager.Open(SubUIConfig.ItemView, item.transform) + if not self._GoodsItemList then + self._GoodsItemList = {} end - Util.SetGray(_GoodsItemList[shopItem].gameObject, not _IsUnLock) + if not self._GoodsItemList[shopItem] then + self._GoodsItemList[shopItem] = SubUIManager.Open(SubUIConfig.ItemView, item.transform) + end + Util.SetGray(self._GoodsItemList[shopItem].gameObject, not _IsUnLock) if isEmpty or not _IsUnLock then -- 物品空或者未解锁不现实物品特效 - _GoodsItemList[shopItem]:OnOpen(false, goods[1],1,false,false,false) + self._GoodsItemList[shopItem]:OnOpen(false, goods[1],1,false,false,false) else - _GoodsItemList[shopItem]:OnOpen(false, goods[1],1,false,false,false,this.sortingOrder) + self._GoodsItemList[shopItem]:OnOpen(false, goods[1],1,false,false,false,this.sortingOrder) end -- 商品颜色显示 @@ -547,6 +555,8 @@ function this:RechargeShopItemAdapter(shopItem, itemData) self:RechargeSuccessFunc(itemData.goodsId) end) end) + + end -- 充值成功回调 @@ -579,6 +589,7 @@ function this:ShowShop(shopType,_sortingOrder) -- 刷新显示 self.ShopType = shopType + isPlayShow = true self.ShopId = ShopManager.GetShopDataByType(self.ShopType).id self.ShopConfig = _ShopTypeConfig[self.ShopId] -- 显示帮助按钮 @@ -624,8 +635,8 @@ end -- 设置层级 function this:SetSortLayer(sortLayer) -- - Log("sortLayer _GoodsItemList "..sortLayer.." "..LengthOfTable(_GoodsItemList)) - for _, item in pairs(_GoodsItemList) do + Log("sortLayer _GoodsItemList "..sortLayer.." "..LengthOfTable(self._GoodsItemList)) + for _, item in pairs(self._GoodsItemList) do item:SetEffectLayer(sortLayer)--this.sortingOrder) end From ec7e498b87535e4c0e55cb66cd0f3ea1d4e18537 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Tue, 27 Oct 2020 15:15:43 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8C=81=E7=BB=AD=E4=BC=A4=E5=AE=B3=E4=BC=9A?= =?UTF-8?q?=E5=87=BA=E7=8E=B0=E5=B0=8F=E6=95=B0=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua index 5c0712028f..3dfd30c080 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua @@ -663,7 +663,7 @@ function BattleUtil.RandomDot(rand, dot, caster, target, round, interval, damage caster.Event:DispatchEvent(BattleEventName.PassiveRandomDot, _CallBack, dot) target.Event:DispatchEvent(BattleEventName.PassiveBeRandomDot, _CallBack, dot) rand = BattleUtil.CountChangeList(rand, cl) - damage = BattleUtil.CountChangeList(damage, dcl) + damage = floor(BattleUtil.CountChangeList(damage, dcl)) return BattleUtil.RandomAction(rand, function() local buff = Buff.Create(caster, BuffName.DOT, round, interval, dot, damage)