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

Merge branch 'main' of gitea.bywaystudios.com:zhanghongbo/Art_SubModule

Browse Source
This commit is contained in:
zhang hongbo 2026-05-12 19:10:57 +08:00
commit cc9842fcf9
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
yyzl/01Mergeorder/MainMergePanel.prefab
View File

@ -2018,8 +2018,8 @@ RectTransform:
- {fileID: 2843713268902288817}
- {fileID: 5430244975654148133}
- {fileID: 7019715042501104486}
- {fileID: 318959987582715246}
- {fileID: 3216020020601692315}
- {fileID: 318959987582715246}
- {fileID: 1004999890571123216}
- {fileID: 6088691187536542525}
- {fileID: 8451686770817756124}
@ -2423,6 +2423,7 @@ MonoBehaviour:
info_timer: 0
lastMergeChess: {fileID: 0}
lastGetGift: {fileID: 0}
lastMergeChessId: 0
lastGetGiftChessId: 0
IsCanAccomyPet: 0
find_begin_pos: {x: 0, y: 0, z: 0}

26
yyzl/12PetHome/DecorateBuildPanel.prefab
View File

@ -993,9 +993,9 @@ RectTransform:
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: 0, y: 0}
m_SizeDelta: {x: 164, y: 164}
m_Pivot: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -82}
m_SizeDelta: {x: 164, y: 82}
m_Pivot: {x: 0.5, y: 0}
--- !u!222 &8037233801383791862
CanvasRenderer:
m_ObjectHideFlags: 0
@ -1033,7 +1033,7 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
m_PixelsPerUnitMultiplier: 1.5
--- !u!1 &1447243444984763989
GameObject:
m_ObjectHideFlags: 0
@ -1068,9 +1068,9 @@ RectTransform:
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: 0, y: 0}
m_AnchoredPosition: {x: 0, y: -82}
m_SizeDelta: {x: 164, y: 164}
m_Pivot: {x: 0.5, y: 0.5}
m_Pivot: {x: 0.5, y: 0}
--- !u!222 &7389794732699305810
CanvasRenderer:
m_ObjectHideFlags: 0
@ -1108,7 +1108,7 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
m_PixelsPerUnitMultiplier: 1.5
--- !u!1 &1522975416545326701
GameObject:
m_ObjectHideFlags: 0
@ -2005,9 +2005,9 @@ RectTransform:
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: 0, y: 0}
m_AnchoredPosition: {x: 0, y: -82}
m_SizeDelta: {x: 164, y: 164}
m_Pivot: {x: 0.5, y: 0.5}
m_Pivot: {x: 0.5, y: 0}
--- !u!222 &1112444176223989301
CanvasRenderer:
m_ObjectHideFlags: 0
@ -2045,7 +2045,7 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
m_PixelsPerUnitMultiplier: 1.5
--- !u!1 &2883305045609186465
GameObject:
m_ObjectHideFlags: 0
@ -3369,9 +3369,9 @@ RectTransform:
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: 0, y: 0}
m_AnchoredPosition: {x: 0, y: -82}
m_SizeDelta: {x: 164, y: 164}
m_Pivot: {x: 0.5, y: 0.5}
m_Pivot: {x: 0.5, y: 0}
--- !u!222 &5153784321242769576
CanvasRenderer:
m_ObjectHideFlags: 0
@ -3409,7 +3409,7 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
m_PixelsPerUnitMultiplier: 1.5
--- !u!1 &6046754660890457124
GameObject:
m_ObjectHideFlags: 0

BIN
yyzl/12PetHome/image/playroom_icon_jiaoshi.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 11 KiB