修改ui

Assets/Res/UI/DialoguePanel/DialoguePanel.prefab

@@ -3374,13 +3374,13 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 9117437417368447086}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6037835178821244997}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 28.6007, y: 0}

Assets/Res/UI/SkillSelectPanel/SkillWidget.prefab

@@ -135,6 +135,7 @@ GameObject:
   m_Component:
   - component: {fileID: 8817738242950991828}
   - component: {fileID: 8011248716651228647}
+  - component: {fileID: 2107088918873752165}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: SkillWidget
@@ -230,7 +231,68 @@ MonoBehaviour:
     - gameObject: {fileID: 1541203404502475801}
     - gameObject: {fileID: 7344344513877532038}
     - gameObject: {fileID: 3002968146783622268}
+  - key: ShuXingCsc
+    gameObject: {fileID: 2107088918873752165}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 7739541666801086000}
+    - gameObject: {fileID: 1541203404502475801}
+    - gameObject: {fileID: 7344344513877532038}
+    - gameObject: {fileID: 3002968146783622268}
   isAssetBundle: 1
+--- !u!114 &2107088918873752165
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1157110654555507881}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ef7878ea2dacc454894d556c1d97bca0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - StateInfos:
+    - Target: {fileID: 4044849639734904529}
+      UIStateV4Types: 40000000
+      UIStateV4Datas:
+      - {x: 0.7058824, y: 0.43921572, z: 0.0627451, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+  - StateInfos:
+    - Target: {fileID: 4044849639734904529}
+      UIStateV4Types: 40000000
+      UIStateV4Datas:
+      - {x: 0.13333334, y: 0.5176471, z: 0.18823531, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+  - StateInfos:
+    - Target: {fileID: 4044849639734904529}
+      UIStateV4Types: 40000000
+      UIStateV4Datas:
+      - {x: 0.10588236, y: 0.3921569, z: 0.5568628, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+  - StateInfos:
+    - Target: {fileID: 4044849639734904529}
+      UIStateV4Types: 40000000
+      UIStateV4Datas:
+      - {x: 0.49411768, y: 0.0627451, z: 0.078431375, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+  - StateInfos:
+    - Target: {fileID: 4044849639734904529}
+      UIStateV4Types: 40000000
+      UIStateV4Datas:
+      - {x: 0.35686275, y: 0.21176472, z: 0.04705883, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+  AllComs:
+  - {fileID: 4044849639734904529}
+  AllComsStateTypes: 40000000
+  CurrIndex: 3
 --- !u!1 &1269921678863901166
 GameObject:
   m_ObjectHideFlags: 0
@@ -811,7 +873,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.57254905, g: 0.69411767, b: 0.654902, a: 1}
+  m_Color: {r: 0.49411768, g: 0.0627451, b: 0.078431375, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -828,14 +890,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_yuanhuan_quse
+  _icon_name: dec_ty_yuan
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 08bcd577b76e3c94cacfc8e9783bd09a, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
-    packName: battle
-    packgJsonPath: /Art/UIAssets/TextrueJson\battle.txt
-    packgSpritePath: Assets/Res/UIAtlas/battle.spriteatlasv2
-    lasetJsonGUID: b30151c7ca91f3adc1fcb725072e1a9f
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: d570df61e5e429dc2d9169bbaecec167
   imageH: 101.7751
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}

Assets/Scripts/GameUI/UI/CombatPanel/SkillWidget.cs

@@ -59,6 +59,37 @@ namespace Fort23.Mono
                 }
             }
 
+            //金
+            if (skillConfigId.skillConfig.attribute == 1)
+            {
+                ShuXingCsc.ChangeState(0);
+            }
+
+            //木
+            if (skillConfigId.skillConfig.attribute == 2)
+            {
+                ShuXingCsc.ChangeState(1);
+            }
+
+            //水
+            if (skillConfigId.skillConfig.attribute == 4)
+            {
+                ShuXingCsc.ChangeState(2);
+            }
+
+            //火
+            if (skillConfigId.skillConfig.attribute == 8)
+            {
+                ShuXingCsc.ChangeState(3);
+            }
+
+            //土
+            if (skillConfigId.skillConfig.attribute == 16)
+            {
+                ShuXingCsc.ChangeState(4);
+            }
+
+
             // for (var i = 0; i < StarRoot.Count; i++)
             // {
             //     MyImage myImage = StarRoot[i] as MyImage;

Assets/Scripts/GameUI/UI/CombatPanel/SkillWidgetData.cs

@@ -96,6 +96,17 @@ namespace Fort23.Mono
 	      return _csc;
 	     }
 	   }
