فهرست منبع

升级数字动画.

lcn 5 ماه پیش
والد
کامیت
a57fd67e0e

+ 2 - 2
Assets/Layer Lab/GUI Pro-SuperCasual/ResourcesData/Fonts/Cairo_Line_Black SDF.asset

@@ -5740,8 +5740,8 @@ Material:
     - _Stencil: 0
     - _StencilComp: 8
     - _StencilOp: 0
-    - _StencilReadMask: 255
-    - _StencilWriteMask: 255
+    - _StencilReadMask: 1
+    - _StencilWriteMask: 0
     - _TextureHeight: 1024
     - _TextureWidth: 1024
     - _UnderlayDilate: 1

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 99 - 882
Assets/Res/UI/HeroDetailPanel.prefab


+ 174 - 0
Assets/Res/UI/HeroUpTxtEft.prefab

@@ -0,0 +1,174 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &2287078410214474204
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5135952974914396357}
+  - component: {fileID: 4114408173942861410}
+  - component: {fileID: 3992509306590940860}
+  - component: {fileID: 7782233227781314710}
+  - component: {fileID: 2783349857181196743}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: HeroUpTxtEft
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5135952974914396357
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2287078410214474204}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 231.72, y: 88}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &4114408173942861410
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2287078410214474204}
+  m_CullTransparentMesh: 1
+--- !u!114 &3992509306590940860
+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: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_text: +700
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: 7137805b022d44869b12d93cb388c588, type: 2}
+  m_sharedMaterial: {fileID: 8527393934874279224, guid: 7137805b022d44869b12d93cb388c588, type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4278255045
+  m_fontColor: {r: 0.7719639, g: 0.990566, b: 0, a: 1}
+  m_enableVertexGradient: 0
+  m_colorMode: 3
+  m_fontColorGradient:
+    topLeft: {r: 1, g: 1, b: 1, a: 1}
+    topRight: {r: 1, g: 1, b: 1, a: 1}
+    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+    bottomRight: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColorGradientPreset: {fileID: 0}
+  m_spriteAsset: {fileID: 0}
+  m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
+  m_overrideHtmlColors: 0
+  m_faceColor:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontSize: 35
+  m_fontSizeBase: 36
+  m_fontWeight: 400
+  m_enableAutoSizing: 1
+  m_fontSizeMin: 24
+  m_fontSizeMax: 35
+  m_fontStyle: 0
+  m_HorizontalAlignment: 1
+  m_VerticalAlignment: 512
+  m_textAlignment: 65535
+  m_characterSpacing: 0
+  m_wordSpacing: 0
+  m_lineSpacing: 0
+  m_lineSpacingMax: 0
+  m_paragraphSpacing: 0
+  m_charWidthMaxAdj: 0
+  m_enableWordWrapping: 1
+  m_wordWrappingRatios: 0.4
+  m_overflowMode: 0
+  m_linkedTextComponent: {fileID: 0}
+  parentLinkedComponent: {fileID: 0}
+  m_enableKerning: 1
+  m_enableExtraPadding: 0
+  checkPaddingRequired: 0
+  m_isRichText: 1
+  m_parseCtrlCharacters: 1
+  m_isOrthographic: 1
+  m_isCullingEnabled: 0
+  m_horizontalMapping: 0
+  m_verticalMapping: 0
+  m_uvLineOffset: 0
+  m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
+  m_VertexBufferAutoSizeReduction: 0
+  m_useMaxVisibleDescender: 1
+  m_pageToDisplay: 1
+  m_margin: {x: 0, y: 2.178482, z: 93.673706, w: 16.338444}
+  m_isUsingLegacyAnimationComponent: 0
+  m_isVolumetricText: 0
+  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
+  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: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data: []
+  isAssetBundle: 1

+ 7 - 0
Assets/Res/UI/HeroUpTxtEft.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: WnMW5iL8Wi0D63a6wfzmjiXnmOaZfL6luKPYCHSsv7xu4rut5Ykh9F0=
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 315 - 0
Assets/Res/UIPlayable/HeroAttUp.playable

@@ -0,0 +1,315 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!114 &-8189757671495878384
+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: 583515fb0fbe9ff4ba244ff5c01d126d, type: 3}
+  m_Name: Text Mesh Pro UGUI Animation Track
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_AnimClip: {fileID: 0}
+  m_Locked: 0
+  m_Muted: 0
+  m_CustomPlayableFullTypename: 
+  m_Curves: {fileID: 0}
+  m_Parent: {fileID: 11400000}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: -4700745978088650691}
+    m_Duration: 0.5
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: -8189757671495878384}
+    m_EaseInDuration: 0
+    m_EaseOutDuration: 0
+    m_BlendInDuration: -1
+    m_BlendOutDuration: -1
+    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: TextMeshProUGUIAnimationClip
+  m_Markers:
+    m_Objects: []
+--- !u!114 &-6204559280289277337
+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: 11aa0b29ff13eab449a39fa0f8c3c506, type: 3}
+  m_Name: RectTransformAnimationClip
+  m_EditorClassIdentifier: 
+  template:
+    _loopDuration: 0
+    _loopType: 0
+    _curve:
+      _curveType: 0
+      _easeType: 0
+      _animationCurve:
+        serializedVersion: 2
+        m_Curve: []
+        m_PreInfinity: 2
+        m_PostInfinity: 2
+        m_RotationOrder: 4
+    _controlPosition: 1
+    _controlSize: 0
+    _controlRotation: 0
+    _controlScale: 0
+    _startValue:
+      _anchoredPosition: {x: 0, y: 0, z: 0}
+      _sizeDelta: {x: 0, y: 0}
+      _localRotation: {x: 0, y: 0, z: 0}
+      _localScale: {x: 0, y: 0, z: 0}
+    _endValue:
+      _anchoredPosition: {x: 0, y: 50, z: 0}
+      _sizeDelta: {x: 0, y: 0}
+      _localRotation: {x: 0, y: 0, z: 0}
+      _localScale: {x: 0, y: 0, z: 0}
+--- !u!114 &-4700745978088650691
+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: aa164a07e2607b34aad5f7abdaeda554, type: 3}
+  m_Name: TextMeshProUGUIAnimationClip
+  m_EditorClassIdentifier: 
+  template:
+    _loopDuration: 0
+    _loopType: 0
+    _curve:
+      _curveType: 0
+      _easeType: 0
+      _animationCurve:
+        serializedVersion: 2
+        m_Curve: []
+        m_PreInfinity: 2
+        m_PostInfinity: 2
+        m_RotationOrder: 4
+    _controlFontSize: 0
+    _controlColor: 1
+    _controlVertexGradient: 0
+    _controlSpacing: 0
+    _controlRuntimeFaceColor: 0
+    _controlRuntimeOutlineColor: 0
+    _controlRuntimeOutlineWidth: 0
+    _startValue:
+      _fontSize: 36
+      _color: {r: 0.46659112, g: 1, b: 0, a: 1}
+      _gradient:
+        _usePreset: 0
+        _vertexGradient:
+          topLeft: {r: 1, g: 1, b: 1, a: 1}
+          topRight: {r: 1, g: 1, b: 1, a: 1}
+          bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+          bottomRight: {r: 1, g: 1, b: 1, a: 1}
+        _preset: {fileID: 0}
+      _spacing:
+        _character: 0
+        _line: 0
+        _word: 0
+        _paragraph: 0
+      _faceColor: {r: 1, g: 1, b: 1, a: 1}
+      _outlineColor: {r: 0, g: 0, b: 0, a: 1}
+      _outlineWidth: 0
+    _endValue:
+      _fontSize: 36
+      _color: {r: 0.46659112, g: 1, b: 0, a: 0}
+      _gradient:
+        _usePreset: 0
+        _vertexGradient:
+          topLeft: {r: 1, g: 1, b: 1, a: 1}
+          topRight: {r: 1, g: 1, b: 1, a: 1}
+          bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+          bottomRight: {r: 1, g: 1, b: 1, a: 1}
+        _preset: {fileID: 0}
+      _spacing:
+        _character: 0
+        _line: 0
+        _word: 0
+        _paragraph: 0
+      _faceColor: {r: 1, g: 1, b: 1, a: 1}
+      _outlineColor: {r: 0, g: 0, b: 0, a: 1}
+      _outlineWidth: 0
+--- !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: bfda56da833e2384a9677cd3c976a436, type: 3}
+  m_Name: HeroAttUp
+  m_EditorClassIdentifier: 
+  m_Version: 0
+  m_Tracks:
+  - {fileID: 6582516066229308053}
+  - {fileID: -8189757671495878384}
+  m_FixedDuration: 0
+  m_EditorSettings:
+    m_Framerate: 60
+    m_ScenePreview: 1
+  m_DurationMode: 0
+  m_MarkerTrack: {fileID: 0}
+--- !u!114 &6582516066229308053
+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: ab997e120f9c3184195588497850c91e, type: 3}
+  m_Name: Rect Transform Animation Track
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_AnimClip: {fileID: 0}
+  m_Locked: 0
+  m_Muted: 0
+  m_CustomPlayableFullTypename: 
+  m_Curves: {fileID: 0}
+  m_Parent: {fileID: 11400000}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: -6204559280289277337}
+    m_Duration: 0.4
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: 6582516066229308053}
+    m_EaseInDuration: 0
+    m_EaseOutDuration: 0
+    m_BlendInDuration: -1
+    m_BlendOutDuration: -1
+    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: RectTransformAnimationClip
+  m_Markers:
+    m_Objects: []

