Merge branch 'YKing'

# Conflicts:
#	EintooAR/UserSettings/Layouts/default-6000.dwlt   resolved by main version

EintooAR/Assets/Editor/I2Localization/I2Languages.asset

@@ -17,6 +17,60 @@ MonoBehaviour:
     UserAgreesToHaveItInsideThePluginsFolder: 0
     GoogleLiveSyncIsUptoDate: 1
     mTerms:
+    - Term: ar_ARFindPet
+      TermType: 0
+      Description: 
+      Languages:
+      - "AR\u5BFB\u5BA0"
+      - ARFindPet
+      - "AR\u5C0B\u5BF5"
+      Flags: 000000
+      Languages_Touch: []
+    - Term: ar_ARSelectType
+      TermType: 0
+      Description: 
+      Languages:
+      - "\u8BF7\u9009\u62E9\u54C1\u79CD"
+      - Please select a variety
+      - "\u8ACB\u9078\u64C7\u54C1\u7A2E"
+      Flags: 000000
+      Languages_Touch: []
+    - Term: ar_ARSelectZone
+      TermType: 0
+      Description: 
+      Languages:
+      - "\u8BF7\u9009\u62E9\u5730\u533A"
+      - Please select a region
+      - "\u8ACB\u9078\u64C7\u5730\u5340"
+      Flags: 000000
+      Languages_Touch: []
+    - Term: ar_ArClickCollect
+      TermType: 0
+      Description: 
+      Languages:
+      - "\u70B9\u51FB\u6536\u85CF"
+      - ClickCollect
+      - "\u9EDE\u64CA\u6536\u85CF"
+      Flags: 000000
+      Languages_Touch: []
+    - Term: ar_ArCollect
+      TermType: 0
+      Description: 
+      Languages:
+      - "\u6536\u85CF"
+      - Collect
+      - "\u6536\u85CF"
+      Flags: 000000
+      Languages_Touch: []
+    - Term: ar_ArCompany
+      TermType: 0
+      Description: 
+      Languages:
+      - "AR\u4F01\u4E1A"
+      - AR Company
+      - "AR\u4F01\u696D"
+      Flags: 000000
+      Languages_Touch: []
     - Term: ar_ArExample
       TermType: 0
       Description: 
@@ -26,6 +80,15 @@ MonoBehaviour:
       - "AR\u6848\u4F8B"
       Flags: 000000
       Languages_Touch: []
+    - Term: ar_ArSearch
+      TermType: 0
+      Description: 
+      Languages:
+      - "\u641C\u7D22"
+      - Search
+      - "\u641C\u5C0B"
+      Flags: 000000
+      Languages_Touch: []
     - Term: ar_ArTeacher
       TermType: 0
       Description: 
@@ -46,6 +109,60 @@ MonoBehaviour:
       - "AR\u865B\u64EC\u4EBA"
       Flags: 000000
       Languages_Touch: []
+    - Term: ar_Arself
+      TermType: 0
+      Description: 
+      Languages:
+      - "\u6211\u7684"
+      - Self
+      - "\u6211\u7684"
+      Flags: 000000
+      Languages_Touch: []
+    - Term: ar_Cancel
+      TermType: 0
+      Description: 
+      Languages:
+      - "\u53D6\u6D88"
+      - Cancel
+      - "\u53D6\u6D88"
+      Flags: 000000
+      Languages_Touch: []
+    - Term: ar_Cancle
+      TermType: 0
+      Description: 
+      Languages:
+      - "\u53D6\u6D88"
+      - 
+      - 
+      Flags: 000000
+      Languages_Touch: []
+    - Term: ar_Confirm
+      TermType: 0
+      Description: 
+      Languages:
+      - "\u786E\u8BA4"
+      - Sure
+      - "\u78BA\u8A8D"
+      Flags: 000000
+      Languages_Touch: []
+    - Term: ar_DeletePetInfo
+      TermType: 0
+      Description: 
+      Languages:
+      - "\u662F\u5426\u5220\u9664\u8BE5AR\u5BA0\u7269\u4FE1\u606F\uFF1F"
+      - Do you want to delete the AR pet information?
+      - "\u662F\u5426\u522A\u9664\u8A72AR\u5BF5\u7269\u4FE1\u606F\uFF1F"
+      Flags: 000000
+      Languages_Touch: []
+    - Term: ar_FindARBrochure
+      TermType: 0
+      Description: 
+      Languages:
+      - "\u627E\u4E0D\u5230\u5BA3\u4F20\u518C\uFF1F\u524D\u5F80\u641C\u7D22"
+      - Can't find the brochure? Go to search.
+      - "\u627E\u4E0D\u5230\u5BA3\u50B3\u518A\uFF1F\u524D\u5F80\u641C\u5C0B"
+      Flags: 000000
+      Languages_Touch: []
     - Term: ar_HelloWorld
       TermType: 0
       Description: 
