DESKTOP-FB72PO8\Administrator vor 3 Monaten
Ursprung
Commit
a7223a68be

+ 1 - 0
Assets/Art/ArtHero/Hero01.prefab

@@ -1755,6 +1755,7 @@ PlayableDirector:
     m_References:
     - cf06bc45747630f4e8dd81eb5ce660c8: {fileID: 2178176032076016739}
     - be3e33a009c3ff24894e4ebe1ec8490d: {fileID: 2511492103188014007}
+    - 78a6d2b7ee8816d4f83f89c130aaeb2f: {fileID: 0}
     - f7625a8570b86ee4489bc08716ca7d20: {fileID: 1640795377577136482}
     - 2e6796201e865d04db2e7bf812135ea5: {fileID: 5992122126348811026}
     - e836fb53612872a49839c893989484ec: {fileID: 5992122126348811026}

+ 130 - 0
Assets/Art/HeroTimeLine/Hero01.playable

@@ -735,6 +735,43 @@ MonoBehaviour:
     m_DisplayName: TimeLineTriggerAsset
   m_Markers:
     m_Objects: []
+--- !u!114 &-7452031731387005372
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  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: f1fc88ca9f5b46d2929d20f65fbe5c4e, type: 3}
+  m_Name: TimeLineParticleSystemAsset(Clone)(Clone)
+  m_EditorClassIdentifier: 
+  sourceGameObject:
+    exposedName: 78a6d2b7ee8816d4f83f89c130aaeb2f
+    defaultValue: {fileID: 0}
+  prefabGameObject: {fileID: 5624882359785030059, guid: d3af49a296bdcf2449e8ca9666a5eac5, type: 3}
+  updateParticle: 1
+  particleRandomSeed: 4736
+  updateDirector: 1
+  updateITimeControl: 1
+  searchHierarchy: 0
+  active: 1
+  postPlayback: 2
+  targetType: 1
+  LocationType: 0
+  targetSpecialDotName: hitpos
+  hitPointGroupName: 
+  isGround: 0
+  isFollowTarget: 0
+  isNotRotate: 0
+  isFollowRootTarget: 0
+  isAttSpeed: 0
+  isLoop: 0
+  loopAlone: 0
+  isActivityCustomTargetPos: 0
+  CustomTargetPosIndex: 0
+  intervalTime: 0
 --- !u!114 &-7379477113019173770
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -1640,6 +1677,98 @@ MonoBehaviour:
     volume: 1
     stereoPan: 0
     spatialBlend: 0
+--- !u!114 &-4453018565393652067
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  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: 15e0374501f39d54eb30235764636e0e, type: 3}
+  m_Name: Control Track (2)
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_AnimClip: {fileID: 0}
+  m_Locked: 0
+  m_Muted: 0
+  m_CustomPlayableFullTypename: 
+  m_Curves: {fileID: 0}
+  m_Parent: {fileID: 2664366215323630651}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: -7452031731387005372}
+    m_Duration: 0.3
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: -4453018565393652067}
+    m_EaseInDuration: 0
+    m_EaseOutDuration: 0
+    m_BlendInDuration: 0
+    m_BlendOutDuration: 0
+    m_MixInCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    m_MixOutCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    m_BlendInCurveMode: 0
+    m_BlendOutCurveMode: 0
+    m_ExposedParameterNames: []
+    m_AnimationCurves: {fileID: 0}
+    m_Recordable: 0
+    m_PostExtrapolationMode: 0
+    m_PreExtrapolationMode: 0
+    m_PostExtrapolationTime: 0
+    m_PreExtrapolationTime: 0
+    m_DisplayName: fx_hero01_dg_hit
+  m_Markers:
+    m_Objects: []
 --- !u!114 &-3828777382670004432
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -3181,6 +3310,7 @@ MonoBehaviour:
   m_Curves: {fileID: 0}
   m_Parent: {fileID: 11400000}
   m_Children:
+  - {fileID: -4453018565393652067}
   - {fileID: -7489244471532758654}
   - {fileID: -5700901883387235338}
   - {fileID: 1097836342402878407}

