Merge branch 'master' of http://192.168.123.2:3000/fort23/XY001

Assets/GPUECSAnimationBaker/Samples/Shaders/GPUECSAnimator_URP_SimpleShader.shadergraph.meta

@@ -5,6 +5,6 @@ ScriptedImporter:
   externalObjects: {}
   serializedVersion: 2
   userData: 
-  assetBundleName: fb010shader
+  assetBundleName: 
   assetBundleVariant: 
   script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3}

Assets/Res/UI/HeroDetailPanel.prefab

@@ -1467,7 +1467,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   duration: 0.07
   ease: 5
-  animationSizeDelta: {x: 0.2, y: 0.2, z: 0}
+  animationSizeDelta: {x: 0.05, y: 0.05, z: 0}
 --- !u!1 &731879025552473058
 GameObject:
   m_ObjectHideFlags: 0
@@ -6304,6 +6304,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:
@@ -6542,6 +6544,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:
@@ -8317,6 +8321,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:
@@ -9834,6 +9840,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:
@@ -10691,7 +10699,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   duration: 0.07
   ease: 5
-  animationSizeDelta: {x: 0.2, y: 0.2, z: 0}
+  animationSizeDelta: {x: 0.05, y: 0.05, z: 0}
 --- !u!1 &5315175790152181287
 GameObject:
   m_ObjectHideFlags: 0
@@ -10742,6 +10750,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:
@@ -12606,7 +12616,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:
@@ -14196,6 +14206,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:
@@ -14660,6 +14672,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:
@@ -15589,6 +15603,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:
@@ -15799,6 +15815,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:

Assets/Res/UI/HeroUpTxtEft.prefab

@@ -170,5 +170,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  data: []
+  data:
+  - key: txtEft
+    gameObject: {fileID: 3992509306590940860}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1

Assets/Res/UIPlayable/HeroDetailPanelTimeline.playable

@@ -45,7 +45,7 @@ MonoBehaviour:
     _controlPosition: 0
     _controlSize: 0
     _controlRotation: 0
-    _controlScale: 1
+    _controlScale: 0
     _startValue:
       _anchoredPosition: {x: 0, y: 0, z: 0}
       _sizeDelta: {x: 0, y: 0}
@@ -81,7 +81,7 @@ MonoBehaviour:
     m_Start: 0
     m_ClipIn: 0
     m_Asset: {fileID: -2147174353164675019}
-    m_Duration: 0.4
+    m_Duration: 0.2
     m_TimeScale: 1
     m_ParentTrack: {fileID: -6019252560737163005}
     m_EaseInDuration: 0
@@ -341,7 +341,7 @@ MonoBehaviour:
       _anchoredPosition: {x: 0, y: 0, z: 0}
       _sizeDelta: {x: 0, y: 0}
       _localRotation: {x: 0, y: 0, z: 0}
-      _localScale: {x: 1.1, y: 1.1, z: 1}
+      _localScale: {x: 1, y: 1, z: 1}
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -406,7 +406,7 @@ MonoBehaviour:
     m_Start: 0
     m_ClipIn: 0
     m_Asset: {fileID: -3517064595543215121}
-    m_Duration: 0.20000000000000007
+    m_Duration: 0.1
     m_TimeScale: 1
     m_ParentTrack: {fileID: 7089825263001972541}
     m_EaseInDuration: 0

Assets/Scripts/GameUI/UI/Hero/HeroDetailPanel.cs

@@ -59,7 +59,7 @@ namespace Fort23.Mono
             upPre = await UIManager.Instance.CreateGComponentForObject<HeroPowerUpPre>(objHeroPowerUpPre,
                 delegate(HeroPowerUpPre pre)
                 {
-                    EnterUpgradePre(2);
+                    EnterPowerUpPre(2);
                     pre.OpenPromotePre(heroInfo);
                 }, root: rtBottom);
             
@@ -75,16 +75,6 @@ namespace Fort23.Mono
             }
         }
 
-        private void EnterPromotePre()
-        {
-            
-        }
-
-        private void ExitPromotePre()
-        {
-            
-        }
-
         /// <summary>
         /// 是否打开了升级/升星的预览界面
         /// </summary>
@@ -102,7 +92,7 @@ namespace Fort23.Mono
             else if (resultType == HeroUpResultType.PlayUpgradeEftFirst)
             {
                 //TODO 要播放特效.
-                ExitUpgradePre(1);
+                ExitPowerUpPre(1);
                 UpdateAttributeUI();
             }
             else if(resultType == HeroUpResultType.NeedOpenPreUI)