+ 8 - 0
Assets/Res/UIPlayable/HeroAttUp.playable.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: XXka4yOpAS0+0xkn0JM0umAY40V3AVjQe6Ty/s0h0WMybJ9cr3amwAc=
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 220 - 258
Assets/Scenes/UIBuild.scene


+ 38 - 9
Assets/Scripts/GameUI/UI/Hero/HeroDetailPanel.cs

@@ -97,7 +97,7 @@ namespace Fort23.Mono
 
             if (resultType == HeroUpResultType.Success)
             {
-               UpdateAttributeUI();
+                UpdateAttributeUI();
             }
             else if (resultType == HeroUpResultType.PlayUpgradeEftFirst)
             {
@@ -168,14 +168,14 @@ namespace Fort23.Mono
             {
                 btnPromote.gameObject.SetActive(true);
                 RectTransform rt = btnUpgrade.GetComponent<RectTransform>();
-                rt.sizeDelta = new Vector2(320, rt.sizeDelta.y);
+                rt.sizeDelta = new Vector2(400, rt.sizeDelta.y);
                 rt.localPosition = new Vector3(163f, rt.localPosition.y, rt.localPosition.z);
             }
             else
             {
                 btnUpgrade.gameObject.SetActive(true);
                 RectTransform rt = btnPromote.GetComponent<RectTransform>();
-                rt.sizeDelta = new Vector2(220, rt.sizeDelta.y);
+                rt.sizeDelta = new Vector2(180, rt.sizeDelta.y);
                 rt.localPosition = new Vector3(-135f, rt.localPosition.y, rt.localPosition.z);
             }
             
@@ -284,15 +284,44 @@ namespace Fort23.Mono
                     break;
             }
 
