Merge branch 'develop' into feature/storage

Assets/Scripts/CECHostPlayer.Combat.cs

@@ -128,7 +128,6 @@ namespace BrewMonster
 
         private void OnMsgHstHurtResult(ECMSG Msg)
         {
-            //BMLogger.LogError("HoangDev : OnMsgHstHurtResult");
               int cmd = Convert.ToInt32(Msg.dwParam2);
               if (cmd == CommandID.BE_HURT)
               {

Assets/Scripts/CECHostPlayer.HostCmd.cs

@@ -29,7 +29,6 @@ namespace BrewMonster
         //	坐下 / 站起
         public bool CmdSitDown(bool bSitDown)
         {
-            BMLogger.LogError("HoangDev: CmdSitDown:"+bSitDown);
             if (!CanDo(ActionCanDo.CANDO_SITDOWN))
                 return false;
 

Assets/Scripts/CECHostPlayer.Interaction.cs

@@ -135,7 +135,6 @@ namespace BrewMonster
             int iAction = (int)PLAYER_ACTION_TYPE.ACT_STAND;
             bool bSession = false;
 
-            BMLogger.LogError("HoangDev: idEmote "+idEmote);
             //	Select action according to pose
             switch (idEmote)
             {

Assets/Scripts/CECHostPlayer.Skill.cs

@@ -603,7 +603,6 @@ namespace BrewMonster
                  }*/
                 else if (GetEquipSkillByID(idSkill) == null)
                 {
-                    BMLogger.LogError("HoangDev: pSkill " + pSkill);
                 }
                 else
                 {

Assets/Scripts/CECHostPlayer.World.cs

@@ -15,14 +15,12 @@ namespace BrewMonster
     {
         public void OnMsgHstCorrectPos(in ECMSG Msg)
         {
-            //Debug.LogError("HoangDev : OnMsgHstCorrectPos");
             byte[] buf = (byte[])Msg.dwParam1; // chỗ bạn lưu pDataBuf
             GCHandle handle = GCHandle.Alloc(buf, GCHandleType.Pinned);
             cmd_host_correct_pos pCmd = (cmd_host_correct_pos)Marshal.PtrToStructure(
                 handle.AddrOfPinnedObject(), typeof(cmd_host_correct_pos));
             handle.Free();
             //cmd_host_correct_pos pCmd = GPDataTypeHelper.FromBytes<cmd_host_correct_pos>((byte[])Msg.dwParam1);
-            // Debug.LogError("HoangDev :pCmd.pos " + pCmd.pos);
             SetPos(pCmd.pos);
             m_vVelocity.Clear();
             m_CDRInfo.vAbsVelocity.Clear();

Assets/Scripts/CECHostPlayer.cs

@@ -366,7 +366,6 @@ namespace BrewMonster
 
         public async Task<bool> LoadResources()
         {
-            //BMLogger.LogError("HoangDev: CECHostPlayer::LoadResources");
             RoleInfo RoleInfo = UnityGameSession.Instance.GetRoleInfo();
             m_iProfession = RoleInfo.occupation;
             m_iGender = RoleInfo.gender;
@@ -496,7 +495,6 @@ namespace BrewMonster
         public void ProcessMessage(in ECMSG Msg)
         {
             var msg = (int)Msg.dwMsg;
-            //Debug.LogError("HoangDev : ProcessMessageProcessMessageProcessMessage " + msg);
             switch (msg)
             {
                 case EC_MsgDef.MSG_HST_CORRECTPOS: OnMsgHstCorrectPos(Msg); break;
@@ -575,6 +573,7 @@ namespace BrewMonster
                 case EC_MsgDef.MSG_HST_COOLTIMEDATA: OnMsgHstCoolTimeData(Msg); break;
                 case EC_MsgDef.MSG_HST_PRESSCANCEL: OnMsgHstPressCancel(Msg); break;
                 case EC_MsgDef.MSG_PM_PLAYERFLY: OnMsgPlayerFly(Msg); break;
+                case EC_MsgDef.MSG_PM_PLAYERSITDOWN: OnMsgPlayerSitDown(Msg); break;
                 case EC_MsgDef.MSG_HST_PETOPT: OnMsgHstPetOpt(Msg); break;
                 case EC_MsgDef.MSG_HST_SETPLAYERLIMIT: OnMsgHstSetPlayerLimit(Msg); break;
                 case EC_MsgDef.MSG_PM_PLAYERMOUNT: OnMsgPlayerMount(Msg); break;
@@ -1312,7 +1311,6 @@ namespace BrewMonster
         //	Message MSG_HST_SELTARGET handler
         void OnMsgHstSelTarget(ECMSG Msg)
         {
-            //BMLogger.LogError("HoangDev: OnMsgHstSelTarget");
             if (Convert.ToInt32(Msg.dwParam2) == CommandID.SELECT_TARGET)
             {
                 var data = (byte[])Msg.dwParam1;
@@ -1337,6 +1335,7 @@ namespace BrewMonster
             m_IncantCnt = new CECCounter();
             m_IncantCnt.SetPeriod(1000);
             m_IncantCnt.Reset(true);
+            InitBindCmdCoolCnt();
             m_bEnterGame = false;
         }
 
@@ -2106,14 +2105,12 @@ namespace BrewMonster
                 bRet = true;
                 if (idTarget == 0)
                 {
-                    //BMLogger.LogError("HoangDev: HostPlayer Unsetlect npc");
                     UnityGameSession.c2s_CmdUnselect();
                     m_idSelTarget = 0;
                     m_idUCSelTarget = 0;
                 }
                 else
                 {
-                    //BMLogger.LogError("HoangDev: HostPlayer setlect npc");
                     UnityGameSession.c2s_CmdSelectTarget(idTarget);
                     m_idSelTarget = idTarget;
                     m_idUCSelTarget = idTarget;
@@ -2394,7 +2391,10 @@ namespace BrewMonster
         public bool GetPushDir(ref Vector3 vPushDir, uint dwMask, float deltaTime)
         {
             vPushDir = Vector3.zero;
-            if (joystick.Horizontal == 0 && joystick.Vertical == 0)
+            if (IsDead())
+                return false;
+
+            if (joystick == null || (joystick.Horizontal == 0 && joystick.Vertical == 0))
             {
                 if (isPressMoveUp)
                 {
@@ -3381,7 +3381,7 @@ namespace BrewMonster
 
             if (iPose == (int)RoleExpression.ROLEEXP_SITDOWN)
             {
-                // UnityGameSession.c2s_CmdSessionEmote(iPose);
+                UnityGameSession.c2s_CmdSessionEmote(iPose);
             }
             else if (iPose == (int)RoleExpression.ROLEEXP_KISS)
             {
@@ -3662,9 +3662,10 @@ namespace BrewMonster
 
             m_PetOptCnt.IncCounter(iRealTime);
             // Bind command cool counter
-            /* if (m_BindCmdCoolCnt.IncCounter(dwDeltaTime))
-                 m_BindCmdCoolCnt.Reset(true);
+             if (m_BindCmdCoolCnt.IncCounter(iRealTime))
+                m_BindCmdCoolCnt.Reset(true);
 
+            /*
              // Auto fashion time counter
              if (m_bAutoFashion && GetBoothState() != 2 && !IsShapeChanged())
              {

Assets/Scripts/PlayerVisual.cs

@@ -222,7 +222,6 @@ namespace BrewMonster
             {
                 return;
             }
-            BMLogger.LogError("HoangDev animationName:"+animationName);
             bool isState = namedAnimancer.States.TryGet(animationName, out var existingState) ? true : false;
             if (isState)
             {