diff --git a/Assets/ResWork/UIPrefabs/Pet/PetCard.prefab b/Assets/ResWork/UIPrefabs/Pet/PetCard.prefab index c4b858a30..443d2908d 100644 --- a/Assets/ResWork/UIPrefabs/Pet/PetCard.prefab +++ b/Assets/ResWork/UIPrefabs/Pet/PetCard.prefab @@ -108,9 +108,9 @@ RectTransform: m_Father: {fileID: 384003431067609950} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -15} - m_SizeDelta: {x: 0, y: 30} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 84.8, y: -21.9} + m_SizeDelta: {x: 147, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6202927014981136828 CanvasRenderer: @@ -143,7 +143,8 @@ MonoBehaviour: m_text: Lv.00 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 6d7cd7be388f7ca40a8ad4491be308b8, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -167,17 +168,17 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 30 + m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 10 m_fontSizeMax: 40 m_fontStyle: 0 - m_HorizontalAlignment: 4 + m_HorizontalAlignment: 1 m_VerticalAlignment: 4096 m_textAlignment: 65535 - m_characterSpacing: 0 + m_characterSpacing: -5 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 @@ -242,10 +243,10 @@ RectTransform: - {fileID: 8750852398077670237} m_Father: {fileID: 384003431067609950} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 10} - m_SizeDelta: {x: 0, y: 20} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 15.8} + m_SizeDelta: {x: 91, y: 27} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6859385401789456719 CanvasRenderer: @@ -268,14 +269,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 0.5882353} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 65f581562538e304cbbfe8ee3beab09c, type: 3} + m_Sprite: {fileID: 21300000, guid: 2bd1672dc57a9224a8a645669807fc3f, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -317,10 +318,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 384003431067609950} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3616234789346990046 CanvasRenderer: @@ -504,7 +505,8 @@ MonoBehaviour: m_text: "\uCD9C\uC804" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -528,8 +530,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 15 + m_fontSizeBase: 15 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 10 @@ -617,10 +619,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 384003431067609950} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5672102311620284898 CanvasRenderer: @@ -650,7 +652,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 771e7fe0adffe774baf7b7b042a59215, type: 3} + m_Sprite: {fileID: 21300000, guid: bde12b5d7b8b4e04a95a1678a53970c4, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -768,7 +770,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} + m_SizeDelta: {x: 147, y: 147} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &8644788085243761268 MonoBehaviour: diff --git a/Assets/Res_Addr/MainUI/NewGameUI.prefab b/Assets/Res_Addr/MainUI/NewGameUI.prefab index 8f0ba6b19..2c48d53d9 100644 --- a/Assets/Res_Addr/MainUI/NewGameUI.prefab +++ b/Assets/Res_Addr/MainUI/NewGameUI.prefab @@ -2267,7 +2267,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 22.5, y: -12.5} + m_AnchoredPosition: {x: 22.5, y: -21.96} m_SizeDelta: {x: 45, y: 45} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &225588656052564512 @@ -4069,10 +4069,10 @@ RectTransform: - {fileID: 4832275993286904625} m_Father: {fileID: 890059663777587120} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 320, y: -40} - m_SizeDelta: {x: -640, y: -80} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -506.69, y: -47.91} + m_SizeDelta: {x: 850.71, y: 898.33} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5364944966194216653 CanvasRenderer: @@ -4095,15 +4095,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.21960786, g: 0.21960786, b: 0.21960786, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 65f581562538e304cbbfe8ee3beab09c, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 1f4213f1679e640478b781d492e2283d, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -8438,8 +8438,8 @@ MonoBehaviour: m_ChildAlignment: 0 m_StartCorner: 0 m_StartAxis: 0 - m_CellSize: {x: 100, y: 100} - m_Spacing: {x: 8, y: 8} + m_CellSize: {x: 145, y: 145} + m_Spacing: {x: 20, y: 20} m_Constraint: 0 m_ConstraintCount: 2 --- !u!1 &786963231354333758 @@ -10072,7 +10072,7 @@ RectTransform: 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: 45, y: 45} + m_SizeDelta: {x: 69, y: 69} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6760803475765744959 CanvasRenderer: @@ -10102,7 +10102,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 86d7b161efe3a33458b5ff9d13b4a104, type: 3} + m_Sprite: {fileID: 21300000, guid: 689c37c7348673546acbf42702084e0e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -11471,6 +11471,81 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &1007052483825289592 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 359812985718049331} + - component: {fileID: 5535242563829169699} + - component: {fileID: 2026836639905630474} + m_Layer: 5 + m_Name: New Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &359812985718049331 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1007052483825289592} + 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: 7761529305282708550} + 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: 17, y: 28} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5535242563829169699 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1007052483825289592} + m_CullTransparentMesh: 1 +--- !u!114 &2026836639905630474 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1007052483825289592} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: d4480c69c6ce8c841bf2af91872037d9, 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 &1020533420941626403 GameObject: m_ObjectHideFlags: 0 @@ -11717,7 +11792,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 15} + m_AnchoredPosition: {x: 1.4, y: 14.5} m_SizeDelta: {x: 150, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7830430186002370439 @@ -11776,8 +11851,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 25 + m_fontSizeBase: 25 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 10 @@ -11786,7 +11861,7 @@ MonoBehaviour: m_HorizontalAlignment: 2 m_VerticalAlignment: 4096 m_textAlignment: 65535 - m_characterSpacing: 0 + m_characterSpacing: -5 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 @@ -12205,9 +12280,9 @@ RectTransform: m_Father: {fileID: 4674778917806183727} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.216, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: -8, y: -4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8103909821248825151 CanvasRenderer: @@ -12230,15 +12305,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 65f581562538e304cbbfe8ee3beab09c, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 22bd883877f36674ba51b8f732864fb0, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -23093,7 +23168,7 @@ RectTransform: 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: 45, y: 45} + m_SizeDelta: {x: 69, y: 69} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6765116102321750204 CanvasRenderer: @@ -23123,7 +23198,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 86d7b161efe3a33458b5ff9d13b4a104, type: 3} + m_Sprite: {fileID: 21300000, guid: 689c37c7348673546acbf42702084e0e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -23325,16 +23400,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2018675922791312405} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 3484728803530258135} + m_Father: {fileID: 3172102059552323472} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 89, y: -20} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -26.2, y: 0} m_SizeDelta: {x: 150, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6583498612010789601 @@ -23393,17 +23468,17 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 40 + m_fontSizeBase: 40 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 10 m_fontSizeMax: 40 m_fontStyle: 0 - m_HorizontalAlignment: 1 + m_HorizontalAlignment: 2 m_VerticalAlignment: 4096 m_textAlignment: 65535 - m_characterSpacing: 0 + m_characterSpacing: -3 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 @@ -27033,7 +27108,7 @@ RectTransform: 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: 45, y: 45} + m_SizeDelta: {x: 69, y: 69} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &832571152610561694 CanvasRenderer: @@ -27063,7 +27138,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 86d7b161efe3a33458b5ff9d13b4a104, type: 3} + m_Sprite: {fileID: 21300000, guid: 689c37c7348673546acbf42702084e0e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -36833,7 +36908,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 457.5, y: -12.5} + m_AnchoredPosition: {x: 538.5, y: -21.96} m_SizeDelta: {x: 45, y: 45} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3083740965406761319 @@ -49275,7 +49350,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &4832275993286904625 RectTransform: m_ObjectHideFlags: 0 @@ -52069,7 +52144,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 312.5, y: -12.5} + m_AnchoredPosition: {x: 366.5, y: -21.96} m_SizeDelta: {x: 45, y: 45} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4383710066625397105 @@ -52359,7 +52434,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 167.5, y: -12.5} + m_AnchoredPosition: {x: 194.5, y: -21.96} m_SizeDelta: {x: 45, y: 45} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4420263150058956035 @@ -55543,6 +55618,140 @@ MonoBehaviour: m_ScrollRect: {fileID: 6883037544334977825} m_Content: {fileID: 0} go_card: {fileID: 5160656702407552058, guid: 6a424dd6aeb361b48bd98e9f87d2cf85, type: 3} +--- !u!1 &4771111119931847208 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7761529305282708550} + - component: {fileID: 1318473114119023964} + - component: {fileID: 1510862293411792044} + - component: {fileID: 5524471270420649181} + - component: {fileID: 1500287585038340942} + m_Layer: 5 + m_Name: btn_ask + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7761529305282708550 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4771111119931847208} + 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: 359812985718049331} + m_Father: {fileID: 3172102059552323472} + 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: 117.4, y: 0} + m_SizeDelta: {x: 37, y: 38} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1318473114119023964 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4771111119931847208} + m_CullTransparentMesh: 1 +--- !u!114 &1510862293411792044 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4771111119931847208} + 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: -10, y: -10, z: -10, w: -10} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 2a8291c4b3bd6804ea178aa2c117b91f, 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!114 &5524471270420649181 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4771111119931847208} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1510862293411792044} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1500287585038340942 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4771111119931847208} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ab4e7dba3733e584abb76cd4fbc0e116, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &4773775024650937446 GameObject: m_ObjectHideFlags: 0 @@ -55987,7 +56196,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 602.5, y: -12.5} + m_AnchoredPosition: {x: 710.5, y: -21.96} m_SizeDelta: {x: 45, y: 45} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4818177792738251745 @@ -59685,7 +59894,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -2.5899658, y: 0} + m_AnchoredPosition: {x: -14, y: 0} m_SizeDelta: {x: 5.18004, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3234800382335809296 @@ -59706,7 +59915,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 3 - m_Spacing: 100 + m_Spacing: 127 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 @@ -60926,6 +61135,83 @@ MonoBehaviour: gos: - {fileID: 6306288027435359767} - {fileID: 3399385713515205864} +--- !u!1 &5232958508396801669 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3172102059552323472} + - component: {fileID: 8316174585606670615} + - component: {fileID: 81837232256701188} + m_Layer: 5 + m_Name: lveffect + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3172102059552323472 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5232958508396801669} + 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: 4147615160085040798} + - {fileID: 7761529305282708550} + m_Father: {fileID: 3484728803530258135} + 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: 57.249973} + m_SizeDelta: {x: 440, y: 57.9} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8316174585606670615 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5232958508396801669} + m_CullTransparentMesh: 1 +--- !u!114 &81837232256701188 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5232958508396801669} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 27d815cb916e1544fb3418dab2c89f49, 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 &5238792777739533653 GameObject: m_ObjectHideFlags: 0 @@ -66261,7 +66547,7 @@ RectTransform: 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: 45, y: 45} + m_SizeDelta: {x: 69, y: 69} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4145638255281459196 CanvasRenderer: @@ -66291,7 +66577,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 86d7b161efe3a33458b5ff9d13b4a104, type: 3} + m_Sprite: {fileID: 21300000, guid: 689c37c7348673546acbf42702084e0e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -67621,7 +67907,7 @@ RectTransform: 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: 45, y: 45} + m_SizeDelta: {x: 69, y: 69} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1143798323453521638 CanvasRenderer: @@ -67651,7 +67937,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 86d7b161efe3a33458b5ff9d13b4a104, type: 3} + m_Sprite: {fileID: 21300000, guid: 689c37c7348673546acbf42702084e0e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -69720,7 +70006,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &890059663777587120 RectTransform: m_ObjectHideFlags: 0 @@ -69736,10 +70022,10 @@ RectTransform: - {fileID: 1398147926211020194} m_Father: {fileID: 968397854553593359} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -960, y: 0} + m_SizeDelta: {x: 1920, y: 1080} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1425173094993105834 MonoBehaviour: @@ -79173,7 +79459,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1969818477082571141 RectTransform: m_ObjectHideFlags: 0 @@ -82466,7 +82752,6 @@ GameObject: m_Component: - component: {fileID: 4593158308316823385} - component: {fileID: 176435844127711650} - - component: {fileID: 7564137927653063791} - component: {fileID: 8443249060695007423} m_Layer: 5 m_Name: scrollview_ @@ -82492,8 +82777,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -0.77001953} - m_SizeDelta: {x: 0, y: -198.46} + m_AnchoredPosition: {x: 13.769989, y: -80.74} + m_SizeDelta: {x: -27.53, y: -389.56} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &176435844127711650 CanvasRenderer: @@ -82503,36 +82788,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7293149946106244239} m_CullTransparentMesh: 1 ---- !u!114 &7564137927653063791 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7293149946106244239} - 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.13725491, g: 0.12941177, b: 0.18431373, 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: 65f581562538e304cbbfe8ee3beab09c, 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!114 &8443249060695007423 MonoBehaviour: m_ObjectHideFlags: 0 @@ -91416,15 +91671,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.039215688, g: 0.039215688, b: 0.039215688, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 65f581562538e304cbbfe8ee3beab09c, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 034a32b434c712c49b760096ea019e8e, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -105178,8 +105433,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: 0.93, y: -4.48} - m_SizeDelta: {x: 613.87, y: 25} + m_AnchoredPosition: {x: 10.45, y: -47.18} + m_SizeDelta: {x: 709.04, y: 43.92} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2853416513910016238 MonoBehaviour: @@ -105228,7 +105483,7 @@ MonoBehaviour: m_MinValue: 0 m_MaxValue: 1 m_WholeNumbers: 0 - m_Value: 0.5 + m_Value: 0.216 m_OnValueChanged: m_PersistentCalls: m_Calls: [] @@ -105407,8 +105662,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3484728803530258135} - - component: {fileID: 8009890577963672846} - - component: {fileID: 917467592993187876} m_Layer: 5 m_Name: Top m_TagString: Untagged @@ -105428,54 +105681,16 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 4147615160085040798} + - {fileID: 3172102059552323472} - {fileID: 7710708610136186982} - {fileID: 4008788777577623787} m_Father: {fileID: 1398147926211020194} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -50} - m_SizeDelta: {x: 0, y: 100} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -121.13} + m_SizeDelta: {x: 850, y: 242.26} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8009890577963672846 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9118451506699011743} - m_CullTransparentMesh: 1 ---- !u!114 &917467592993187876 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9118451506699011743} - 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.43529415, g: 0.41960788, b: 0.5137255, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 65f581562538e304cbbfe8ee3beab09c, 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 &9120915853040807585 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Res_Addr/Pet/Fire_Chick_A.prefab b/Assets/Res_Addr/Pet/Fire_Chick_A.prefab new file mode 100644 index 000000000..7295527d3 --- /dev/null +++ b/Assets/Res_Addr/Pet/Fire_Chick_A.prefab @@ -0,0 +1,597 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &190751307423336891 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7191351714648899583} + m_Layer: 3 + m_Name: FootR + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7191351714648899583 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 190751307423336891} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.0004047, y: 0.008201533, z: -0.018123852} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3841347257649420783} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2867548008184049774 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5798710844176372014} + m_Layer: 3 + m_Name: fur1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5798710844176372014 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2867548008184049774} + serializedVersion: 2 + m_LocalRotation: {x: 0.2978054, y: -0.6413361, z: -0.2978054, w: 0.6413361} + m_LocalPosition: {x: -0, y: 0.011197184, z: 0.04358365} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2529184861101773463} + m_Father: {fileID: 861862195327758865} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &3476452748009168971 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1960199024642830267} + m_Layer: 3 + m_Name: fur3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1960199024642830267 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3476452748009168971} + serializedVersion: 2 + m_LocalRotation: {x: -0.37860975, y: 0.5972057, z: 0.37860975, w: 0.5972057} + m_LocalPosition: {x: -0.048537735, y: 2.220446e-18, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2529184861101773463} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &3530999602708539963 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1227025145939215624} + - component: {fileID: 3896194161512351289} + m_Layer: 3 + m_Name: Fire_Chick + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1227025145939215624 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3530999602708539963} + serializedVersion: 2 + 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: 5183068221046358814} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!137 &3896194161512351289 +SkinnedMeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3530999602708539963} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 3 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 5cc931b9745779f4bba56c076a0dd2c5, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + serializedVersion: 2 + m_Quality: 0 + m_UpdateWhenOffscreen: 0 + m_SkinnedMotionVectors: 1 + m_Mesh: {fileID: -5721146665394667794, guid: 0b925779736ac144bb585e20ac141c5e, type: 3} + m_Bones: + - {fileID: 958688045893024492} + - {fileID: 861862195327758865} + - {fileID: 5798710844176372014} + - {fileID: 2529184861101773463} + - {fileID: 1960199024642830267} + - {fileID: 3875659899919820752} + - {fileID: 916778993077860099} + - {fileID: 7134642787593694876} + - {fileID: 1873904116015958991} + - {fileID: 3841347257649420783} + - {fileID: 7191351714648899583} + m_BlendShapeWeights: [] + m_RootBone: {fileID: 958688045893024492} + m_AABB: + m_Center: {x: -0.00095620006, y: 0.06702543, z: 0.027172597} + m_Extent: {x: 0.07300904, y: 0.12948453, z: 0.08825104} + m_DirtyAABB: 0 +--- !u!1 &3896426417148363412 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7134642787593694876} + m_Layer: 3 + m_Name: FootL + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7134642787593694876 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3896426417148363412} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.00040474918, y: -0.008201533, z: 0.018123815} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 916778993077860099} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &5183536310891452095 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 958688045893024492} + m_Layer: 3 + m_Name: Root + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &958688045893024492 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5183536310891452095} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: -0.003603874, z: -0, w: 0.9999935} + m_LocalPosition: {x: -0, y: 0.030446215, z: -0.011331049} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 861862195327758865} + - {fileID: 3875659899919820752} + - {fileID: 1873904116015958991} + m_Father: {fileID: 5183068221046358814} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &5619245554182600926 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2529184861101773463} + m_Layer: 3 + m_Name: fur2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2529184861101773463 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5619245554182600926} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: -0.12992997, w: 0.99152315} + m_LocalPosition: {x: -0.053486183, y: 4.440892e-18, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1960199024642830267} + m_Father: {fileID: 5798710844176372014} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &6411359071819339698 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1873904116015958991} + m_Layer: 3 + m_Name: HipR + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1873904116015958991 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6411359071819339698} + serializedVersion: 2 + m_LocalRotation: {x: 0.94774234, y: 0.0017993076, z: -0.0042665848, w: -0.3190034} + m_LocalPosition: {x: 0.0210009, y: -0.014126633, z: 0.0070552584} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3841347257649420783} + m_Father: {fileID: 958688045893024492} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &6798239121051692547 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5183068221046358814} + - component: {fileID: 2144217723731704869} + - component: {fileID: -144601751208542900} + - component: {fileID: 4415694967289564304} + - component: {fileID: -561957770754484286} + - component: {fileID: -7236217036285258734} + m_Layer: 3 + m_Name: Fire_Chick_A + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5183068221046358814 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6798239121051692547} + serializedVersion: 2 + 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: 1227025145939215624} + - {fileID: 958688045893024492} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &2144217723731704869 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6798239121051692547} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: f81d8651069135347b457f7fa05645a7, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &-144601751208542900 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6798239121051692547} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7aa03fe504786d64398f1406a111fee4, type: 3} + m_Name: + m_EditorClassIdentifier: + gos_Effect: [] + m_Role: 1 + m_SubRole: 0 + m_AttackType: 0 + m_animation: {fileID: 0} + _target: {fileID: 0} + isTarget: 0 +--- !u!65 &4415694967289564304 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6798239121051692547} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.14728644, y: 0.25896907, z: 0.17754994} + m_Center: {x: -0.0011520272, y: 0.09747165, z: 0.015833952} +--- !u!195 &-561957770754484286 +NavMeshAgent: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6798239121051692547} + m_Enabled: 1 + m_AgentTypeID: 0 + m_Radius: 0.25 + m_Speed: 4.5 + m_Acceleration: 140 + avoidancePriority: 51 + m_AngularSpeed: 300 + m_StoppingDistance: 0.1 + m_AutoTraverseOffMeshLink: 1 + m_AutoBraking: 1 + m_AutoRepath: 1 + m_Height: 2 + m_BaseOffset: 0 + m_WalkableMask: 4294967295 + m_ObstacleAvoidanceType: 3 +--- !u!54 &-7236217036285258734 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6798239121051692547} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 126 + m_CollisionDetection: 0 +--- !u!1 &6820068293583506013 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3875659899919820752} + m_Layer: 3 + m_Name: HipL + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3875659899919820752 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6820068293583506013} + serializedVersion: 2 + m_LocalRotation: {x: 0.047265034, y: 0.0036504518, z: 0.0032305133, w: 0.9988705} + m_LocalPosition: {x: -0.021000862, y: -0.014126595, z: 0.0070552593} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 916778993077860099} + m_Father: {fileID: 958688045893024492} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7483664109237182367 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 916778993077860099} + m_Layer: 3 + m_Name: LegL + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &916778993077860099 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7483664109237182367} + serializedVersion: 2 + m_LocalRotation: {x: -0.0821727, y: -0.000099432975, z: -0.0042505963, w: 0.99660903} + m_LocalPosition: {x: 0.0000008632986, y: -0.008873405, z: -0.0002994625} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7134642787593694876} + m_Father: {fileID: 3875659899919820752} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &8062099731306853940 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3841347257649420783} + m_Layer: 3 + m_Name: LegtR + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3841347257649420783 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8062099731306853940} + serializedVersion: 2 + m_LocalRotation: {x: -0.2815114, y: 0.0004789434, z: 0.0036835887, w: 0.95955074} + m_LocalPosition: {x: -0.0000009, y: 0.008873366, z: 0.00029946357} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7191351714648899583} + m_Father: {fileID: 1873904116015958991} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &8286373718407995376 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 861862195327758865} + m_Layer: 3 + m_Name: Head + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &861862195327758865 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8286373718407995376} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: -0.038437657, z: -0, w: 0.999261} + m_LocalPosition: {x: -0, y: 0.07717489, z: 0.00866712} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5798710844176372014} + m_Father: {fileID: 958688045893024492} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Res_Addr/Pet/Fire_Chick_A.prefab.meta b/Assets/Res_Addr/Pet/Fire_Chick_A.prefab.meta new file mode 100644 index 000000000..6d4b00827 --- /dev/null +++ b/Assets/Res_Addr/Pet/Fire_Chick_A.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8cb15e3458da83142b4324b6346ad473 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/UI/Pet/PetCard.cs b/Assets/Script/UI/Pet/PetCard.cs index 8c7201a62..7ed57fce8 100644 --- a/Assets/Script/UI/Pet/PetCard.cs +++ b/Assets/Script/UI/Pet/PetCard.cs @@ -16,7 +16,7 @@ public class PetCard : CardBase m_Data = _base as PetListTableData; var sdata = ServerInfo.Ins.m_ServerData; - images[0].sprite = UIAtlasMgr.Ins.Get_GradeSprite(m_Data.n_PetGrade); + //images[0].sprite = UIAtlasMgr.Ins.Get_GradeSprite(m_Data.n_PetGrade); images[1].sprite = UIAtlasMgr.Ins.Get_Sprite(m_Data.Get_Icon()); texts[0].text = $"Lv.{sdata.Get_PetLv(m_Data.n_PetID)}";