@@ -64,6 +181,60 @@ MonoBehaviour:
       - "\u9996\u9801"
       Flags: 000000
       Languages_Touch: []
+    - Term: ar_PetInfo
+      TermType: 0
+      Description: 
+      Languages:
+      - "\u5BA0\u7269\u4FE1\u606F"
+      - Pet Infomation
+      - "\u5BF5\u7269\u4FE1\u606F"
+      Flags: 000000
+      Languages_Touch: []
+    - Term: ar_PetInformationbank
+      TermType: 0
+      Description: 
+      Languages:
+      - "\u5BA0\u7269\u4FE1\u606F\u5E93"
+      - PetInformationbank
+      - "\u5BF5\u7269\u4FE1\u606F\u5EAB"
+      Flags: 000000
+      Languages_Touch: []
+    - Term: ar_PetOwnInfo
+      TermType: 0
+      Description: 
+      Languages:
+      - "\u5BA0\u7269\u4E3B\u4EBA\u4FE1\u606F"
+      - Pet owner information
+      - "\u5BF5\u7269\u4E3B\u4EBA\u4FE1\u606F"
+      Flags: 000000
+      Languages_Touch: []
+    - Term: ar_PlaceModel
+      TermType: 0
+      Description: 
+      Languages:
+      - "\u6A21\u578B\u653E\u7F6E"
+      - PlaceModel
+      - "\u6A21\u578B\u653E\u7F6E"
+      Flags: 000000
+      Languages_Touch: []
+    - Term: ar_PleaseInputCompanyName
+      TermType: 0
+      Description: 
+      Languages:
+      - "\u8BF7\u8F93\u5165\u516C\u53F8\u540D\u79F0\u8D27AR\u9879\u76EE\u540D\u79F0"
+      - <size=12>Please enter the company name and the AR project name</size>
+      - "\u8ACB\u8F38\u5165\u516C\u53F8\u540D\u7A31\u8CA8AR\u9805\u76EE\u540D\u7A31"
+      Flags: 000000
+      Languages_Touch: []
+    - Term: ar_ResetModel
+      TermType: 0
+      Description: 
+      Languages:
+      - "\u91CD\u7F6E"
+      - Reset
+      - "\u91CD\u7F6E"
+      Flags: 000000
+      Languages_Touch: []
     - Term: ar_Retrun
       TermType: 0
       Description: "\u8FD9\u662F \u4E00\u4E2A \u8FD4\u56DE \u529F\u80FD"
@@ -82,76 +253,49 @@ MonoBehaviour:
       - "\u958B\u59CB\u9AD4\u9A57"
       Flags: 000000
       Languages_Touch: []
-    - Term: ar_ArCollect
+    - Term: ar_Sure
       TermType: 0
       Description: 
       Languages:
-      - "\u6536\u85CF"
+      - "\u786E\u8BA4"
-      - Collect
+      - Sure
-      - "\u6536\u85CF"
+      - "\u78BA\u8A8D"
       Flags: 000000
       Languages_Touch: []
-    - Term: ar_ArClickCollect
+    - Term: ar_Tips
       TermType: 0
       Description: 
       Languages:
-      - "\u70B9\u51FB\u6536\u85CF"
+      - "\u63D0\u793A"
-      - ClickCollect
+      - Tip
-      - "\u9EDE\u64CA\u6536\u85CF"
+      - "\u63D0\u793A"
       Flags: 000000
       Languages_Touch: []
-    - Term: ar_ArCompany
+    - Term: ar_TrackImages
       TermType: 0
       Description: 
       Languages:
-      - "AR\u4F01\u4E1A"
+      - "\u8BC6\u522B\u56FE\u76F8\u518C"
-      - AR Company
+      - Identification photo album
-      - "AR\u4F01\u696D"
+      - 
       Flags: 000000
       Languages_Touch: []