+ 130 - 0
Assets/Art/HeroTimeLine/Hero02.playable

@@ -1415,6 +1415,98 @@ MonoBehaviour:
   m_Clips: []
   m_Markers:
     m_Objects: []
+--- !u!114 &-1564706278235989131
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  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: 15e0374501f39d54eb30235764636e0e, type: 3}
+  m_Name: Control Track (2)
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_AnimClip: {fileID: 0}
+  m_Locked: 0
+  m_Muted: 0
+  m_CustomPlayableFullTypename: 
+  m_Curves: {fileID: 0}
+  m_Parent: {fileID: 2664366215323630651}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: 4869156371720643496}
+    m_Duration: 0.3
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: -1564706278235989131}
+    m_EaseInDuration: 0
+    m_EaseOutDuration: 0
+    m_BlendInDuration: 0
+    m_BlendOutDuration: 0
+    m_MixInCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    m_MixOutCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    m_BlendInCurveMode: 0
+    m_BlendOutCurveMode: 0
+    m_ExposedParameterNames: []
+    m_AnimationCurves: {fileID: 0}
+    m_Recordable: 0
+    m_PostExtrapolationMode: 0
+    m_PreExtrapolationMode: 0
+    m_PostExtrapolationTime: 0
+    m_PreExtrapolationTime: 0
+    m_DisplayName: fx_ty_skill
+  m_Markers:
+    m_Objects: []
 --- !u!114 &-1257232546480234104
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -2087,6 +2179,7 @@ MonoBehaviour:
   m_Curves: {fileID: 0}
   m_Parent: {fileID: 11400000}
   m_Children:
+  - {fileID: -1564706278235989131}
   - {fileID: -7489244471532758654}
   - {fileID: -5700901883387235338}
   - {fileID: -3964179811523661920}
@@ -2325,6 +2418,43 @@ MonoBehaviour:
     volume: 1
     stereoPan: 0
     spatialBlend: 0
+--- !u!114 &4869156371720643496
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  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: f1fc88ca9f5b46d2929d20f65fbe5c4e, type: 3}
+  m_Name: TimeLineParticleSystemAsset(Clone)(Clone)(Clone)(Clone)
+  m_EditorClassIdentifier: 
+  sourceGameObject:
+    exposedName: 44e28f1d51af4a9489a8901fca43b82f
+    defaultValue: {fileID: 0}
+  prefabGameObject: {fileID: 5624882359785030059, guid: d3af49a296bdcf2449e8ca9666a5eac5, type: 3}
+  updateParticle: 1
+  particleRandomSeed: 4736
+  updateDirector: 1
+  updateITimeControl: 1
+  searchHierarchy: 0
+  active: 1
+  postPlayback: 2
+  targetType: 1
+  LocationType: 0
+  targetSpecialDotName: hitpos
+  hitPointGroupName: 
+  isGround: 0
+  isFollowTarget: 0
+  isNotRotate: 0
+  isFollowRootTarget: 0
+  isAttSpeed: 0
+  isLoop: 0
+  loopAlone: 0
+  isActivityCustomTargetPos: 0
+  CustomTargetPosIndex: 0
+  intervalTime: 0
 --- !u!114 &5325946099461709416
 MonoBehaviour:
   m_ObjectHideFlags: 1

+ 130 - 0
Assets/Art/HeroTimeLine/Hero03.playable

@@ -1345,6 +1345,98 @@ MonoBehaviour:
   isActivityCustomTargetPos: 0
   CustomTargetPosIndex: 0
   intervalTime: 0
