UI搭建. 添加英雄成长相关的配置表

Assembly-CSharp.csproj

@@ -66,6 +66,7 @@
     <Compile Include="Assets/TextMesh Pro/Examples &amp; Extras/Scripts/VertexShakeB.cs" />
     <Compile Include="Assets/TextMesh Pro/Examples &amp; Extras/Scripts/DropdownSample.cs" />
     <Compile Include="Assets/TextMesh Pro/Examples &amp; Extras/Scripts/VertexColorCycler.cs" />
+    <Compile Include="Assets/Scenes/DrawParabola.cs" />
     <Compile Include="Assets/TextMesh Pro/Examples &amp; Extras/Scripts/ObjectSpin.cs" />
     <Compile Include="Assets/TextMesh Pro/Examples &amp; Extras/Scripts/TMP_PhoneNumberValidator.cs" />
     <Compile Include="Assets/TextMesh Pro/Examples &amp; Extras/Scripts/VertexJitter.cs" />

Assets/Scripts/GameLogic/Combat/Hero/CombatHeroInfo.cs

@@ -15,6 +15,11 @@ public class CombatHeroInfo
     public EncryptionFloat crit=new EncryptionFloat();
     public EncryptionFloat critDamage=new EncryptionFloat();
     public EncryptionFloat dodge=new EncryptionFloat();
+
+    public int lv;
+    public int star;
+    
+    
     public string modelName;
     public float maxDis=2;
     public float maxDisTo=2*2;

Assets/Scripts/GameLogic/Player/PlayerManager.cs

@@ -1,18 +1,14 @@
 using System.Collections;
 using System.Collections.Generic;
+using GameLogic.Hero;
 using UnityEngine;
+using Utility;
 
-public class PlayerManager : MonoBehaviour
+public class PlayerManager : Singleton<PlayerManager>
 {
-    // Start is called before the first frame update
-    void Start()
-    {
-        
-    }
-
-    // Update is called once per frame
-    void Update()
-    {
-        
-    }
+    public List<HeroInfo> heroList = new List<HeroInfo>();
+    /// <summary>
+    /// 上阵的英雄，也可以叫主力，替补英雄等级=主力英雄的最低等级（和afk一样的）
+    /// </summary>
+    public List<HeroInfo> heroListInLead = new List<HeroInfo>();
 }

Assets/Scripts/GameUI/UI/Hero/WidgetHero.cs

@@ -1,20 +1,83 @@
+using GameLogic.Hero;
+using UnityEngine;
+using UnityEngine.UI;
+
 namespace Fort23.Mono
 {
-[UIBinding(prefab = "Widget_Hero"  )]
-	public partial class WidgetHero : UIComponent
-	{
-	private void Init()
-	{
-	}
-	public override void AddEvent()
-	{
-	}
-	public override void DelEvent()
-	{
-	}
-	public override void AddButtonEvent()
-	{
-	}
-
-	}
-}
+    [UIBinding(prefab = "Widget_Hero"  )]
+    public partial class WidgetHero : UIComponent
+    {
+        private void Init()
+        {
+        }
+        public override void AddEvent()
+        {
+        }
+        public override void DelEvent()
+        {
+        }
+        public override void AddButtonEvent()
+        {
+            btnHero.onClick.AddListener(OnHeroClick);
+        }
+
+        private void OnHeroClick()
+        {
+            
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="heroInfo"></param>
+        public void InitHero(HeroInfo heroInfo)
+        {
+            lv.text = heroInfo.lv.ToString();
+            
+            // 最大星级展示个数（6星，只显示一颗星星，换颜色）
+            int maxShowStar = 5;
+
+            // 计算 当前星级 应该用什么星星的表现
+            int group = (heroInfo.star - 1) / maxShowStar;
+
+     
+            
+            int i = 1;
+            foreach (var star in stars)
+            {
+                GameObject starObj = star as GameObject;
+
+                SetStarImg(group, starObj);
+                
+                if (heroInfo.star >= i)
+                {
+                    starObj.SetActive(true);
+                }
+                else
+                {
+                    starObj.SetActive(false);
+                }
+                i++;
+            }
+        }
+
+        private void SetStarImg(int group, GameObject starObj)
+        {
+            Image image = starObj.GetComponent<Image>();
+            // 执行对应的逻辑  （0）GradeIcon_Star_s_Yellow  （1）GradeIcon_Star_s_Premium
+            switch (group)
+            {
+                case 0: // n = 1~5
+                    image.name = "GradeIcon_Star_s_Yellow";
+                    break;
+                case 1: // n = 6~10
+                    image.name = "GradeIcon_Star_s_Premium";    
+                    break;
+                default: // 其他情况
+                    image.name = "GradeIcon_Star_s_Yellow";
+                    break;
+            }
+        }
+
+    }
+}