-            UpdateAttributeUI();
+            UpdateAttributeUI(true);
         }
 
-        public void UpdateAttributeUI()
+        public async void UpdateAttributeUI(bool isInit = false)
         {
-            txtHP.text = heroInfo.hp.Value.ToStringEx();
-            txtATK.text = heroInfo.attack.Value.ToStringEx();
-            txtDEF.text = heroInfo.defense.Value.ToStringEx();
-            txtSHANBI.text = heroInfo.shanbi.Value.ToStringEx();
+            if (txtHP.text != heroInfo.hp.Value.ToStringEx())
+            {
+                txtHP.text = heroInfo.hp.Value.ToStringEx();
+                if(!isInit)
+                    await UIManager.Instance.CreateGComponent<HeroUpTxtEft>(null, 
+                        poolName: "HeroUpTxtEft", root: eftNumPos[0] as RectTransform);
+            }
+
+            if (txtATK.text != heroInfo.attack.Value.ToStringEx())
+            {
+                txtATK.text = heroInfo.attack.Value.ToStringEx();
+                if(!isInit)
+                    await UIManager.Instance.CreateGComponent<HeroUpTxtEft>(null,
+                        poolName: "HeroUpTxtEft", root: eftNumPos[1] as RectTransform);
+            }
+
+            if (txtDEF.text != heroInfo.defense.Value.ToStringEx())
+            {
+                txtDEF.text = heroInfo.defense.Value.ToStringEx();
+                if(!isInit)
+                    await UIManager.Instance.CreateGComponent<HeroUpTxtEft>(null,
+                        poolName: "HeroUpTxtEft", root: eftNumPos[2] as RectTransform);
+            }
+
+            if (txtSHANBI.text != heroInfo.shanbi.Value.ToStringEx())
+            {
+                txtSHANBI.text = heroInfo.shanbi.Value.ToStringEx();
+                if(!isInit)
+                    await UIManager.Instance.CreateGComponent<HeroUpTxtEft>(null,
+                        poolName: "HeroUpTxtEft", root: eftNumPos[3] as RectTransform);
+            }
+            
+            
             txtLv.text = heroInfo.level.Value.ToStringEx();
             txtExpGain.text = heroInfo.expGain.Value.ToStringEx();
 

+ 11 - 0
Assets/Scripts/GameUI/UI/Hero/HeroDetailPanelData.cs

@@ -307,6 +307,17 @@ namespace Fort23.Mono
 	      return _txtUpLimit;
 	     }
 	   }
