Merge remote-tracking branch 'origin/develop' into feature/chat_01

Assets/PerfectWorld/Scripts/Skills/SkillStubs1/skill88.cs

@@ -86,9 +86,9 @@ namespace BrewMonster
         public Skill88Stub() : base(88)
         {
             cls = 1;
-            name = "ӿȪ";
-            nativename = "ӿȪ";
-            icon = "ӿȪ";
+            name = "涌泉";
+            nativename = "涌泉";
+            icon = "涌泉";
             max_level = 10;
             type = 1;
             apcost = 0;
@@ -109,11 +109,43 @@ namespace BrewMonster
             long_range = 0;
             restrict_corpse = 0;
             allow_forms = 1;
-            effect = "ӿȪ";
+            effect = "涌泉";
             doenchant = 1;
             dobless = 0;
             commoncooldown = 0;
             commoncooldowntime = 0;
+            m_szFlyGfxPath = string.Empty;
+            m_szHitGrndGfxPath = string.Empty;
+            m_szHitGfxPath = "策划联入/人物技能/飞行/涌泉中招.gfx";
+            m_szFlySfxPath = string.Empty;
+            m_szHitGrndSfxPath = string.Empty;
+            m_szHitSfxPath = "skill/02mage/涌泉_c";
+            
+            // GFX Movement and Behavior Parameters / GFX移动和行为参数
+            m_MoveMode = (GfxMoveMode)0;
+            m_TargetMode = (GfxTargetMode)0;
+            m_AttFlyMode = (GfxAttackMode)0;
+            m_AttHitMode = (GfxAttackMode)0;
+            m_dwFlyTime = 0;
+            m_bTraceTarget = false;
+            m_FlyClusterCount = 1;
+            m_FlyClusterInterval = 0;
+            m_HitClusterCount = 1;
+            m_HitClusterInterval = 0;
+            m_bOneHit = true;
+            m_bFadeOut = false;
+            m_bRelScl = true;
+            m_fDefTarScl = 1.8f;
+            
+            // Area parameters (commented out) / 区域参数（已注释）
+            // m_bArea = false;
+            // m_Shape = (EmitShape)0;
+            // m_vSize = new Vector3(0.0f, 0.0f, 0.0f);
+            
+            // Param (commented out) / 参数（已注释）
+            // m_paramType = (GfxSkillValType)1;
+            // m_param = new GFX_SKILL_PARAM();
+            // m_param.nVal = 0;
             restrict_weapons.Add(0);
             restrict_weapons.Add(292);
             range = new Range();

Assets/PerfectWorld/Scripts/UI/Dialogs/CDlgSkillSubList.cs

@@ -129,7 +129,7 @@ namespace BrewMonster.UI
             {
                 CreateOneRankDlg(taoistRank);
             }
-            totalSPText.text = "    <color=yellow>Nguyên Thần:</color>      " +GetHostPlayer().GetBasicProps().iSP.ToString() + "</color>";
+           
         }
 
         // ��ʼ�����������ڶԻ���һ���Է�����ڴ� / Initialize rank sub-dialogs once to avoid realloc
@@ -190,6 +190,7 @@ namespace BrewMonster.UI
                 FitSize();
                 ShowLastSelectedSkill();
             }
+            totalSPText.text = "    <color=yellow>Nguyên Thần:</color>      " + GetHostPlayer().GetBasicProps().iSP.ToString() + "</color>";
         }
 
         // ��鵯��ħ״̬ / Reset when switching between god/evil

Assets/PerfectWorld/Scripts/UI/GamePlay/AUIImagePicture.cs