@@ -110,7 +100,7 @@ namespace Fort23.Mono
                 upPre = await UIManager.Instance.CreateGComponentForObject<HeroPowerUpPre>(objHeroPowerUpPre,
                     delegate(HeroPowerUpPre pre)
                     {
-                        EnterUpgradePre(1);
+                        EnterPowerUpPre(1);
                         pre.OpenUpgradePre(heroInfo);
                     }, root: rtBottom);
             }
@@ -133,7 +123,7 @@ namespace Fort23.Mono
         /// 进入 升级/升星预览界面
         /// </summary>
         /// <param name="preTyp">1升级;2 升星</param>
-        private void EnterUpgradePre(byte preTyp)
+        private void EnterPowerUpPre(byte preTyp)
         {
             isOpenPre = true;
             curPreTyp = preTyp;
@@ -151,6 +141,17 @@ namespace Fort23.Mono
                 RectTransform rt = btnPromote.GetComponent<RectTransform>();
                 rt.sizeDelta = new Vector2(510, rt.sizeDelta.y);
                 rt.localPosition = new Vector3(47, rt.localPosition.y, rt.localPosition.z);
+
+                if (costHeroCount > curHeroCount)
+                {
+                    btnPromote.GetComponent<MyImage>().icon_name = "btn_l_Gray";
+                    
+                }
+                else
+                {
+                    btnPromote.GetComponent<MyImage>().icon_name = "btn_l_Green";
+                }
+                
             }
         }
 
@@ -159,7 +160,7 @@ namespace Fort23.Mono
         /// 离开 升级/升星预览界面
         /// </summary>
         /// <param name="preTyp">1升级;2 升星</param>
-        private void ExitUpgradePre(byte preTyp)
+        private void ExitPowerUpPre(byte preTyp)
         {
             isOpenPre = false;
             btns1.SetActive(true);
@@ -177,11 +178,10 @@ namespace Fort23.Mono
                 RectTransform rt = btnPromote.GetComponent<RectTransform>();
                 rt.sizeDelta = new Vector2(180, rt.sizeDelta.y);
                 rt.localPosition = new Vector3(-135f, rt.localPosition.y, rt.localPosition.z);
-            }
-            
                 
+                btnPromote.GetComponent<MyImage>().icon_name = "btn_l_Green";
+            }
             
-                
             objHeroPowerUpPre.SetActive(false);
         }
 
