DESKTOP-FB72PO8\Administrator 4 meses atrás
pai
commit
8139540e62

+ 46 - 28
Assets/Res/UI/HeroBagPanel.prefab

@@ -181,6 +181,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:
@@ -1086,6 +1088,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:
@@ -3071,6 +3075,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:
@@ -4542,6 +4548,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:
@@ -4740,6 +4748,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:
@@ -4880,6 +4890,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:
@@ -5999,8 +6011,8 @@ GameObject:
   - component: {fileID: 3181852693172486306}
   - component: {fileID: 9154997696072646161}
   - component: {fileID: 6059881785422164945}
-  - component: {fileID: 524429718100663683}
   - component: {fileID: 5600907577368196505}
+  - component: {fileID: 67843362433966437}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: HeroBagPanel
@@ -6125,33 +6137,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_ShowMaskGraphic: 1
---- !u!320 &524429718100663683
-PlayableDirector:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3881840993377848576}
-  m_Enabled: 1
-  serializedVersion: 3
-  m_PlayableAsset: {fileID: 11400000, guid: 185c5bcffa9aa1941b49529246fc7c68, type: 2}
-  m_InitialState: 1
-  m_WrapMode: 2
-  m_DirectorUpdateMode: 1
-  m_InitialTime: 0
-  m_SceneBindings:
-  - key: {fileID: -4398279264670304355, guid: 185c5bcffa9aa1941b49529246fc7c68, type: 2}
-    value: {fileID: 7939915476203004500}
-  - key: {fileID: 3098885728808021784, guid: 185c5bcffa9aa1941b49529246fc7c68, type: 2}
-    value: {fileID: 7939915476203004500}
-  - key: {fileID: -6019252560737163005, guid: 185c5bcffa9aa1941b49529246fc7c68, type: 2}
-    value: {fileID: 7939915476203004500}
-  - key: {fileID: 7089825263001972541, guid: 185c5bcffa9aa1941b49529246fc7c68, type: 2}
-    value: {fileID: 5600907577368196505}
-  - key: {fileID: -3648922518979620870, guid: 185c5bcffa9aa1941b49529246fc7c68, type: 2}
-    value: {fileID: 7939915476203004500}
-  m_ExposedReferences:
-    m_References: []
 --- !u!225 &5600907577368196505
 CanvasGroup:
   m_ObjectHideFlags: 0
@@ -6164,6 +6149,33 @@ CanvasGroup:
   m_Interactable: 1
   m_BlocksRaycasts: 1
   m_IgnoreParentGroups: 0
+--- !u!114 &67843362433966437
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3881840993377848576}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6a23dadfaa104ddf929b8c98dd02623c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  maxDuration: 0.3
+  isUpdate: 0
+  currTime: 0.33333334
+  GrpupInfos:
+  - Foldout: 1
+    isActive: 1
+    animName: show
+    allTargets:
+    - {fileID: 7939915476203004500}
+    - {fileID: 5600907577368196505}
+    TweenAssetInfo: {fileID: 11400000, guid: f0bdd4e99fcc6c74da59f9ab86e8701f, type: 2}
+    TargetFoldout: 1
+    maxDuration: 0.3
+    isUpdate: 0
+    currTime: 0
 --- !u!1 &4002006122008443889
 GameObject:
   m_ObjectHideFlags: 0
@@ -7318,6 +7330,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:
@@ -11378,6 +11392,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:
@@ -11540,6 +11556,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:

+ 108 - 24
Assets/Res/UI/HeroUpTxtEft.prefab

@@ -11,8 +11,9 @@ GameObject:
   - component: {fileID: 5135952974914396357}
   - component: {fileID: 4114408173942861410}
   - component: {fileID: 3992509306590940860}
-  - component: {fileID: 7782233227781314710}
   - component: {fileID: 2783349857181196743}
