From 500d54469d4e7b05b1995a91e29db64ef8e07bac Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 8 Apr 2021 18:16:28 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=89=AB=E5=85=89=E3=80=91=E6=8C=82?= =?UTF-8?q?=E6=9C=BA=EF=BC=8C=E5=85=85=E5=80=BC=E7=95=8C=E9=9D=A2=E6=89=AB?= =?UTF-8?q?=E5=85=89=E5=85=89=E6=95=88=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Materials/UI_Effect_TouXiang_FightBtn.mat | 37 ++++++++ .../UI_Effect_TouXiang_FightBtn.mat.meta | 9 ++ .../UI_Effect_TouXiang_OneKey_Recharge.mat | 37 ++++++++ ...I_Effect_TouXiang_OneKey_Recharge.mat.meta | 9 ++ .../UI/Fight/FightPointPassMainPanel.prefab | 88 +++++++++++++++++-- .../Prefabs/UI/Main/MainRechargePanel.prefab | 80 ++++++++++++++++- .../UI/NewActivity/EveryDayGift.prefab | 82 ++++++++++++++++- .../Modules/Fight/FightPointPassMainPanel.lua | 4 + .../Modules/Recharge/View/EveryDayGift.lua | 3 + .../~Lua/Modules/Recharge/View/GiftView.lua | 5 ++ 10 files changed, 346 insertions(+), 8 deletions(-) create mode 100644 Assets/ManagedResources/EffectResUI/TianGongXunBao/Materials/UI_Effect_TouXiang_FightBtn.mat create mode 100644 Assets/ManagedResources/EffectResUI/TianGongXunBao/Materials/UI_Effect_TouXiang_FightBtn.mat.meta create mode 100644 Assets/ManagedResources/EffectResUI/TianGongXunBao/Materials/UI_Effect_TouXiang_OneKey_Recharge.mat create mode 100644 Assets/ManagedResources/EffectResUI/TianGongXunBao/Materials/UI_Effect_TouXiang_OneKey_Recharge.mat.meta diff --git a/Assets/ManagedResources/EffectResUI/TianGongXunBao/Materials/UI_Effect_TouXiang_FightBtn.mat b/Assets/ManagedResources/EffectResUI/TianGongXunBao/Materials/UI_Effect_TouXiang_FightBtn.mat new file mode 100644 index 0000000000..c1be88bb51 --- /dev/null +++ b/Assets/ManagedResources/EffectResUI/TianGongXunBao/Materials/UI_Effect_TouXiang_FightBtn.mat @@ -0,0 +1,37 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI_Effect_TouXiang_FightBtn + m_Shader: {fileID: 4800000, guid: 508f1ff17d221c748927a8db3bc7ee3f, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _Lin: + m_Texture: {fileID: 2800000, guid: 1556ba40063954e4a9376d89eb48a29e, type: 3} + m_Scale: {x: 1, y: 0.8} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: bed0f3ecb49860b44b7fc53703900f59, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _InvFade: 1 + - _Num: 0.3 + - _Speed: 0.4 + - _Stencil: 0 + m_Colors: + - _MainColor: {r: 1, g: 1, b: 1, a: 0} + - _TintColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/ManagedResources/EffectResUI/TianGongXunBao/Materials/UI_Effect_TouXiang_FightBtn.mat.meta b/Assets/ManagedResources/EffectResUI/TianGongXunBao/Materials/UI_Effect_TouXiang_FightBtn.mat.meta new file mode 100644 index 0000000000..a6154e9538 --- /dev/null +++ b/Assets/ManagedResources/EffectResUI/TianGongXunBao/Materials/UI_Effect_TouXiang_FightBtn.mat.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 77ebe0cd68ff366428bd5f0776c28033 +timeCreated: 1528724438 +licenseType: Pro +NativeFormatImporter: + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/EffectResUI/TianGongXunBao/Materials/UI_Effect_TouXiang_OneKey_Recharge.mat b/Assets/ManagedResources/EffectResUI/TianGongXunBao/Materials/UI_Effect_TouXiang_OneKey_Recharge.mat new file mode 100644 index 0000000000..fd5515a5e3 --- /dev/null +++ b/Assets/ManagedResources/EffectResUI/TianGongXunBao/Materials/UI_Effect_TouXiang_OneKey_Recharge.mat @@ -0,0 +1,37 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI_Effect_TouXiang_OneKey_Recharge + m_Shader: {fileID: 4800000, guid: 508f1ff17d221c748927a8db3bc7ee3f, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _Lin: + m_Texture: {fileID: 2800000, guid: 1556ba40063954e4a9376d89eb48a29e, type: 3} + m_Scale: {x: 1, y: 0.8} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 98b646746e686b6438555ec8552ecc60, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _InvFade: 1 + - _Num: 0.3 + - _Speed: 0.4 + - _Stencil: 0 + m_Colors: + - _MainColor: {r: 1, g: 1, b: 1, a: 0} + - _TintColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/ManagedResources/EffectResUI/TianGongXunBao/Materials/UI_Effect_TouXiang_OneKey_Recharge.mat.meta b/Assets/ManagedResources/EffectResUI/TianGongXunBao/Materials/UI_Effect_TouXiang_OneKey_Recharge.mat.meta new file mode 100644 index 0000000000..3479905351 --- /dev/null +++ b/Assets/ManagedResources/EffectResUI/TianGongXunBao/Materials/UI_Effect_TouXiang_OneKey_Recharge.mat.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 302dfa1210d2d414781fdb1258ff87f7 +timeCreated: 1528724438 +licenseType: Pro +NativeFormatImporter: + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab index 31a0ba297a..3451d75fd8 100644 --- a/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab @@ -6129,7 +6129,7 @@ RectTransform: - {fileID: 3620672236438832033} - {fileID: 6452811165627678722} m_Father: {fileID: 3829532297210306968} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -31365,6 +31365,83 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &550172830994131731 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5204423984622933357} + - component: {fileID: 4364765942041843341} + - component: {fileID: 2972268997527647440} + m_Layer: 0 + m_Name: saoguang + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5204423984622933357 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 550172830994131731} + m_LocalRotation: {x: -0, y: 1, z: -0, w: 0.00000028088027} + m_LocalPosition: {x: -1.2, y: -27.6, z: 100.32529} + m_LocalScale: {x: 142.7168, y: 45.916, z: 0} + m_Children: [] + m_Father: {fileID: 3829532297210306968} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 179.99998, z: 0} +--- !u!33 &4364765942041843341 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 550172830994131731} + m_Mesh: {fileID: 4300000, guid: f425defbdc50d3b4ea69b1098c8eb35d, type: 3} +--- !u!23 &2972268997527647440 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 550172830994131731} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 77ebe0cd68ff366428bd5f0776c28033, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 300 --- !u!1 &643417629125995719 GameObject: m_ObjectHideFlags: 0 @@ -31743,7 +31820,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 50, y: 0} m_SizeDelta: {x: 100, y: 217.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1473222624206509369 @@ -36831,7 +36908,7 @@ RectTransform: m_Children: - {fileID: 7260768385889208524} m_Father: {fileID: 3829532297210306968} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -79898,7 +79975,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3829532297210306968} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -101652,7 +101729,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 50, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &109213283015355470 @@ -113021,6 +113098,7 @@ RectTransform: m_Children: - {fileID: 8077834434338251515} - {fileID: 4823769979385840690} + - {fileID: 5204423984622933357} - {fileID: 8443255222074332825} - {fileID: 2039730614} - {fileID: 2835335463341580670} diff --git a/Assets/ManagedResources/Prefabs/UI/Main/MainRechargePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Main/MainRechargePanel.prefab index 8edd840870..3b5bcd2f0c 100644 --- a/Assets/ManagedResources/Prefabs/UI/Main/MainRechargePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Main/MainRechargePanel.prefab @@ -2410,6 +2410,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 6110885791313462184} + - {fileID: 7238345453039068175} m_Father: {fileID: 802783340} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -8613,7 +8614,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0.000029371866, y: 0} + m_AnchoredPosition: {x: -0.0000011437851, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0.5} --- !u!114 &6954504526559241720 @@ -10344,6 +10345,83 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &4356364362538793344 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7238345453039068175} + - component: {fileID: 5388700874519848325} + - component: {fileID: 7545929012998373937} + m_Layer: 0 + m_Name: saoguang + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7238345453039068175 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4356364362538793344} + m_LocalRotation: {x: -0, y: 1, z: -0, w: 0.00000028088027} + m_LocalPosition: {x: 0.6, y: 0.51, z: 100.32529} + m_LocalScale: {x: 77.79492, y: 25.823158, z: 0} + m_Children: [] + m_Father: {fileID: 1948612919371492188} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 179.99998, z: 0} +--- !u!33 &5388700874519848325 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4356364362538793344} + m_Mesh: {fileID: 4300000, guid: f425defbdc50d3b4ea69b1098c8eb35d, type: 3} +--- !u!23 &7545929012998373937 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4356364362538793344} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 302dfa1210d2d414781fdb1258ff87f7, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 300 --- !u!1 &4621832663263693582 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/NewActivity/EveryDayGift.prefab b/Assets/ManagedResources/Prefabs/UI/NewActivity/EveryDayGift.prefab index aa6f00cfcd..ecc690cffd 100644 --- a/Assets/ManagedResources/Prefabs/UI/NewActivity/EveryDayGift.prefab +++ b/Assets/ManagedResources/Prefabs/UI/NewActivity/EveryDayGift.prefab @@ -304,6 +304,83 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4363160613285279899} m_CullTransparentMesh: 0 +--- !u!1 &4391287929986418072 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8778226543071966709} + - component: {fileID: 1303385263412231138} + - component: {fileID: 2459249386874405349} + m_Layer: 0 + m_Name: saoguang + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8778226543071966709 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4391287929986418072} + m_LocalRotation: {x: -0, y: 1, z: -0, w: 0.00000028088027} + m_LocalPosition: {x: 0, y: 0, z: 100.32529} + m_LocalScale: {x: 77.79493, y: 25.82316, z: 0} + m_Children: [] + m_Father: {fileID: 9069308257944265737} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 179.99998, z: 0} +--- !u!33 &1303385263412231138 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4391287929986418072} + m_Mesh: {fileID: 4300000, guid: f425defbdc50d3b4ea69b1098c8eb35d, type: 3} +--- !u!23 &2459249386874405349 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4391287929986418072} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 302dfa1210d2d414781fdb1258ff87f7, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 300 --- !u!1 &5049567396853013260 GameObject: m_ObjectHideFlags: 0 @@ -5704,7 +5781,7 @@ ParticleSystem: --- !u!199 &5835294107039667155 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -10801,7 +10878,7 @@ ParticleSystem: --- !u!199 &5835345885398115607 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -11046,6 +11123,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 3609706222115065085} + - {fileID: 8778226543071966709} m_Father: {fileID: 7410245404359298873} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua index 17622a4f68..3af421d403 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua @@ -99,6 +99,7 @@ function FightPointPassMainPanel:InitComponent() this.btnFight = Util.GetGameObject(self.gameObject, "Bg/btnDown/btnFight") this.fightText = Util.GetGameObject(this.btnFight, "Text"):GetComponent("Text") + this.fightSaoGuang = Util.GetGameObject(this.btnFight, "saoguang") LanguageFontSizeFilter(this.fightText, 50) -- 你要变强 this.btnGetForce = Util.GetGameObject(self.gameObject, "Bg/btnDown/btnIWantMilk") @@ -551,10 +552,12 @@ end -- 设置挑战按钮文字 function this.SetFightBtnText() this.fightLock:SetActive(false) + this.fightSaoGuang:SetActive(true) local isPass = FightPointPassManager.IsCanFight(FightPointPassManager.curOpenFight) if not isCounting then if not isPass then this.fightLock:SetActive(true) + this.fightSaoGuang:SetActive(false) this.lockText.text = FightPointPassManager.GetBtnText() else this.fightText.text = FightPointPassManager.GetBtnText() @@ -595,6 +598,7 @@ function FightPointPassMainPanel:OnSortingOrderChange() Util.AddParticleSortLayer(this.GuideJumpEffectGo, self.sortingOrder - orginLayer) Util.AddParticleSortLayer(this.pgEffect, self.sortingOrder - orginLayer) Util.AddParticleSortLayer(this.UI_Effect_MuBiaoJiangLi, self.sortingOrder - orginLayer) + Util.SetParticleSortLayer(this.fightSaoGuang, self.sortingOrder + 1) fightMap:OnSortingOrderChange(self.sortingOrder) orginLayer = self.sortingOrder diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua index 04a63867b2..c3124d7c3c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua @@ -36,6 +36,7 @@ function EveryDayGift:InitComponent() self.buyAllBtn = Util.GetGameObject(self.oneKey,"oneKeyBtn") self.oriPrice = Util.GetGameObject(self.oneKey,"oriPrice"):GetComponent("Text") self.nowPrice = Util.GetGameObject(self.oneKey,"nowPrice"):GetComponent("Text") + self.allSaoGuang = Util.GetGameObject(self.oneKey, "saoguang") self.endTimeBg = Util.GetGameObject(self.bg,"tiao") self.endTime = Util.GetGameObject(self.endTimeBg,"time"):GetComponent("Text") @@ -180,6 +181,7 @@ function EveryDayGift:isBought() if self.shopData[i].data.boughtNum > 0 then Util.SetGray(self.buyAllBtn,true) self.buyAllBtn:GetComponent("Button").interactable = false + self.allSaoGuang:SetActive(false) break end end @@ -210,6 +212,7 @@ function EveryDayGift:RefreshOneKeyShow() end Util.SetGray(self.buyAllBtn,false) self.buyAllBtn:GetComponent("Button").interactable = true + self.allSaoGuang:SetActive(true) -- 计算总价 local ori = 0 for i = 1 , #self.shopData do diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua index f1b5ff7b2e..bb67639ade 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua @@ -52,8 +52,10 @@ function GiftView:InitComponent(gameObject) self.buyAllBtn = Util.GetGameObject(self.oneKey, "Button") self.oriPrice = Util.GetGameObject(self.oneKey, "oriPrice"):GetComponent("Text") self.nowPrice = Util.GetGameObject(self.oneKey, "nowPrice"):GetComponent("Text") + self.allSaoGuang = Util.GetGameObject(self.oneKey, "saoguang") Util.SetGray(self.buyAllBtn,false) self.buyAllBtn:GetComponent("Button").interactable = true + self.allSaoGuang:SetActive(true) self.scrollItem = Util.GetGameObject(gameObject, "rzyBg/scrollItem") self.tip3 = Util.GetGameObject(gameObject, "rzyBg/tip3") self.lightList = { @@ -108,6 +110,8 @@ function GiftView:OnSortingOrderChange(cursortingOrder) self.ItemList[i][j]:SetEffectLayer(cursortingOrder) end end + + Util.SetParticleSortLayer(self.allSaoGuang, self.sortingOrder + 1) end -- function GiftView.refresh() @@ -381,6 +385,7 @@ function GiftView:isBought() if data[i].buyTimes >0 then Util.SetGray(self.buyAllBtn,true) self.buyAllBtn:GetComponent("Button").interactable = false + self.allSaoGuang:SetActive(false) break end end