修改bug

Assets/Res/Config/HeroModelConfig.json

@@ -144,7 +144,7 @@
       "expGain": null,
       "move_speed": 4,
       "speed_atk": 0.5,
-      "range_atk": 1,
+      "range_atk": 2,
       "skillID": [
         1001
       ],
@@ -332,7 +332,7 @@
       "expGain": null,
       "move_speed": 3,
       "speed_atk": 0.5,
-      "range_atk": 1,
+      "range_atk": 2,
       "skillID": [
         1001
       ],

Assets/Res/UI/MainUIPanel.prefab

@@ -1054,8 +1054,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 3872687123469740126}
+  m_Children: []
   m_Father: {fileID: 6372682890431576924}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -4369,6 +4368,15 @@ MonoBehaviour:
     - gameObject: {fileID: 6107101496507914859}
     - gameObject: {fileID: 397899105639740}
     - gameObject: {fileID: 3469845461661622283}
+  - key: Icon_HeroExp
+    gameObject: {fileID: 2002673787439862528}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9073062006211861286}
+    - gameObject: {fileID: 6107101496507914859}
+    - gameObject: {fileID: 397899105639740}
+    - gameObject: {fileID: 3469845461661622283}
   isAssetBundle: 1
 --- !u!1 &6750499123037776255
 GameObject:
@@ -4792,7 +4800,8 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 3872687123469740126}
   m_Father: {fileID: 1722181438945693490}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -5076,8 +5085,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   maxDuration: 1
-  isUpdate: 1
-  currTime: 79.7119
+  isUpdate: 0
+  currTime: 80.045235
   GrpupInfos:
   - Foldout: 1
     isActive: 1
@@ -5825,7 +5834,7 @@ PrefabInstance:
   serializedVersion: 2
   m_Modification:
     serializedVersion: 3
-    m_TransformParent: {fileID: 5433286787357854352}
+    m_TransformParent: {fileID: 6989071283435105637}
     m_Modifications:
     - target: {fileID: 5652462218939348953, guid: 5a9370d4ffd86274dadb8069eddb828e, type: 3}
       propertyPath: m_Pivot.x

Assets/Scripts/GameLogic/Combat/CombatType/LevelBattleCombatType.cs

@@ -207,7 +207,7 @@ namespace GameLogic.Combat.CombatType
             CombatItemShowEventData combatItemShowEventData = CombatItemShowEventData.Create();
             combatItemShowEventData.count = 1;
             combatItemShowEventData.startPos_WorldPos = combatHeroEntity.combatHeroGameObject.position;
-            combatItemShowEventData.showName = "icon_Coin";
+            combatItemShowEventData.showName = "icon_res_upgrade_1";
             combatItemShowEventData.isExp = false;
             combatItemShowEventData.addValue = _levelBattleConfig.miniExpAndGold[0];
             EventManager.Instance.Dispatch(CustomEventType.Combat_ItemShow, combatItemShowEventData);
@@ -304,7 +304,7 @@ namespace GameLogic.Combat.CombatType
             CombatItemShowEventData combatItemShowEventData = CombatItemShowEventData.Create();
             combatItemShowEventData.count = 20;
             combatItemShowEventData.startPos_WorldPos = combatHeroEntity.combatHeroGameObject.position;
-            combatItemShowEventData.showName = "icon_Coin";
+            combatItemShowEventData.showName = "icon_res_upgrade_1";
             combatItemShowEventData.isExp = false;
             combatItemShowEventData.addValue = _levelBattleConfig.bossExpAndGold;
             EventManager.Instance.Dispatch(CustomEventType.Combat_ItemShow, combatItemShowEventData);

Assets/Scripts/GameLogic/Combat/Hero/State/CombatHeroIdleState.cs

@@ -1,4 +1,5 @@
 using UnityEngine;
+using UnityEngine.AI;
 
 namespace GameLogic.Combat.Hero.State
 {
@@ -11,6 +12,15 @@ namespace GameLogic.Combat.Hero.State
         protected override void ProEnter()
         {
             combatHeroEntity.combatHeroAnimtion.Play("idle");
+            if (!combatHeroEntity.IsEnemy)
+            {
+                combatHeroEntity.CombatAIBasic.NavMeshAgent.obstacleAvoidanceType=ObstacleAvoidanceType.HighQualityObstacleAvoidance;
+                combatHeroEntity.CombatAIBasic.NavMeshAgent.avoidancePriority = 100;
+            }
+            else
+            {
+                combatHeroEntity.CombatAIBasic.NavMeshAgent.avoidancePriority = 50;
+            }
         }
 
         protected override void ProUpdate(float t)

Assets/Scripts/GameLogic/Combat/Hero/State/CombatHeroMoveState.cs

@@ -69,7 +69,7 @@ namespace GameLogic.Combat.Hero.State
             EventManager.Instance.RemoveEventListener(CustomEventType.RefreshFull,RefreshFull);
             combatHeroEntity.CombatAIBasic.NavMeshAgent.isStopped = true;
             combatHeroEntity.CombatAIBasic.NavMeshAgent.velocity = Vector3.zero;
-            combatHeroEntity.CombatAIBasic.NavMeshAgent.avoidancePriority = 50;
+        
             // combatHeroEntity.CombatAIBasic.NavMeshAgent.acceleration = 0;
         }
 

Assets/Scripts/GameLogic/Combat/Skill/S10001.cs

@@ -1,4 +1,5 @@
-using CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic;
+using System;
+using CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic;
 using Excel2Json;
 using GameLogic.Combat.CombatTool;
 using GameLogic.Combat.Hero;