-    - Term: ar_PlaceModel
+    - Term: ar_addtionPet
       TermType: 0
       Description: 
       Languages:
-      - "\u6A21\u578B\u653E\u7F6E"
+      - "\u65B0\u589E\u5BA0\u7269"
-      - PlaceModel
+      - AddtionPet
-      - "\u6A21\u578B\u653E\u7F6E"
+      - "\u65B0\u589E\u5BF5\u7269"
       Flags: 000000
       Languages_Touch: []
-    - Term: ar_ResetModel
+    - Term: ar_games
       TermType: 0
       Description: 
       Languages:
-      - "\u91CD\u7F6E"
+      - "AR\u6E38\u620F"
-      - Reset
+      - AR Games
-      - "\u91CD\u7F6E"
+      - "AR\u904A\u6232"
-      Flags: 000000
-      Languages_Touch: []
-    - Term: ar_FindARBrochure
-      TermType: 0
-      Description: 
-      Languages:
-      - "\u627E\u4E0D\u5230\u5BA3\u4F20\u518C\uFF1F\u524D\u5F80\u641C\u7D22"
-      - Can't find the brochure? Go to search.
-      - "\u627E\u4E0D\u5230\u5BA3\u50B3\u518A\uFF1F\u524D\u5F80\u641C\u5C0B"
-      Flags: 000000
-      Languages_Touch: []
-    - Term: ar_Arself
-      TermType: 0
-      Description: 
-      Languages:
-      - "\u6211\u7684"
-      - Self
-      - "\u6211\u7684"
-      Flags: 000000
-      Languages_Touch: []
-    - Term: ar_ArSearch
-      TermType: 0
-      Description: 
-      Languages:
-      - "\u641C\u7D22"
-      - Search
-      - "\u641C\u5C0B"
       Flags: 000000
       Languages_Touch: []
     - Term: ar_historySearch
@@ -163,31 +307,31 @@ MonoBehaviour:
       - "\u6B77\u53F2\u641C\u5C0B"
       Flags: 000000
       Languages_Touch: []
-    - Term: ar_PleaseInputCompanyName
+    - Term: ar_imageRecognition
       TermType: 0
       Description: 
       Languages:
-      - "\u8BF7\u8F93\u5165\u516C\u53F8\u540D\u79F0\u8D27AR\u9879\u76EE\u540D\u79F0"
+      - "AR\u8BC6\u56FE"
-      - <size=12>Please enter the company name and the AR project name</size>
+      - AR image recognition
-      - "\u8ACB\u8F38\u5165\u516C\u53F8\u540D\u7A31\u8CA8AR\u9805\u76EE\u540D\u7A31"
+      - "AR\u8B58\u5716"
       Flags: 000000
       Languages_Touch: []
-    - Term: ar_Cancel
+    - Term: ar_imageTrackTip
       TermType: 0
       Description: 
       Languages:
-      - "\u53D6\u6D88"
+      - "\u6ED1\u52A8\u6A21\u5757\u542F\u52A8AR\u65B0\u4F53\u9A8C"
-      - Cancel
+      - Slide module to start new AR experience
-      - "\u53D6\u6D88"
+      - "\u6ED1\u52D5\u6A21\u7D44\u555F\u52D5AR\u65B0\u9AD4\u9A57"
       Flags: 000000
       Languages_Touch: []
-    - Term: ar_Confirm
+    - Term: ar_intoo
       TermType: 0
       Description: 
       Languages:
-      - "\u786E\u8BA4"
+      - "\u82F1\u9886\u4E4B\u6D82"
-      - Sure
+      - intoo
-      - "\u78BA\u8A8D"
+      - "\u82F1\u9818\u4E4B\u5857"
       Flags: 000000
       Languages_Touch: []
     - Term: ar_languageSwitch
@@ -217,42 +361,6 @@ MonoBehaviour:
       - "\u865B\u64EC\u4EBA"
       Flags: 000000
       Languages_Touch: []