+	  private List<object> _eftNumPos;
+	  public List<object> eftNumPos
+	   {
+	   get{
+	      if (_eftNumPos == null)
+	       {
+	         _eftNumPos  = GetUIUnit<List<object>>("eftNumPos"); 
+	       }
+	      return _eftNumPos;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

+ 29 - 0
Assets/Scripts/GameUI/UI/Hero/HeroUpTxtEft.cs

@@ -0,0 +1,29 @@
+using Common.Utility.CombatTimer;
+using Fort23.UTool;
+
+namespace Fort23.Mono
+{
+    [UIBinding(prefab = "HeroUpTxtEft"  )]
+    public partial class HeroUpTxtEft : UIComponent
+    {
+        private void Init()
+        {
+            CombatTimerManager.Instance.AddTimer(1f, delegate
+            {
+                UIManager.Instance.DormancyGComponent(this);
+                LogTool.Log("Recycle:" + poolObjName);
+            });
+            // UIManager.Instance.
+        }
+        public override void AddEvent()
+        {
+        }
+        public override void DelEvent()
+        {
+        }
+        public override void AddButtonEvent()
+        {
+        }
+
+    }
+}

+ 11 - 0
Assets/Scripts/GameUI/UI/Hero/HeroUpTxtEft.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: Bn9NvCz8Uy8k0efznRQ0v8IXYlrGbj2l5LDbIGBfyfWLXg5F3Ph0kqI=
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 18 - 0
Assets/Scripts/GameUI/UI/Hero/HeroUpTxtEftData.cs

@@ -0,0 +1,18 @@
+using Fort23.Core;
+using Fort23.UTool;
+using UnityEngine.UI;
+using UnityEngine;
+using System.Collections.Generic;
+namespace Fort23.Mono
+{
+	public partial class HeroUpTxtEft 
+	{
+	  #region 自定义数据 
+	  #endregion 自定义数据结束 
+	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
+	{
+	 await base.SetUIGameObject(gObjectPoolInterface);
+	 Init();
+	}
+	}
+}

+ 11 - 0
Assets/Scripts/GameUI/UI/Hero/HeroUpTxtEftData.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: XXoX4Sv5UX2rOQwxv3YzdcA06hmI41br7Cy5P7OpGdsBdlKDNbG5UMs=
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
Assets/StreamingAssets/assetConfig.txt


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 203 - 343
UserSettings/Layouts/default-2022.dwlt


برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است