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

Assets/Res/Config/LanguageChineseConfig.json

@@ -830,39 +830,39 @@
     },
     {
       "ID": 208,
-      "txt": "事件10001：一只[怪物1]袭击了你，准备迎战"
+      "txt": ""
     },
     {
       "ID": 209,
-      "txt": "你击败了怪物，并从它身上吸取了一些修为"
+      "txt": ""
     },
     {
       "ID": 210,
-      "txt": "你偶遇一处仙气四溢无人生活的洞穴"
+      "txt": ""
     },
     {
       "ID": 211,
-      "txt": "不知哪位高人在洞穴内壁留下绝世秘籍"
+      "txt": ""
     },
     {
       "ID": 212,
-      "txt": "你在飞行途中不慎滑倒"
+      "txt": ""
     },
     {
       "ID": 213,
-      "txt": "原来是脚下有一块圆润的微微发光的石头"
+      "txt": ""
     },
     {
       "ID": 214,
-      "txt": "你拾起来一看，原来它蕴含了丰富的法宝灵韵"
+      "txt": ""
     },
     {
       "ID": 215,
-      "txt": "原本郁闷的心情，突然变的好了起来，哈哈~"
+      "txt": ""
     },
     {
       "ID": 216,
-      "txt": "你被怪物击败，神识也随之消散了。"
+      "txt": ""
     },
     {
       "ID": 217,
@@ -8458,7 +8458,7 @@
     },
     {
       "ID": 2115,
-      "txt": "击败结界兽"
+      "txt": "击败结界兽怎么想过去，就去吧.."
     },
     {
       "ID": 2116,
@@ -9462,95 +9462,95 @@
     },
     {
       "ID": 2366,
-      "txt": "小友留步，老夫有一事相求"
+      "txt": "与疯道人对话(0/1)"
     },
     {
       "ID": 2367,
-      "txt": "三十年前北海妖族来犯，击退妖族后老夫捡到个被妖兽重伤的娃娃。"
+      "txt": "小友留步，老夫有一事相求"
     },
     {
       "ID": 2368,
-      "txt": "他心口妖气汇聚，周身却萦绕着纯净的风灵根。这般矛盾体质，注定要卷入因果轮回。"
+      "txt": "三十年前北海妖族来犯，击退妖族后老夫捡到个被妖兽重伤的娃娃。"
     },
     {
       "ID": 2369,
-      "txt": "于是老夫收留他在门下修养"
+      "txt": "他心口妖气汇聚，周身却萦绕着纯净的风灵根。这般矛盾体质，注定要卷入因果轮回。"
     },
     {
       "ID": 2370,
-      "txt": "但他心智被妖气所蛊惑一心只想报仇，整日念叨着要杀尽北海妖族。"
+      "txt": "于是老夫收留他在门下修养"
     },
     {
       "ID": 2371,
-      "txt": "但十年的相处老夫早就把他当做亲人看待，为了断掉念想，只得让他离去，他离开之时盗走了洞府中的禁书《御风化影诀》。"
+      "txt": "但他心智被妖气所蛊惑一心只想报仇，整日念叨着要杀尽北海妖族。"
     },
     {
       "ID": 2372,
-      "txt": "\"\""
+      "txt": "但十年的相处老夫早就把他当做亲人看待，为了断掉念想，只得让他离去，他离开之时盗走了洞府中的禁书《御风化影诀》。"
     },
     {
       "ID": 2373,
-      "txt": "前辈为何不追"
+      "txt": "\"\""
     },
     {
       "ID": 2374,
-      "txt": "他怎会轻易盗走此书"
+      "txt": "前辈为何不追"
     },
     {
       "ID": 2375,
-      "txt": "那孩子恐是为了给爹妈寻仇，也是看往日情面，老夫不想亲自动手。"
+      "txt": "他怎会轻易盗走此书"
     },
     {
       "ID": 2376,
-      "txt": "现如今老夫发现山中的生灵会莫名消失，村中孩童也是被神秘的妖气所卷走，这和书中的血肉炼化的方法一模一样，老夫断定是那孩子所为。"
+      "txt": "那孩子恐是为了给爹妈寻仇，也是看往日情面，老夫不想亲自动手。"
     },
     {
       "ID": 2377,
-      "txt": "小友，我追踪妖气波动，他就在西边的树林之中！"
+      "txt": "现如今老夫发现山中的生灵会莫名消失，村中孩童也是被神秘的妖气所卷走，这和书中的血肉炼化的方法一模一样，老夫断定是那孩子所为。"
     },
     {
       "ID": 2378,
-      "txt": "（枯叶居然无风漂浮在空中，地面残留着扭曲的符文刻痕，见风无咎在地上刻画着什么）"
+      "txt": "小友，我追踪妖气波动，他就在西边的树林之中！"
     },
     {
       "ID": 2379,
-      "txt": "(看见主角到来)你小子身上怎会有老疯子的气，是那老头让你来抓我的吗。"
+      "txt": "（枯叶居然无风漂浮在空中，地面残留着扭曲的符文刻痕，见风无咎在地上刻画着什么）"
     },
     {
       "ID": 2380,
-      "txt": "前辈见往日情面不愿亲自动手，我一人足以   "
+      "txt": "(看见主角到来)你小子身上怎会有老疯子的气，是那老头让你来抓我的吗。"
     },
     {
       "ID": 2381,
-      "txt": "（说罢，风无咎的影子化形，为了一妖，顿时煞气暴涨）"
+      "txt": "前辈见往日情面不愿亲自动手，我一人足以   "
     },
     {
       "ID": 2382,
-      "txt": "如今我自断妖魂炼出影身，正好今天拿你试试！"
+      "txt": "（说罢，风无咎的影子化形，为了一妖，顿时煞气暴涨）"
     },
     {
       "ID": 2383,
-      "txt": "岂会如此！"
+      "txt": "如今我自断妖魂炼出影身，正好今天拿你试试！"
     },
     {
       "ID": 2384,
-      "txt": "交还书页，我可留你魂魄入轮回。"
+      "txt": "岂会如此！"
     },
     {
       "ID": 2385,
-      "txt": " 轮回？今日是我大意了！老东西还有你，给我等着！（化作一震妖风带着《御风化影诀》逃往远方）"
+      "txt": "交还书页，我可留你魂魄入轮回。"
     },
     {
       "ID": 2386,
-      "txt": "这孩子天资聪颖，短短二十年就能参悟书中所写。"
+      "txt": " 轮回？今日是我大意了！老东西还有你，给我等着！（化作一震妖风带着《御风化影诀》逃往远方）"
     },
     {
       "ID": 2387,
-      "txt": "无妨，此法需要大量血肉献祭，如此规模的法术定会妖气四散，找到他也是迟早之事。"
+      "txt": "这孩子天资聪颖，短短二十年就能参悟书中所写。"
     },
     {
       "ID": 2388,
-      "txt": ""
+      "txt": "无妨，此法需要大量血肉献祭，如此规模的法术定会妖气四散，找到他也是迟早之事。"
     },
     {
       "ID": 2389,

Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -327,7 +327,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
                         }
 
                         int randomValue4 = Random.Range(0, 101);
