Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_glow_add.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.16710803
+    - _Alpha: 0.28925925
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0

Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_quan.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0
+    - _Alpha: 0.020031393
     - _AlphaCutoff: 0.5
     - _ColorMask: 0
     - _EnableExternalAlpha: 0

Assets/Art/VFX/Materials/UIMat/ui_renwu_lg.mat

@@ -57,13 +57,13 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.25927776
+    - _Alpha: 0.21363008
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0
     - _MainSpeedU: 0.5
     - _MainSpeedV: 0.5
-    - _MainTexOffsetU: 0.1433127
+    - _MainTexOffsetU: 0.19580758
     - _MainTexOffsetV: 0
     - _MainTilingU: 0.8
     - _MainTilingV: 1

Assets/Res/UI/ItemDetailsPanel/FaBaoDetailsPanel.prefab

@@ -1957,7 +1957,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &4672021808672808400
 RectTransform:
   m_ObjectHideFlags: 0

Assets/Res/UI/ItemDetailsPanel/GongFaDetailsPanel.prefab

@@ -2111,7 +2111,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &3506692094758419250
 RectTransform:
   m_ObjectHideFlags: 0

Assets/Res/UI/MainHeroPanel/SelectFaBaoPanel.prefab

@@ -2349,6 +2349,7 @@ GameObject:
   - component: {fileID: 6455921579910473774}
   - component: {fileID: 414044791521804828}
   - component: {fileID: 65899356648462701}
+  - component: {fileID: 8257270936662101197}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_UpGrade
@@ -2547,6 +2548,21 @@ MonoBehaviour:
   m_FlexibleWidth: -1
   m_FlexibleHeight: -1
   m_LayoutPriority: 1
+--- !u!114 &8257270936662101197
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3908091618312269019}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b2313d4d59614a4aa1c04a1a07b28213, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  startTime: 0.5
+  intervalTime: 0.05
+  isPressd: 0
 --- !u!1 &3931340268851502278
 GameObject:
   m_ObjectHideFlags: 0
@@ -4818,7 +4834,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!114 &4159330424245520485
 MonoBehaviour:
@@ -4988,6 +5004,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Btn_UpGradeLongPress
+    gameObject: {fileID: 8257270936662101197}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 0
 --- !u!1 &9056821549282551153
 GameObject:

Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroInformationPanel.cs

