From 2c677c0093ec4f0a43186d6d175d60f8a6b57673 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 2 Jun 2021 15:47:26 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E7=89=9B=E6=B0=A3=E8=A1=9D?= =?UTF-8?q?=E5=A4=A9=E3=80=91=E6=8A=A5=E9=94=99=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua | 6 +++--- .../~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua b/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua index f4c3780d0e..2c57ac9350 100644 --- a/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua @@ -78,9 +78,9 @@ function FuXingGaoZhaoPanel:RemoveListener() Game.GlobalEvent:RemoveEvent(GameEvent.FiveAMRefresh.ServerNotifyRefresh, self.Refresh,self) end -function FuXingGaoZhaoPanel:OnSortingOrderChange() - Util.AddParticleSortLayer(self.effect, self.sortingOrder - sortingOrder) - sortingOrder = self.sortingOrder +function FuXingGaoZhaoPanel:OnSortingOrderChange(_sortingOrder) + Util.SetParticleSortLayer(self.effect,_sortingOrder + 1) + self.sortingOrder = _sortingOrder end --界面打开时调用(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua b/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua index e1b8ddc477..059e4df524 100644 --- a/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua @@ -69,9 +69,9 @@ end function NiuQiChongTianPanel:RemoveListener() end -function NiuQiChongTianPanel:OnSortingOrderChange() - Util.AddParticleSortLayer(self.effect5, self.sortingOrder - sortingOrder) - sortingOrder = self.sortingOrder +function NiuQiChongTianPanel:OnSortingOrderChange(_sortingOrder) + Util.SetParticleSortLayer(self.effect5,_sortingOrder + 1) + self.sortingOrder = _sortingOrder end --界面打开时调用(用于子类重写) From f8800771d812db77ef7cc92ef05c0beb2bab9676 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 2 Jun 2021 16:43:56 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E7=99=BB=E5=BD=95=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E3=80=91=E5=A2=9E=E5=8A=A0=E8=A7=86=E9=A2=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Login/LoginPanel.prefab | 162 +++++++++++++++++- .../RTexture/CardTexture13.renderTexture | 34 ++++ .../RTexture/CardTexture13.renderTexture.meta | 8 + 3 files changed, 195 insertions(+), 9 deletions(-) create mode 100644 Assets/ManagedResources/RTexture/CardTexture13.renderTexture create mode 100644 Assets/ManagedResources/RTexture/CardTexture13.renderTexture.meta diff --git a/Assets/ManagedResources/Prefabs/UI/Login/LoginPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Login/LoginPanel.prefab index 2a1a74a114..17c5121460 100644 --- a/Assets/ManagedResources/Prefabs/UI/Login/LoginPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Login/LoginPanel.prefab @@ -581,6 +581,78 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: ver +--- !u!1 &3359870870675714931 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3283108695918559999} + - component: {fileID: 8139587797343191039} + - component: {fileID: 4390134011534434759} + m_Layer: 5 + m_Name: RawImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3283108695918559999 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3359870870675714931} + 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: 8490762428927022713} + m_RootOrder: 2 + 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 &8139587797343191039 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3359870870675714931} + m_CullTransparentMesh: 0 +--- !u!114 &4390134011534434759 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3359870870675714931} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -98529514, 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_Texture: {fileID: 8400000, guid: aa344742525755f468f1743df85b146b, type: 2} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 --- !u!1 &4988553398133080000 GameObject: m_ObjectHideFlags: 0 @@ -1744,6 +1816,76 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &7647703339993553609 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3218301070609729345} + - component: {fileID: 2114390341234516742} + m_Layer: 5 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3218301070609729345 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7647703339993553609} + 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: 8490762428927022713} + m_RootOrder: 1 + 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!328 &2114390341234516742 +VideoPlayer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7647703339993553609} + m_Enabled: 1 + m_VideoClip: {fileID: 32900000, guid: bc6a8b55358ba6a43ba3a9256dbc9d41, type: 3} + m_TargetCameraAlpha: 1 + m_TargetCamera3DLayout: 0 + m_TargetCamera: {fileID: 0} + m_TargetTexture: {fileID: 8400000, guid: aa344742525755f468f1743df85b146b, type: 2} + m_TimeReference: 0 + m_TargetMaterialRenderer: {fileID: 0} + m_TargetMaterialProperty: _MainTex + m_RenderMode: 2 + m_AspectRatio: 2 + m_DataSource: 0 + m_PlaybackSpeed: 1 + m_AudioOutputMode: 2 + m_TargetAudioSources: + - {fileID: 0} + m_DirectAudioVolumes: + - 1 + m_Url: + m_EnabledAudioTracks: 01 + m_DirectAudioMutes: 00 + m_ControlledAudioTrackCount: 1 + m_PlayOnAwake: 1 + m_SkipOnDrop: 1 + m_Looping: 0 + m_WaitForFirstFrame: 1 + m_FrameReadyEventEnabled: 0 --- !u!1 &8490762427106227106 GameObject: m_ObjectHideFlags: 0 @@ -6348,7 +6490,7 @@ ParticleSystem: --- !u!199 &8490762427165167817 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -11181,7 +11323,7 @@ ParticleSystem: --- !u!199 &8490762427297531630 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -16678,7 +16820,7 @@ ParticleSystem: --- !u!199 &8490762427821104763 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -21662,7 +21804,7 @@ ParticleSystem: --- !u!199 &8490762428035569255 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -26453,7 +26595,7 @@ ParticleSystem: --- !u!199 &8490762428074860618 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -31392,7 +31534,7 @@ ParticleSystem: --- !u!199 &8490762428351855326 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -36219,7 +36361,7 @@ ParticleSystem: --- !u!199 &8490762428588085446 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -41081,7 +41223,7 @@ ParticleSystem: --- !u!199 &8490762428872251531 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -41247,6 +41389,8 @@ RectTransform: m_LocalScale: {x: 0.6, y: 0.6, z: 1} m_Children: - {fileID: 8490762427331175395} + - {fileID: 3218301070609729345} + - {fileID: 3283108695918559999} m_Father: {fileID: 8490762427581985335} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -46192,7 +46336,7 @@ ParticleSystem: --- !u!199 &8490762429003853987 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/RTexture/CardTexture13.renderTexture b/Assets/ManagedResources/RTexture/CardTexture13.renderTexture new file mode 100644 index 0000000000..84199cccbd --- /dev/null +++ b/Assets/ManagedResources/RTexture/CardTexture13.renderTexture @@ -0,0 +1,34 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!84 &8400000 +RenderTexture: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: CardTexture13 + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + m_Width: 1080 + m_Height: 1920 + m_AntiAliasing: 1 + m_DepthFormat: 0 + m_ColorFormat: 0 + m_MipMap: 0 + m_GenerateMips: 1 + m_SRGB: 0 + m_UseDynamicScale: 0 + m_BindMS: 0 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 1 + m_Aniso: 0 + m_MipBias: 0 + m_WrapU: 1 + m_WrapV: 1 + m_WrapW: 1 + m_Dimension: 2 + m_VolumeDepth: 1 diff --git a/Assets/ManagedResources/RTexture/CardTexture13.renderTexture.meta b/Assets/ManagedResources/RTexture/CardTexture13.renderTexture.meta new file mode 100644 index 0000000000..71d49d7891 --- /dev/null +++ b/Assets/ManagedResources/RTexture/CardTexture13.renderTexture.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: aa344742525755f468f1743df85b146b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: