Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

Assets/Res/UI/SentimentPanel/SentimentInfoPanel.prefab

@@ -651,7 +651,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Content: {fileID: 5355338081498464365}
-  m_Horizontal: 1
+  m_Horizontal: 0
   m_Vertical: 1
   m_MovementType: 1
   m_Elasticity: 0.1

Assets/Scripts/GameUI/UI/SentimentPanel/SentimentInfoPanel.cs

@@ -170,9 +170,19 @@ namespace Fort23.Mono
             }
 
 
-            // energyWidget =
-            //     await UIManager.Instance.CreateGComponent<EnergyWidget>(null, Group_ResourceBar);
-            // energyWidget.CustomInit(sentimentEffectConfig1.upConstItemId);
+            return await base.AsyncInit(uiData);
+        }
+
+        public async override CTask Show()
+        {
+            await base.Show();
+            foreach (var sentimentEffectWidget in sentimentEffectWidgets)
+            {
+                UIManager.Instance.DormancyGComponent(sentimentEffectWidget);
+            }
+
+            sentimentEffectWidgets.Clear();
+
 
             foreach (var sentimentDataSentimentProperty in sentimentData.sentimentProperties)
             {
@@ -198,12 +208,6 @@ namespace Fort23.Mono
             }
 
 
-            return await base.AsyncInit(uiData);
-        }
-
-        public async override CTask Show()
-        {
-            await base.Show();
             foreach (var sentimentEffectWidget in sentimentEffectWidgets)
             {
                 int level = sentimentEffectWidget.sentimentProperty.level <= 0 ? 1 : sentimentEffectWidget.sentimentProperty.level;