diff --git a/EintooAR/Assets/AssetRaw/UI/YL/UIPetInfoWindow/UIPetInfoWindow.prefab b/EintooAR/Assets/AssetRaw/UI/YL/UIPetInfoWindow/UIPetInfoWindow.prefab index 34d8b4b8..bdc312ce 100644 --- a/EintooAR/Assets/AssetRaw/UI/YL/UIPetInfoWindow/UIPetInfoWindow.prefab +++ b/EintooAR/Assets/AssetRaw/UI/YL/UIPetInfoWindow/UIPetInfoWindow.prefab @@ -378,8 +378,7 @@ GameObject: m_Component: - component: {fileID: 1858543574900965356} - component: {fileID: 3063678936640964785} - - component: {fileID: 805433139158714042} - - component: {fileID: 4436104505685402568} + - component: {fileID: 1312536014301764254} m_Layer: 5 m_Name: m_goTips m_TagString: Untagged @@ -399,14 +398,13 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 2780340779995634444} - - {fileID: 1536469712628444800} + - {fileID: 4841298228547277831} m_Father: {fileID: 3631003828425781646} 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: -8.52, y: 0} - m_SizeDelta: {x: 600, y: 280} + 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_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3063678936640964785 CanvasRenderer: @@ -416,7 +414,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1985960215393784975} m_CullTransparentMesh: 1 ---- !u!114 &805433139158714042 +--- !u!114 &1312536014301764254 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -425,11 +423,11 @@ MonoBehaviour: m_GameObject: {fileID: 1985960215393784975} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 141109fb25f0083469e71ce8cb3e75c8, type: 3} + 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_Color: {r: 0, g: 0, b: 0, a: 0.23529412} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -446,95 +444,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 - m_DrawShape: 3 - m_ImageType: 0 - m_MaterialMode: 0 - m_StrokeWidth: 0 - m_OutlineWidth: 0 - m_OutlineColor: {r: 0, g: 0, b: 0, a: 1} - m_FalloffDistance: 0.5 - m_ConstrainRotation: 1 - m_ShapeRotation: 0 - m_FlipHorizontal: 0 - m_FlipVertical: 0 - m_Triangle: - m_CornerRadius: {x: 0, y: 0, z: 0} - m_UniformCornerRadius: 0 - m_Rectangle: - m_CornerRadius: {x: 60, y: 60, z: 60, w: 60} - m_UniformCornerRadius: 1 - m_Circle: - m_Radius: 0 - m_FitRadius: 0 - m_Pentagon: - m_CornerRadius: {x: 0, y: 0, z: 0, w: 0} - m_UniformCornerRadius: 0 - m_TipRadius: 0.001 - m_TipSize: 1 - m_Hexagon: - m_CornerRadius: {x: 1, y: 1, z: 1, w: 1} - m_UniformCornerRadius: 0 - m_TipSize: {x: 1, y: 1} - m_UniformTipSize: 0 - m_TipRadius: {x: 1, y: 1} - m_UniformTipRadius: 0 - m_NStarPolygon: - m_SideCount: 3 - m_Inset: 2 - m_CornerRadius: 0 - m_Offset: {x: 0, y: 0} - m_GradientEffect: - m_Enabled: 0 - m_GradientType: 0 - m_Gradient: - serializedVersion: 2 - key0: {r: 1, g: 1, b: 1, a: 1} - key1: {r: 1, g: 1, b: 1, a: 1} - key2: {r: 0, g: 0, b: 0, a: 0} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_ColorSpace: -1 - m_NumColorKeys: 2 - m_NumAlphaKeys: 2 - m_CornerGradientColors: - - {r: 0, g: 0, b: 0, a: 0} - - {r: 0, g: 0, b: 0, a: 0} - - {r: 0, g: 0, b: 0, a: 0} - - {r: 0, g: 0, b: 0, a: 0} - m_Rotation: 0 ---- !u!114 &4436104505685402568 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1985960215393784975} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShowMaskGraphic: 1 --- !u!1 &1995186072504682808 GameObject: m_ObjectHideFlags: 0 @@ -1303,10 +1212,10 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 7386397652882480380} + - {fileID: 1038749970051304505} - {fileID: 5444677223103793555} - {fileID: 3704015329131500542} - m_Father: {fileID: 1858543574900965356} + m_Father: {fileID: 4841298228547277831} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1444,7 +1353,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1858543574900965356} + m_Father: {fileID: 4841298228547277831} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1597,6 +1506,173 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] +--- !u!1 &6373814638923377093 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4841298228547277831} + - component: {fileID: 6265200171497313542} + - component: {fileID: 3619095871958978345} + - component: {fileID: 1528782841985453088} + m_Layer: 5 + m_Name: MaskLayout + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4841298228547277831 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6373814638923377093} + 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: 2780340779995634444} + - {fileID: 1536469712628444800} + m_Father: {fileID: 1858543574900965356} + 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: -8.52, y: 0} + m_SizeDelta: {x: 600, y: 280} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6265200171497313542 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6373814638923377093} + m_CullTransparentMesh: 1 +--- !u!114 &3619095871958978345 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6373814638923377093} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 141109fb25f0083469e71ce8cb3e75c8, 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: 0} + 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 + m_DrawShape: 3 + m_ImageType: 0 + m_MaterialMode: 0 + m_StrokeWidth: 0 + m_OutlineWidth: 0 + m_OutlineColor: {r: 0, g: 0, b: 0, a: 1} + m_FalloffDistance: 0.5 + m_ConstrainRotation: 1 + m_ShapeRotation: 0 + m_FlipHorizontal: 0 + m_FlipVertical: 0 + m_Triangle: + m_CornerRadius: {x: 0, y: 0, z: 0} + m_UniformCornerRadius: 0 + m_Rectangle: + m_CornerRadius: {x: 60, y: 60, z: 60, w: 60} + m_UniformCornerRadius: 1 + m_Circle: + m_Radius: 0 + m_FitRadius: 0 + m_Pentagon: + m_CornerRadius: {x: 0, y: 0, z: 0, w: 0} + m_UniformCornerRadius: 0 + m_TipRadius: 0.001 + m_TipSize: 1 + m_Hexagon: + m_CornerRadius: {x: 1, y: 1, z: 1, w: 1} + m_UniformCornerRadius: 0 + m_TipSize: {x: 1, y: 1} + m_UniformTipSize: 0 + m_TipRadius: {x: 1, y: 1} + m_UniformTipRadius: 0 + m_NStarPolygon: + m_SideCount: 3 + m_Inset: 2 + m_CornerRadius: 0 + m_Offset: {x: 0, y: 0} + m_GradientEffect: + m_Enabled: 0 + m_GradientType: 0 + m_Gradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: -1 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + m_CornerGradientColors: + - {r: 0, g: 0, b: 0, a: 0} + - {r: 0, g: 0, b: 0, a: 0} + - {r: 0, g: 0, b: 0, a: 0} + - {r: 0, g: 0, b: 0, a: 0} + m_Rotation: 0 +--- !u!114 &1528782841985453088 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6373814638923377093} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 1 --- !u!1 &6621546445676089363 GameObject: m_ObjectHideFlags: 0 @@ -2242,7 +2318,7 @@ MonoBehaviour: mGUI_ShowCallback: 0 mLocalizeTarget: {fileID: 0} mLocalizeTargetName: TEngine.Localization.LocalizeTarget_TextMeshPro_UGUI ---- !u!1 &7353328628115307757 +--- !u!1 &7341472646408545835 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2250,10 +2326,10 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7386397652882480380} - - component: {fileID: 5293364562211582033} - - component: {fileID: 8441513199088194787} - - component: {fileID: 7603967156740670222} + - component: {fileID: 1038749970051304505} + - component: {fileID: 7781710281862717423} + - component: {fileID: 8815035662968860044} + - component: {fileID: 2832428146501659781} m_Layer: 5 m_Name: Title m_TagString: Untagged @@ -2261,13 +2337,13 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &7386397652882480380 +--- !u!224 &1038749970051304505 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7353328628115307757} + m_GameObject: {fileID: 7341472646408545835} 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} @@ -2277,24 +2353,24 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 300, y: -38.33333} + m_AnchoredPosition: {x: 300, y: -38.333332} m_SizeDelta: {x: 600, y: 50} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5293364562211582033 +--- !u!222 &7781710281862717423 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7353328628115307757} + m_GameObject: {fileID: 7341472646408545835} m_CullTransparentMesh: 1 ---- !u!114 &8441513199088194787 +--- !u!114 &8815035662968860044 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7353328628115307757} + m_GameObject: {fileID: 7341472646408545835} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -2379,13 +2455,13 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!114 &7603967156740670222 +--- !u!114 &2832428146501659781 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7353328628115307757} + m_GameObject: {fileID: 7341472646408545835} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} @@ -2418,7 +2494,7 @@ MonoBehaviour: mGUI_ShowCallback: 0 mLocalizeTarget: {fileID: 0} mLocalizeTargetName: TEngine.Localization.LocalizeTarget_TextMeshPro_UGUI ---- !u!1 &7420356098938187199 +--- !u!1 &7353328628115307757 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2426,9 +2502,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1971934105336562885} - - component: {fileID: 5218409724635656088} - - component: {fileID: 9173138007019277610} + - component: {fileID: 7386397652882480380} + - component: {fileID: 5293364562211582033} + - component: {fileID: 8441513199088194787} m_Layer: 5 m_Name: Title m_TagString: Untagged @@ -2436,13 +2512,13 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1971934105336562885 +--- !u!224 &7386397652882480380 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7420356098938187199} + m_GameObject: {fileID: 7353328628115307757} 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} @@ -2455,21 +2531,21 @@ RectTransform: m_AnchoredPosition: {x: 366.5, y: -40} m_SizeDelta: {x: 733, y: 80} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5218409724635656088 +--- !u!222 &5293364562211582033 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7420356098938187199} + m_GameObject: {fileID: 7353328628115307757} m_CullTransparentMesh: 1 ---- !u!114 &9173138007019277610 +--- !u!114 &8441513199088194787 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7420356098938187199} + m_GameObject: {fileID: 7353328628115307757} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -2584,7 +2660,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1971934105336562885} + - {fileID: 7386397652882480380} - {fileID: 9164996300742651407} - {fileID: 1989893004251603919} - {fileID: 1686117929436006730} diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/YL/UI/UIPetInfoWindow/UIPetInfoWindow.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/YL/UI/UIPetInfoWindow/UIPetInfoWindow.cs index aaa6d33b..bf227926 100644 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/YL/UI/UIPetInfoWindow/UIPetInfoWindow.cs +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/YL/UI/UIPetInfoWindow/UIPetInfoWindow.cs @@ -19,8 +19,8 @@ namespace GameLogic m_btnAddtionPet = FindChildComponent