+--- !u!114 &-3891136953861992550
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  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: 15e0374501f39d54eb30235764636e0e, type: 3}
+  m_Name: Control Track (2)
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_AnimClip: {fileID: 0}
+  m_Locked: 0
+  m_Muted: 0
+  m_CustomPlayableFullTypename: 
+  m_Curves: {fileID: 0}
+  m_Parent: {fileID: 2664366215323630651}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: -403393283879678549}
+    m_Duration: 0.3
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: -3891136953861992550}
+    m_EaseInDuration: 0
+    m_EaseOutDuration: 0
+    m_BlendInDuration: 0
+    m_BlendOutDuration: 0
+    m_MixInCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    m_MixOutCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    m_BlendInCurveMode: 0
+    m_BlendOutCurveMode: 0
+    m_ExposedParameterNames: []
+    m_AnimationCurves: {fileID: 0}
+    m_Recordable: 0
+    m_PostExtrapolationMode: 0
+    m_PreExtrapolationMode: 0
+    m_PostExtrapolationTime: 0
+    m_PreExtrapolationTime: 0
+    m_DisplayName: fx_ty_skill
+  m_Markers:
+    m_Objects: []
 --- !u!114 &-3405003413432236710
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -1937,6 +2029,43 @@ MonoBehaviour:
   isActivityCustomTargetPos: 0
   CustomTargetPosIndex: 0
   intervalTime: 0
+--- !u!114 &-403393283879678549
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  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: f1fc88ca9f5b46d2929d20f65fbe5c4e, type: 3}
+  m_Name: TimeLineParticleSystemAsset(Clone)(Clone)(Clone)(Clone)
+  m_EditorClassIdentifier: 
+  sourceGameObject:
+    exposedName: 190edea285b1fcb40ba505d514ed5314
+    defaultValue: {fileID: 0}
+  prefabGameObject: {fileID: 5624882359785030059, guid: d3af49a296bdcf2449e8ca9666a5eac5, type: 3}
+  updateParticle: 1
+  particleRandomSeed: 4736
+  updateDirector: 1
+  updateITimeControl: 1
+  searchHierarchy: 0
+  active: 1
+  postPlayback: 2
+  targetType: 1
+  LocationType: 0
+  targetSpecialDotName: hitpos
+  hitPointGroupName: 
+  isGround: 0
+  isFollowTarget: 0
+  isNotRotate: 0
+  isFollowRootTarget: 0
+  isAttSpeed: 0
+  isLoop: 0
+  loopAlone: 0
+  isActivityCustomTargetPos: 0
+  CustomTargetPosIndex: 0
+  intervalTime: 0
 --- !u!114 &-148574705729872205
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -2387,6 +2516,7 @@ MonoBehaviour:
   m_Curves: {fileID: 0}
   m_Parent: {fileID: 11400000}
   m_Children:
+  - {fileID: -3891136953861992550}
   - {fileID: -5700901883387235338}
   - {fileID: 1674232180069977348}
   - {fileID: -5213821412162879996}

+ 130 - 0
Assets/Art/HeroTimeLine/Hero04.playable

@@ -1866,6 +1866,98 @@ MonoBehaviour:
   m_Rotation: {x: 0, y: 0, z: 0, w: 1}
   isRunPlay: 0
   layerId: 0
+--- !u!114 &-1467403167216396638
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  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: 15e0374501f39d54eb30235764636e0e, type: 3}
+  m_Name: Control Track (2)
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_AnimClip: {fileID: 0}
+  m_Locked: 0
+  m_Muted: 0
+  m_CustomPlayableFullTypename: 
+  m_Curves: {fileID: 0}
+  m_Parent: {fileID: 2664366215323630651}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: 1022174176582763300}
+    m_Duration: 0.3
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: -1467403167216396638}
+    m_EaseInDuration: 0
+    m_EaseOutDuration: 0
+    m_BlendInDuration: 0
+    m_BlendOutDuration: 0
+    m_MixInCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    m_MixOutCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    m_BlendInCurveMode: 0
+    m_BlendOutCurveMode: 0
+    m_ExposedParameterNames: []
+    m_AnimationCurves: {fileID: 0}
+    m_Recordable: 0
+    m_PostExtrapolationMode: 0
+    m_PreExtrapolationMode: 0
+    m_PostExtrapolationTime: 0
+    m_PreExtrapolationTime: 0
+    m_DisplayName: fx_ty_skill
+  m_Markers:
+    m_Objects: []
 --- !u!114 &-1402885669341666734
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -2411,6 +2503,43 @@ MonoBehaviour:
     m_DisplayName: fx_gongjian_sk_zd
   m_Markers:
     m_Objects: []