+	  private CustomStateController _ShuXingCsc;
+	  public CustomStateController ShuXingCsc
+	   {
+	   get{
+	      if (_ShuXingCsc == null)
+	       {
+	         _ShuXingCsc  = GetUIUnit<CustomStateController>("ShuXingCsc"); 
+	       }
+	      return _ShuXingCsc;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/DialoguePanel/DialoguePanel.cs

@@ -64,7 +64,7 @@ namespace Fort23.Mono
 
         public override CTask Show()
         {
-            EventManager.Instance.Dispatch(CustomEventType.DialoguePanelOpen,null);
+            EventManager.Instance.Dispatch(CustomEventType.DialoguePanelOpen, null);
             return base.Show();
         }
 
@@ -189,13 +189,23 @@ namespace Fort23.Mono
                 Text_Name2.text = LanguageManager.Instance.Text(eventNpc.name);
             }
 
-       
-            
-            
 
             StartShowMassge();
         }
 
+        public static string ReverseUsingLoop(string input)
+        {
+            if (string.IsNullOrEmpty(input))
+                return input;
+
+            StringBuilder sb = new StringBuilder(input.Length);
+            for (int i = input.Length - 1; i >= 0; i--)
+            {
+                sb.Append(input[i]);
+            }
+
+            return sb.ToString();
+        }
 
         public void ShowPanel(int[] LanID, string[] icon,
             ShowDialogueEventData.MessageShowType messageShowType,
@@ -215,10 +225,10 @@ namespace Fort23.Mono
             if (isOver)
                 return;
             icon.gameObject.SetActive(false);
-            if (eventConditionConfig.NPCID != 100 &&  eventConditionConfig.NPCID != 0)
+            if (eventConditionConfig.NPCID != 100 && eventConditionConfig.NPCID != 0)
             {
                 EventNPC eventNpc = ConfigComponent.Instance.Get<EventNPC>(eventConditionConfig.NPCID);
-             
+
                 icon.onSpriteAlter = () =>
                 {
                     icon.SetNativeSize();
@@ -226,6 +236,7 @@ namespace Fort23.Mono
                 };
                 icon.icon_name = eventNpc.icon;
             }
+
             Btn_Bag.gameObject.SetActive(false);
             if (index >= dialogueMessaga.Length)
             {
@@ -234,10 +245,7 @@ namespace Fort23.Mono
                 {
                     ShowOptions();
                 }
-                
-                
-                
-            
+
 
                 // 所有句子显示完成，检查是否有选项
                 if (eventConditionConfig.ID != 0 && eventConditionConfig.optionType == 1 && !_isShowingOptions)
@@ -246,7 +254,8 @@ namespace Fort23.Mono
                 }
                 else
                 {
-                    if (eventConditionConfig.ID != 0 && _eventLinkData != null && _eventLinkData.eventConditions.Count > 0)
+                    if (eventConditionConfig.ID != 0 && _eventLinkData != null &&
+                        _eventLinkData.eventConditions.Count > 0)
                     {
                         foreach (var eventConditionData in _eventLinkData.eventConditions)
                         {
@@ -265,10 +274,12 @@ namespace Fort23.Mono
                         List<ItemInfo> itemInfos = new List<ItemInfo>();
                         for (var i = 0; i < eventConditionConfig.PrizeIDs.Length; i++)
                         {
-                            DropConfig dropConfig = ConfigComponent.Instance.Get<DropConfig>(eventConditionConfig.PrizeIDs[i]);
+                            DropConfig dropConfig =
+                                ConfigComponent.Instance.Get<DropConfig>(eventConditionConfig.PrizeIDs[i]);
                             if (dropConfig.dropType == 3)
                             {
-                                ItemInfo itemInfo = new ItemInfo(dropConfig.dropGroupID[0], eventConditionConfig.PrizeNums[i]);
+                                ItemInfo itemInfo = new ItemInfo(dropConfig.dropGroupID[0],
+                                    eventConditionConfig.PrizeNums[i]);
                                 itemInfos.Add(itemInfo);
                             }
                             else
@@ -278,9 +289,12 @@ namespace Fort23.Mono
                             }
                         }
 
-                        ShowItemMoveToTargetPanel showItemMoveToTargetUiPane = UIManager.Instance.GetComponent<ShowItemMoveToTargetPanel>();
-                        Vector3 target = showItemMoveToTargetUiPane.transform.worldToLocalMatrix * Btn_Bag.transform.position;
-                        Vector3 startPos = showItemMoveToTargetUiPane.transform.worldToLocalMatrix * StartPos.transform.position;
+                        ShowItemMoveToTargetPanel showItemMoveToTargetUiPane =
+                            UIManager.Instance.GetComponent<ShowItemMoveToTargetPanel>();
+                        Vector3 target = showItemMoveToTargetUiPane.transform.worldToLocalMatrix *
+                                         Btn_Bag.transform.position;
+                        Vector3 startPos = showItemMoveToTargetUiPane.transform.worldToLocalMatrix *
+                                           StartPos.transform.position;
                         int maxCount = 1;
 
                         foreach (var itemInfo in itemInfos)
@@ -288,14 +302,15 @@ namespace Fort23.Mono
                             int addValue = (int)itemInfo.count.Value / maxCount;
                             int finishVale = (int)itemInfo.count.Value % maxCount;
                             // ItemInfo i = itemInfo;
-                            showItemMoveToTargetUiPane.ShowPanel(startPos, target, maxCount, itemInfo.config.icon, CombatItemShowEventData.ShowType.HeroExp, (imageMove) =>
-                            {
-                                int currAddValue = addValue;
-                                if (imageMove.GroupIndex == maxCount - 1)
+                            showItemMoveToTargetUiPane.ShowPanel(startPos, target, maxCount, itemInfo.config.icon,
+                                CombatItemShowEventData.ShowType.HeroExp, (imageMove) =>
                                 {
-                                    currAddValue += finishVale;
-                                }
-                            });
+                                    int currAddValue = addValue;
+                                    if (imageMove.GroupIndex == maxCount - 1)
+                                    {
+                                        currAddValue += finishVale;
+                                    }
+                                });
                         }
 
                         await TimerComponent.Instance.WaitAsync(2000);
@@ -312,10 +327,9 @@ namespace Fort23.Mono
 
             _isShowNextButton = false;
             shownextIcon.SetActive(false);
-            string m = LanguageManager.Instance.Text(dialogueMessaga[index],PlayerManager.Instance.PlayerName);
+            string m = LanguageManager.Instance.Text(dialogueMessaga[index], PlayerManager.Instance.PlayerName);
+
 
-         
-            
             // if (showIconName != null && index < showIconName.Length)
             // {
             //     icon.icon_name = showIconName[index];
@@ -354,7 +368,8 @@ namespace Fort23.Mono
                 {
                     DialogueOptionWidget dialogueOptionWidget =
                         await UIManager.Instance.CreateGComponent<DialogueOptionWidget>(null, OptionRoot);
-                    dialogueOptionWidget.CustomInit(i, CurrentEventList, eventConditionConfig.optionPara1[i], eventConditionConfig.ID, SelectOption);
+                    dialogueOptionWidget.CustomInit(i, CurrentEventList, eventConditionConfig.optionPara1[i],
+                        eventConditionConfig.ID, SelectOption);
                 }
 
 

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

@@ -85,7 +85,7 @@ namespace Fort23.Mono
             useCount = (int)value;
             Text_Count.text = LanguageManager.Instance.Text(10253, value);
             // Text_shenshishangxian.text = $"({EventSystemManager.Instance.GetShenShiCount()}<color=green>+{value}</color>/{maxCount})";
-            Text_shenshishangxian.text = $"({EventSystemManager.Instance.GetShenShiCount() + value}/{maxCount})";
+            Text_shenshishangxian.text = $"({EventSystemManager.Instance.GetShenShiCount() }/{maxCount})";
             foreach (var senceInfoBtnWidget in _divineSenceInfoBtnWidgets)
             {
                 senceInfoBtnWidget.UpdateItermCount(useCount);