+  - component: {fileID: 3719799474640087321}
+  - component: {fileID: 4501378206774687333}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: HeroUpTxtEft
@@ -77,8 +78,8 @@ MonoBehaviour:
   m_fontMaterials: []
   m_fontColor32:
     serializedVersion: 2
-    rgba: 4278255045
-  m_fontColor: {r: 0.7719639, g: 0.990566, b: 0, a: 1}
+    rgba: 4294967295
+  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
   m_enableVertexGradient: 0
   m_colorMode: 3
   m_fontColorGradient:
@@ -137,27 +138,6 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
---- !u!320 &7782233227781314710
-PlayableDirector:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2287078410214474204}
-  m_Enabled: 1
-  serializedVersion: 3
-  m_PlayableAsset: {fileID: 11400000, guid: b35f94bfbd73348a889cedd28430af14, type: 2}
-  m_InitialState: 1
-  m_WrapMode: 2
-  m_DirectorUpdateMode: 1
-  m_InitialTime: 0
-  m_SceneBindings:
-  - key: {fileID: 6582516066229308053, guid: b35f94bfbd73348a889cedd28430af14, type: 2}
-    value: {fileID: 5135952974914396357}
-  - key: {fileID: -8189757671495878384, guid: b35f94bfbd73348a889cedd28430af14, type: 2}
-    value: {fileID: 3992509306590940860}
-  m_ExposedReferences:
-    m_References: []
 --- !u!114 &2783349857181196743
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -177,3 +157,107 @@ MonoBehaviour:
     isList: 0
     ListCollectorDatas: []
   isAssetBundle: 1
+--- !u!114 &3719799474640087321
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2287078410214474204}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6a23dadfaa104ddf929b8c98dd02623c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  maxDuration: 0.5
+  isUpdate: 0
+  currTime: 0
+  GrpupInfos:
+  - Foldout: 1
+    isActive: 1
+    animName: show
+    allTargets:
+    - {fileID: 5135952974914396357}
+    - {fileID: 4501378206774687333}
+    - {fileID: 3992509306590940860}
+    TweenAssetInfo: {fileID: 11400000, guid: 5469e727e0adcb34aa069f03d46dd020, type: 2}
+    TargetFoldout: 1
+    maxDuration: 0.5
+    isUpdate: 1
+    currTime: 0
+  MinMaxGradient:
+    m_Mode: 0
+    m_GradientMin:
+      serializedVersion: 2
+      key0: {r: 1, g: 1, b: 1, a: 1}
+      key1: {r: 1, g: 1, b: 1, a: 1}
+      key2: {r: 0, g: 0, b: 0, a: 0}
+      key3: {r: 0, g: 0, b: 0, a: 0}
+      key4: {r: 0, g: 0, b: 0, a: 0}
+      key5: {r: 0, g: 0, b: 0, a: 0}
+      key6: {r: 0, g: 0, b: 0, a: 0}
+      key7: {r: 0, g: 0, b: 0, a: 0}
+      ctime0: 0
+      ctime1: 65535
+      ctime2: 0
+      ctime3: 0
+      ctime4: 0
+      ctime5: 0
+      ctime6: 0
+      ctime7: 0
+      atime0: 0
+      atime1: 65535
+      atime2: 0
+      atime3: 0
+      atime4: 0
+      atime5: 0
+      atime6: 0
+      atime7: 0
+      m_Mode: 0
+      m_ColorSpace: -1
+      m_NumColorKeys: 2
+      m_NumAlphaKeys: 2
+    m_GradientMax:
+      serializedVersion: 2
+      key0: {r: 1, g: 1, b: 1, a: 1}
+      key1: {r: 1, g: 1, b: 1, a: 1}
+      key2: {r: 0, g: 0, b: 0, a: 0}
+      key3: {r: 0, g: 0, b: 0, a: 0}
+      key4: {r: 0, g: 0, b: 0, a: 0}
+      key5: {r: 0, g: 0, b: 0, a: 0}
+      key6: {r: 0, g: 0, b: 0, a: 0}
+      key7: {r: 0, g: 0, b: 0, a: 0}
+      ctime0: 0
+      ctime1: 65535
+      ctime2: 0
+      ctime3: 0
+      ctime4: 0
+      ctime5: 0
+      ctime6: 0
+      ctime7: 0
+      atime0: 0
+      atime1: 65535
+      atime2: 0
+      atime3: 0
+      atime4: 0
+      atime5: 0
+      atime6: 0
+      atime7: 0
+      m_Mode: 0
+      m_ColorSpace: -1
+      m_NumColorKeys: 2
+      m_NumAlphaKeys: 2
+    m_ColorMin: {r: 0, g: 0, b: 0, a: 0}
+    m_ColorMax: {r: 0, g: 0, b: 0, a: 0}
+--- !u!225 &4501378206774687333
+CanvasGroup:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2287078410214474204}
+  m_Enabled: 1
+  m_Alpha: 1
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0