-    - Term: ar_games
-      TermType: 0
-      Description: 
-      Languages:
-      - "AR\u6E38\u620F"
-      - AR Games
-      - "AR\u904A\u6232"
-      Flags: 000000
-      Languages_Touch: []
-    - Term: ar_intoo
-      TermType: 0
-      Description: 
-      Languages:
-      - "\u82F1\u9886\u4E4B\u6D82"
-      - intoo
-      - "\u82F1\u9818\u4E4B\u5857"
-      Flags: 000000
-      Languages_Touch: []
-    - Term: ar_imageRecognition
-      TermType: 0
-      Description: 
-      Languages:
-      - "AR\u8BC6\u56FE"
-      - AR image recognition
-      - "AR\u8B58\u5716"
-      Flags: 000000
-      Languages_Touch: []
-    - Term: ar_imageTrackTip
-      TermType: 0
-      Description: 
-      Languages:
-      - "\u6ED1\u52A8\u6A21\u5757\u542F\u52A8AR\u65B0\u4F53\u9A8C"
-      - Slide module to start new AR experience
-      - "\u6ED1\u52D5\u6A21\u7D44\u555F\u52D5AR\u65B0\u9AD4\u9A57"
-      Flags: 000000
-      Languages_Touch: []
     - Term: ar_xuanchuance
       TermType: 0
       Description: 
@@ -262,89 +370,6 @@ MonoBehaviour:
       - "AR\u5BA3\u50B3\u518A"
       Flags: 000000
       Languages_Touch: []
-    - Term: ar_TrackImages
-      TermType: 0
-      Description: 
-      Languages:
-      - "\u8BC6\u522B\u56FE\u76F8\u518C"
-      - Identification photo album
-      - 
-      Flags: 000000
-      Languages_Touch: []
-    - Term: ar_ARSelectType
-      TermType: 0
-      Description: 
-      Languages:
-      - "\u8BF7\u9009\u62E9\u54C1\u79CD"
-      - Please select a variety
-      - "\u8ACB\u9078\u64C7\u54C1\u7A2E"
-      Flags: 000000
-      Languages_Touch: []
-    - Term: ar_ARSelectZone
-      TermType: 0
-      Description: 
-      Languages:
-      - "\u8BF7\u9009\u62E9\u5730\u533A"
-      - Please select a region
-      - "\u8ACB\u9078\u64C7\u5730\u5340"
-      Flags: 000000
-      Languages_Touch: []
-    - Term: ar_Sure
-      TermType: 0
-      Description: 
-      Languages:
-      - "\u786E\u8BA4"
-      - 'Sure
-
-'
-      - 
-      Flags: 000000
-      Languages_Touch: []
-    - Term: ar_PetInfo
-      TermType: 0
-      Description: 
-      Languages:
-      - "\u5BA0\u7269\u4FE1\u606F"
-      - Pet Infomation
-      - "\u5BF5\u7269\u4FE1\u606F"
-      Flags: 000000
-      Languages_Touch: []
-    - Term: ar_PetOwnInfo
-      TermType: 0
-      Description: 
-      Languages:
-      - "\u5BA0\u7269\u4E3B\u4EBA\u4FE1\u606F"
-      - Pet owner information
-      - "\u5BF5\u7269\u4E3B\u4EBA\u4FE1\u606F"
-      Flags: 000000
-      Languages_Touch: []
-    - Term: ar_ARFindPet
-      TermType: 0
-      Description: 
-      Languages:
-      - "AR\u5BFB\u5BA0"
-      - ARFindPet
-      - "AR\u5C0B\u5BF5"
-      Flags: 000000
-      Languages_Touch: []
-    - Term: ar_addtionPet
-      TermType: 0
-      Description: 
-      Languages:
-      - "\u65B0\u589E\u5BA0\u7269"
-      - AddtionPet
-      - "\u65B0\u589E\u5BF5\u7269"
-      Flags: 000000
-      Languages_Touch: []
-    - Term: ar_PetInformationbank
-      TermType: 0
-      Description: 
-      Languages:
-      - "\u5BA0\u7269\u4FE1\u606F\u5E93"
-      - PetInformationbank
-      - "\u5BF5\u7269\u4FE1\u606F\u5EAB"
-      Flags: 000000
-      Languages_Touch: []
     CaseInsensitiveTerms: 0
     OnMissingTranslation: 1
     mTerm_AppName: 

EintooAR/Assets/GameScripts/HotFix/GameLogic/YL/UI/Custom.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 35dea7d9c9cfe584d97b2bec109c7512
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

EintooAR/Assets/GameScripts/HotFix/GameLogic/YL/UI/Custom/CustomContentSizeFitter.cs