Assets/Scripts/GameUI/UI/MainUIPanel.cs

@@ -1,4 +1,5 @@
 using System.Threading.Tasks;
+using GameLogic.Hero;
 using UnityEngine;
 
 namespace Fort23.Mono
@@ -22,9 +23,17 @@ namespace Fort23.Mono
 
         private async Task InitBattleHero()
         {
-            WidgetHero itemHero = await UIManager.Instance.CreateGComponent<WidgetHero>(null, poolName: "WuGongWidget");
 
-            RectTransform rectTransform = hero_battle[0] as RectTransform;
+            for (int i = 0; i < PlayerManager.Instance.heroListInLead.Count; i++)
+            {
+                RectTransform rectTransform = hero_battle[i] as RectTransform;
+                WidgetHero itemHero = await UIManager.Instance.CreateGComponent<WidgetHero>(null, 
+                    poolName: "WidgetHero", root: rectTransform);
+                itemHero.InitHero(PlayerManager.Instance.heroListInLead[i]);
+            }
+   
+            
+            
         }
 
     }

Fort23.GameLogic.csproj

@@ -45,6 +45,7 @@
     <Analyzer Include="/Applications/Tuanjie/Tuanjie.app/Contents/Tools/Unity.SourceGenerators/Unity.Properties.SourceGenerator.dll" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Assets/Scripts/GameLogic/Combat/Skill/S20001.cs" />
     <Compile Include="Assets/Scripts/GameLogic/CombatScenesTool/CombatAlertManager.cs" />
     <Compile Include="Assets/Scripts/GameLogic/Combat/Hero/State/CombatHeroDieState.cs" />
     <Compile Include="Assets/Scripts/GameLogic/Combat/CombatTool/CombatCameraControllder.cs" />
@@ -65,6 +66,7 @@
     <Compile Include="Assets/Scripts/GameLogic/Combat/CombatEvent/CombatEventType.cs" />
     <Compile Include="Assets/Scripts/GameLogic/Combat/CombatTool/HarmReturnInfo.cs" />
     <Compile Include="Assets/Scripts/GameLogic/Player/PlayerManager.cs" />
+    <Compile Include="Assets/Scripts/GameLogic/Combat/CombatEvent/ShowTextEventData.cs" />
     <Compile Include="Assets/Scripts/GameLogic/Combat/Hero/State/CombatHeroFollowMoveState.cs" />
     <Compile Include="Assets/Scripts/GameLogic/Combat/CombatEvent/AlertTriggerEventData.cs" />
     <Compile Include="Assets/Scripts/GameLogic/Combat/CombatEvent/CombatItemShowEventData.cs" />
@@ -77,6 +79,7 @@
     <Compile Include="Assets/Scripts/GameLogic/Combat/CombatEvent/CreateHeroHpEventData.cs" />
     <Compile Include="Assets/Scripts/GameLogic/Combat/Hero/CombatHeroSkillControl.cs" />
     <Compile Include="Assets/Scripts/GameLogic/Combat/CombatType/TestCombatType.cs" />
+    <Compile Include="Assets/Scripts/GameLogic/Combat/Skill/S40001.cs" />
     <Compile Include="Assets/Scripts/GameLogic/Combat/CombatTool/CombatController.cs" />
     <Compile Include="Assets/Scripts/GameLogic/Combat/Skill/S10001.cs" />
     <Compile Include="Assets/Scripts/GameLogic/Paritcle/ParitcleLogic/FxAIBeelineBulletLogic.cs" />
@@ -89,6 +92,7 @@
     <Compile Include="Assets/Scripts/GameLogic/Combat/CombatTool/HarmType.cs" />
     <Compile Include="Assets/Scripts/GameLogic/Combat/Skill/SkillBasic.cs" />
     <Compile Include="Assets/Scripts/GameLogic/Combat/CombatState/CombatStateBasic.cs" />
+    <Compile Include="Assets/Scripts/GameLogic/Combat/Skill/S110001.cs" />
     <Compile Include="Assets/Scripts/GameLogic/Combat/CombatTool/SkillScriptManager.cs" />
     <Compile Include="Assets/Scripts/GameLogic/Paritcle/ParitcleLogic/FxAILogicBasic.cs" />
     <Compile Include="Assets/Scripts/GameLogic/Combat/CombatTool/CombatHeroController.cs" />
