修复Demo中的一些问题

Unity/Assets/Plugins/Animancer/Internal/Editor/Animancer Settings.asset

@@ -0,0 +1,27 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 16
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 18bd840b706853d4a934ec3199f63a41, type: 3}
+  m_Name: Animancer Settings
+  m_EditorClassIdentifier: 
+  _TransitionPreviewWindow:
+    _AutoClose: 1
+    _SceneLighting: 0
+    _ShowSkybox: 0
+    _SceneEnvironment: {fileID: 0}
+    _Models: []
+  _AnimationTimeFields:
+    showApproximations: 1
+    showNormalized: 1
+    showSeconds: 1
+    showFrames: 1
+  _InspectorRepaintInterval: 0.25
+  _NewAnimationFrameRate: 12

Unity/Assets/Plugins/Animancer/Internal/Editor/Animancer Settings.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b6629c01aeb2fae49aec420a8514ef69
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Res/effectShader.meta → Unity/Assets/Res/ArtSource/effectShader.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 0fc8583c5ded1d8409671bbb8fc65561
+guid: 63ee70f256b01af4d95c469ada28695a
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Unity/Assets/Scenes/Init.unity

@@ -185,6 +185,10 @@ PrefabInstance:
       propertyPath: enablePopup
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 22331464, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
+      propertyPath: m_AdditionalShaderChannelsFlag
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 22426080, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_AnchorMax.x
       value: 0

Unity/Assets/Scripts/Codes/Hotfix/Client/EntryEvent2_InitClient.cs

@@ -7,17 +7,8 @@
         {
             //加载战斗相关资源
             Game.AddSingleton<BattleResourceMgr>();
-            await BattleResourceMgr.Instance.InitAsync();
-
             Game.AddSingleton<BattleMgr>();
-            await BattleMgr.Instance.InitAsync();
-
             Game.AddSingleton<BattleUnitFactory>();
-            await BattleUnitFactory.Instance.InitAsync();
-
-            //Game.AddSingleton<SoundManager>();
-            //await SoundManager.Instance.InitAsync();
-
             Game.AddSingleton<SkillMgr>();
         }
     }

Unity/Assets/Scripts/Codes/Hotfix/Client/Login/EnterMapHelper.cs

@@ -1,4 +1,4 @@
-using System;
+using System; 
 
 namespace ET.Client
 {
@@ -21,7 +21,7 @@ namespace ET.Client
                 // 等待场景切换完成
                 await clientScene.GetComponent<ObjectWait>().Wait<Wait_SceneChangeFinish>();
                 //告诉战斗服 i am ready
-                clientScene.GetComponent<SessionComponent>().Session.Call(new C2G_EnterSceneReady()).Coroutine();
+                clientScene.GetComponent<SessionComponent>().Session.Send(new BattleClientReady());
             }
             catch (Exception e)
             {

Unity/Assets/Scripts/Codes/Hotfix/Client/Router/RouterCheckComponentSystem.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Net;
 
 namespace ET.Client
@@ -43,7 +43,7 @@ namespace ET.Client
 
                     (uint localConn, uint remoteConn) = await NetServices.Instance.GetChannelConn(session.ServiceId, sessionId);
                     
-                    IPEndPoint realAddress = self.GetParent<Session>().RemoteAddress;
+                    IPEndPoint realAddress = session.RemoteAddress;
                     Log.Info($"get recvLocalConn start: {self.ClientScene().Id} {realAddress} {localConn} {remoteConn}");
 
                     (uint recvLocalConn, IPEndPoint routerAddress) = await RouterHelper.GetRouterAddress(self.ClientScene(), realAddress, localConn, remoteConn);
@@ -66,4 +66,4 @@ namespace ET.Client
             }
         }
     }
-}
+}

Unity/Assets/Scripts/Codes/Hotfix/Client/battle/BattleMgr.cs