@@ -0,0 +1,175 @@
+using UnityEngine;
+using UnityEngine.UI;
+
+// 自定义内容大小适配脚本
+public class CustomContentSizeFitter : MonoBehaviour
+{
+    // 适配模式枚举
+    public enum FitMode
+    {
+        // 无约束
+        Unconstrained,
+        // 最小尺寸
+        MinSize,
+        // 首选尺寸
+        PreferredSize
+    }
+
+    // 水平方向的适配模式
+    public FitMode horizontalFit = FitMode.Unconstrained;
+    // 垂直方向的适配模式
+    public FitMode verticalFit = FitMode.Unconstrained;
+
+    // 当前对象的矩形变换组件
+    private RectTransform rectTransform;
+    // 网格布局组组件
+    private GridLayoutGroup gridLayoutGroup;
+    
+    private void Awake()
+    {
+        // 获取当前对象的矩形变换组件
+        rectTransform = GetComponent<RectTransform>();
+        // 获取当前对象的网格布局组组件
+        gridLayoutGroup = GetComponent<GridLayoutGroup>();
+    }
+        
+    private void Update()
+    {
+        // 检查水平或垂直方向适配
+        if (horizontalFit != FitMode.Unconstrained || verticalFit != FitMode.Unconstrained)
+        {
+            SetLayoutHorizontal();
+            
+            SetLayoutVertical();
+        }
+    }
+
+    // 更新水平方向布局
+    private void SetLayoutHorizontal()
+    {
+        // 如果水平方向无约束，不处理
+        if (horizontalFit == FitMode.Unconstrained) return;
+
+        float minWidth = 0;
+        
+        float preferredWidth = 0;
+
+        // 如果存在网格布局组组件
+        if (gridLayoutGroup != null)
+        {
+            int childCount = rectTransform.childCount;
+            // 如果没有子对象，不处理
+            if (childCount == 0) return;
+
+            int columnCount;
+            // 计算列数
+            if (gridLayoutGroup.constraint == GridLayoutGroup.Constraint.FixedColumnCount)
+            {
+                columnCount = gridLayoutGroup.constraintCount;
+            }
+            else if (gridLayoutGroup.constraint == GridLayoutGroup.Constraint.FixedRowCount)
+            {
+                columnCount = Mathf.CeilToInt((float)childCount / gridLayoutGroup.constraintCount);
+            }
+            else
+            {
+                columnCount = Mathf.CeilToInt(Mathf.Sqrt(childCount));
+            }
+
+            float cellWidth = gridLayoutGroup.cellSize.x;
+            
+            float spacingX = gridLayoutGroup.spacing.x;
+            
+            float paddingLeft = gridLayoutGroup.padding.left;
+            
+            float paddingRight = gridLayoutGroup.padding.right;
+
+            preferredWidth = columnCount * cellWidth + Mathf.Max(0, columnCount - 1) * spacingX + paddingLeft + paddingRight;
+            
+            minWidth = preferredWidth;
+        }
+        else
+        {
+            // 如果没有网格布局组组件，遍历所有子对象
+            foreach (RectTransform child in rectTransform)
+            {
+                float childRight = child.anchoredPosition.x + child.sizeDelta.x;
+                
+                minWidth = Mathf.Max(minWidth, childRight);
+                
+                preferredWidth += child.sizeDelta.x;
+            }
+        }
+
+        if (horizontalFit == FitMode.MinSize)
+        {
+            rectTransform.sizeDelta = new Vector2(minWidth, rectTransform.sizeDelta.y);
+        }
+        else if (horizontalFit == FitMode.PreferredSize)
+        {
+            rectTransform.sizeDelta = new Vector2(preferredWidth, rectTransform.sizeDelta.y);
+        }
+    }
+
+    private void SetLayoutVertical()
+    {
+        if (verticalFit == FitMode.Unconstrained) return;
+
+        float minHeight = 0;
+        
+        float preferredHeight = 0;
+        
+        if (gridLayoutGroup != null)
+        {
+            int childCount = rectTransform.childCount;
+            
+            if (childCount == 0) return;
+
+            int rowCount;
+            if (gridLayoutGroup.constraint == GridLayoutGroup.Constraint.FixedRowCount)
+            {
+                rowCount = gridLayoutGroup.constraintCount;
+            }
+            else if (gridLayoutGroup.constraint == GridLayoutGroup.Constraint.FixedColumnCount)
+            {
+                rowCount = Mathf.CeilToInt((float)childCount / gridLayoutGroup.constraintCount);
+            }
+            else
+            {
+                rowCount = Mathf.CeilToInt((float)childCount / Mathf.CeilToInt(Mathf.Sqrt(childCount)));
+            }
+
+            float cellHeight = gridLayoutGroup.cellSize.y;
+            
+            float spacingY = gridLayoutGroup.spacing.y;
+            
+            float paddingTop = gridLayoutGroup.padding.top;
+            
+            float paddingBottom = gridLayoutGroup.padding.bottom;
+
+            preferredHeight = rowCount * cellHeight + Mathf.Max(0, rowCount - 1) * spacingY + paddingTop + paddingBottom;
+            
+            minHeight = preferredHeight;
+        }
+        else
+        {
+            foreach (RectTransform child in rectTransform)
+            {
+                float childBottom = child.anchoredPosition.y + child.sizeDelta.y;
+                
+                minHeight = Mathf.Max(minHeight, childBottom);
+                
+                preferredHeight += child.sizeDelta.y;
+            }
+        }
+
+        if (verticalFit == FitMode.MinSize)
+        {
+            rectTransform.sizeDelta = new Vector2(rectTransform.sizeDelta.x, minHeight);
+        }
+        else if (verticalFit == FitMode.PreferredSize)
+        {
+            rectTransform.sizeDelta = new Vector2(rectTransform.sizeDelta.x, preferredHeight);
+        }
+    }
+}

