Merge branch 'master' of 192.168.0.254:BattleSever/WSHCommon

Common/CommonAI/Zone/Data.cs

@@ -1061,7 +1061,7 @@ namespace CommonAI.Zone
 
 			if (UType == UnitType.TYPE_NPC && this.RecoveryIntervalMS > 0)
 			{
-				log.Info("NPC配置了恢复时间, 强行重置" + this.ID);
+				log.Debug("NPC配置了恢复时间, 强行重置" + this.ID);
 				this.RecoveryIntervalMS = 0;
 			}
 		}

Common/CommonAI/ZoneClient/ZoneObject.Unit.Status.cs

@@ -660,6 +660,11 @@ namespace CommonAI.ZoneClient
                     {
                         //CD未结束的技能，action都是在最后一段（不然不会有CD）
                         this.CurrentActionID = Data.ActionQueue.Count - 1;
+                        if (OnChargeStateChange != null)
+                        {
+                            ChargeProgress = 1f;
+                            OnChargeStateChange.Invoke();
+                        }
                     }
                 }
 

Common/CommonAIClient/Client/BattleClient.cs

@@ -128,7 +128,7 @@ namespace CommonAIClient.Client
             this.QueueTask((AbstractBattle client) =>
             {
                 BattleClient bc = client as BattleClient;
-                log.Info("sessionOpened : " + session);
+                log.Debug("sessionOpened : " + session);
                 if (bc.mConnected != null)
                 {
                     bc.mConnected.Invoke(bc);
@@ -147,7 +147,7 @@ namespace CommonAIClient.Client
             this.QueueTask((AbstractBattle client) =>
             {
                 BattleClient bc = client as BattleClient;
-                log.Info("sessionClosed : " + session);
+                log.Debug("sessionClosed : " + session);
                 if (bc.mDisconnectd != null)
                 {
                     bc.mDisconnectd.Invoke(bc);