@@ -87,7 +87,7 @@ namespace ET
         //单位进入战斗  
         protected void LayerEvent_ObjectEnter(ZoneLayer layer, ZoneObject obj)
         {
-            Log.Debug($"OnObjectEnter: {obj}@{obj.ObjectID}");
+            //Log.Debug($"OnObjectEnter: {obj}@{obj.ObjectID}");
 
             var unit = BattleUnitFactory.Instance.Create(obj);
             if(unit != null )
@@ -108,7 +108,7 @@ namespace ET
         //单位离开战斗   
         protected void LayerEvent_ObjectLeave(ZoneLayer layer, ZoneObject obj)
         {
-            Log.Debug($"OnObjectLeave: {obj.ObjectID}");
+            //Log.Debug($"OnObjectLeave: {obj.ObjectID}");
 
             var unit = UnitMgr.Instance.GetUnit(obj.ObjectID);
             if(unit == null)
@@ -152,6 +152,19 @@ namespace ET
 
                 (UnitMgr.Instance.Actor.ZUnit as ZoneActor).IsGuard = isAutoFight;
             });
+            objectEventHandler.AddListener<PlayerFocuseTargetEvent>((ev) =>
+            {
+                var e = ev as PlayerFocuseTargetEvent;
+                if(e.ObjectID == UnitMgr.Instance.ActorId)
+                {
+                    var target = UnitMgr.Instance.GetUnit(e.targetUnitID);
+                    if (target != null)
+                    {
+                        Log.Debug($"we have target: {target.Id}");
+                    }
+                }
+            });
+            
             objectEventHandler.AddListener<ShowTipsEventB2C>((ev) =>
             {
             });
@@ -166,6 +179,9 @@ namespace ET
             });
             objectEventHandler.AddListener<PlayerPKModeChangeEventB2C>((ev) =>
             {
+                //TODO:替代virtual层
+                var e = ev as PlayerPKModeChangeEventB2C;
+                Log.Debug($"PKMode: {e.CurMode}");
             });
             objectEventHandler.AddListener<PlayerBattlePropChangeEventB2C>((ev) =>
             {
@@ -181,11 +197,18 @@ namespace ET
                 var e = ev as UnitEffectEvent;
                 EventSystem.Instance.Publish<PlayEffectEvent>(PlayEffectEvent.Static.Clone(e.effect, e.ObjectID, CommonLang.Geometry.Vector3.Zero));
             });
+            objectEventHandler.AddListener<XmdsUnitPropEventB2C>((ev) =>
+            {
+                var prop = (ev as XmdsUnitPropEventB2C).Props;
+                Log.Debug($"UnitPropChange: {ev.ObjectID}");
+            });
             //NPCCureEventB2C
             //MonsterSufferDamageInfoB2C
             //BattleHintNumberB2C
             //BattleFloatTipsEventB2C
             //BubbleTipsEventB2C
