diff --git a/GameMain/UI/UISprites/MergeObj/Packed/Other/Launcher_Chest_catcion_lv1.png b/GameMain/UI/UISprites/MergeObj/Packed/Other/Launcher_Chest_catcion_lv1.png index 1529ac52..73aa726a 100644 Binary files a/GameMain/UI/UISprites/MergeObj/Packed/Other/Launcher_Chest_catcion_lv1.png and b/GameMain/UI/UISprites/MergeObj/Packed/Other/Launcher_Chest_catcion_lv1.png differ diff --git a/GameMain/UI/UISprites/MergeObj/Packed/Other/Launcher_Chest_catcion_lv2.png b/GameMain/UI/UISprites/MergeObj/Packed/Other/Launcher_Chest_catcion_lv2.png index 011330db..a7dbebf7 100644 Binary files a/GameMain/UI/UISprites/MergeObj/Packed/Other/Launcher_Chest_catcion_lv2.png and b/GameMain/UI/UISprites/MergeObj/Packed/Other/Launcher_Chest_catcion_lv2.png differ diff --git a/GameMain/UI/UISprites/MergeObj/Packed/Other/Launcher_Chest_catcion_lv3.png b/GameMain/UI/UISprites/MergeObj/Packed/Other/Launcher_Chest_catcion_lv3.png index ffb3a69d..7d82488d 100644 Binary files a/GameMain/UI/UISprites/MergeObj/Packed/Other/Launcher_Chest_catcion_lv3.png and b/GameMain/UI/UISprites/MergeObj/Packed/Other/Launcher_Chest_catcion_lv3.png differ diff --git a/GameMain/UI/UISprites/MergeObj/Packed/Other/Launcher_Chest_catcion_lv4.png b/GameMain/UI/UISprites/MergeObj/Packed/Other/Launcher_Chest_catcion_lv4.png index ba5f87a9..8e0036a2 100644 Binary files a/GameMain/UI/UISprites/MergeObj/Packed/Other/Launcher_Chest_catcion_lv4.png and b/GameMain/UI/UISprites/MergeObj/Packed/Other/Launcher_Chest_catcion_lv4.png differ diff --git a/GameMain/UI/UISprites/MergeObj/Packed/Other/Launcher_Chest_catcion_lv5.png b/GameMain/UI/UISprites/MergeObj/Packed/Other/Launcher_Chest_catcion_lv5.png index bfe55acd..3ec0d77e 100644 Binary files a/GameMain/UI/UISprites/MergeObj/Packed/Other/Launcher_Chest_catcion_lv5.png and b/GameMain/UI/UISprites/MergeObj/Packed/Other/Launcher_Chest_catcion_lv5.png differ diff --git a/GameMain/UI/UISprites/PetPlayRoom/NewHomeUI/Packed/pr_icn_taozhuang_Blue suit_Glasses.png b/GameMain/UI/UISprites/PetPlayRoom/NewHomeUI/Packed/pr_icn_taozhuang_Blue suit_Glasses.png index d8c41ec1..7ed85a0d 100644 Binary files a/GameMain/UI/UISprites/PetPlayRoom/NewHomeUI/Packed/pr_icn_taozhuang_Blue suit_Glasses.png and b/GameMain/UI/UISprites/PetPlayRoom/NewHomeUI/Packed/pr_icn_taozhuang_Blue suit_Glasses.png differ diff --git a/yyzl/06Task/DailyTaskPanel.prefab b/yyzl/06Task/DailyTaskPanel.prefab index 55999362..fc21b533 100644 --- a/yyzl/06Task/DailyTaskPanel.prefab +++ b/yyzl/06Task/DailyTaskPanel.prefab @@ -1902,6 +1902,96 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1488540035008791372 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7268192328808916467} + - component: {fileID: 5439221786713307813} + - component: {fileID: 1853398522681497243} + - component: {fileID: 8938301476249642791} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7268192328808916467 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1488540035008791372} + 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: + - {fileID: 4946493935935595207} + m_Father: {fileID: 3504823801342921416} + 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.75} + m_SizeDelta: {x: 843, y: 416.5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5439221786713307813 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1488540035008791372} + m_CullTransparentMesh: 1 +--- !u!114 &1853398522681497243 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1488540035008791372} + 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: a31f9c953dd549443b510fce31368d68, type: 3} + m_Type: 1 + 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!114 &8938301476249642791 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1488540035008791372} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 1 --- !u!1 &1583770661003641751 GameObject: m_ObjectHideFlags: 0 @@ -1937,8 +2027,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 265.72, y: 81.5179} - m_SizeDelta: {x: 530.57, y: 159.6105} + m_AnchoredPosition: {x: 265.72006, y: 82.45986} + m_SizeDelta: {x: 506.1277, y: 132.4323} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8169510404777400746 CanvasRenderer: @@ -1968,7 +2058,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b99b5da95a8411149b6bf5f4b91010c4, type: 3} + m_Sprite: {fileID: 21300000, guid: 42ad0b867ffd54b4fb50ef40c00e6a20, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -8943,7 +9033,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 7268192328808916467} m_Father: {fileID: 3825267457884804665} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -9434,6 +9525,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8015948138563082380 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4946493935935595207} + - component: {fileID: 8269116647148744427} + - component: {fileID: 615829132867485721} + m_Layer: 5 + m_Name: w + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4946493935935595207 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8015948138563082380} + 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: 7268192328808916467} + 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: -1, y: 18} + m_SizeDelta: {x: 843, y: 415} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8269116647148744427 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8015948138563082380} + m_CullTransparentMesh: 1 +--- !u!114 &615829132867485721 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8015948138563082380} + 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: 0.99215686, g: 0.7764706, b: 0.4862745, a: 0.8235294} + 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: 2607b99ff658c4248ab1b568a68551d0, type: 3} + m_Type: 2 + 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 &8046932129591868888 GameObject: m_ObjectHideFlags: 0 diff --git a/yyzl/06Task/image/Collect_pic_yellow2 1.png b/yyzl/06Task/image/Collect_pic_yellow2 1.png new file mode 100644 index 00000000..6166d4a3 Binary files /dev/null and b/yyzl/06Task/image/Collect_pic_yellow2 1.png differ diff --git a/yyzl/12PetHome/image/shop_panel_roof_canting.png.meta b/yyzl/06Task/image/Collect_pic_yellow2 1.png.meta similarity index 96% rename from yyzl/12PetHome/image/shop_panel_roof_canting.png.meta rename to yyzl/06Task/image/Collect_pic_yellow2 1.png.meta index 21f56706..4ce0466b 100644 --- a/yyzl/12PetHome/image/shop_panel_roof_canting.png.meta +++ b/yyzl/06Task/image/Collect_pic_yellow2 1.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e5d7578614920e4459e4628c0192e65f +guid: a31f9c953dd549443b510fce31368d68 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -49,7 +49,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 57, y: 58, z: 57, w: 58} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -113,7 +113,7 @@ TextureImporter: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 + internalID: 1537655665 vertices: [] indices: edges: [] diff --git a/yyzl/12PetHome/PetAdoptionCertificatePanel.prefab b/yyzl/12PetHome/PetAdoptionCertificatePanel.prefab index 2cae32e7..af307288 100644 --- a/yyzl/12PetHome/PetAdoptionCertificatePanel.prefab +++ b/yyzl/12PetHome/PetAdoptionCertificatePanel.prefab @@ -3901,8 +3901,8 @@ 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: 9, y: 81.8745} - m_SizeDelta: {x: 448.9427, y: 359.9928} + m_AnchoredPosition: {x: -2, y: 109.7121} + m_SizeDelta: {x: 518.3746, y: 415.6681} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8350899717243931346 CanvasRenderer: @@ -4272,8 +4272,8 @@ 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: -346, y: 200} - m_SizeDelta: {x: 139.0229, y: 111.4781} + m_AnchoredPosition: {x: -363.37, y: 213.9288} + m_SizeDelta: {x: 173.76, y: 139.3358} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2478699791457343613 CanvasRenderer: diff --git a/yyzl/12PetHome/image/shop_panel_roof_canting.png b/yyzl/12PetHome/image/shop_panel_roof_canting.png deleted file mode 100644 index 6e1e048b..00000000 Binary files a/yyzl/12PetHome/image/shop_panel_roof_canting.png and /dev/null differ diff --git a/yyzl/Common/Small/common_mz.png b/yyzl/Common/Small/common_mz.png index 7edca06c..3088b33f 100644 Binary files a/yyzl/Common/Small/common_mz.png and b/yyzl/Common/Small/common_mz.png differ diff --git a/yyzl/Resources/Prop/PetRoomIcon/pr_icn_taozhuang_Blue suit_Glasses.png b/yyzl/Resources/Prop/PetRoomIcon/pr_icn_taozhuang_Blue suit_Glasses.png index d8c41ec1..7ed85a0d 100644 Binary files a/yyzl/Resources/Prop/PetRoomIcon/pr_icn_taozhuang_Blue suit_Glasses.png and b/yyzl/Resources/Prop/PetRoomIcon/pr_icn_taozhuang_Blue suit_Glasses.png differ