zhanghongbo/Art_SubModule
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

111

Browse Source
This commit is contained in:
WIN-IEQ8U88PPRB\Administrator 2026-04-28 19:25:50 +08:00
parent cf867eeb8d
commit 2070419441
3 changed files with 180 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
GameMain/UI/UISprites/Merge/Packed/Other/merge_panel_white3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
GameMain/UI/UISprites/Merge/Packed/Other/merge_pic_toppic_tablebg_1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 139 B

After

Width:  |  Height:  |  Size: 107 B

207
yyzl/01Mergeorder/MainMergePanel.prefab
View File

@ -2329,6 +2329,7 @@ MonoBehaviour:
BubbleClickBoard: {fileID: 0}
mergeParent: {fileID: 0}
chooseRt: {fileID: 0}
MergeAttractRt: {fileID: 0}
packBtn: {fileID: 0}
topSV: {fileID: 0}
speedT: {fileID: 0}
@ -5354,6 +5355,81 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 18363789288cc944c8a340692f2367ff, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &638981882089837691
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8728054279877097538}
- component: {fileID: 3221700335648460099}
- component: {fileID: 3780476124307499301}
m_Layer: 5
m_Name: lineS (7)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8728054279877097538
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 638981882089837691}
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 357073646129736361}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -630, y: 0}
m_SizeDelta: {x: 8, y: 1696}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3221700335648460099
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 638981882089837691}
m_CullTransparentMesh: 1
--- !u!114 &3780476124307499301
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 638981882089837691}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: cdc72c1a8fb4198488bbd01f371e6d6e, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &639812775253540707
GameObject:
m_ObjectHideFlags: 0
@ -6431,7 +6507,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 816}
m_SizeDelta: {x: 0, y: 660}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &4525758996848654002
CanvasRenderer:
@ -6463,7 +6539,7 @@ MonoBehaviour:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: ea5888b43d5dbf843840414588c44c7e, type: 3}
m_Type: 0
m_PreserveAspect: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
@ -19256,6 +19332,81 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &1668778120449630567
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8467821248820639318}
- component: {fileID: 7424648302831722708}
- component: {fileID: 2946015592911162654}
m_Layer: 5
m_Name: lineS (6)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8467821248820639318
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1668778120449630567}
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 357073646129736361}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 630, y: 0}
m_SizeDelta: {x: 8, y: 1696}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7424648302831722708
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1668778120449630567}
m_CullTransparentMesh: 1
--- !u!114 &2946015592911162654
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1668778120449630567}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: cdc72c1a8fb4198488bbd01f371e6d6e, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &1675627225208375297
GameObject:
m_ObjectHideFlags: 0
@ -93109,10 +93260,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 357073646129736361}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 90, y: 0}
m_SizeDelta: {x: 20, y: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -450, y: 0}
m_SizeDelta: {x: 8, y: 1696}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8055633682255266686
CanvasRenderer:
@ -95907,6 +96058,8 @@ RectTransform:
- {fileID: 2222241177069898636}
- {fileID: 2869720310755875961}
- {fileID: 2332425150668320518}
- {fileID: 8467821248820639318}
- {fileID: 8728054279877097538}
m_Father: {fileID: 318959986884134882}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@ -95935,7 +96088,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.6666667, g: 0.4392157, b: 0.3764706, a: 1}
m_Color: {r: 0.7058824, g: 0.49803922, b: 0.4392157, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@ -102404,10 +102557,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 357073646129736361}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 450, y: 0}
m_SizeDelta: {x: 20, y: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -90, y: 0}
m_SizeDelta: {x: 8, y: 1696}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1161572687766386540
CanvasRenderer:
@ -110730,10 +110883,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 357073646129736361}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 270, y: 0}
m_SizeDelta: {x: 20, y: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -270, y: 0}
m_SizeDelta: {x: 8, y: 1696}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3500311216129544805
CanvasRenderer:
@ -123261,10 +123414,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 357073646129736361}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 630, y: 0}
m_SizeDelta: {x: 20, y: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 90, y: 0}
m_SizeDelta: {x: 8, y: 1696}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5758415346814538605
CanvasRenderer:
@ -128442,10 +128595,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 357073646129736361}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 810, y: 0}
m_SizeDelta: {x: 20, y: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 270, y: 0}
m_SizeDelta: {x: 8, y: 1696}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4531327548205102457
CanvasRenderer:
@ -156749,10 +156902,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 357073646129736361}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 990, y: 0}
m_SizeDelta: {x: 20, y: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 450, y: 0}
m_SizeDelta: {x: 8, y: 1696}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7160806882732994389
CanvasRenderer: