소스 검색

修改bug

lzx 2 일 전
부모
커밋
bd2fa1a014

+ 4 - 4
Assets/Res/UI/SentimentPanel/SentimentInfoPanel.prefab

@@ -890,10 +890,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 9037135992368401232}
   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: 750, y: 1624}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3982180203602062132
 CanvasRenderer:
@@ -916,7 +916,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0, b: 0, a: 0.003921569}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.6901961}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1

+ 1 - 1
Assets/Scenes/testCombat.scene

@@ -2317,7 +2317,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 9214784224709271120, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: m_IsActive
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []

+ 1 - 0
Assets/Scripts/GameLogic/Player/AccountFileInfo.cs

@@ -133,6 +133,7 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
     /// <summary>
     /// 心境属性
     /// </summary>
+    [System.Serializable]
     public class SentimentProperty
     {
         // 属性类别

+ 25 - 8
Assets/Scripts/GameUI/UI/SentimentPanel/SentimentInfoPanel.cs

@@ -10,12 +10,15 @@ namespace Fort23.Mono
     [UIBinding(prefab = "SentimentInfoPanel")]
     public partial class SentimentInfoPanel : UIPanel
     {
+        AccountFileInfo.SentimentProperty curretnSentimentProperty;
         private AccountFileInfo.SentimentData sentimentData;
 
         List<SentimentEffectWidget> sentimentEffectWidgets = new List<SentimentEffectWidget>();
 
         private void Init()
         {
+            isAddStack = false;
+            isPopUi = true;
         }
 
         protected override void AddEvent()
@@ -36,6 +39,7 @@ namespace Fort23.Mono
             sentimentData = uiData[0] as AccountFileInfo.SentimentData;
             SentimentEffectWidget sentimentEffectWidget = await UIManager.Instance.CreateGComponentForObject<SentimentEffectWidget>(MainSentimentEffectWidget, null);
             sentimentEffectWidget.CustomInit(sentimentData.mainSentiment);
+            sentimentEffectWidget.OnClick = OnClick;
             foreach (var sentimentDataSentimentProperty in sentimentData.sentimentProperties)
             {
                 SentimentEffectWidget sentimentEffectWidget1 = await UIManager.Instance.CreateGComponent<SentimentEffectWidget>(null, Content);
@@ -47,24 +51,37 @@ namespace Fort23.Mono
             return await base.AsyncInit(uiData);
         }
 
-        private void UpdateUi(SentimentEffectConfig sentimentEffectConfig)
-        {
-            Text_Name.text = LanguageManager.Instance.Text(sentimentEffectConfig.name);
-            // Text_Desc.text = UtilTools.GetString(sentimentEffectConfig.)
-        }
+        // private void UpdateUi(SentimentEffectConfig sentimentEffectConfig)
+        // {
+        //
+        // }
 
         private void OnClick(ItemWidgetBasic obj)
         {
             SentimentEffectWidget sentimentEffectWidget = obj as SentimentEffectWidget;
-
+            curretnSentimentProperty = sentimentEffectWidget.sentimentProperty;
             int conFigId = sentimentEffectWidget.sentimentProperty.groupId * 100 + sentimentEffectWidget.sentimentProperty.level;
             SentimentEffectConfig sentimentEffectConfig = ConfigComponent.Instance.Get<SentimentEffectConfig>(conFigId);
-            UpdateUi(sentimentEffectConfig);
+            Text_Name.text = LanguageManager.Instance.Text(sentimentEffectConfig.name);
+            Text_Desc.text = UtilTools.GetString(LanguageManager.Instance.Text(sentimentEffectConfig.massge), sentimentEffectConfig.effectVale);
+            Text_Level.text = $"当前层 ;{curretnSentimentProperty.level}/{5}";
+            // UpdateUi(sentimentEffectConfig);
         }
 
-        public async CTask OpenPanel(AccountFileInfo.SentimentData sentimentData)
+        public static async CTask OpenPanel(AccountFileInfo.SentimentData sentimentData)
         {
             await UIManager.Instance.LoadAndOpenPanel<SentimentInfoPanel>(null, uiData: new object[] { sentimentData });
         }
+
+        public override void Close()
+        {
+            foreach (var sentimentEffectWidget in sentimentEffectWidgets)
+            {
+                UIManager.Instance.DormancyGComponent(sentimentEffectWidget);
+            }
+            sentimentEffectWidgets.Clear();
+
+            base.Close();
+        }
     }
 }

+ 1 - 0
Assets/Scripts/GameUI/UI/SentimentPanel/SentimentPanel.cs

@@ -37,6 +37,7 @@ namespace Fort23.Mono
 		private void OnClick(ItemWidgetBasic obj)
 		{
 			SentimentWidget sentimentWidget = obj as SentimentWidget;
+			SentimentInfoPanel.OpenPanel(sentimentWidget.sentimentData);
 		}
 
 		public async static CTask OpenPanel()

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
Assets/StreamingAssets/assetConfig.txt


이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.