From 003eaf3a3c9983c0884b0cdf44ddf6e1c4d8194b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A3=AE2003?= <2384017988@qq.com> Date: Tue, 20 Oct 2026 02:45:11 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B8=80=E4=BA=9B=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E7=9A=84canvas=E5=B1=82=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scripts/Manager/CreateFishManager.cs | 1 - .../aa/UI/DefaultPanel/BoardCarst.prefab | 4 +- .../DefaultPanel/BossBoardCarstGongGao.prefab | 24 ++++++ .../DefaultPanel/LoadPanel/LoadPanel.prefab | 39 +--------- .../MyGame/aa/UI/DefaultPanel/恭喜获得.prefab | 2 +- .../MyGame/aa/UI/DefaultPanel/提示 1.prefab | 42 ++++++++++ Assets/MyGame/aa/UI/DefaultPanel/提示.prefab | 42 ++++++++++ .../aa/UI/Home/Sub/SelectRoomPanel.prefab | 14 +++- Assets/MyGame/aa/UI/Login/LoginPanel.prefab | 77 ++++++++++--------- 9 files changed, 164 insertions(+), 81 deletions(-) diff --git a/Assets/MyGame/Scripts/Manager/CreateFishManager.cs b/Assets/MyGame/Scripts/Manager/CreateFishManager.cs index 03a0b7f34..55722de3d 100644 --- a/Assets/MyGame/Scripts/Manager/CreateFishManager.cs +++ b/Assets/MyGame/Scripts/Manager/CreateFishManager.cs @@ -79,7 +79,6 @@ public class CreateFishManager : MonoSingleton public GameObject dieFXPrefab; // 基础死亡特效 public GameObject dieFXPrefabAward; // 普通鱼金币奖励特效 - public GameObject dieFXPrefabAwardProp; // 道具效果 public GameObject dieFXPrefabAwardTmp; // Boss 分数浮动文本 public GameObject dieFXPrefabAwardTmp_AddScore; diff --git a/Assets/MyGame/aa/UI/DefaultPanel/BoardCarst.prefab b/Assets/MyGame/aa/UI/DefaultPanel/BoardCarst.prefab index 2b7569298..aeebac309 100644 --- a/Assets/MyGame/aa/UI/DefaultPanel/BoardCarst.prefab +++ b/Assets/MyGame/aa/UI/DefaultPanel/BoardCarst.prefab @@ -226,12 +226,12 @@ Canvas: m_PlaneDistance: 100 m_PixelPerfect: 0 m_ReceivesEvents: 1 - m_OverrideSorting: 0 + m_OverrideSorting: 1 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 25 m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 - m_SortingOrder: 32767 + m_SortingOrder: 5000 m_TargetDisplay: 0 diff --git a/Assets/MyGame/aa/UI/DefaultPanel/BossBoardCarstGongGao.prefab b/Assets/MyGame/aa/UI/DefaultPanel/BossBoardCarstGongGao.prefab index 72a28c7b4..3cae47863 100644 --- a/Assets/MyGame/aa/UI/DefaultPanel/BossBoardCarstGongGao.prefab +++ b/Assets/MyGame/aa/UI/DefaultPanel/BossBoardCarstGongGao.prefab @@ -326,6 +326,7 @@ GameObject: - component: {fileID: 5906154763923034694} - component: {fileID: 4157826458431261933} - component: {fileID: 7104341906146201700} + - component: {fileID: 7536475684281836070} m_Layer: 5 m_Name: BossBoardCarstGongGao m_TagString: Untagged @@ -392,3 +393,26 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!223 &7536475684281836070 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2654078965480511721} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 1 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 5000 + m_TargetDisplay: 0 diff --git a/Assets/MyGame/aa/UI/DefaultPanel/LoadPanel/LoadPanel.prefab b/Assets/MyGame/aa/UI/DefaultPanel/LoadPanel/LoadPanel.prefab index 88dbb7f57..1000db627 100644 --- a/Assets/MyGame/aa/UI/DefaultPanel/LoadPanel/LoadPanel.prefab +++ b/Assets/MyGame/aa/UI/DefaultPanel/LoadPanel/LoadPanel.prefab @@ -61,7 +61,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4e3d181187b8960468a09681396cff23, type: 3} m_Name: m_EditorClassIdentifier: - player: {fileID: 8053605273848260111} + player: {fileID: 0} image_Bg: {fileID: 3732645741845648369} fadeTime: 1.3 --- !u!223 &-8634983503678138505 @@ -190,7 +190,6 @@ GameObject: - component: {fileID: 4291601664812101764} - component: {fileID: 5054340543038180183} - component: {fileID: 3224967138221357578} - - component: {fileID: 8053605273848260111} m_Layer: 5 m_Name: LoadPanel (1) m_TagString: Untagged @@ -252,39 +251,3 @@ MonoBehaviour: y: 0 width: 1 height: 1 ---- !u!328 &8053605273848260111 -VideoPlayer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5151481646774888968} - m_Enabled: 1 - m_VideoClip: {fileID: 32900000, guid: 029dc73b392ceec4fbde610235b81a08, type: 3} - m_TargetCameraAlpha: 1 - m_TargetCamera3DLayout: 0 - m_TargetCamera: {fileID: 0} - m_TargetTexture: {fileID: 8400000, guid: 19aab719d005628448bd0ac1931120bc, type: 2} - m_TimeReference: 0 - m_TargetMaterialRenderer: {fileID: 0} - m_TargetMaterialProperty: - m_RenderMode: 2 - m_AspectRatio: 2 - m_DataSource: 0 - m_TimeUpdateMode: 2 - 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 - m_VideoShaders: [] diff --git a/Assets/MyGame/aa/UI/DefaultPanel/恭喜获得.prefab b/Assets/MyGame/aa/UI/DefaultPanel/恭喜获得.prefab index db90b8b7e..1535aa83a 100644 --- a/Assets/MyGame/aa/UI/DefaultPanel/恭喜获得.prefab +++ b/Assets/MyGame/aa/UI/DefaultPanel/恭喜获得.prefab @@ -501,7 +501,7 @@ Canvas: m_AdditionalShaderChannelsFlag: 0 m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 - m_SortingOrder: 201 + m_SortingOrder: 5000 m_TargetDisplay: 0 --- !u!114 &2451405837072168603 MonoBehaviour: diff --git a/Assets/MyGame/aa/UI/DefaultPanel/提示 1.prefab b/Assets/MyGame/aa/UI/DefaultPanel/提示 1.prefab index aa4704f90..8cc77a008 100644 --- a/Assets/MyGame/aa/UI/DefaultPanel/提示 1.prefab +++ b/Assets/MyGame/aa/UI/DefaultPanel/提示 1.prefab @@ -122,6 +122,8 @@ GameObject: - component: {fileID: 3718523959878486843} - component: {fileID: 3234835751327950874} - component: {fileID: 9012792162372886002} + - component: {fileID: 6277667640520449847} + - component: {fileID: 4163273464295624219} m_Layer: 0 m_Name: "\u63D0\u793A 1" m_TagString: Untagged @@ -187,6 +189,46 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!223 &6277667640520449847 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1447821011612761746} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 1 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 5000 + m_TargetDisplay: 0 +--- !u!114 &4163273464295624219 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1447821011612761746} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 --- !u!1 &1595080913434700448 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/MyGame/aa/UI/DefaultPanel/提示.prefab b/Assets/MyGame/aa/UI/DefaultPanel/提示.prefab index 9f1f10b51..13360e6e8 100644 --- a/Assets/MyGame/aa/UI/DefaultPanel/提示.prefab +++ b/Assets/MyGame/aa/UI/DefaultPanel/提示.prefab @@ -87,6 +87,8 @@ GameObject: - component: {fileID: 3234835751327950874} - component: {fileID: 9012792162372886002} - component: {fileID: 6021506708320883731} + - component: {fileID: 5523750232938093454} + - component: {fileID: 7948525303838487680} m_Layer: 0 m_Name: "\u63D0\u793A" m_TagString: Untagged @@ -167,6 +169,46 @@ MonoBehaviour: btn_Close: {fileID: 1254685092051194277} btn_QueRen: {fileID: 5077158635959651760} tmpText_TiShiLabel: {fileID: 1407117275869039512} +--- !u!223 &5523750232938093454 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1447821011612761746} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 1 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 5000 + m_TargetDisplay: 0 +--- !u!114 &7948525303838487680 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1447821011612761746} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 --- !u!1 &1595080913434700448 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/MyGame/aa/UI/Home/Sub/SelectRoomPanel.prefab b/Assets/MyGame/aa/UI/Home/Sub/SelectRoomPanel.prefab index 5aac29e6f..98d8327ff 100644 --- a/Assets/MyGame/aa/UI/Home/Sub/SelectRoomPanel.prefab +++ b/Assets/MyGame/aa/UI/Home/Sub/SelectRoomPanel.prefab @@ -3557,6 +3557,7 @@ MonoBehaviour: btn_SelectGameRoom: {fileID: 2794818461979916231} txt_VenueInfo: {fileID: 0} txt_EntryCondition: {fileID: 5205548320024713036} + pressDuration: 0.1 --- !u!1 &2020613298847462084 GameObject: m_ObjectHideFlags: 0 @@ -3755,6 +3756,7 @@ MonoBehaviour: btn_SelectGameRoom: {fileID: 0} txt_VenueInfo: {fileID: 0} txt_EntryCondition: {fileID: 0} + pressDuration: 0.1 --- !u!1 &2077399692917080309 GameObject: m_ObjectHideFlags: 0 @@ -4554,6 +4556,7 @@ MonoBehaviour: btn_SelectGameRoom: {fileID: 0} txt_VenueInfo: {fileID: 0} txt_EntryCondition: {fileID: 0} + pressDuration: 0.1 --- !u!1 &2617788658099404179 GameObject: m_ObjectHideFlags: 0 @@ -7927,6 +7930,7 @@ MonoBehaviour: btn_SelectGameRoom: {fileID: 0} txt_VenueInfo: {fileID: 0} txt_EntryCondition: {fileID: 0} + pressDuration: 0.1 --- !u!1 &4697404717714913702 GameObject: m_ObjectHideFlags: 0 @@ -8528,6 +8532,7 @@ MonoBehaviour: btn_SelectGameRoom: {fileID: 3696963520046716122} txt_VenueInfo: {fileID: 0} txt_EntryCondition: {fileID: 0} + pressDuration: 0.1 --- !u!1 &5009932069825927895 GameObject: m_ObjectHideFlags: 0 @@ -9458,6 +9463,7 @@ MonoBehaviour: btn_SelectGameRoom: {fileID: 9026847394714228765} txt_VenueInfo: {fileID: 0} txt_EntryCondition: {fileID: 733240602522231277} + pressDuration: 0.1 --- !u!1 &5511547500955515738 GameObject: m_ObjectHideFlags: 0 @@ -9523,6 +9529,7 @@ MonoBehaviour: btn_SelectGameRoom: {fileID: 3813483564473239926} txt_VenueInfo: {fileID: 0} txt_EntryCondition: {fileID: 0} + pressDuration: 0.1 --- !u!1 &5559264540956782489 GameObject: m_ObjectHideFlags: 0 @@ -9875,6 +9882,7 @@ MonoBehaviour: btn_SelectGameRoom: {fileID: 5072427152552697222} txt_VenueInfo: {fileID: 0} txt_EntryCondition: {fileID: 3555024498055939074} + pressDuration: 0.1 --- !u!1 &5589047771026659740 GameObject: m_ObjectHideFlags: 0 @@ -12583,6 +12591,7 @@ MonoBehaviour: btn_SelectGameRoom: {fileID: 0} txt_VenueInfo: {fileID: 0} txt_EntryCondition: {fileID: 0} + pressDuration: 0.1 --- !u!1 &7052610546284540112 GameObject: m_ObjectHideFlags: 0 @@ -13800,6 +13809,7 @@ MonoBehaviour: btn_SelectGameRoom: {fileID: 3395373169694656452} txt_VenueInfo: {fileID: 0} txt_EntryCondition: {fileID: 0} + pressDuration: 0.1 --- !u!1 &7585790476300433829 GameObject: m_ObjectHideFlags: 0 @@ -14466,6 +14476,7 @@ MonoBehaviour: btn_SelectGameRoom: {fileID: 0} txt_VenueInfo: {fileID: 0} txt_EntryCondition: {fileID: 0} + pressDuration: 0.1 --- !u!1 &7960208893597413153 GameObject: m_ObjectHideFlags: 0 @@ -16056,7 +16067,7 @@ MonoBehaviour: m_EditorClassIdentifier: buttonClickAudioID: 60009 btn_Close: {fileID: 3221558725069045634} - uIEffect: 0 + uIEffect: 1 SelectRoom1: {fileID: 6090086242841333665} SelectRoom2: {fileID: 6955752725113703066} SelectRoom3: {fileID: 5259183580828657814} @@ -16510,6 +16521,7 @@ MonoBehaviour: btn_SelectGameRoom: {fileID: 0} txt_VenueInfo: {fileID: 0} txt_EntryCondition: {fileID: 0} + pressDuration: 0.1 --- !u!1 &8894946812987032075 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/MyGame/aa/UI/Login/LoginPanel.prefab b/Assets/MyGame/aa/UI/Login/LoginPanel.prefab index 1a07f5341..e9af7fbe1 100644 --- a/Assets/MyGame/aa/UI/Login/LoginPanel.prefab +++ b/Assets/MyGame/aa/UI/Login/LoginPanel.prefab @@ -765,7 +765,6 @@ GameObject: m_Component: - component: {fileID: 8942587589404630199} - component: {fileID: 752175735967083099} - - component: {fileID: 7134849961257384889} - component: {fileID: 6345218497695488522} m_Layer: 0 m_Name: BG @@ -801,42 +800,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5517822349774092509} m_CullTransparentMesh: 1 ---- !u!328 &7134849961257384889 -VideoPlayer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5517822349774092509} - m_Enabled: 1 - m_VideoClip: {fileID: 32900000, guid: 8a0c6aca89628754da35d497dd3d0d42, type: 3} - m_TargetCameraAlpha: 1 - m_TargetCamera3DLayout: 0 - m_TargetCamera: {fileID: 0} - m_TargetTexture: {fileID: 8400000, guid: ee1088bf4a1dfc54b9b571bf7560e723, type: 2} - m_TimeReference: 0 - m_TargetMaterialRenderer: {fileID: 0} - m_TargetMaterialProperty: - m_RenderMode: 2 - m_AspectRatio: 2 - m_DataSource: 0 - m_TimeUpdateMode: 2 - 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: 1 - m_WaitForFirstFrame: 1 - m_FrameReadyEventEnabled: 0 - m_VideoShaders: [] --- !u!114 &6345218497695488522 MonoBehaviour: m_ObjectHideFlags: 0 @@ -857,7 +820,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Texture: {fileID: 8400000, guid: ee1088bf4a1dfc54b9b571bf7560e723, type: 2} + m_Texture: {fileID: 8400000, guid: 19aab719d005628448bd0ac1931120bc, type: 2} m_UVRect: serializedVersion: 2 x: 0 @@ -1146,6 +1109,7 @@ GameObject: m_Component: - component: {fileID: 1757802389424026021} - component: {fileID: 7618136032869811654} + - component: {fileID: 5723835308432911354} m_Layer: 5 m_Name: LoginPanel m_TagString: Untagged @@ -1190,6 +1154,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0bbcad2f12924d844aaf5ff8d8cdac19, type: 3} m_Name: m_EditorClassIdentifier: + buttonClickAudioID: 60009 loginConfig: {fileID: 11400000, guid: afe4850fa6ef7284b8d8cd1e107c60b0, type: 2} subPanelParent: {fileID: 4916410414296525402} phoneLogin: {fileID: 8733090325295091054} @@ -1199,6 +1164,42 @@ MonoBehaviour: loginParent: {fileID: 823316465834655317} WXLogin: {fileID: 2180513923416259210} btn_ServicePanel: {fileID: 1679042159541900254} +--- !u!328 &5723835308432911354 +VideoPlayer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6216245946385704259} + m_Enabled: 1 + m_VideoClip: {fileID: 32900000, guid: 029dc73b392ceec4fbde610235b81a08, type: 3} + m_TargetCameraAlpha: 1 + m_TargetCamera3DLayout: 0 + m_TargetCamera: {fileID: 0} + m_TargetTexture: {fileID: 8400000, guid: 19aab719d005628448bd0ac1931120bc, type: 2} + m_TimeReference: 0 + m_TargetMaterialRenderer: {fileID: 0} + m_TargetMaterialProperty: + m_RenderMode: 2 + m_AspectRatio: 5 + m_DataSource: 0 + m_TimeUpdateMode: 2 + 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: 1 + m_WaitForFirstFrame: 1 + m_FrameReadyEventEnabled: 0 + m_VideoShaders: [] --- !u!1 &6256436603004493382 GameObject: m_ObjectHideFlags: 0