From bf98618722e527c63b5ffce3396b6966c98d325b Mon Sep 17 00:00:00 2001 From: Cal <3027929699@qq.com> Date: Sat, 25 Sep 2021 21:04:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Server/Hotfix/Game/Helper/UnitHelper.cs | 52 ++++++++++-------- .../ExcelTool/Excel/MaintainRewardConfig.xlsx | Bin 10685 -> 10677 bytes .../DataTable/MaintainRewardConfig.json | 2 +- 3 files changed, 31 insertions(+), 23 deletions(-) diff --git a/Server/Hotfix/Game/Helper/UnitHelper.cs b/Server/Hotfix/Game/Helper/UnitHelper.cs index a77cf7f9..2239cf3b 100755 --- a/Server/Hotfix/Game/Helper/UnitHelper.cs +++ b/Server/Hotfix/Game/Helper/UnitHelper.cs @@ -15,28 +15,38 @@ namespace ET { Unit unit = EntityFactory.CreateWithId(domain, id); PlayerData data = await DBComponent.Instance.Query(id); - unit.AddComponent(data); + if (data) + unit.AddComponent(data); Character character = await DBComponent.Instance.Query(id); - unit.AddComponent(character); + if (character) + unit.AddComponent(character); NumericComponent num = await DBComponent.Instance.Query(id); - unit.AddComponent(num); + if (num) + unit.AddComponent(num); UnitSkillComponent unitSkill = await DBComponent.Instance.Query(id); - unit.AddComponent(unitSkill); + if (unitSkill) + unit.AddComponent(unitSkill); //!玩家设置 UserSetting setting = await DBComponent.Instance.Query(id); - unit.AddComponent(setting); + if (setting) + unit.AddComponent(setting); //!任务 UnitTask unitTask = await DBComponent.Instance.Query(id); - unit.AddComponent(unitTask); + if (unitTask) + unit.AddComponent(unitTask); //!背包 Bag bag = await DBComponent.Instance.Query(id); - unit.AddComponent(bag); + if (bag) + unit.AddComponent(bag); UnitScene unitScene = await DBComponent.Instance.Query(id); - unit.AddComponent(unitScene); + if (unitScene) + unit.AddComponent(unitScene); StarSoulBag starSoulBag = await DBComponent.Instance.Query(id); - unit.AddComponent(starSoulBag); + if (starSoulBag) + unit.AddComponent(starSoulBag); Pet pet = await DBComponent.Instance.Query(id); - unit.AddComponent(pet); + if (pet) + unit.AddComponent(pet); unit.AddComponent(); return unit; @@ -96,7 +106,8 @@ namespace ET long mapInstanceId = StartSceneConfigCategory.Instance.GetBySceneName(zone, SceneType.UserCache.ToString()).SceneId; MessageHelper.SendActor(mapInstanceId, new M2U_WriteComponent() { Id = t.Id, type = typeof (T).Name, component = t }); } - public static void SaveComponenet(int zone,T t) where T : Entity + + public static void SaveComponenet(int zone, T t) where T : Entity { if (zone == 0) { @@ -129,7 +140,7 @@ namespace ET unitInfo.YAngle = unitScene.YAngle; } - public static async ETTask AddComponentFromDB(Unit unit,int jobId) + public static async ETTask AddComponentFromDB(Unit unit, int jobId) { int zone = unit.DomainZone(); long id = unit.Id; @@ -150,7 +161,7 @@ namespace ET character = unit.AddComponent(); else unit.AddComponent(character); - + var num = await UnitHelper.Query(zone, id); if (num == null) { @@ -231,8 +242,9 @@ namespace ET { bag.InitBag(); } + bag.CheckSlot(); - + Store store = await StoreComponent.Instance.Query(unit.Id); //!初始化仓库 if (store == null) @@ -250,9 +262,8 @@ namespace ET public static async ETTask SendUnitInfo(Unit unit) { - Log.Debug($"【{ UserComponent.Instance.Get(unit.Id)?.NickName} ({ unit.Id})】已经进入游戏"); + Log.Debug($"【{UserComponent.Instance.Get(unit.Id)?.NickName} ({unit.Id})】已经进入游戏"); PlayerData data = unit.GetComponent(); - var num = unit.GetComponent(); CharacterHelper.ResetAddNumeric(unit, num); @@ -263,19 +274,16 @@ namespace ET Log.Error($"unitScene == null where id = {unit.Id}"); return; } - if(unitScene.MapId/100 == Sys_SceneId.Scene_BattleIdle) + + if (unitScene.MapId / 100 == Sys_SceneId.Scene_BattleIdle) { unitScene.MapId = Sys_SceneId.Scene_MainCity * 100 + 1; } - + //!+任务相关 - //!+发送Boss消息 Game.EventSystem.Publish(new EventType.AfterEnterGame() { unit = unit }); - - } - } } \ No newline at end of file diff --git a/Tools/ExcelTool/Excel/MaintainRewardConfig.xlsx b/Tools/ExcelTool/Excel/MaintainRewardConfig.xlsx index 99973327b6c23195088ad6382331bf955b087435..b01ed746269f03eb4c9763c44b6f76ea4f4d7f17 100755 GIT binary patch delta 4484 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 WDgs>!lL09elcFgV1`H(t0002nuWEMy delta 4472 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 K1{5U#0002sqk2^U diff --git a/Unity/Assets/Download/DataTable/MaintainRewardConfig.json b/Unity/Assets/Download/DataTable/MaintainRewardConfig.json index 5a1a3182..64e2074f 100644 --- a/Unity/Assets/Download/DataTable/MaintainRewardConfig.json +++ b/Unity/Assets/Download/DataTable/MaintainRewardConfig.json @@ -1 +1 @@ -eNolTT0LwjAU3AP5D3Krb3gJQunbpC4OXRwECaEUWkuWBGLEQfrfTe1wcMd9Oa2cYTZ0+GIIE+Qv8IBYtpX0kJZwgTSE+5xfIcWaIdzmz5inc84QV5sFgn4MsVTsVpfiMyzHXYAwXLdxw5ZPhC69Y9kueCW/etLKa/UDI1Imdg== \ No newline at end of file +eNqL5uWKNjQwMNRRqFaKz0xRsgJzlCKVrIwMjIAMXyUrSx0lFyAXyAlLLSrOzM8DKtJR8ssvyUxOVbJSerJj7fPl3S+6mp7uX/1k54T3exqVdJSCUssTi1Ici4qUrKKBBpcA1fkmZuaVADFEyjk/Ly0zXRvCAWqI9wTZbWhgZGCio+ScX5pXAnKBgUGtTmxtrA4vVywvFwA4dDcg \ No newline at end of file