@@ -212,7 +212,7 @@ namespace Fort23.Mono
         {
             if (isOpenPre)
             {
-                ExitUpgradePre(curPreTyp);
+                ExitPowerUpPre(curPreTyp);
             }
             else
             {
@@ -287,29 +287,43 @@ namespace Fort23.Mono
             UpdateAttributeUI(true);
         }
 
+        private long curHeroCount;
+        private long costHeroCount;
         public async void UpdateAttributeUI(bool isInit = false)
         {
             if (txtHP.text != heroInfo.hp.Value.ToStringEx())
             {
+                long old = long.Parse(txtHP.text);
                 txtHP.text = heroInfo.hp.Value.ToStringEx();
                 if(!isInit)
-                    await UIManager.Instance.CreateGComponent<HeroUpTxtEft>(null, 
+                    await UIManager.Instance.CreateGComponent<HeroUpTxtEft>(delegate(HeroUpTxtEft heroUpTxtEft)
+                        {
+                            heroUpTxtEft.txtEft.text = "+" + (heroInfo.hp.Value - old).ToStringEx();
+                        }, 
                         poolName: "HeroUpTxtEft", root: eftNumPos[0] as RectTransform);
             }
 
             if (txtATK.text != heroInfo.attack.Value.ToStringEx())
             {
+                long old = long.Parse(txtATK.text);
                 txtATK.text = heroInfo.attack.Value.ToStringEx();
                 if(!isInit)
-                    await UIManager.Instance.CreateGComponent<HeroUpTxtEft>(null,
+                    await UIManager.Instance.CreateGComponent<HeroUpTxtEft>(delegate(HeroUpTxtEft heroUpTxtEft)
+                        {
+                            heroUpTxtEft.txtEft.text = "+" + (heroInfo.attack.Value - old).ToStringEx();
+                        },
                         poolName: "HeroUpTxtEft", root: eftNumPos[1] as RectTransform);
             }
 
             if (txtDEF.text != heroInfo.defense.Value.ToStringEx())
             {
+                long old = long.Parse(txtDEF.text);
                 txtDEF.text = heroInfo.defense.Value.ToStringEx();
                 if(!isInit)
-                    await UIManager.Instance.CreateGComponent<HeroUpTxtEft>(null,
+                    await UIManager.Instance.CreateGComponent<HeroUpTxtEft>(delegate(HeroUpTxtEft heroUpTxtEft)
+                        {
+                            heroUpTxtEft.txtEft.text = "+" + (heroInfo.defense.Value - old).ToStringEx();
+                        },
                         poolName: "HeroUpTxtEft", root: eftNumPos[2] as RectTransform);
             }
 
@@ -335,18 +349,21 @@ namespace Fort23.Mono
             {
                 redColorStar = "<color=#FF4C4C>";
                 redColorEnd = "</color>";
+                
+                btnUpgrade.GetComponent<MyImage>().icon_name = "btn_l_Gray";
             }
             else
             {
                 redColorStar = "";
                 redColorEnd = "";
+                btnUpgrade.GetComponent<MyImage>().icon_name = "btn_l_Green";
             }
 
-            txtUpgrade.text = redColorStar + curExp + redColorEnd + "/" + costExp;
+            txtUpgrade.text = redColorStar + curExp.ToStringEx() + redColorEnd + "/" + costExp.ToStringEx();
             
             
-            long curHeroCount = BagController.Instance.GetItemInfo(heroInfo.modelConfig.itemID).count.Value;
-            long costHeroCount = heroInfo.promoteConfig.costCount;
+            curHeroCount = BagController.Instance.GetItemInfo(heroInfo.modelConfig.itemID).count.Value;
+            costHeroCount = heroInfo.promoteConfig.costCount;
             
             if (costHeroCount > curHeroCount)
             {
@@ -361,8 +378,8 @@ namespace Fort23.Mono
             
             txtPromote.text = redColorStar + curHeroCount + redColorEnd + "/" + costHeroCount;
 
-            LogTool.Log(PlayerManager.Instance.heroController.CanUpgrade(heroInfo));
-            LogTool.Log(go1.activeSelf);
+            // LogTool.Log(PlayerManager.Instance.heroController.CanUpgrade(heroInfo));
+            // LogTool.Log(go1.activeSelf);
             if (PlayerManager.Instance.heroController.CanUpgrade(heroInfo) == HeroUpResultType.MainLevelNotEnough)
             {
                 go1.SetActive(false);
@@ -374,7 +391,7 @@ namespace Fort23.Mono
             {
                 go1.SetActive(true);
                 txtUpLimit.gameObject.SetActive(false);
-                btnUpgrade.GetComponent<MyImage>().icon_name = "btn_l_Green";
+                // btnUpgrade.GetComponent<MyImage>().icon_name = "btn_l_Green";
             }
         }
 

Assets/Scripts/GameUI/UI/Hero/HeroUpTxtEftData.cs

@@ -3,11 +3,24 @@ using Fort23.UTool;
 using UnityEngine.UI;
 using UnityEngine;
 using System.Collections.Generic;
+using TMPro;
+
 namespace Fort23.Mono
 {
 	public partial class HeroUpTxtEft 
 	{
 	  #region 自定义数据 
+	  private TextMeshProUGUI _txtEft;
+	  public TextMeshProUGUI txtEft
+	   {
+	   get{
+	      if (_txtEft == null)
+	       {
+	         _txtEft  = GetUIUnit<TextMeshProUGUI>("txtEft"); 
+	       }
+	      return _txtEft;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

ProjectSettings/ProjectSettings.asset

@@ -314,7 +314,99 @@ PlayerSettings:
   AndroidValidateAppBundleSize: 1
   AndroidAppBundleSizeToValidate: 200
   m_BuildTargetIcons: []
-  m_BuildTargetPlatformIcons: []
+  m_BuildTargetPlatformIcons:
+  - m_BuildTarget: Android
+    m_Icons:
+    - m_Textures: []
+      m_Width: 432
+      m_Height: 432
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 324
+      m_Height: 324
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 216
+      m_Height: 216
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 162
+      m_Height: 162
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 108
+      m_Height: 108
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 81
+      m_Height: 81
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 192
+      m_Height: 192
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 144
+      m_Height: 144
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 96
+      m_Height: 96
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 72
+      m_Height: 72
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 48
+      m_Height: 48
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 36
+      m_Height: 36
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 192
+      m_Height: 192
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 144
+      m_Height: 144
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 96
+      m_Height: 96
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 72
+      m_Height: 72
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 48
+      m_Height: 48
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 36
+      m_Height: 36
+      m_Kind: 0
+      m_SubKind: 
   m_BuildTargetBatching:
   - m_BuildTarget: Standalone
     m_StaticBatching: 0