@@ -16,6 +16,7 @@ namespace BrewMonster.Assets.PerfectWorld.Scripts.UI.GamePlay
     public class AUIImagePicture : AUIImagePictureBase
     {
         public const string DefaultComboIcon = "爱你";
+        [SerializeField] Button skillbutton;
         [SerializeField] GameObject borderImage;
         [SerializeField] int cooldownTime;
         [SerializeField] AUIClockIcon m_ClockCounter;
@@ -36,6 +37,12 @@ namespace BrewMonster.Assets.PerfectWorld.Scripts.UI.GamePlay
 
         public override void Awake()
         {
+            if (skillbutton == null)
+            {
+                return;
+            }
+            skillbutton.onClick.RemoveAllListeners();
+            skillbutton.onClick.AddListener(Execute);
             m_pParent = GetComponentInParent<AUIDialog>();
             // _skillID = int.Parse(this.name.Split('_')[1]);
         }
@@ -44,11 +51,14 @@ namespace BrewMonster.Assets.PerfectWorld.Scripts.UI.GamePlay
         {
             if (isInteract)
             {
+                skillbutton.interactable = true;
                 disPlayImage.color = Color.white;
             }
             else
             {
                 disPlayImage.color = Color.gray;
+
+                skillbutton.interactable = false;
             }
         }
 
@@ -87,6 +97,12 @@ namespace BrewMonster.Assets.PerfectWorld.Scripts.UI.GamePlay
                 Debug.LogError("Skill Image is not assigned in AUIImagePicture");
                 return;
             }
+
+            if (skillbutton != null)
+            {
+                skillbutton.interactable = true;
+            }
+
             disPlayImage.color = Color.white;
             disPlayImage.sprite = sprite;
             disPlayImage.gameObject.SetActive(true);
@@ -95,9 +111,11 @@ namespace BrewMonster.Assets.PerfectWorld.Scripts.UI.GamePlay
         }
         private IEnumerator CooldownRoutine()
         {
+            skillbutton.interactable = false;
             disPlayImage.color = Color.gray;
             yield return new WaitForSeconds(cooldownTime);
             disPlayImage.color = Color.white;
+            skillbutton.interactable = true;
         }
         public AUIClockIcon GetClockIcon() => m_ClockCounter;
 
@@ -116,6 +134,7 @@ namespace BrewMonster.Assets.PerfectWorld.Scripts.UI.GamePlay
         {
             // BMLogger.Log("Clear AUIImagePicture with name: " + name) ;
             base.Clear();
+            skillbutton.interactable = true;
             if (disPlayImage != null)
             {
                 disPlayImage.color = Color.white;
@@ -214,7 +233,6 @@ namespace BrewMonster.Assets.PerfectWorld.Scripts.UI.GamePlay
             }
 
             _skillGroupIndex = resolvedGroup;
-
             Clear();
             return false;
         }
@@ -227,6 +245,7 @@ namespace BrewMonster.Assets.PerfectWorld.Scripts.UI.GamePlay
                 return false;
             }
 
+            skillbutton.interactable = true;
             var uiMan = EC_Game.GetGameRun()?.GetUIManager()?.GetInGameUIMan();
             if (uiMan == null)
             {

Assets/PerfectWorld/Scripts/UI/SkillUI/CDlgSkillSubPool.cs

@@ -144,6 +144,7 @@ namespace BrewMonster
 
         private void OnClickedConfirmCombo()
         {
+            _skillSetUpComboWidget.ShowCurrentCombos();
             if (_currentSelectComboSlot != null &&
                 _skillSetUpComboWidget.CurrentComboSetting.comboSkill[_currentSelectComboSlot.GetSlotIndex].idSkill == null)
             {

Assets/PerfectWorld/Scripts/UI/SkillUI/SkillSetUpComboWidget.cs

@@ -104,7 +104,7 @@ namespace BrewMonster
             _btnLoopAttack.OnClickedSkillSlot -= OnSelectedSkillToAsign;
         }
 
-        private void ShowCurrentCombos()
+        public void ShowCurrentCombos()
         {
             // setting.comboSkill[GetData() - 1].nIcon = (byte)m_nIcon;
             if (Setting.comboSkill == null || _combosList.Count != Setting.comboSkill.Length)

Assets/Prefabs/UI/SkillUI.prefab

@@ -943,7 +943,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 335.91, y: -507.53912}
+  m_AnchoredPosition: {x: 335.91, y: -431.53912}
   m_SizeDelta: {x: 651.82, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2731969899170380074