瀏覽代碼

修改心境表

lzx 2 天之前
父節點
當前提交
db7c7f2b49

+ 13 - 1
Assets/Scripts/GameData/ExcelConfig/EventLinkConfig.cs

@@ -32,6 +32,18 @@ public int conciseEventMessage;
 public int EventConditionMessage;
 
 
+		/// <summary>
+		///前置表现 
+		/// </summary>
+public int PreShow;
+
+
+		/// <summary>
+		///前置表现参数 
+		/// </summary>
+public int PreShowPar;
+
+
 		/// <summary>
 		///对话NPCID
 		/// </summary>
@@ -63,7 +75,7 @@ public int[] ConditionId;
 
 
 		/// <summary>
-		///步骤类型 1=提供选项 2=进入战斗 3=获得奖励 4=扣除道具
+		///步骤类型 1=提供选项 2=进入战斗 3=获得奖励 4=扣除道具 5=自动退出
 		/// </summary>
 public int optionType;
 

+ 23 - 23
Assets/Scripts/GameUI/UI/SentimentPanel/SentimentEffectWidget.cs

@@ -1,29 +1,29 @@
 namespace Fort23.Mono
 {
-	[UIBinding(prefab = "SentimentEffectWidget"  )]
-	public partial class SentimentEffectWidget : UIComponent
-	{
-		private void Init()
-		{
+    [UIBinding(prefab = "SentimentEffectWidget")]
+    public partial class SentimentEffectWidget : ItemWidgetBasic
+    {
+        public AccountFileInfo.SentimentProperty sentimentProperty;
+        private void Init()
+        {
+        }
 
-		}
-		public override void AddEvent()
-		{
+        public override void AddEvent()
+        {
+        }
 
-		}
-		public override void DelEvent()
-		{
+        public override void DelEvent()
+        {
+        }
 
-		}
-		public override void AddButtonEvent()
-		{
+        public override void AddButtonEvent()
+        {
+            base.AddButtonEvent();
+        }
 
-		}
-
-		public void CustomInit(AccountFileInfo.SentimentProperty sentimentProperty)
-		{
-			
-		}
-
-	}
-}
+        public void CustomInit(AccountFileInfo.SentimentProperty sentimentProperty)
+        {
+            this.sentimentProperty = sentimentProperty;
+        }
+    }
+}

+ 34 - 2
Assets/Scripts/GameUI/UI/SentimentPanel/SentimentInfoPanel.cs

@@ -1,4 +1,9 @@
+using System.Collections.Generic;
+using Core.Language;
+using Excel2Json;
 using Fort23.Core;
+using Fort23.UTool;
+using Utility;
 
 namespace Fort23.Mono
 {
@@ -7,6 +12,8 @@ namespace Fort23.Mono
     {
         private AccountFileInfo.SentimentData sentimentData;
 
+        List<SentimentEffectWidget> sentimentEffectWidgets = new List<SentimentEffectWidget>();
+
         private void Init()
         {
         }
@@ -24,10 +31,35 @@ namespace Fort23.Mono
             Btn_Close.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
         }
 
-        public override CTask<bool> AsyncInit(object[] uiData)
+        public async override CTask<bool> AsyncInit(object[] uiData)
         {
             sentimentData = uiData[0] as AccountFileInfo.SentimentData;
-            return base.AsyncInit(uiData);
+            SentimentEffectWidget sentimentEffectWidget = await UIManager.Instance.CreateGComponentForObject<SentimentEffectWidget>(MainSentimentEffectWidget, null);
+            sentimentEffectWidget.CustomInit(sentimentData.mainSentiment);
+            foreach (var sentimentDataSentimentProperty in sentimentData.sentimentProperties)
+            {
+                SentimentEffectWidget sentimentEffectWidget1 = await UIManager.Instance.CreateGComponent<SentimentEffectWidget>(null, Content);
+                sentimentEffectWidget1.CustomInit(sentimentDataSentimentProperty);
+                sentimentEffectWidget1.OnClick = OnClick;
+                sentimentEffectWidgets.Add(sentimentEffectWidget1);
+            }
+
+            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 OnClick(ItemWidgetBasic obj)
+        {
+            SentimentEffectWidget sentimentEffectWidget = obj as SentimentEffectWidget;
+
+            int conFigId = sentimentEffectWidget.sentimentProperty.groupId * 100 + sentimentEffectWidget.sentimentProperty.level;
+            SentimentEffectConfig sentimentEffectConfig = ConfigComponent.Instance.Get<SentimentEffectConfig>(conFigId);
+            UpdateUi(sentimentEffectConfig);
         }
 
         public async CTask OpenPanel(AccountFileInfo.SentimentData sentimentData)

二進制
Excel2Json/Excel/Sentiment.xlsx