+            //怪物归属权
+            //MonsterHeirInfoChangeEventB2C
 
             zoneEventHandler.AddListener<AddEffectEvent>((ev) => {
                 var e = ev as AddEffectEvent;

Unity/Assets/Scripts/Codes/Hotfix/Client/battle/BattleMgr_Cmd.cs

@@ -0,0 +1,32 @@
+
+using CommonAI.Zone;
+using ET.Client;
+
+namespace ET
+{
+    //发送战斗服指令相关
+    public partial class BattleMgr
+    {
+        private bool autoFight;
+        public bool AutoFight
+        {
+            get
+            {
+                return autoFight;
+            }
+            set
+            {
+                if(value == autoFight) return;
+                else
+                {
+                    autoFight = value;
+                }
+            }
+        }
+
+        public CommonAI.Zone.Action SetAutoFight(bool flag)
+        {
+            return new UnitGuardAction(UnitMgr.Instance.ActorId, flag, CommonAI.XmdsConstConfig.AUTO_GUARD_MODE_POINT);
+        }
+    }
+}

Unity/Assets/Scripts/Codes/Hotfix/Client/battle/BattleMgr_Cmd.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 2b5bc52f6f238d14ea75c37375c97f0b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Scripts/Codes/Hotfix/Client/battle/BattlePushHandler.cs

@@ -14,7 +14,7 @@ namespace ET.Client
         protected override async ETTask Run(Session session, BattleEventPush pushdata)
         {
             var type = pushdata.key;
-            Log.Debug($"<<receive battle push type({type})");
+            //Log.Debug($"<<receive battle push type({type})");
 
             object data;
             if(!BattleResourceMgr.Instance.BattleMsgDecoder.doDecode(new MemoryStream(pushdata.data), out data))

Unity/Assets/Scripts/Codes/Hotfix/Client/battle/skill/SkillMgr.cs

@@ -45,12 +45,26 @@ namespace ET.Client
         {
             launchSkillAction.SkillID = skillId;
             launchSkillAction.object_id = UnitMgr.Instance.Actor.Id;
-            launchSkillAction.TargetObjID = 0;
+            launchSkillAction.TargetObjID = SelectTarget(skillId);
             launchSkillAction.SpellTargetPos = null;
             launchSkillAction.IsAutoFocusNearTarget = false;
             launchSkillAction.Direction = 0;
             BattleMgr.Instance.SendAction(launchSkillAction);
         }
+
+        private uint SelectTarget(int skillId)
+        {
+            var CFG = UnitMgr.Instance.Actor.ZUnit.Templates;
+            SkillTemplate skt = CFG.getSkill(skillId);
+            if(skt.ExpectTarget == SkillTemplate.CastTarget.Enemy)
+            {
+                foreach(var unit in UnitMgr.Instance.AllUnits)
+                {
+
+                }
+            }
+            return 0;
+        }
     }
 
     [Event(SceneType.None)]

Unity/Assets/Scripts/Codes/Hotfix/Client/battle/unit/BattleActor.cs

@@ -1,6 +1,7 @@
 using CommonAI.ZoneClient;
 using ET;
 using ET.Client;
+using XmdsCommon.Plugin;
 
 public class BattleActor : BattlePlayer
 {
@@ -13,6 +14,9 @@ public class BattleActor : BattlePlayer
         za.OnStopPickObject += OnStopPickObject;
         za.OnSkillChanged += OnSkillChanged;
         za.OnClickSkillSimulationEvent += OnClickSkillSimulationEvent;
+
+        var uProp = za.Info.Properties as XmdsUnitProperties;
+        Log.Debug($"pkMode: {uProp.ServerData.UnitPKInfo.CurPKMode}");
     }
 
     private void OnSkillChanged(ZoneUnit.SkillOption op, ZoneUnit unit, int baseSkillID, params int[] skills)

Unity/Assets/Scripts/Codes/Hotfix/Client/battle/unit/BattleMonster.cs

@@ -0,0 +1,9 @@
+using CommonAI.ZoneClient;
+
+public class BattleMonster : BattleUnit
+{
+    public override void OnAwake(ZoneObject zo)
+    {
+        base.OnAwake(zo);
+    }
+}

Unity/Assets/Scripts/Codes/Hotfix/Client/battle/unit/BattleMonster.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 407b444679046c3489c9c2b69a5a6872
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Scripts/Codes/Hotfix/Client/battle/unit/BattleUnit.cs

@@ -66,6 +66,11 @@ public class BattleUnit : BattleObject
     protected virtual void OnLaunchSkill(ZoneUnit _, ZoneUnit.SkillState __, UnitLaunchSkillEvent ___)
     {
         CommonAI.ZoneClient.ZoneUnit.ISkillAction action = ZUnit.CurrentSkillAction;
+        if(action == null)
+        {
+            Log.Warning("object's currentSkillAction = null, cannot launch skill");
+            return;
+        }
         SkillTemplate skillTemplate = action.SkillData;
         var curActionIndex = action.CurrentActionIndex;
         if (skillTemplate.ActionQueue.Count <= curActionIndex)
@@ -78,20 +83,21 @@ public class BattleUnit : BattleObject
         if (skillTemplate.IsSingleAction)
         {
             UnitActionData actdata = skillTemplate.ActionQueue[curActionIndex];
-            var duration = action.ActionTimeArray != null ? action.ActionTimeArray[0] : actdata.TotalTimeMS;
-            EventSystem.Instance.Publish<PlayAnimatorEvent>(CurrentScene, new PlayAnimatorEvent() {
-                UnitId = Id,
-                CommandType = AnimatorEventType.Skill,
-                SkillName = actdata.ActionName,
-                Duration = duration,
-                Speed = action.ActionSpeed,
-                Loop = actdata.IsCycAction
-            });
-
-            if (!actdata.ActionAudioName.IsNullOrWhitespace())
+            if (actdata.ActionName.IsNullOrWhitespace())
             {
-                SoundManager.Instance.Play3DSound(actdata.ActionAudioName, ZUnit.X, ZUnit.Y, ZUnit.Z, duration);
+                Log.Debug($"ActionName is null @skill({skillTemplate.TemplateID}), actionIndex:{curActionIndex}");
+                return;
             }
+            var duration = action.ActionTimeArray != null ? action.ActionTimeArray[0] : actdata.TotalTimeMS;
+            EventSystem.Instance.Publish<PlayAnimatorEvent>(PlayAnimatorEvent.Static.Clone(
+                Id,
+                AnimatorEventType.Skill,
+                actdata.ActionName,
+                duration,
+                action.ActionSpeed,
+                0,
+                actdata.IsCycAction, actdata.ActionAudioName)
+            );
         }
         else
         {
@@ -101,6 +107,12 @@ public class BattleUnit : BattleObject
             for (int i = curActionIndex; i < skillTemplate.ActionQueue.Count; i++)
             {
                 item = skillTemplate.ActionQueue[i];
+                if (item.ActionName.IsNullOrWhitespace())
+                {
+                    Log.Debug($"ActionName is null @skill({skillTemplate.TemplateID}), actionIndex:{curActionIndex}");
+                    return;
+                }
+
                 if (action.LaunchEvent != null)
                 {
                     speed = action.LaunchEvent.action_speed;
@@ -110,23 +122,20 @@ public class BattleUnit : BattleObject
                     }
                 }
 
-                EventSystem.Instance.Publish<PlayAnimatorEvent>(CurrentScene, new PlayAnimatorEvent()
-                {
-                    UnitId = Id,
-                    CommandType = AnimatorEventType.Skill,
-                    SkillName = item.ActionName,
-                    Duration = action.ActionTimeArray[i],
-                    Speed = speed,
-                    Loop = item.IsCycAction,
-                    GroupId = GroupId()
-                });
+                EventSystem.Instance.Publish<PlayAnimatorEvent>(PlayAnimatorEvent.Static.Clone(
+                    Id,
+                    AnimatorEventType.Skill,
+                    item.ActionName,
+                    action.ActionTimeArray[i],
+                    speed, GroupId(),
+                    item.IsCycAction,
+                    isFrist ? item.ActionAudioName : ""));
 
                 if(!item.ActionAudioName.IsNullOrWhitespace())
                 {
                     if (isFrist)
                     {
                         isFrist = false;
-                        SoundManager.Instance.Play3DSound(item.ActionAudioName, ZUnit.X, ZUnit.Y, ZUnit.Z, action.ActionTimeArray[i]);
                     }
                     else
                     {
@@ -154,7 +163,7 @@ public class BattleUnit : BattleObject
 
     protected virtual void OnHPChanged(ZoneUnit unit, int oldHP, int newHP)
     {
-        throw new NotImplementedException();
+        Log.Debug($"hp change({unit.ObjectID}), {oldHP}-->{newHP}");
     }
 
     protected virtual void OnSkillActionChanged(ZoneUnit unit, ZoneUnit.SkillState skill, byte index)
@@ -178,11 +187,11 @@ public class BattleUnit : BattleObject
     private void registerActionHandler()
     {
         actionChangeHandler.AddListener(UnitActionStatus.Idle, (_) => {
-            EventSystem.Instance.Publish<PlayAnimatorEvent>(CurrentScene, new PlayAnimatorEvent() { UnitId = Id, CommandType = AnimatorEventType.Idle });
+            EventSystem.Instance.Publish<PlayAnimatorEvent>(PlayAnimatorEvent.Static.Clone(Id, AnimatorEventType.Idle));
         });
 
         var move = actionChangeHandler.AddListener(UnitActionStatus.Move, (o) => {
-            EventSystem.Instance.Publish<PlayAnimatorEvent>(CurrentScene, new PlayAnimatorEvent() { UnitId = Id, CommandType = AnimatorEventType.Run });
+            EventSystem.Instance.Publish<PlayAnimatorEvent>(PlayAnimatorEvent.Static.Clone(Id, AnimatorEventType.Run));
         });
         actionChangeHandler.AddListener(UnitActionStatus.Chaos, move);
         actionChangeHandler.AddListener(UnitActionStatus.ServerSyncMove, move);

Unity/Assets/Scripts/Codes/HotfixView/Client/Unit/OnNewZoneObject.cs

@@ -51,7 +51,7 @@ namespace ET.Client
             {
                 CameraMgr.FollowMe(go.transform.position);
             }
-            Log.Debug($"unitRender({zu.ObjectID}) ok.");
+            Log.Debug($"unitRender({zu.ObjectID}),pos({zu.X},{zu.Y},{zu.Z}) ok.");
 
             //TODO: 同步ZoneUnit status
         }
@@ -62,7 +62,7 @@ namespace ET.Client
             //spell effect hack
             var res = zs.Info.FileName;
             var handle = await YooAssetProxy.LoadAssetAsync<GameObject>($"Effect_{res}");
-            if (!UnitMgr.Instance.HasUnit(zs.ObjectID) || !UnitMgr.Instance.HasUnit(zs.Sender.ObjectID))
+            if (!UnitMgr.Instance.HasUnit(zs.ObjectID) || (zs.Sender != null && !UnitMgr.Instance.HasUnit(zs.Sender.ObjectID)))
             {
                 //还没显示就已挂掉的单位，走好
                 Log.Debug($"ignore dead unit's spell: {zs.ObjectID}@{zs.Sender.ObjectID}");

Unity/Assets/Scripts/Codes/HotfixView/Client/Unit/UnitRenderSystem.cs

@@ -3,14 +3,15 @@ using AniType = Mono.AnimationData.AnimationType;
 using UnityEngine;
 using System.Text.RegularExpressions;
 using ET.EventType;
+using Sirenix.Utilities;
 
 namespace ET.Client
 {
     [Event(SceneType.Current)]
     [FriendOf(typeof(ET.Client.UnitRenderComponet))]
-    public class AnimatorEventHandler : AEvent<EventType.PlayAnimatorEvent>
+    public class AnimatorEventHandler : BEvent<EventType.PlayAnimatorEvent>
     {
-        protected override async ETTask Run(Scene scene, EventType.PlayAnimatorEvent args)
+        public override void OnEvent(EventType.PlayAnimatorEvent args)
         {
             var component = ModelViewComponent.Instance.GetChild<UnitRenderComponet>(args.UnitId);
             if (component == null)
@@ -58,7 +59,10 @@ namespace ET.Client
                 component.AppendCommand(cmd);
             }
 
-            await ETTask.CompletedTask;
+            if(!args.Audio.IsNullOrWhitespace())
+            {
+                //TODO: Playaudio
+            }
         }
     }
 
@@ -117,7 +121,10 @@ namespace ET.Client
                 var cmd = self.FilterCmdList();
                 if (cmd != null)
                 {
-                    self.ExeCommand(cmd);
+                    if (self.DoingCmd?.Type != cmd.Type || cmd.Type >= AniType.Skill0)
+                    {
+                        self.ExeCommand(cmd);
+                    }
                 }
             }
         }

Unity/Assets/Scripts/Codes/Model/Client/EventTypeClient.cs

@@ -12,7 +12,7 @@ namespace ET
         {
             public uint ObjectId;
         }
-        public struct PlayAnimatorEvent
+        public class PlayAnimatorEvent
         {
             public uint UnitId;
             public AnimatorEventType CommandType;
@@ -21,8 +21,10 @@ namespace ET
             public float Speed;
             public uint GroupId;
             public bool Loop;
+            public string Audio;
 
-            public PlayAnimatorEvent(uint id, AnimatorEventType type, string skill = "", float duration = -1, float speed = 1.0f, uint gid = 0, bool loop = false)
+            public static PlayAnimatorEvent Static = new PlayAnimatorEvent();
+            public PlayAnimatorEvent Clone(uint id, AnimatorEventType type, string skill = "", float duration = -1, float speed = 1.0f, uint gid = 0, bool loop = false, string audio = "")
             {
                 UnitId = id;
                 CommandType = type;
@@ -31,6 +33,8 @@ namespace ET
                 Speed = speed;
                 GroupId = gid;
                 Loop = loop;
+                Audio = audio;
+                return this;
             }
         }
         public class SkillChangeEvent { }

Unity/Assets/Scripts/Codes/Model/Share/Const/ConstGame.cs

@@ -12,7 +12,7 @@
     /// <summary>
     /// 性别类型
     /// </summary>
-    public enum SexType: byte
+    public enum SexType : byte
     {
         Man = 0,
         Woman = 1,
@@ -21,7 +21,7 @@
     /// <summary>
     /// 职业类型
     /// </summary>
-    public enum PlayerProType: byte
+    public enum PlayerProType : byte
     {
         /** ALL **/
         ALL = 0,
@@ -45,15 +45,33 @@
 	public enum MapType
     {
         /** 无 **/
-		None = 0,
+        None = 0,
         /** 主城|野外 **/
-		NORMAL = 1,
+        NORMAL = 1,
         /** 副本 **/
-		FIGHT_LEVEL = 2,
+        FIGHT_LEVEL = 2,
 
         // >100属于跨服地图玩法
-		/** 跨服野外场景 **/
-		CROSS_NORMAL = 101,
+        /** 跨服野外场景 **/
+        CROSS_NORMAL = 101,
 
-	}
+    }
+
+    public enum PkModel
+    {
+        /** PVP-PKModel表格 和平不攻击任何玩家*/
+        Peace = 0,
+        /** 和平不攻击任何玩家*/
+        Justice,
+        /** 只攻击黑黄红名玩家*/
+        Force,
+        /** 只攻击非本仙盟玩家*/
+        Guild,
+        /** 只攻击非本队伍玩家*/
+        Team,
+        /** 只攻击非本服玩家*/
+        Server,
+        /** 攻击所有玩家*/
+        All
+    }
 }

Unity/Assets/Scripts/Codes/Model/Share/Module/Actor/IActorMessage.cs

@@ -12,4 +12,16 @@
     public interface IActorResponse: IResponse
     {
     }
-}
+
+    [ObjectSystem]
+    public class SkillInfo
+    {
+        public int id;
+        public int level;
+        public int[] talentLevel = new int[3];// 斩妖特殊含义: 冷却时间减少,触发几率增加,持续时间增加
+        public int type;
+        public long skillTime; // 技能到期时间戳
+        public int cdTime; // 技能cd变更，万分比
+        public int flag;
+    };
+}

Unity/Assets/Scripts/Codes/Mono/AnimationData.cs

@@ -49,7 +49,6 @@ namespace Mono
             var clip = GetClip(type);
             if (clip != null)
             {
-                Log.Debug($"Play ani: {type}");
                 var state = Animancer.Play(clip);
                 state.Time = 0;
                 if(endcb != null)