-                        if (randomValue4 >= eventConfig1.RefreshProbability)
+                        if (randomValue4 <= eventConfig1.RefreshProbability)
                         {
                             eventLists.Add(AddEvent(eventConfig1.ID));
                             isRefence = true;

Assets/Scripts/GameUI/UI/DivineSence/ShengShiConditionWidget.cs

@@ -30,6 +30,13 @@ namespace Fort23.Mono
 			Text_Name.text = EventHelper.GetTaskMessage(eventConditionData) ;
 			
 		}
+		
+		public void CustomInit(string tips)
+		{
+			
+			Text_Name.text = tips ;
+			
+		}
 
 	}
 }

Assets/Scripts/GameUI/UI/MainPanel/MainPanel.cs

@@ -216,7 +216,9 @@ namespace Fort23.Mono
 
                 AccountFileInfo.EventLinkData eventLinkData = eventList.eventLinks.FirstOrDefault(el => el.eventLinkId == eventList.curStep);
 
-                if (eventLinkData != null && eventLinkData.eventConditions != null && eventLinkData.eventConditions.Count >= 0)
+                EventLinkConfig evenkConfig = ConfigComponent.Instance.Get<EventLinkConfig>(eventLinkData.eventLinkId);
+
+                if (eventLinkData != null && eventLinkData.eventConditions != null && eventLinkData.eventConditions.Count > 0)
                 {
                     foreach (var eventConditionData in eventLinkData.eventConditions)
                     {
@@ -225,6 +227,12 @@ namespace Fort23.Mono
                         _shengShiConditionWidgets.Add(shengShiConditionWidget);
                     }
                 }
+                else if (evenkConfig.EventConditionMessage != 0)
+                {
+                    ShengShiConditionWidget shengShiConditionWidget = await UIManager.Instance.CreateGComponent<ShengShiConditionWidget>(null, EventConditionRoot);
+                    shengShiConditionWidget.CustomInit(LanguageManager.Instance.Text(evenkConfig.EventConditionMessage));
+                    _shengShiConditionWidgets.Add(shengShiConditionWidget);
+                }
             }
             else
             {

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;
+        }
+    }
+}

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)