EintooAR/Assets/GameScripts/HotFix/GameLogic/YL/UI/Custom/CustomContentSizeFitter.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: a11df6da9317110469e84add500288b4

EintooAR/Assets/GameScripts/HotFix/GameLogic/YL/UI/UIPetInfoWindow/UIPetInfoWindow.cs

@@ -11,20 +11,62 @@ namespace GameLogic
         #region 脚本工具生成的代码
         private Button m_btnAddtionPet;
         private GameObject m_goParent;
+        private GameObject m_goTips;
+        private Button m_btnCancle;
+        private Button m_btnSure;
         protected override void ScriptGenerator()
         {
             m_btnAddtionPet = FindChildComponent<Button>("ScrollView/Viewport/Content/AddtionPetGroup/AddtionPetBackImage/AddPetBottom/m_btnAddtionPet");
-            m_goParent = FindChild("ScrollView/Viewport/Content/Group/m_goParent").gameObject;
+            m_goParent = FindChild("ScrollView/Viewport/Content/m_goParent").gameObject;
+            m_goTips = FindChild("m_goTips").gameObject;
+            m_btnCancle = FindChildComponent<Button>("m_goTips/Parent/Bottom/m_btnCancle");
+            m_btnSure = FindChildComponent<Button>("m_goTips/Parent/Bottom/m_btnSure");
             m_btnAddtionPet.onClick.AddListener(UniTask.UnityAction(OnClickAddtionPetBtn));
+            m_btnCancle.onClick.AddListener(UniTask.UnityAction(OnClickCancleBtn));
+            m_btnSure.onClick.AddListener(UniTask.UnityAction(OnClickSureBtn));
         }
         #endregion
 
         #region 事件
-        private async UniTaskVoid OnClickAddtionPetBtn()
+        private async UniTaskVoid OnClickAddtionPetBtn()                                                    // 新增宠物
+        {
+            await UniTask.Yield();
+            CreatePetInfoPrefab();
+        }
+        private async UniTaskVoid OnClickCancleBtn()                                                        // 取消删除
+        {
+            await UniTask.Yield();
+            ShowTipPanel();
+        }
+        private async UniTaskVoid OnClickSureBtn()                                                          // 确认删除
         {
             await UniTask.Yield();
         }
         #endregion
 
+        // 创建宠物信息
+        private void CreatePetInfoPrefab()
+        {
+            GameObject PetInfoPrefab = GameModule.Resource.LoadGameObject("UIPetinfoWidget");
+            PetInfoPrefab.transform.SetParent(m_goParent.transform);
+            PetInfoPrefab.transform.localPosition = Vector3.zero;
+            PetInfoPrefab.transform.localScale = Vector3.one;
+        }
+
+        // 显示tip面板
+        private void ShowTipPanel()
+        {
+            if (m_goTips != null)
+            {
+                if(m_goTips.activeSelf == true)
+                {
+                    m_goTips.SetActive(false);
+                }
+                else
+                {
+                    m_goTips.SetActive(true);
+                }
+            }
+        }
     }
 }