+ 2 - 2
Assets/Res/UIAnimRes/TweenAssetInfoHeroDetailPanel.asset

@@ -13,7 +13,7 @@ MonoBehaviour:
   m_Name: TweenAssetInfoHeroDetailPanel
   m_EditorClassIdentifier: 
   allTweenInfo:
-  - Foldout: 0
+  - Foldout: 1
     TweenType: 0
     duration: 0.3
     delay: 0
@@ -113,7 +113,7 @@ MonoBehaviour:
         m_PreInfinity: 2
         m_PostInfinity: 2
         m_RotationOrder: 4
-  - Foldout: 0
+  - Foldout: 1
     TweenType: 1
     duration: 0.3
     delay: 0

+ 179 - 0
Assets/Res/UIAnimRes/TweenAssetInfoHeroUpTxtEft.asset

@@ -0,0 +1,179 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 81c305ba541a4659ad97bd292322e9b3, type: 3}
+  m_Name: TweenAssetInfoHeroUpTxtEft
+  m_EditorClassIdentifier: 
+  allTweenInfo:
+  - Foldout: 1
+    TweenType: 0
+    duration: 0.5
+    delay: 0
+    TweenBasic:
+      Foldout: 1
+      duration: 0.5
+      delay: 0
+      currSchedule: 0
+      TweenRectTransformInfos:
+      - TweenRectTransformType: 0
+        TweenLerpType: 0
+        Start: {x: 0, y: 0, z: 0}
+        End: {x: 0, y: 100, z: 0}
+        startX:
+          serializedVersion: 2
+          m_Curve: []
+          m_PreInfinity: 2
+          m_PostInfinity: 2
+          m_RotationOrder: 4
+        startY:
+          serializedVersion: 2
+          m_Curve: []
+          m_PreInfinity: 2
+          m_PostInfinity: 2
+          m_RotationOrder: 4
+        startZ:
+          serializedVersion: 2
+          m_Curve: []
+          m_PreInfinity: 2
+          m_PostInfinity: 2
+          m_RotationOrder: 4
+      - TweenRectTransformType: 2
+        TweenLerpType: 1
+        Start: {x: 1.3, y: 1, z: 1}
+        End: {x: 1, y: 1, z: 1}
+        startX:
+          serializedVersion: 2
+          m_Curve:
+          - serializedVersion: 3
+            time: 0
+            value: 1
+            inSlope: 0.29088062
+            outSlope: 0.29088062
+            tangentMode: 34
+            weightedMode: 0
+            inWeight: 0
+            outWeight: 0.33333334
+          - serializedVersion: 3
+            time: 0.29999998
+            value: 1.0872642
+            inSlope: 0.08310875
+            outSlope: 0.08310875
+            tangentMode: 34
+            weightedMode: 0
+            inWeight: 0.33333334
+            outWeight: 0.33333334
+          - serializedVersion: 3
+            time: 1
+            value: 1
+            inSlope: -0.12466311
+            outSlope: -0.12466311
+            tangentMode: 34
+            weightedMode: 0
+            inWeight: 0.33333334
+            outWeight: 0
+          m_PreInfinity: 2
+          m_PostInfinity: 2
+          m_RotationOrder: 4
+        startY:
+          serializedVersion: 2
+          m_Curve:
+          - serializedVersion: 3
+            time: 0
+            value: 1
+            inSlope: 0.24258794
+            outSlope: 0.24258794
+            tangentMode: 34
+            weightedMode: 0
+            inWeight: 0
+            outWeight: 0.33333334
+          - serializedVersion: 3
+            time: 0.26250002
+            value: 1.0636793
+            inSlope: 0.078121535
+            outSlope: 0.078121535
+            tangentMode: 34
+            weightedMode: 0
+            inWeight: 0.33333334
+            outWeight: 0.33333334
+          - serializedVersion: 3
+            time: 1
+            value: 1
+            inSlope: -0.08634487
+            outSlope: -0.08634487
+            tangentMode: 34
+            weightedMode: 0
+            inWeight: 0.33333334
+            outWeight: 0
+          m_PreInfinity: 2
+          m_PostInfinity: 2
+          m_RotationOrder: 4
+        startZ:
+          serializedVersion: 2
+          m_Curve: []
+          m_PreInfinity: 2
+          m_PostInfinity: 2
+          m_RotationOrder: 4
+    TweenCanvasGroup:
+      Foldout: 0
+      duration: 0.5
+      delay: 0
+      currSchedule: 0
+      TweenLerpType: 0
+      StartAlpha: 0
+      EndAlpha: 0
+      startX:
+        serializedVersion: 2
+        m_Curve: []
+        m_PreInfinity: 2
+        m_PostInfinity: 2
+        m_RotationOrder: 4
+  - Foldout: 1
+    TweenType: 1
+    duration: 0.5
+    delay: 0
+    TweenBasic:
+      Foldout: 0
+      duration: 0.5
+      delay: 0
+      currSchedule: 0
+      TweenRectTransformInfos: []
+    TweenCanvasGroup:
+      Foldout: 1
+      duration: 0.5
+      delay: 0
+      currSchedule: 0
+      TweenLerpType: 1
+      StartAlpha: 0
+      EndAlpha: 0
+      startX:
+        serializedVersion: 2
+        m_Curve:
+        - serializedVersion: 3
+          time: 0
+          value: 1
+          inSlope: 0.051794335
+          outSlope: 0.051794335
+          tangentMode: 0
+          weightedMode: 0
+          inWeight: 0
+          outWeight: 1
+        - serializedVersion: 3
+          time: 1
+          value: 0
+          inSlope: -2.8301868
+          outSlope: -2.8301868
+          tangentMode: 0
+          weightedMode: 0
+          inWeight: 0.037500024
+          outWeight: 0
+        m_PreInfinity: 2
+        m_PostInfinity: 2
+        m_RotationOrder: 4