@@ -20,7 +21,7 @@ namespace GameLogic.Combat.Skill
         {
             count = 1;
             _harm = SelfSkillConfig.effectValue[0];
-           
+
 
             // if(
             AddTriggerCallBack("sk1_fashe", Sk1_fasheTrigger);
@@ -29,16 +30,15 @@ namespace GameLogic.Combat.Skill
         protected override void ProInitSkill()
         {
             SkillConfig skillBasic = CombatHeroEntity.CurrCombatHeroInfo.GetGroupSkillConfig(10004);
-            if (skillBasic.ID>0)
+            if (skillBasic.ID > 0)
             {
-                count +=(int)skillBasic.effectValue[0];
+                count += (int)skillBasic.effectValue[0];
             }
         }
 
 
         protected override void ProUseSkill()
         {
-           
             ActivationTimeLineData("sk1");
         }
 
@@ -61,15 +61,26 @@ namespace GameLogic.Combat.Skill
                 Vector3 forward = new Vector3(0, 0, 1);
                 Vector3 eulerAngles = CombatHeroEntity.combatHeroGameObject.transform.eulerAngles;
                 Vector3 zdPos = CombatHeroEntity.GetSpecialDotInfo("zdpos").GetWorlPos();
-                int angle = 360 / count;
+                int angle = 90 / count;
+
                 for (int i = 0; i < count; i++)
                 {
-                    eulerAngles.y += i * angle;
+                    int c = 0;
+                    if (i % 2 == 0)
+                    {
+                        c = (i / 2);
+                    }
+                    else
+                    {
+                        c = (-(i + 1) / 2);
+                    }
+
+                    Vector3 currEulerAngles = eulerAngles + new Vector3(0, c * angle, 0);
                     // Quaternion quaternion = Quaternion.AngleAxis(i * 90, Vector3.up);
                     // quaternion = quaternion + CombatHeroEntity.combatHeroGameObject.transform.rotation;
                     // Vector3 newAngle = new Vector3(eulerAngles.x, eulerAngles.y + i * 15+180, eulerAngles.z);
                     // Quaternion quaternion = Quaternion.Euler(newAngle);
-                    Quaternion quaternion = Quaternion.Euler(eulerAngles);
+                    Quaternion quaternion = Quaternion.Euler(currEulerAngles);
                     Vector3 newForward = quaternion * forward;
                     Vector3 targetPos = zdPos + newForward;
                     ActivationTimeLineData("sk1_fashe", null, new Vector3[] { targetPos });

Assets/Scripts/GameStart/GameStart.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Reflection;
 using UnityEngine;
 using UnityEngine.Playables;
@@ -10,6 +11,12 @@ public class GameStart : MonoBehaviour
 
     private GameStartUIPanel _gameStartUIPanel;
 
+    [ContextMenu("asdada")]
+    public void Test()
+    {
+       
+    }
+
     public void Start()
     {
         ShaderVariantCollection.WarmUp();
@@ -24,7 +31,7 @@ public class GameStart : MonoBehaviour
         {
             Assembly assembly = Assembly.Load("Fort23.Mono");
 
-          
+
             System.Type type = assembly.GetType(typeName);
             IGameStart iGameStart = System.Activator.CreateInstance(type) as IGameStart;
             iGameStart.StartGame(LoadType, h5Url, _gameStartUIPanel, delegate { gameObject.SetActive(false); });

Assets/Scripts/GameUI/UI/MainUIPanelData.cs

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

Assets/Scripts/GameUI/UI/ShowItemMoveTarget/ShowItemMoveToTargetPanel.cs

@@ -60,7 +60,7 @@ namespace Fort23.Mono
             else
             {
                 MainUIPanel mainUIPanel = UIManager.Instance.GetComponent<MainUIPanel>();
-                Vector3 pos = mainUIPanel.Icon_Coin.position;
+                Vector3 pos = mainUIPanel.Icon_HeroExp.transform.position;
                 target = transform.worldToLocalMatrix * pos;
             }
 
@@ -113,7 +113,7 @@ namespace Fort23.Mono
                             ParticleSystemPool particleSystemPool =
                                 GObjectPool.Instance.FetchAsyncForGameObject<ParticleSystemPool>(mainUIPanel.fx_ui_coin,
                                     "fx_ui_coin");
-                            particleSystemPool.transform.SetParent(mainUIPanel.Icon_Coin.transform);
+                            particleSystemPool.transform.SetParent(mainUIPanel.Icon_HeroExp.transform);
                             particleSystemPool.transform.localPosition = Vector3.zero;
                             particleSystemPool.transform.localScale = Vector3.one;
                             BagController.Instance.AddHeroExp(currAddValue);
@@ -204,10 +204,11 @@ namespace Fort23.Mono
             gameObjectPool.own.transform.localScale = Vector3.zero;
             currImageMove.GameObjectPool = gameObjectPool;
             MyImage myImage = gameObjectPool.own.GetComponent<MyImage>();
-            myImage.onSpriteAlter = delegate { myImage.SetNativeSize(); };
+            // myImage.onSpriteAlter = delegate { myImage.SetNativeSize(); };
             myImage.icon_name = itemConfig;
+        
             currImageMove.transform = gameObjectPool.own.GetComponent<RectTransform>();
-            // currImageMove.transform.sizeDelta = new Vector2(35, 35);
+            currImageMove.transform.sizeDelta = new Vector2(50, 65);
             currImageMove.moveStartPos = startPos;
             currImageMove.transform.anchoredPosition = currImageMove.moveStartPos;
             currImageMove.yanChi = Random.Range(0, 0.5f);