Browse Source

技能设计

liao 5 months ago
parent
commit
afd457cf24

+ 48 - 30
Assets/Res/UI/HeroDetailPanel.prefab

@@ -419,7 +419,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 207711551128351574}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
   m_Name: 
@@ -1880,9 +1880,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 5091166044801204644}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 466.40002, y: -40}
   m_SizeDelta: {x: 45.700012, y: 47}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1969311041310409060
@@ -3535,9 +3535,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 3725798218940426506}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 250.95001, y: -40}
   m_SizeDelta: {x: 45, y: 47}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8046685421020806195
@@ -6095,9 +6095,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 5091166044801204644}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 375, y: -40}
   m_SizeDelta: {x: 45.700012, y: 47}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2732630439701141293
@@ -6305,6 +6305,8 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -6543,6 +6545,8 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -8318,6 +8322,8 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -9855,6 +9861,8 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -10763,6 +10771,8 @@ SkinnedMeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 3
   m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -11081,9 +11091,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 3725798218940426506}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 160.95001, y: -40}
   m_SizeDelta: {x: 45, y: 47}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &372935494571646065
@@ -12664,7 +12674,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 750, y: 1334}
+  m_SizeDelta: {x: 750, y: 1624}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3592094474613093350
 CanvasRenderer:
@@ -14317,6 +14327,8 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -14781,6 +14793,8 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -15710,6 +15724,8 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -15920,6 +15936,8 @@ SkinnedMeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 3
   m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -16240,9 +16258,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 3725798218940426506}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 205.95001, y: -40}
   m_SizeDelta: {x: 45, y: 47}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5490923062748187026
@@ -16640,9 +16658,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 5091166044801204644}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 329.3, y: -40}
   m_SizeDelta: {x: 45.700012, y: 47}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2451370377385730876
@@ -16897,9 +16915,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 5091166044801204644}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 420.7, y: -40}
   m_SizeDelta: {x: 45.700012, y: 47}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3596508466326571759
@@ -17612,7 +17630,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8191368305320982722}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
   m_Name: 
@@ -18270,9 +18288,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 3725798218940426506}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 115.95001, y: -40}
   m_SizeDelta: {x: 45, y: 47}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &270976551773092808
@@ -19596,9 +19614,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 5091166044801204644}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 283.59998, y: -40}
   m_SizeDelta: {x: 45.700012, y: 47}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4300090933347681505

+ 34 - 26
Assets/Scripts/GameUI/UI/Hero/HeroDetailPanel.cs

@@ -56,22 +56,30 @@ namespace Fort23.Mono
                 LogTool.Log("已到达最高星级:" + PlayerManager.Instance.gameConstantConfig.maxStar);
                 return;
             }
+
+            if (isOpenPre)
+            {
+                if (BagController.Instance.DeductItem(heroInfo.modelConfig.itemID, heroInfo.promoteConfig.costCount))
+                {
+                    heroInfo.Promote();
+                    PlayerManager.Instance.SaveHeroData(heroInfo);
+                    UpdateAttributeUI();
+                    HeroUITools.SetStarShow(stars, heroInfo.star.Value);
+                    LayoutRebuilder.MarkLayoutForRebuild(StarsLayout.GetComponent<RectTransform>());
+                    SendEvent(HeroUpType.Promote);
+                }
+            }
+            else
+            {
+                await UIManager.Instance.CreateGComponentForObject<HeroPowerUpPre>(objHeroPowerUpPre, Callback, root: rtBottom);    
+            }
             
-            await UIManager.Instance.CreateGComponentForObject<HeroPowerUpPre>(objHeroPowerUpPre, Callback, root: rtBottom);
 
 
             
             // heroInfo.modelConfig.itemID
 
-            if (BagController.Instance.DeductItem(heroInfo.modelConfig.itemID, heroInfo.promoteConfig.costCount))
-            {
-                heroInfo.Promote();
-                PlayerManager.Instance.SaveHeroData(heroInfo);
-                UpdateAttributeUI();
-                HeroUITools.SetStarShow(stars, heroInfo.star.Value);
-                LayoutRebuilder.MarkLayoutForRebuild(StarsLayout.GetComponent<RectTransform>());
-                SendEvent(HeroUpType.Promote);
-            }
+ 
         }
 
         private async void Callback(HeroPowerUpPre pre)
@@ -117,18 +125,6 @@ namespace Fort23.Mono
                         pre.OpenUpgradePre(heroInfo);
                     }, root: rtBottom);
             }
-            
-            // if (PlayerManager.Instance.gameConstantConfig.maxLv <= heroInfo.level.Value)
-            // {
-            //     LogTool.Log("已到达最高等级:" + PlayerManager.Instance.gameConstantConfig.maxLv);
-            //     return;
-            // }
-            // if (BagController.Instance.DuctHeroExp(heroInfo.powerUpConfig.levelUpExp))
-            // {
-            //     heroInfo.Upgrade();
-            //     UpdateAttributeUI();
-            //     SendEvent(HeroUpType.Level);
-            // }
         }
 
         private List<SimpleMove> simpleMoves = new List<SimpleMove>();
@@ -138,7 +134,9 @@ namespace Fort23.Mono
             upPre.Stars1Layout.gameObject.SetActive(false);
             upPre.Stars2Layout.gameObject.SetActive(false);
             
-            LayoutRebuilder.MarkLayoutForRebuild (upPre.Stars1Layout.GetComponent<RectTransform>());
+            // LayoutRebuilder.MarkLayoutForRebuild (upPre.Stars1Layout.GetComponent<RectTransform>());
+            
+            
             
             await TimerComponent.Instance.WaitAsync(200);
             for (int i = 0; i < heroInfo.star; i++)
@@ -152,8 +150,17 @@ namespace Fort23.Mono
             }
             //把现在的星星隐藏了.
             StarsLayout.gameObject.SetActive(false);
-            upPre.Stars1Layout.gameObject.SetActive(true);
             
+     
+            
+           
+            // await TimerComponent.Instance.WaitAsync(1);
+            // upPre.Stars1Layout.enabled = true;
+            // upPre.Stars1Layout.SetLayoutHorizontal();
+            // await TimerComponent.Instance.WaitAsync(1);
+            // upPre.Stars1Layout.enabled = false;
+            
+            upPre.Stars1Layout.gameObject.SetActive(true);
             
             int j = 0;
             float delayTime = 0;
@@ -172,7 +179,7 @@ namespace Fort23.Mono
         {
             int i = 0;
             
-            LayoutRebuilder.MarkLayoutForRebuild(StarsLayout.GetComponent<RectTransform>());
+            // LayoutRebuilder.MarkLayoutForRebuild(StarsLayout.GetComponent<RectTransform>());
             
             simpleMoves.Clear();
             foreach (var star in stars)
@@ -333,7 +340,8 @@ namespace Fort23.Mono
             // StarsLayout.gameObject.SetActive(true);
             
             HeroUITools.SetStarShow(stars, heroInfo.star.Value);
-
+            StarsLayout.enabled = true;
+            StarsLayout.SetLayoutHorizontal();
             await TimerComponent.Instance.WaitAsync(1);
             StarsLayout.enabled = false;
             

File diff suppressed because it is too large
+ 0 - 0
Assets/StreamingAssets/assetConfig.txt


BIN
Excel2Json/Excel/skill.xlsx


Some files were not shown because too many files changed in this diff