+ 8 - 0
Assets/Res/UIAnimRes/TweenAssetInfoHeroUpTxtEft.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: Cn4ZvH+qUXymuTQOuGNSfrOt4r0w/NJDvqCSMtlMwx3AQctU+44tuig=
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 26 - 4
Assets/Scripts/Core/Editor/Tween/UITweenControllerInspector.cs

@@ -2,6 +2,7 @@ using System.Collections;
 using System.Collections.Generic;
 using Core.UI.UTool.UITween;
 using UnityEditor;
+using UnityEditorInternal;
 using UnityEngine;
 
 [CustomEditor(typeof(UITweenController))]
@@ -37,7 +38,7 @@ public class UITweenControllerInspector : Editor
             EditorUtility.SetDirty(_uiTweenController);
             EditorUtility.SetDirty(_uiTweenController.gameObject);
         }
-        
+
         if (GUILayout.Button("播放"))
         {
             _uiTweenController.StartPlay();
@@ -66,7 +67,8 @@ public class UITweenControllerInspector : Editor
     {
         EditorGUI.BeginChangeCheck();
         EditorGUILayout.BeginHorizontal();
-        _tweenAssetGrpupInfo.TweenAssetInfo=(TweenAssetInfo)  EditorGUILayout.ObjectField("动画资源", _tweenAssetGrpupInfo.TweenAssetInfo, typeof(TweenAssetInfo), false);
+        _tweenAssetGrpupInfo.TweenAssetInfo = (TweenAssetInfo)EditorGUILayout.ObjectField("动画资源",
+            _tweenAssetGrpupInfo.TweenAssetInfo, typeof(TweenAssetInfo), false);
 
         if (_tweenAssetGrpupInfo.TweenAssetInfo == null)
         {
@@ -100,7 +102,6 @@ public class UITweenControllerInspector : Editor
             return;
         }
 
-      
 
         _tweenAssetGrpupInfo.TargetFoldout = EditorGUILayout.Foldout(_tweenAssetGrpupInfo.TargetFoldout,
             "目标");
@@ -144,7 +145,7 @@ public class UITweenControllerInspector : Editor
             }
         }
 