@@ -96,8 +100,11 @@
     <Compile Include="Assets/Scripts/GameLogic/Combat/Hero/State/CombatHeroFollowIdleState.cs" />
     <Compile Include="Assets/Scripts/GameLogic/Combat/CombatType/CombatTypeBasic.cs" />
     <Compile Include="Assets/Scripts/GameLogic/Combat/CombatEvent/CombatUseSkillEventData.cs" />
+    <Compile Include="Assets/Scripts/GameLogic/CombatScenesTool/CombatEquipFallManager.cs" />
     <Compile Include="Assets/Scripts/GameLogic/Paritcle/GameTimeLineParticleFactory.cs" />
     <Compile Include="Assets/Scripts/GameLogic/Combat/CombatEvent/HarmUpdateEventData.cs" />
+    <Compile Include="Assets/Scripts/GameLogic/Combat/Skill/S110003.cs" />
+    <Compile Include="Assets/Scripts/GameLogic/Combat/Skill/S110002.cs" />
     <Compile Include="Assets/Scripts/GameLogic/Combat/Hero/CombatHeroInfo.cs" />
     <Compile Include="Assets/Scripts/GameLogic/MyPlugin.cs" />
     <Compile Include="Assets/Scripts/GameLogic/Combat/CombatEvent/ICombatEventData.cs" />

Fort23.Mono.csproj

@@ -51,9 +51,13 @@
     <Compile Include="Assets/Scripts/GameUI/UI/CombatHPPanel.cs" />
     <Compile Include="Assets/Scripts/GameUI/UI/Combat/ShowTextWidgetData.cs" />
     <Compile Include="Assets/Scripts/GameUI/UI/Hero/WidgetHeroData.cs" />
+    <Compile Include="Assets/Scripts/GameUI/UI/ShowTextPanel/TextWidgetData.cs" />
     <Compile Include="Assets/Scripts/GameUI/UI/Combat/CombatShowTextPanelData.cs" />
     <Compile Include="Assets/Scripts/GameUI/UI/MainUIPanelData.cs" />
     <Compile Include="Assets/Scripts/GameUI/UI/ShowItemMoveTarget/ShowItemMoveToTargetPanelData.cs" />
+    <Compile Include="Assets/Scripts/GameUI/UI/ShowTextPanel/TextWidget.cs" />
+    <Compile Include="Assets/Scripts/GameUI/UI/ShowTextPanel/ShowTextPanelData.cs" />
+    <Compile Include="Assets/Scripts/GameUI/UI/ShowTextPanel/ShowTextPanel.cs" />
     <Compile Include="Assets/Scripts/GameUI/UI/Combat/ShowTextWidget.cs" />
     <Compile Include="Assets/Scripts/GameUI/UI/Combat/CombatShowTextPanel.cs" />
     <Compile Include="Assets/Scripts/GameUI/UI/HeroHpWidget.cs" />

UserSettings/EditorUserSettings.asset

@@ -45,10 +45,10 @@ EditorUserSettings:
       value: 5a50500553530b595d0f597343770941474e4c722e2a20367e794861e1b86c68
       flags: 0
     RecentlyUsedSceneGuid-8:
-      value: 5a500c0357030b0f0858097a44770f40154f4f2e2a2c743229794b64e0b56c6a
+      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
       flags: 0
     RecentlyUsedSceneGuid-9:
-      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
+      value: 5a500c0357030b0f0858097a44770f40154f4f2e2a2c743229794b64e0b56c6a
       flags: 0
     Systems Window:
       value: 183b144645154b7802000a2b17364d11021e17246e72662b47695d73a2a07478a2a505e1e82d6f2f100cca3210371526d1051c05e22a040f2507f00b32f01c061ccb5a9f5ace1e10d81c50a48d5d91a3959694aa9ad8efd7c9f2afe0f1c0fcfdf6f8b6f2a5a6dacfb89debbfa1cbc9c3f5c3bac18e9c89c1bbdec2d6f2b992939996c59699c79ae8d182b7baad82aba0b0aea88398abdbf1dd8a8ea765ffc520262728fafcf8f6c28eb162945c71898d6167877a72a980809c9f71cecece859d579fd5f106dbdadb21de0dde237c686c76706641634c764f547c624a7e622d6628286620686f653d2b635a0204003e0805017509093043470e3643041c5d5b415c54450e1c424b420f6e4b634e636263696655641a1f273c0f083c1102ec362de62318e9ea25ab61ade8ed0ee30655b0b6b7b8176615