Merge pull request 'npc douple fix' (#89) from feature/loopanimation into develop

Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/89

Assets/PerfectWorld/Scripts/Managers/CECManager.cs

@@ -138,6 +138,8 @@ namespace BrewMonster.Managers
 
 
 
+
+
 
 
 

Assets/PerfectWorld/Scripts/Managers/CECNPCMan.cs

@@ -38,15 +38,30 @@ public class CECNPCMan : IMsgHandler
                 case EC_MsgDef.MSG_NM_NPCMOVE: OnMsgNPCMove(Msg); break;
                 case EC_MsgDef.MSG_NM_NPCSTOPMOVE: OnMsgNPCStopMove(Msg); break;
                 case EC_MsgDef.MSG_NM_NPCRUNOUT: OnMsgNPCRunOut(Msg); break;
+                case EC_MsgDef.MSG_NM_NPCOUTOFVIEW: OnMsgNPCOutOfView(Msg); break;
                 case EC_MsgDef.MSG_NM_NPCDIED: OnMsgNPCDied(Msg); break;
                 case EC_MsgDef.MSG_NM_NPCDISAPPEAR: OnMsgNPCDisappear(Msg); break;
+                case EC_MsgDef.MSG_NM_INVALIDOBJECT: OnMsgInvalidObject(Msg); break;
                 case EC_MsgDef.MSG_NM_NPCATKRESULT: TransmitMessage(Msg); break;
             }
         }
         return true;
     }
 
-    
+    private void OnMsgInvalidObject(ECMSG Msg)
+    {
+        int id = (int)Msg.dwParam1;
+
+        CECNPC pNPC = GetNPC(id);
+        if (pNPC)
+        {
+            NPCLeave(id);
+        }
+    }
+    private void OnMsgNPCOutOfView(ECMSG msg)
+    {
+        NPCLeave((int)msg.dwParam1);
+    }
     public void Tick()
     {
         iRemoveCnt = 0;

Assets/PerfectWorld/Scripts/Managers/EC_HPWorkMove.cs

@@ -583,7 +583,7 @@ namespace BrewMonster.Scripts
                 }
                 else if (m_iDestType == DestTypes.DEST_DIR)
                 {
-                    vCurPos = m_pHost.m_MoveCtrl.GroundMove(m_vCurDir, fSpeed, fDeltaTime, m_pHost.m_fVertSpeed);
+                    vCurPos = m_pHost.m_MoveCtrl.GroundMove(m_vCurDir, fSpeed -0.5f, fDeltaTime, m_pHost.m_fVertSpeed);
                     UpdateFacingFromDelta(vCurPos);
                     m_pHost.SetPos(EC_Utility.ToVector3(vCurPos));
 

Assets/PerfectWorld/Scripts/Network/CSNetwork/EC_MsgDef.cs

@@ -245,7 +245,7 @@ namespace CSNetwork
         public static int MSG_NM_NPCEXTSTATE = 410;         // NPC extend states changed
         public static int MSG_NM_ENCHANTRESULT = 411;       // Enchant result
         public static int MSG_NM_NPCSKILLRESULT = 412;      // NPC skill attack result
-        public static int MSG_NM_INVALIDOBJECT = 413;       // Object is invalid
+        public const int MSG_NM_INVALIDOBJECT = 413;       // Object is invalid
         public static int MSG_NM_NPCLEVELUP = 414;          // NPC level up
         public static int MSG_NM_NPCINVISIBLE = 415;        // NPC invisible
         public static int MSG_NM_NPCSTARTPLAYACTION = 416;  // NPC play policy action

Assets/PerfectWorld/Scripts/Skills/skill7.cs

@@ -170,3 +170,5 @@ namespace BrewMonster
 
 
 
+
+

Assets/PerfectWorld/Scripts/Skills/skill8.cs

@@ -168,3 +168,5 @@ namespace BrewMonster
 
 
 
+
+

Assets/PerfectWorld/Scripts/Skills/skill9.cs

@@ -107,3 +107,5 @@ namespace BrewMonster
 
 
 
+
+