-     
+
         for (int i = 0; i < _tweenAssetGrpupInfo.TweenAssetInfo.allTweenInfo.Count; i++)
         {
             TweenEntity tweenEntity = _tweenAssetGrpupInfo.TweenAssetInfo.allTweenInfo[i];
@@ -213,6 +214,9 @@ public class UITweenControllerInspector : Editor
                     case TweenType.CanvasGroup:
                         tweenEntity.TweenCanvasGroup = new TweenCanvasGroup();
                         break;
+                    case TweenType.Graphic:
+                        tweenEntity.TweenGraphic = new TweenGraphic();
+                        break;
                 }
             }
 
@@ -235,12 +239,30 @@ public class UITweenControllerInspector : Editor
                         "效果");
                     DrawTweenCanvasGroup(tweenEntity.TweenCanvasGroup, ob);
                     break;
+                case TweenType.Graphic:
+                    tweenEntity.TweenGraphic.Foldout = EditorGUILayout.Foldout(tweenEntity.TweenGraphic.Foldout,
+                        "效果");
+                    DrawTweenGraphic(tweenEntity.TweenGraphic, ob);
+                    break;
             }
 
             EditorGUI.indentLevel--;
         }
     }
 
+    private void DrawTweenGraphic(TweenGraphic tweenGraphic, Object ob)
+    {
+        if (tweenGraphic.Foldout)
+        {
+            EditorGUI.indentLevel++;
+            tweenGraphic.startColor = EditorGUILayout.ColorField("起始颜色", tweenGraphic.startColor);
+            tweenGraphic.endColor = EditorGUILayout.ColorField("结束颜色", tweenGraphic.endColor);
+            tweenGraphic.startX = EditorGUILayout.CurveField("插值类型", tweenGraphic.startX);
+            EditorGUI.indentLevel--;
+        }
+    }
+
+
     private void DrawTweenCanvasGroup(TweenCanvasGroup tweenCanvasGroup, Object ob)
     {
         if (tweenCanvasGroup.Foldout)

+ 5 - 0
Assets/Scripts/Core/UI/UTool/UITween/TweenEntity.cs

@@ -13,18 +13,21 @@ namespace Core.UI.UTool.UITween
         public float delay;
         [CanBeNull] public TweenTransform TweenBasic = null;
         [CanBeNull] public TweenCanvasGroup TweenCanvasGroup = null;
+        [CanBeNull]  public TweenGraphic TweenGraphic = null;
         [HideInInspector] public Map<TweenType, TweenBasic> Map = new Map<TweenType, TweenBasic>();
 
         public void Claer()
         {
             TweenBasic = null;
             TweenCanvasGroup = null;
+            TweenGraphic = null;
         }
 
         public void Play(Object RectTransform,float allTime, bool isFallBack)
         {
             TweenBasic?.Play(RectTransform,allTime, isFallBack);
             TweenCanvasGroup?.Play(RectTransform,allTime, isFallBack);
+            TweenGraphic?.Play(RectTransform,allTime, isFallBack);
         }
 
 
@@ -32,12 +35,14 @@ namespace Core.UI.UTool.UITween
         {
             TweenBasic?.Rest(RectTransform);
             TweenCanvasGroup?.Rest(RectTransform);
+            TweenGraphic?.Rest(RectTransform);
         }
 
         public void Prepare()
         {
             TweenBasic?.Prepare(delay, duration);
             TweenCanvasGroup?.Prepare(delay, duration);
+            TweenGraphic?.Prepare(delay, duration);
         }
     }
 }

