Merge branch 'develop' into feature/add-vfx

# Conflicts: # Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
2025-11-12 11:04:43 +07:00
parent 142fabf108 fb2288c2a2
commit cfeebf3a15
16 changed files with 1731 additions and 686 deletions
@@ -261,15 +261,15 @@ public partial class CECHostPlayer : CECPlayer
                SelectTarget(m_idUCSelTarget);
            }

-            /*     if (idTraceTarget != 0)
-                 {
-                     if (iTraceReason == CECHPWorkTrace.Trace_reason.TRACE_ATTACK)
-                     {
-                         if (!CanDo(ActionCanDo.CANDO_MELEE))
-                             return;
-                         NormalAttackObject(idTraceTarget, bForceAttack);
-                     }
-                 }*/
+            if (idTraceTarget != 0)
+            {
+                if (iTraceReason == CECHPWorkTrace.Trace_reason.TRACE_ATTACK)
+                {
+                    if (!CanDo(ActionCanDo.CANDO_MELEE))
+                        return;
+                    NormalAttackObject(idTraceTarget, bForceAttack);
+                }
+            }
        }
        m_pWorkMan?.Tick(Time.deltaTime);