From 8304af85efee757757da48a93409feed3479636a Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Mon, 9 Oct 2023 15:57:20 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../battle/sfx_p0045/sfx_p0045_02.mat | 1 - .../battle/sfx_p0045/sfx_p0045_03.mat | 1 - .../battle/sfx_p0045/sfx_p0045_04.mat | 1 - .../battle/sfx_p0045/sfx_p0045_05.mat | 1 - .../battle/sfx_p0045/sfx_p0045_06.mat | 1 - .../battle/sfx_p0045/sfx_p0045_07.mat | 1 - .../battle/sfx_p0045/sfx_p0045_08.mat | 1 - .../battle/sfx_p0045/sfx_p0045_09.mat | 1 - .../battle/sfx_p0045/sfx_p0045_10.mat | 1 - .../battle/sfx_p0045/sfx_p0045_11.mat | 1 - .../battle/sfx_p0045/sfx_p0045_13.mat | 1 - .../battle/sfx_p0045/sfx_p0045_14.mat | 1 - .../effects/battle/sfx_p0045_b01.prefab | 2 +- .../effects/battle/sfx_p0045_b02.prefab | 2 +- .../effects/battle/sfx_p0045_b03.prefab | 2 +- .../effects/battle/sfx_p0045_b04.prefab | 2 +- .../effects/battle/sfx_p0045_b05.prefab | 2 +- .../tourn_arena/tourn_arena_ui.prefab | 30 ++++++++--------- .../activity/tourn_wave/tourn_wave_ui.prefab | 32 +++++++++---------- 19 files changed, 36 insertions(+), 48 deletions(-) diff --git a/Assets/arts/effects/material/battle/sfx_p0045/sfx_p0045_02.mat b/Assets/arts/effects/material/battle/sfx_p0045/sfx_p0045_02.mat index 931409fb0..6d80214eb 100644 --- a/Assets/arts/effects/material/battle/sfx_p0045/sfx_p0045_02.mat +++ b/Assets/arts/effects/material/battle/sfx_p0045/sfx_p0045_02.mat @@ -33,7 +33,6 @@ Material: m_Offset: {x: 0, y: 0} m_Floats: - _CULLENUM: 0 - - _HIDE_Y: 0 - _MASK_UV_SPEED_CUSTOM: 0 - _diss_alpha_clip: 0 - _diss_clip: 0.2 diff --git a/Assets/arts/effects/material/battle/sfx_p0045/sfx_p0045_03.mat b/Assets/arts/effects/material/battle/sfx_p0045/sfx_p0045_03.mat index 72947789e..c85685d80 100644 --- a/Assets/arts/effects/material/battle/sfx_p0045/sfx_p0045_03.mat +++ b/Assets/arts/effects/material/battle/sfx_p0045/sfx_p0045_03.mat @@ -33,7 +33,6 @@ Material: m_Offset: {x: 0, y: 0} m_Floats: - _CULLENUM: 0 - - _HIDE_Y: 0 - _MASK_UV_SPEED_CUSTOM: 0 - _diss_alpha_clip: 0 - _diss_clip: 0.2 diff --git a/Assets/arts/effects/material/battle/sfx_p0045/sfx_p0045_04.mat b/Assets/arts/effects/material/battle/sfx_p0045/sfx_p0045_04.mat index de4bb5f67..4c99a0cea 100644 --- a/Assets/arts/effects/material/battle/sfx_p0045/sfx_p0045_04.mat +++ b/Assets/arts/effects/material/battle/sfx_p0045/sfx_p0045_04.mat @@ -33,7 +33,6 @@ Material: m_Offset: {x: 0, y: 0} m_Floats: - _CULLENUM: 0 - - _HIDE_Y: 0 - _MASK_UV_SPEED_CUSTOM: 0 - _diss_alpha_clip: 0 - _diss_clip: 0.2 diff --git a/Assets/arts/effects/material/battle/sfx_p0045/sfx_p0045_05.mat b/Assets/arts/effects/material/battle/sfx_p0045/sfx_p0045_05.mat index 2a7a39b14..1e441cb26 100644 --- a/Assets/arts/effects/material/battle/sfx_p0045/sfx_p0045_05.mat +++ b/Assets/arts/effects/material/battle/sfx_p0045/sfx_p0045_05.mat @@ -33,7 +33,6 @@ Material: m_Offset: {x: 0, y: 0} m_Floats: - _CULLENUM: 0 - - _HIDE_Y: 0 - _MASK_UV_SPEED_CUSTOM: 0 - _diss_alpha_clip: 0 - _diss_clip: 0.2 diff --git a/Assets/arts/effects/material/battle/sfx_p0045/sfx_p0045_06.mat b/Assets/arts/effects/material/battle/sfx_p0045/sfx_p0045_06.mat index 8cc48fc85..1154f5f8b 100644 --- a/Assets/arts/effects/material/battle/sfx_p0045/sfx_p0045_06.mat +++ b/Assets/arts/effects/material/battle/sfx_p0045/sfx_p0045_06.mat @@ -33,7 +33,6 @@ Material: m_Offset: {x: 0, y: 0} m_Floats: - _CULLENUM: 0 - - _HIDE_Y: 0 - _MASK_UV_SPEED_CUSTOM: 0 - _diss_alpha_clip: 0 - _diss_clip: 0.2 diff --git a/Assets/arts/effects/material/battle/sfx_p0045/sfx_p0045_07.mat b/Assets/arts/effects/material/battle/sfx_p0045/sfx_p0045_07.mat index 8245433aa..82359bcb9 100644 --- a/Assets/arts/effects/material/battle/sfx_p0045/sfx_p0045_07.mat +++ b/Assets/arts/effects/material/battle/sfx_p0045/sfx_p0045_07.mat @@ -33,7 +33,6 @@ Material: m_Offset: {x: 0, y: 0} m_Floats: - _CULLENUM: 0 - - _HIDE_Y: 0 - _MASK_UV_SPEED_CUSTOM: 0 - _diss_alpha_clip: 0 - _diss_clip: 0.2 diff --git a/Assets/arts/effects/material/battle/sfx_p0045/sfx_p0045_08.mat b/Assets/arts/effects/material/battle/sfx_p0045/sfx_p0045_08.mat index 18daeea9a..1e5117e7b 100644 --- a/Assets/arts/effects/material/battle/sfx_p0045/sfx_p0045_08.mat +++ b/Assets/arts/effects/material/battle/sfx_p0045/sfx_p0045_08.mat @@ -33,7 +33,6 @@ Material: m_Offset: {x: 0, y: 0} m_Floats: - _CULLENUM: 0 - - _HIDE_Y: 0 - _MASK_UV_SPEED_CUSTOM: 0 - _diss_alpha_clip: 0 - _diss_clip: 0.2 diff --git a/Assets/arts/effects/material/battle/sfx_p0045/sfx_p0045_09.mat b/Assets/arts/effects/material/battle/sfx_p0045/sfx_p0045_09.mat index 0ddfa9683..0c66a473e 100644 --- a/Assets/arts/effects/material/battle/sfx_p0045/sfx_p0045_09.mat +++ b/Assets/arts/effects/material/battle/sfx_p0045/sfx_p0045_09.mat @@ -33,7 +33,6 @@ Material: m_Offset: {x: 0, y: 0} m_Floats: - _CULLENUM: 0 - - _HIDE_Y: 0 - _MASK_UV_SPEED_CUSTOM: 0 - _diss_alpha_clip: 0 - _diss_clip: 0.2 diff --git a/Assets/arts/effects/material/battle/sfx_p0045/sfx_p0045_10.mat b/Assets/arts/effects/material/battle/sfx_p0045/sfx_p0045_10.mat index b121ac3f6..57cc86ea5 100644 --- a/Assets/arts/effects/material/battle/sfx_p0045/sfx_p0045_10.mat +++ b/Assets/arts/effects/material/battle/sfx_p0045/sfx_p0045_10.mat @@ -33,7 +33,6 @@ Material: m_Offset: {x: 0, y: 0} m_Floats: - _CULLENUM: 0 - - _HIDE_Y: 0 - _MASK_UV_SPEED_CUSTOM: 0 - _diss_alpha_clip: 0 - _diss_clip: 0.2 diff --git a/Assets/arts/effects/material/battle/sfx_p0045/sfx_p0045_11.mat b/Assets/arts/effects/material/battle/sfx_p0045/sfx_p0045_11.mat index 4423a0ffb..ca3b6f62d 100644 --- a/Assets/arts/effects/material/battle/sfx_p0045/sfx_p0045_11.mat +++ b/Assets/arts/effects/material/battle/sfx_p0045/sfx_p0045_11.mat @@ -33,7 +33,6 @@ Material: m_Offset: {x: 0, y: 0} m_Floats: - _CULLENUM: 0 - - _HIDE_Y: 0 - _MASK_UV_SPEED_CUSTOM: 0 - _diss_alpha_clip: 0 - _diss_clip: 0.2 diff --git a/Assets/arts/effects/material/battle/sfx_p0045/sfx_p0045_13.mat b/Assets/arts/effects/material/battle/sfx_p0045/sfx_p0045_13.mat index aa29808c6..503a11e94 100644 --- a/Assets/arts/effects/material/battle/sfx_p0045/sfx_p0045_13.mat +++ b/Assets/arts/effects/material/battle/sfx_p0045/sfx_p0045_13.mat @@ -33,7 +33,6 @@ Material: m_Offset: {x: 0, y: 0} m_Floats: - _CULLENUM: 0 - - _HIDE_Y: 0 - _MASK_UV_SPEED_CUSTOM: 0 - _diss_alpha_clip: 0 - _diss_clip: 0.2 diff --git a/Assets/arts/effects/material/battle/sfx_p0045/sfx_p0045_14.mat b/Assets/arts/effects/material/battle/sfx_p0045/sfx_p0045_14.mat index 601d124c8..ce53b80c9 100644 --- a/Assets/arts/effects/material/battle/sfx_p0045/sfx_p0045_14.mat +++ b/Assets/arts/effects/material/battle/sfx_p0045/sfx_p0045_14.mat @@ -33,7 +33,6 @@ Material: m_Offset: {x: 0, y: 0} m_Floats: - _CULLENUM: 0 - - _HIDE_Y: 0 - _MASK_UV_SPEED_CUSTOM: 0 - _diss_alpha_clip: 0 - _diss_clip: 0.2 diff --git a/Assets/prefabs/effects/battle/sfx_p0045_b01.prefab b/Assets/prefabs/effects/battle/sfx_p0045_b01.prefab index 237fa03fa..dd3456807 100644 --- a/Assets/prefabs/effects/battle/sfx_p0045_b01.prefab +++ b/Assets/prefabs/effects/battle/sfx_p0045_b01.prefab @@ -4917,7 +4917,7 @@ GameObject: m_Component: - component: {fileID: 2001134249948060392} - component: {fileID: -7098172498784764208} - m_Layer: 0 + m_Layer: 5 m_Name: sfx_p0045_b01 m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/prefabs/effects/battle/sfx_p0045_b02.prefab b/Assets/prefabs/effects/battle/sfx_p0045_b02.prefab index f17aa369b..f4bb72809 100644 --- a/Assets/prefabs/effects/battle/sfx_p0045_b02.prefab +++ b/Assets/prefabs/effects/battle/sfx_p0045_b02.prefab @@ -29309,7 +29309,7 @@ GameObject: m_Component: - component: {fileID: 4964811371877377015} - component: {fileID: -4231813081449487918} - m_Layer: 0 + m_Layer: 5 m_Name: sfx_p0045_b02 m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/prefabs/effects/battle/sfx_p0045_b03.prefab b/Assets/prefabs/effects/battle/sfx_p0045_b03.prefab index 04d297a06..a3a7016a7 100644 --- a/Assets/prefabs/effects/battle/sfx_p0045_b03.prefab +++ b/Assets/prefabs/effects/battle/sfx_p0045_b03.prefab @@ -10,7 +10,7 @@ GameObject: m_Component: - component: {fileID: 2971024153562597730} - component: {fileID: -3217764578754258200} - m_Layer: 0 + m_Layer: 5 m_Name: sfx_p0045_b03 m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/prefabs/effects/battle/sfx_p0045_b04.prefab b/Assets/prefabs/effects/battle/sfx_p0045_b04.prefab index 017c923f0..e0ee46c87 100644 --- a/Assets/prefabs/effects/battle/sfx_p0045_b04.prefab +++ b/Assets/prefabs/effects/battle/sfx_p0045_b04.prefab @@ -24402,7 +24402,7 @@ GameObject: m_Component: - component: {fileID: 8286940237270030308} - component: {fileID: -2739874733238588449} - m_Layer: 0 + m_Layer: 5 m_Name: sfx_p0045_b04 m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/prefabs/effects/battle/sfx_p0045_b05.prefab b/Assets/prefabs/effects/battle/sfx_p0045_b05.prefab index 88fe8f44a..1e238c8b0 100644 --- a/Assets/prefabs/effects/battle/sfx_p0045_b05.prefab +++ b/Assets/prefabs/effects/battle/sfx_p0045_b05.prefab @@ -43898,7 +43898,7 @@ GameObject: m_Component: - component: {fileID: 4678027343771764570} - component: {fileID: -3327609566571542410} - m_Layer: 0 + m_Layer: 5 m_Name: sfx_p0045_b05 m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/prefabs/ui/activity/tourn_arena/tourn_arena_ui.prefab b/Assets/prefabs/ui/activity/tourn_arena/tourn_arena_ui.prefab index 4dc06b66a..e9e519567 100644 --- a/Assets/prefabs/ui/activity/tourn_arena/tourn_arena_ui.prefab +++ b/Assets/prefabs/ui/activity/tourn_arena/tourn_arena_ui.prefab @@ -293,7 +293,7 @@ GameObject: - component: {fileID: 7316398656744082657} - component: {fileID: 8343115035685326310} - component: {fileID: 8904743875112553911} - m_Layer: 0 + m_Layer: 5 m_Name: tx_empty m_TagString: Untagged m_Icon: {fileID: 0} @@ -918,7 +918,7 @@ GameObject: - component: {fileID: 2831876433657453534} - component: {fileID: 1263535726465308700} - component: {fileID: 4157780851923056228} - m_Layer: 0 + m_Layer: 5 m_Name: btn_last m_TagString: Untagged m_Icon: {fileID: 0} @@ -1179,7 +1179,7 @@ GameObject: - component: {fileID: 8377352324134239090} - component: {fileID: 7907262861863675220} - component: {fileID: 5552132967351667388} - m_Layer: 0 + m_Layer: 5 m_Name: tx_rank m_TagString: Untagged m_Icon: {fileID: 0} @@ -2233,7 +2233,7 @@ GameObject: - component: {fileID: 225813882092289473} - component: {fileID: 8965499449643478441} - component: {fileID: 1748208542364077268} - m_Layer: 0 + m_Layer: 5 m_Name: tx_rank m_TagString: Untagged m_Icon: {fileID: 0} @@ -3085,7 +3085,7 @@ GameObject: - component: {fileID: 5968856417465748941} - component: {fileID: 3380126025732241315} - component: {fileID: 5504126050516569119} - m_Layer: 0 + m_Layer: 5 m_Name: tx_countdown m_TagString: Untagged m_Icon: {fileID: 0} @@ -3461,7 +3461,7 @@ GameObject: - component: {fileID: 746512105641789659} - component: {fileID: 503938262247111080} - component: {fileID: 2226547935277302427} - m_Layer: 0 + m_Layer: 5 m_Name: tx_score m_TagString: Untagged m_Icon: {fileID: 0} @@ -3904,7 +3904,7 @@ GameObject: - component: {fileID: 2662217422815451185} - component: {fileID: 9195705888546859010} - component: {fileID: 6183085668235310591} - m_Layer: 0 + m_Layer: 5 m_Name: tx_name m_TagString: Untagged m_Icon: {fileID: 0} @@ -4172,7 +4172,7 @@ GameObject: - component: {fileID: 4354273698417689913} - component: {fileID: 4057692267024351122} - component: {fileID: 2277640293452337213} - m_Layer: 0 + m_Layer: 5 m_Name: tx_reward m_TagString: Untagged m_Icon: {fileID: 0} @@ -4517,7 +4517,7 @@ GameObject: - component: {fileID: 3960184029193064072} - component: {fileID: 8324788925319582809} - component: {fileID: 7869675328002342109} - m_Layer: 0 + m_Layer: 5 m_Name: tx_last m_TagString: Untagged m_Icon: {fileID: 0} @@ -6915,7 +6915,7 @@ GameObject: - component: {fileID: 874445106009986193} - component: {fileID: 5599910677310336800} - component: {fileID: 9222773802916996570} - m_Layer: 0 + m_Layer: 5 m_Name: btn_reward m_TagString: Untagged m_Icon: {fileID: 0} @@ -7630,7 +7630,7 @@ GameObject: - component: {fileID: 4662982087906593175} - component: {fileID: 9026502188227038421} - component: {fileID: 2063887614522275563} - m_Layer: 0 + m_Layer: 5 m_Name: btn_cur m_TagString: Untagged m_Icon: {fileID: 0} @@ -8174,7 +8174,7 @@ GameObject: - component: {fileID: 4917591620037011204} - component: {fileID: 4822796671972607423} - component: {fileID: 298732109159955821} - m_Layer: 0 + m_Layer: 5 m_Name: tx_cur m_TagString: Untagged m_Icon: {fileID: 0} @@ -8397,7 +8397,7 @@ GameObject: - component: {fileID: 8854209639263296667} - component: {fileID: 4653684970975888199} - component: {fileID: 6829938650073078338} - m_Layer: 0 + m_Layer: 5 m_Name: tx_rank m_TagString: Untagged m_Icon: {fileID: 0} @@ -9096,7 +9096,7 @@ GameObject: - component: {fileID: 6370934326679427964} - component: {fileID: 4935983143821551180} - component: {fileID: 8716181983887619852} - m_Layer: 0 + m_Layer: 5 m_Name: tx_score m_TagString: Untagged m_Icon: {fileID: 0} @@ -9591,7 +9591,7 @@ GameObject: - component: {fileID: 6663119974740817865} - component: {fileID: 4077522953005495452} - component: {fileID: 3765980467045914678} - m_Layer: 0 + m_Layer: 5 m_Name: tx_name m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/prefabs/ui/activity/tourn_wave/tourn_wave_ui.prefab b/Assets/prefabs/ui/activity/tourn_wave/tourn_wave_ui.prefab index 0112d24fd..8546047a6 100644 --- a/Assets/prefabs/ui/activity/tourn_wave/tourn_wave_ui.prefab +++ b/Assets/prefabs/ui/activity/tourn_wave/tourn_wave_ui.prefab @@ -294,7 +294,7 @@ GameObject: - component: {fileID: 7316398656744082657} - component: {fileID: 8343115035685326310} - component: {fileID: 8904743875112553911} - m_Layer: 0 + m_Layer: 5 m_Name: tx_empty m_TagString: Untagged m_Icon: {fileID: 0} @@ -919,7 +919,7 @@ GameObject: - component: {fileID: 2831876433657453534} - component: {fileID: 1263535726465308700} - component: {fileID: 4157780851923056228} - m_Layer: 0 + m_Layer: 5 m_Name: btn_last m_TagString: Untagged m_Icon: {fileID: 0} @@ -1180,7 +1180,7 @@ GameObject: - component: {fileID: 8377352324134239090} - component: {fileID: 7907262861863675220} - component: {fileID: 5552132967351667388} - m_Layer: 0 + m_Layer: 5 m_Name: tx_rank m_TagString: Untagged m_Icon: {fileID: 0} @@ -2234,7 +2234,7 @@ GameObject: - component: {fileID: 225813882092289473} - component: {fileID: 8965499449643478441} - component: {fileID: 1748208542364077268} - m_Layer: 0 + m_Layer: 5 m_Name: tx_rank m_TagString: Untagged m_Icon: {fileID: 0} @@ -3251,7 +3251,7 @@ GameObject: - component: {fileID: 5968856417465748941} - component: {fileID: 3380126025732241315} - component: {fileID: 5504126050516569119} - m_Layer: 0 + m_Layer: 5 m_Name: tx_countdown m_TagString: Untagged m_Icon: {fileID: 0} @@ -3627,7 +3627,7 @@ GameObject: - component: {fileID: 746512105641789659} - component: {fileID: 503938262247111080} - component: {fileID: 2226547935277302427} - m_Layer: 0 + m_Layer: 5 m_Name: tx_score m_TagString: Untagged m_Icon: {fileID: 0} @@ -4070,7 +4070,7 @@ GameObject: - component: {fileID: 2662217422815451185} - component: {fileID: 9195705888546859010} - component: {fileID: 6183085668235310591} - m_Layer: 0 + m_Layer: 5 m_Name: tx_name m_TagString: Untagged m_Icon: {fileID: 0} @@ -4338,7 +4338,7 @@ GameObject: - component: {fileID: 4354273698417689913} - component: {fileID: 4057692267024351122} - component: {fileID: 2277640293452337213} - m_Layer: 0 + m_Layer: 5 m_Name: tx_reward m_TagString: Untagged m_Icon: {fileID: 0} @@ -4683,7 +4683,7 @@ GameObject: - component: {fileID: 3960184029193064072} - component: {fileID: 8324788925319582809} - component: {fileID: 7869675328002342109} - m_Layer: 0 + m_Layer: 5 m_Name: tx_last m_TagString: Untagged m_Icon: {fileID: 0} @@ -5732,7 +5732,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -7084,7 +7084,7 @@ GameObject: - component: {fileID: 874445106009986193} - component: {fileID: 5599910677310336800} - component: {fileID: 9222773802916996570} - m_Layer: 0 + m_Layer: 5 m_Name: btn_reward m_TagString: Untagged m_Icon: {fileID: 0} @@ -7799,7 +7799,7 @@ GameObject: - component: {fileID: 4662982087906593175} - component: {fileID: 9026502188227038421} - component: {fileID: 2063887614522275563} - m_Layer: 0 + m_Layer: 5 m_Name: btn_cur m_TagString: Untagged m_Icon: {fileID: 0} @@ -8343,7 +8343,7 @@ GameObject: - component: {fileID: 4917591620037011204} - component: {fileID: 4822796671972607423} - component: {fileID: 298732109159955821} - m_Layer: 0 + m_Layer: 5 m_Name: tx_cur m_TagString: Untagged m_Icon: {fileID: 0} @@ -8566,7 +8566,7 @@ GameObject: - component: {fileID: 8854209639263296667} - component: {fileID: 4653684970975888199} - component: {fileID: 6829938650073078338} - m_Layer: 0 + m_Layer: 5 m_Name: tx_rank m_TagString: Untagged m_Icon: {fileID: 0} @@ -9265,7 +9265,7 @@ GameObject: - component: {fileID: 6370934326679427964} - component: {fileID: 4935983143821551180} - component: {fileID: 8716181983887619852} - m_Layer: 0 + m_Layer: 5 m_Name: tx_score m_TagString: Untagged m_Icon: {fileID: 0} @@ -9753,7 +9753,7 @@ GameObject: - component: {fileID: 6663119974740817865} - component: {fileID: 4077522953005495452} - component: {fileID: 3765980467045914678} - m_Layer: 0 + m_Layer: 5 m_Name: tx_name m_TagString: Untagged m_Icon: {fileID: 0}