+ 63 - 0
Assets/Scripts/Core/UI/UTool/UITween/TweenGraphic.cs

@@ -0,0 +1,63 @@
+using UnityEngine;
+using UnityEngine.Rendering.Universal;
+using UnityEngine.UI;
+
+namespace Core.UI.UTool.UITween
+{
+    [System.Serializable]
+    public class TweenGraphic : TweenBasic
+    {
+        // public CanvasGroup CanvasGroup;
+        // public TweenLerpType TweenLerpType;
+
+        public Color startColor;
+        public Color endColor;
+        public AnimationCurve startX = new AnimationCurve();
+
+        public Graphic GetCanvasGroup(Object CanvasGroup)
+        {
+            Graphic graphic = CanvasGroup as Graphic;
+            if (graphic == null)
+            {
+                GameObject gameObject = CanvasGroup as GameObject;
+                if (gameObject != null)
+                {
+                    graphic = gameObject.GetComponent<Graphic>();
+                }
+            }
+
+            return graphic;
+        }
+
+        protected override void ProPlay(Object CanvasGroup, float allTime)
+        {
+            Graphic graphic = GetCanvasGroup(CanvasGroup);
+            if (graphic == null)
+            {
+                return;
+            }
+
+            float t = _addTime * allTime;
+            if (t > 1)
+            {
+                t = 1;
+            }
+
+            float v = startX.Evaluate(t);
+
+            Color color = Color.Lerp(startColor, endColor, v);
+            graphic.color = color;
+        }
+
+        protected override void ProRest(Object CanvasGroup)
+        {
+            Graphic graphic = GetCanvasGroup(CanvasGroup);
+            if (graphic == null)
+            {
+                return;
+            }
+
+            graphic.color = startColor;
+        }
+    }
+}

+ 3 - 0
Assets/Scripts/Core/UI/UTool/UITween/TweenGraphic.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 8bd0e0638cb34986aa38d7bb7784252c
+timeCreated: 1734317170

+ 77 - 0
Assets/Scripts/Core/UI/UTool/UITween/TweenTextMeshProUGUI.cs

@@ -0,0 +1,77 @@
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace Core.UI.UTool.UITween
+{
+    
+    public class TweenTextMeshProUGUI: TweenBasic
+    {
+        public enum TweenTextMeshProUGUIType
+        {
+            Al,
+        }
+        public class TweenTextMeshProUGUIInfo
+        {
+            public TweenRectTransformType TweenRectTransformType;
+            public TweenLerpType TweenLerpType;
+            public Vector3 Start;
+            public Vector3 End;
+            public AnimationCurve startX=new AnimationCurve();
+            public AnimationCurve startY=new AnimationCurve();
+            public AnimationCurve startZ=new AnimationCurve();
+        }
+        // public RectTransform RectTransform;
+        public List<TweenRectTransformInfo> TweenRectTransformInfos = new List<TweenRectTransformInfo>();
+
+
+        public RectTransform GetRectTransform(Object RectTransform)
+        {
+           
+            RectTransform rectTransform = RectTransform as RectTransform;
+            if (rectTransform == null)
+            {
+                GameObject gameObject = RectTransform as GameObject;
+                if (gameObject != null)
+                {
+                    rectTransform = gameObject.GetComponent<RectTransform>();
+                }
+            }
+
+            return rectTransform;
+        }
+
+        protected override void ProPlay(Object RectTransform, float allTime)
+        {
+            RectTransform rectTransform = GetRectTransform(RectTransform);
+            if (rectTransform == null)
+            {
+                return;
+            }
+
+            float t = _addTime * allTime;
+            if (t > 1)
+            {
+                t = 1;
+            }
+
+            for (int i = 0; i < TweenRectTransformInfos.Count; i++)
+            {
+                TweenRectTransformInfos[i].Play(rectTransform, t);
+            }
+        }
+
+        protected override void ProRest(Object RectTransform)
+        {
+            RectTransform rectTransform = GetRectTransform(RectTransform);
+            if (rectTransform == null)
+            {
+                return;
+            }
+
+            for (int i = 0; i < TweenRectTransformInfos.Count; i++)
+            {
+                TweenRectTransformInfos[i].Rest(rectTransform);
+            }
+        }
+    }
+}