@@ -101,19 +101,18 @@ namespace Fort23.Mono
 
             Btn_TuPo.onClick.AddListener(async () =>
             {
-                if (PlayerManager.Instance.myHero.powerUpConfig.jingjie1 == heroInfo.powerUpConfig.jingjie1)
-                {
-                    int currentMiao = (int)((TimeHelper.ClientNow() - PlayerManager.Instance.myHero.heroData.upTime) /
-                                            1000);
-
-                    float allexp = currentMiao * PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei;
-                    if (PlayerManager.Instance.myHero.heroData.exp + allexp <
-                        PlayerManager.Instance.myHero.powerUpConfig.levelUpExp)
-                    {
-                        return;
-                    }
+                int currentMiao = (int)((TimeHelper.ClientNow() - PlayerManager.Instance.myHero.heroData.upTime) /
+                                        1000);
 
+                float allexp = currentMiao * PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei;
+                if (PlayerManager.Instance.myHero.heroData.exp + allexp <
+                    PlayerManager.Instance.myHero.powerUpConfig.levelUpExp)
+                {
+                    return;
+                }
 
+                if (PlayerManager.Instance.myHero.powerUpConfig.jingjie1 == heroInfo.powerUpConfig.jingjie1)
+                {
                     //小突破
                     if (PlayerManager.Instance.myHero.powerUpConfig.jingjie2 == heroInfo.powerUpConfig.jingjie2)
                     {

Assets/Scripts/GameUI/UI/MainHeroPnael/SelectFaBaoPanel.cs

@@ -80,93 +80,9 @@ namespace Fort23.Mono
                 SetSelectIcon(currentFaBaoWidget.SelectRoot);
             });
 
-            Btn_UpGrade.onClick.AddListener(() =>
-            {
-                if (selectedFaBaoInfo != null)
-                {
-                    if (selectedFaBaoInfo.FabaoPowerupConfig.ID >=
-                        ConfigComponent.Instance.GetAll<FabaoPowerupConfig>().Length)
-                    {
-                        TipMessagePanel.OpenTipMessagePanel(10338);
-                        return;
-                    }
-
-                    if (PlayerManager.Instance.myHero.powerUpConfig.ID < selectedFaBaoInfo.FabaoPowerupConfig.NeedLv)
-                    {
-                        string jingjie =
-                            LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig
-                                .jingjieLanIDs[0]) +
-                            LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig
-                                .jingjieLanIDs[1]) +
-                            LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[2]);
-                        TipMessagePanel.OpenTipMessagePanel(LanguageManager.Instance.Text(10337, jingjie));
-                        return;
-                    }
-
-                    for (var i = 0; i < selectedFaBaoInfo.FabaoPowerupConfig.PowerupItemIDs.Length; i++)
-                    {
-                        if (!PlayerManager.Instance.BagController.IsEnough(
-                                selectedFaBaoInfo.FabaoPowerupConfig.PowerupItemIDs[i],
-                                selectedFaBaoInfo.FabaoPowerupConfig.PowerupItemCosts[i]))
-                        {
-                            ItemSourcePanel.OpenPanel(selectedFaBaoInfo.FabaoPowerupConfig.PowerupItemIDs[i]);
-                            // TipMessagePanel.OpenTipMessagePanel("道具不足");
-                            return;
-                        }
-                    }
-
-                    ItemConfig itemConfig =
-                        ConfigComponent.Instance.Get<ItemConfig>(selectedFaBaoInfo.FabaoConfig.ItemID);
-                    ItemConfig itemConfig2 = ConfigComponent.Instance.Get<ItemConfig>(itemConfig.associateVlaue[0]);
-                    if (selectedFaBaoInfo.FabaoPowerupConfig.PromotePieceNum != null &&
-                        selectedFaBaoInfo.FabaoPowerupConfig.PromotePieceNum[itemConfig2.quality - 1] != -1)
-                    {
-                        if (!PlayerManager.Instance.BagController.IsEnough(itemConfig.associateVlaue[0],
-                                selectedFaBaoInfo.FabaoPowerupConfig.PromotePieceNum[itemConfig2.quality - 1]))
-                        {
-                            ItemSourcePanel.OpenPanel(itemConfig.associateVlaue[0]);
-                            TipMessagePanel.OpenTipMessagePanel("道具不足");
-                            return;
-                        }
-                    }
-
-                    for (var i = 0; i < selectedFaBaoInfo.FabaoPowerupConfig.PowerupItemIDs.Length; i++)
-                    {
-                        PlayerManager.Instance.BagController.DeductItem(
-                            selectedFaBaoInfo.FabaoPowerupConfig.PowerupItemIDs[i],
-                            selectedFaBaoInfo.FabaoPowerupConfig.PowerupItemCosts[i]);
-                    }
-
-                    if (selectedFaBaoInfo.FabaoPowerupConfig.PromotePieceNum != null &&
-                        selectedFaBaoInfo.FabaoPowerupConfig.PromotePieceNum[itemConfig2.quality - 1] != -1)
-                    {
-                        PlayerManager.Instance.BagController.DeductItem(itemConfig.associateVlaue[0],
-                            selectedFaBaoInfo.FabaoPowerupConfig.PromotePieceNum[itemConfig2.quality - 1]);
-                    }
-
-                    selectedFaBaoInfo.UpGrade();
-                    PlayerManager.Instance.myHero.ComputeHeroInfo();
-                    fx_ui_fabao_shengji.gameObject.SetActive(true);
-                    fx_ui_fabao_shengji.Play();
-                    UpdateCurrentFaBaoWidget();
-                    UpadaFabaoBag();
-                    UpdateUI(selectedFaBaoInfo);
-                    UpdataGradeUI(true);
-
-                    foreach (var faBaoSkillWidget in faBaoSkillWidgets)
-                    {
-                        if (selectedFaBaoInfo.FabaoPowerupConfig.ID ==
-                            faBaoSkillWidget._faBaoInfo.FabaoPowerupConfig.ID)
-                        {
-                            faBaoSkillWidget.fx_ui_fabao_tiaomu.gameObject.SetActive(true);
-                            faBaoSkillWidget.fx_ui_fabao_tiaomu.Play();
-                        }
-                    }
-
+            Btn_UpGrade.onClick.AddListener(() => { UpGrade(); });
 
-                    AudioManager.Instance.PlayAudio("ui_fbgfsj.wav");
-                }
-            });
+            Btn_UpGradeLongPress.longPress = () => { UpGrade(); };
 
             Btn_PeiYang.onClick.AddListener(() =>
             {
@@ -175,6 +91,14 @@ namespace Fort23.Mono
                 BtnChangeRoot.SetActive(false);
                 UpdataGradeUI(true);
                 UpdateBjUI(false);
+                foreach (var itemWidgetType1 in itemWidgetType1s)
+                {
+                    LayoutRebuilder.ForceRebuildLayoutImmediate(
+                        itemWidgetType1.Text_Count.GetComponent<RectTransform>());
+                    LayoutRebuilder.ForceRebuildLayoutImmediate(itemWidgetType1.transform);
+                }
+
+                LayoutRebuilder.ForceRebuildLayoutImmediate(ItemRoot);
             });
             Btn_Cancel.onClick.AddListener(() =>
             {
@@ -187,6 +111,94 @@ namespace Fort23.Mono
         }
 
 
+        private void UpGrade()
+        {
+            if (selectedFaBaoInfo != null)
+            {
+                if (selectedFaBaoInfo.FabaoPowerupConfig.ID >=
+                    ConfigComponent.Instance.GetAll<FabaoPowerupConfig>().Length)
+                {
+                    TipMessagePanel.OpenTipMessagePanel(10338);
+                    return;
+                }
+
+                if (PlayerManager.Instance.myHero.powerUpConfig.ID < selectedFaBaoInfo.FabaoPowerupConfig.NeedLv)
+                {
+                    string jingjie =
+                        LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig
+                            .jingjieLanIDs[0]) +
+                        LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig
+                            .jingjieLanIDs[1]) +
+                        LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[2]);
+                    TipMessagePanel.OpenTipMessagePanel(LanguageManager.Instance.Text(10337, jingjie));
+                    return;
+                }
+
+                for (var i = 0; i < selectedFaBaoInfo.FabaoPowerupConfig.PowerupItemIDs.Length; i++)
+                {
+                    if (!PlayerManager.Instance.BagController.IsEnough(
+                            selectedFaBaoInfo.FabaoPowerupConfig.PowerupItemIDs[i],
+                            selectedFaBaoInfo.FabaoPowerupConfig.PowerupItemCosts[i]))
+                    {
+                        ItemSourcePanel.OpenPanel(selectedFaBaoInfo.FabaoPowerupConfig.PowerupItemIDs[i]);
+                        // TipMessagePanel.OpenTipMessagePanel("道具不足");
+                        return;
+                    }
+                }
+
+                ItemConfig itemConfig =
+                    ConfigComponent.Instance.Get<ItemConfig>(selectedFaBaoInfo.FabaoConfig.ItemID);
+                ItemConfig itemConfig2 = ConfigComponent.Instance.Get<ItemConfig>(itemConfig.associateVlaue[0]);
+                if (selectedFaBaoInfo.FabaoPowerupConfig.PromotePieceNum != null &&
+                    selectedFaBaoInfo.FabaoPowerupConfig.PromotePieceNum[itemConfig2.quality - 1] != -1)
+                {
+                    if (!PlayerManager.Instance.BagController.IsEnough(itemConfig.associateVlaue[0],
+                            selectedFaBaoInfo.FabaoPowerupConfig.PromotePieceNum[itemConfig2.quality - 1]))
+                    {
+                        ItemSourcePanel.OpenPanel(itemConfig.associateVlaue[0]);
+                        TipMessagePanel.OpenTipMessagePanel("道具不足");
+                        return;
+                    }
+                }
+
+                for (var i = 0; i < selectedFaBaoInfo.FabaoPowerupConfig.PowerupItemIDs.Length; i++)
+                {
+                    PlayerManager.Instance.BagController.DeductItem(
+                        selectedFaBaoInfo.FabaoPowerupConfig.PowerupItemIDs[i],
+                        selectedFaBaoInfo.FabaoPowerupConfig.PowerupItemCosts[i]);
+                }
+
+                if (selectedFaBaoInfo.FabaoPowerupConfig.PromotePieceNum != null &&
+                    selectedFaBaoInfo.FabaoPowerupConfig.PromotePieceNum[itemConfig2.quality - 1] != -1)
+                {
+                    PlayerManager.Instance.BagController.DeductItem(itemConfig.associateVlaue[0],
+                        selectedFaBaoInfo.FabaoPowerupConfig.PromotePieceNum[itemConfig2.quality - 1]);
+                }
+
+                selectedFaBaoInfo.UpGrade();
+                PlayerManager.Instance.myHero.ComputeHeroInfo();
+                fx_ui_fabao_shengji.gameObject.SetActive(true);
+                fx_ui_fabao_shengji.Play();
+                UpdateCurrentFaBaoWidget();
+                UpadaFabaoBag();
+                UpdateUI(selectedFaBaoInfo);
+                UpdataGradeUI(true);
+
+                foreach (var faBaoSkillWidget in faBaoSkillWidgets)
+                {
+                    if (selectedFaBaoInfo.FabaoPowerupConfig.ID ==
+                        faBaoSkillWidget._faBaoInfo.FabaoPowerupConfig.ID)
+                    {
+                        faBaoSkillWidget.fx_ui_fabao_tiaomu.gameObject.SetActive(true);
+                        faBaoSkillWidget.fx_ui_fabao_tiaomu.Play();
+                    }
+                }
+
+
+                AudioManager.Instance.PlayAudio("ui_fbgfsj.wav");
+            }
+        }
+
         public async override CTask<bool> AsyncInit(object[] uiData)
         {
             // await UpadaFabaoBag();

Assets/Scripts/GameUI/UI/MainHeroPnael/SelectFaBaoPanelData.cs

@@ -351,6 +351,17 @@ namespace Fort23.Mono
 	      return _fx_ui_fabao_shengji;
 	     }
 	   }
+	  private LongPressBtn _Btn_UpGradeLongPress;
+	  public LongPressBtn Btn_UpGradeLongPress
+	   {
+	   get{
+	      if (_Btn_UpGradeLongPress == null)
+	       {
+	         _Btn_UpGradeLongPress  = GetUIUnit<LongPressBtn>("Btn_UpGradeLongPress"); 
+	       }
+	      return _Btn_UpGradeLongPress;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{