+--- !u!114 &1022174176582763300
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  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: f1fc88ca9f5b46d2929d20f65fbe5c4e, type: 3}
+  m_Name: TimeLineParticleSystemAsset(Clone)(Clone)(Clone)(Clone)
+  m_EditorClassIdentifier: 
+  sourceGameObject:
+    exposedName: 0759e175f44f54a44b36d40dee520c23
+    defaultValue: {fileID: 0}
+  prefabGameObject: {fileID: 5624882359785030059, guid: d3af49a296bdcf2449e8ca9666a5eac5, type: 3}
+  updateParticle: 1
+  particleRandomSeed: 4736
+  updateDirector: 1
+  updateITimeControl: 1
+  searchHierarchy: 0
+  active: 1
+  postPlayback: 2
+  targetType: 1
+  LocationType: 0
+  targetSpecialDotName: hitpos
+  hitPointGroupName: 
+  isGround: 0
+  isFollowTarget: 0
+  isNotRotate: 0
+  isFollowRootTarget: 0
+  isAttSpeed: 0
+  isLoop: 0
+  loopAlone: 0
+  isActivityCustomTargetPos: 0
+  CustomTargetPosIndex: 0
+  intervalTime: 0
 --- !u!114 &1477730321033259709
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -2638,6 +2767,7 @@ MonoBehaviour:
   m_Curves: {fileID: 0}
   m_Parent: {fileID: 11400000}
   m_Children:
+  - {fileID: -1467403167216396638}
   - {fileID: -5700901883387235338}
   - {fileID: 8874639077753602735}
   - {fileID: 6711887329045093846}

Datei-Diff unterdrückt, da er zu groß ist
+ 112 - 112
Assets/Res/Config/HeroBasicEquipConfig.json


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
Assets/Res/TimeLineAssets/Hero01_TD.txt


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
Assets/Res/TimeLineAssets/Hero02_TD.txt


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
Assets/Res/TimeLineAssets/Hero03_TD.txt


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
Assets/Res/TimeLineAssets/Hero04_TD.txt


+ 2 - 2
Assets/Res/UI/WidgetHero.prefab

@@ -1560,9 +1560,9 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   maxDuration: 0
   isUpdate: 0
-  currTime: 0.18130699
+  currTime: 0.1720568
   GrpupInfos:
-  - Foldout: 0
+  - Foldout: 1
     isActive: 0
     animName: skillShow
     isLoop: 0

+ 6 - 6
Assets/Res/UIAnimRes/TweenAssetInfoWidgetHero.asset

@@ -47,7 +47,7 @@ MonoBehaviour:
           m_RotationOrder: 4
     TweenCanvasGroup:
       Foldout: 0
-      duration: 0
+      duration: 0.15
       delay: 0
       currSchedule: 0
       TweenLerpType: 0
@@ -61,7 +61,7 @@ MonoBehaviour:
         m_RotationOrder: 4
     TweenGraphic:
       Foldout: 0
-      duration: 0
+      duration: 0.15
       delay: 0
       currSchedule: 0
       startColor: {r: 0, g: 0, b: 0, a: 0}
@@ -160,8 +160,8 @@ MonoBehaviour:
           m_RotationOrder: 4
     TweenCanvasGroup:
       Foldout: 0
-      duration: 0
-      delay: 0
+      duration: 0.2
+      delay: 0.2
       currSchedule: 0
       TweenLerpType: 0
       StartAlpha: 0
@@ -174,8 +174,8 @@ MonoBehaviour:
         m_RotationOrder: 4
     TweenGraphic:
       Foldout: 0
-      duration: 0
-      delay: 0
+      duration: 0.2
+      delay: 0.2
       currSchedule: 0
       startColor: {r: 0, g: 0, b: 0, a: 0}
       endColor: {r: 0, g: 0, b: 0, a: 0}

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

@@ -47,7 +47,7 @@ MonoBehaviour:
           m_RotationOrder: 4
     TweenCanvasGroup:
       Foldout: 0
-      duration: 0
+      duration: 0.15
       delay: 0
       currSchedule: 0
       TweenLerpType: 0
@@ -61,7 +61,7 @@ MonoBehaviour:
         m_RotationOrder: 4
     TweenGraphic:
       Foldout: 0
-      duration: 0
+      duration: 0.15
       delay: 0
       currSchedule: 0
       startColor: {r: 0, g: 0, b: 0, a: 0}

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

@@ -33,11 +33,14 @@ public class UITweenControllerInspector : Editor
         }
 
         EditorGUILayout.BeginHorizontal();
-        if (GUILayout.Button("添加新的片段"))
+        if (!_uiTweenController.isUpdate)
         {
-            _uiTweenController.GrpupInfos.Add(new TweenAssetGrpupInfo());
-            EditorUtility.SetDirty(_uiTweenController);
-            EditorUtility.SetDirty(_uiTweenController.gameObject);
+            if (GUILayout.Button("添加新的片段"))
+            {
+                _uiTweenController.GrpupInfos.Add(new TweenAssetGrpupInfo());
+                EditorUtility.SetDirty(_uiTweenController);
+                EditorUtility.SetDirty(_uiTweenController.gameObject);
+            }
         }
 
         if (_uiTweenController.isUpdate)

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

@@ -6,7 +6,7 @@ using Object = UnityEngine.Object;
 
 namespace Core.UI.UTool.UITween
 {
-    [ExecuteInEditMode]
+    [ExecuteAlways]
     public class UITweenController : MonoBehaviour
     {
         public float maxDuration;

+ 13 - 10
Assets/Scripts/GameLogic/Combat/CombatType/LevelBattleCombatType.cs

@@ -216,14 +216,21 @@ namespace GameLogic.Combat.CombatType
             {
                 return;
             }
-
-            BagController.Instance.DropHeroExp(combatHeroEntity.combatHeroGameObject.position, 3,
-                _levelBattleConfig.miniExpAndGold[0]);
+           
+            
+            BagController.Instance.AddHeroExp(_levelBattleConfig.miniExpAndGold[0]);
+       
+            // BagController.Instance.DropHeroExp(combatHeroEntity.combatHeroGameObject.position, 3,
+            //     _levelBattleConfig.miniExpAndGold[0]);
             int odds = CombatCalculateTool.Instance.GetOdd(0, 100);
             if (odds < 70)
             {
-                BagController.Instance.DropMonsterGold(combatHeroEntity.combatHeroGameObject.position, 3,
-                    3);
+                ShowTextEventData showTextEventData = ShowTextEventData.Create();
+                showTextEventData.text = "+金币 3";
+                showTextEventData.Color = new Color(1f, 0.64f, 0.22f);
+                showTextEventData.worldPos = combatHeroEntity.combatHeroGameObject.position;
+                EventManager.Instance.Dispatch(CustomEventType.ShowText, showTextEventData);
+                BagController.Instance.AddCoin(3);
             }
            
 
@@ -243,11 +250,7 @@ namespace GameLogic.Combat.CombatType
             // combatEquipFallEventData.startPos_WorldPos = combatItemShowEventData.startPos_WorldPos;
             // EventManager.Instance.Dispatch(CustomEventType.Combat_EquipFall, combatEquipFallEventData);
 
-            // ShowTextEventData showTextEventData = ShowTextEventData.Create();
-            // showTextEventData.text = "+金币 20";
-            // showTextEventData.Color = new Color(1f, 0.64f, 0.22f);
-            // showTextEventData.worldPos = combatHeroEntity.combatHeroGameObject.position;
-            // EventManager.Instance.Dispatch(CustomEventType.ShowText, showTextEventData);
+           
 
 
             // BagController.Instance.AddHeroExp(10);

Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
Assets/StreamingAssets/assetConfig.txt


BIN
Excel2Json/Excel/HeroBasicEquip.xlsx


+ 1 - 1
ProjectSettings/EntitiesClientSettings.asset

@@ -2,7 +2,7 @@
 %TAG !u! tag:yousandi.cn,2023:
 --- !u!114 &1
 MonoBehaviour:
-  m_ObjectHideFlags: 53
+  m_ObjectHideFlags: 61
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}

Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.