+ 3 - 0
Assets/Scripts/Core/UI/UTool/UITween/TweenTextMeshProUGUI.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 1dafc926afeb4ff7b5a213be13a30dd3
+timeCreated: 1734316335

+ 1 - 0
Assets/Scripts/Core/UI/UTool/UITween/TweenType.cs

@@ -4,5 +4,6 @@ namespace Core.UI.UTool.UITween
     {
         RectTransform,
         CanvasGroup,
+        Graphic,
     }
 }

+ 2 - 0
Assets/Scripts/Core/UI/UTool/UITween/UITweenController.cs

@@ -9,6 +9,7 @@ namespace Core.UI.UTool.UITween
     [ExecuteInEditMode]
     public class UITweenController : MonoBehaviour
     {
+        
         public float maxDuration;
         public bool isUpdate;
         [HideInInspector] public float currTime;
@@ -17,6 +18,7 @@ namespace Core.UI.UTool.UITween
 
 
         private BetterList<TweenAssetGrpupInfo> _currPlay = new BetterList<TweenAssetGrpupInfo>();
+       public ParticleSystem.MinMaxGradient MinMaxGradient = new ParticleSystem.MinMaxGradient();
         private void OnEnable()
         {
             if (Application.isPlaying)

+ 1 - 0
Assets/Scripts/GameLogic/Combat/CombatType/LevelBattleCombatType.cs

@@ -98,6 +98,7 @@ namespace GameLogic.Combat.CombatType
         /// </summary>
         private void EntityDropLogic(CombatHeroEntity combatHeroEntity)
         {
+            return;
             List<ItemInfo> equipmentList = DropManager.Instance.
                 DropEquipment(_levelBattleConfig, combatHeroEntity.CurrCombatHeroInfo.heroType);
 

+ 0 - 3
Assets/Scripts/GameLogic/Player/DropManager.cs

@@ -95,9 +95,6 @@ namespace GameLogic.Player
             {
                 equipmentList.Add(itemInfo);
             }
-            
-            
-
             return equipmentList;
         }
 

+ 3 - 0
Assets/Scripts/GameUI/UI/Hero/HeroDetailPanel.cs

@@ -9,6 +9,7 @@ using Fort23.Core;
 using Fort23.UTool;
 using GameLogic.Bag;
 using GameLogic.Hero;
+using TMPro;
 using UnityEngine;
 using UnityEngine.AI;
 using UnityEngine.UI;
@@ -51,6 +52,8 @@ namespace Fort23.Mono
 
         private async void OnClickPromote()
         {
+            Graphic textMeshProUGUI;
+            
             if (PlayerManager.Instance.gameConstantConfig.maxStar <= heroInfo.star.Value)
             {
                 LogTool.Log("已到达最高星级:" + PlayerManager.Instance.gameConstantConfig.maxStar);

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
Assets/StreamingAssets/assetConfig.txt


Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff