更新前存档

2021-09-04 14:55:51 +08:00 · 2021-09-04 14:55:51 +08:00 · 912c1bda47
parent 49f8fe9d54
commit 912c1bda47
62 changed files with 1087 additions and 513 deletions
--- a/Server/Hotfix/Game/Common/GlobalMethod/GlobalMethod.Active.cs
+++ b/Server/Hotfix/Game/Common/GlobalMethod/GlobalMethod.Active.cs
@ -39,6 +39,7 @@ namespace ET
                Log.Error(e);
            }
        }
+
        [DataTableMethod]
        public static async ETTask ActiveWorldBossCopy(object arg)
        {
@ -49,7 +50,7 @@ namespace ET
                if (!unit.IsTeamLeader)
                    return;
                if (unit.teamState != TeamState.None)
-                    return; 
+                    return;
                Game.EventSystem.Publish(new ChangeMap() { unit = unit, mapId = Sys_SceneId.Scene_WorldBoss * 100 + 1 });
            }
            catch (Exception e)
@ -70,5 +71,32 @@ namespace ET
                Log.Error(e);
            }
        }
+
+        [DataTableMethod]
+        public static async ETTask ActiveXXCopy(object arg)
+        {
+            try
+            {
+                ActiveArgs args = arg.As<ActiveArgs>();
+                var unit = args.unit;
+                if (!unit.IsTeamLeader)
+                    return;
+                if (unit.teamState != TeamState.None)
+                    return;
+                string[] param = args.param;
+                int level = int.Parse(param[0]);
+                
+                // var config = unit.GetOrAddComponent<StarSoulCopyConfigComponent>();
+                // config.type = type;
+                // config.difficulty = difficulty;
+                
+                int sceneId = Sys_SceneId.Scene_Beach;
+                Game.EventSystem.Publish(new ChangeMap() { unit = unit, mapId = sceneId * 100 + 1 });
+            }
+            catch (Exception e)
+            {
+                Log.Error(e);
+            }
+        }
    }
 }
--- a/Server/Hotfix/Game/Event/AfterEnterGameEvent.cs
+++ b/Server/Hotfix/Game/Event/AfterEnterGameEvent.cs
@ -1,4 +1,8 @@
-using ET.EventType;
+using System;
+using System.Collections.Generic;
+using Cal.DataTable;
+using ET.EventType;
+using UnityEngine;

 namespace ET
 {
@ -9,16 +13,169 @@ namespace ET
            var unit = args.unit;
            await ETTask.CompletedTask;
            //同步玩家的信息
+            UnitCharacter unitCharacter =await CharacterHelper.GetUnitCharacter(unit);
+            MessageHelper.SendActor(unit, new M2C_SendUnitInfo { UnitCharacter = unitCharacter });
+            
+            
+            Team team = TeamComponent.Instance.Get(unit.TeamLeaderId);
+            PlayerData data = unit.GetComponent<PlayerData>();
+            
+            if (unit.isAgainOnLine)
+            {
+                UnitScene unitScene = unit.GetComponent<UnitScene>();
+                if (team == null)
+                {
+                    Log.Error($"team==null where {unit}");
+                }
+                else
+                if (team.TeamState == TeamState.Fight)
+                {
+                    //!地图切换
+                    await ChangeMap(unit, unitScene, false);
+                    await TimerComponent.Instance.WaitAsync(1000);
+                    TeamHelper.SendTeamMember(team);
+                    //!战斗状态
+                    CopyBattle battleBase = BattleMgrCompnent.Instance.GetBattle(unit);
+                    battleBase.ReSendMonsterInfo(unit);
+                }
+                else
+                {
+                    data.IsBattleIdle = false;
+                    //!地图切换
+                    await ChangeMap(unit, unitScene, true);
+                }
+            }
+            else
+            {
+                MapScene map = unit.GetMapByUnitScene();
+                await map.Enter(unit);
+                
+                if (team == null)
+                {
+                    team = TeamComponent.Instance.CreateTeam(unit.Id);
+                }
+                team.ChangeState(TeamState.None);
+                await TimerComponent.Instance.WaitAsync(1000);
+                TeamHelper.SendTeamMember(team);
+            }
+            
+            await TimerComponent.Instance.WaitAsync(1000);
+            
+            CharacterHelper.SyncAttribute(unit);
+            
+            
            //宠物
+            var pet = unit.GetComponent<Pet>();
+            Game.EventSystem.Change(pet);
+            
            //任务
+            UnitTask unitTask = unit.GetComponent<UnitTask>();
+            if (unitTask!=null && 
+                unitTask.RunningTaskList.Count==0 &&
+                unitTask.CompleteTaskIdList.Count==0&&
+                unitTask.FinishTaskIdList.Count==0
+            )
+            {
+                //!发送新任务
+                M2C_OpenTaskUI ret = new M2C_OpenTaskUI();
+                ret.TaskList.Add(new NPCTask() { Id = (int)TaskComponent.Instance.TaskBaseNpcIdDic[0][0].Id, TaskState = TaskState.TaskWaiting });
+                MessageHelper.SendActor(unit, ret);
+            }
+            
            //签到
            bool isGetSininReward = ActiveComponent.instance.QuerySigninReward(unit, out var config);
            int currConfigId = (int) config.Id;
-            PlayerData data = unit.GetComponent<PlayerData>();
            var activeMessage = new M2C_SendActiveInfo() { isGetSininReward = isGetSininReward, signinCurrId = currConfigId,signinInMonthCount = data.signInCountInMonth};
            activeMessage.gotSignInMonthList.AddRange(data.signInGetRewardCountInMonthList);
            MessageHelper.SendActor(unit,activeMessage);
-            
+
+            //boss
+            SendBossInfo(unit);
+        }
+        private void SendBossInfo(Unit unit)
+        {
+            Log.Debug($"【{ UserComponent.Instance.Get(unit.Id)?.NickName} ({ unit.Id})】发送Boss消息");
+            BossComponent boss = BossComponent.Instance;
+            using ListComponent<string> listComponent = ListComponent<string>.Create();
+            List<string> arr = listComponent.List;
+            foreach (KeyValuePair<int, BossComponent.BossState> item in boss.bossStateDic)
+            {
+                if (item.Value == BossComponent.BossState.Idle)
+                {
+                    arr.Add($"[color=#00cc00]【{boss.GetBossBossName(item.Key)}】[/color]刷新了,大家赶紧去击杀吧，奖励多多！");
+                }
+            }
+            Chat.Instance.SendSystemCaht(unit, arr);
+        }
+        private async ETTask ChangeMap(Unit unit, UnitScene unitScene, bool initMap)
+        {
+            try
+            {
+                int mapId = unitScene.MapId;
+                UnitSceneType unitSceneType = MapHelper.GetMapType(mapId / 100);
+                if (unitSceneType == UnitSceneType.Boss)
+                {
+                    int layer = unitScene.MapId % 100;
+                    BossComponent.BossState state = BossComponent.Instance.GetState(layer);
+                    if (state == BossComponent.BossState.Idle)
+                    {
+                        SendBossRefresh(unit, layer).Coroutine();
+                    }
+                }
+                Sys_Scene targetSceneInfo = MapSceneComponent.Instance.GetMapInfo(mapId / 100);
+                Sys_Scene.PlayerPos position = targetSceneInfo.PlayerPosArr[0];
+
+                Team team = TeamComponent.Instance.Get(unit.TeamLeaderId);
+                if (team == null)
+                {
+                    Log.Error(" team == null");
+                    return;
+                }
+
+                unit.IsTransfer = true;
+                unitScene.enterTime = TimeHelper.ClientNow();
+                //!停止移动
+                unit.Stop();
+                await TimerComponent.Instance.WaitAsync(100);
+
+                unitScene.Position = new Vector2(position.PlayerPos_x, position.PlayerPos_y);
+
+                await unit.GetMapByUnitScene().Enter(unit,true);
+
+                //!发送切换地图
+                MessageHelper.SendActor(unit, new M2C_ChangeMap() { X = unitScene.Position.x, Y = unitScene.Position.y, MapId = unitScene.MapId });
+                await TimerComponent.Instance.WaitAsync(500);
+                if (initMap)
+                {
+                    if (unitSceneType == UnitSceneType.MainStory || unitSceneType == UnitSceneType.Beach)
+                    {
+                        MainStoryMap.Instance.Init(unit, unitScene.MapId);
+                    }
+                    else if (unitSceneType == UnitSceneType.Trial)
+                    {
+                        TrialCopyMap.Instance.InitTrailCopyMap(unit, mapId);
+                    }
+                    else
+                    {
+                        await TimerComponent.Instance.WaitAsync(500);
+                        StartupTransPoint(unit, unitScene.MapId);
+                    }
+                }
+                void StartupTransPoint(Unit unit, int mapId)
+                {
+                    MessageHelper.SendActor(unit, new M2C_StartupTransPoint() { MapId = mapId });
+                }
+                unit.IsTransfer = false;
+            }
+            catch (Exception e)
+            {
+                Log.Error(e);
+            }
+        }
+        private async ETVoid SendBossRefresh(Unit unit, int targetMapLayer)
+        {
+            await TimerComponent.Instance.WaitAsync(1000);
+            MessageHelper.SendActor(unit, new M2C_BossRefresh { BossId = BossComponent.Instance.GetBossId(targetMapLayer) });
        }
    }
 }
--- a/Server/Hotfix/Game/Handler/User/C2M_GetBasicalInfoHandler.cs
+++ b/Server/Hotfix/Game/Handler/User/C2M_GetBasicalInfoHandler.cs
@ -11,6 +11,7 @@ namespace ET
        {
            try
            {
+                return;
                Log.Debug($"【{ UserComponent.Instance.Get(unit.Id)?.NickName} ({ unit.Id})】已经进入游戏");
                PlayerData data = unit.GetComponent<PlayerData>();
  
--- a/Server/Hotfix/Game/Handler/User/C2M_GetStateRebackHandler.cs
+++ b/Server/Hotfix/Game/Handler/User/C2M_GetStateRebackHandler.cs
@ -12,11 +12,11 @@ namespace ET
        {
            try
            {
+                return;
                Log.Debug($"【{ UserComponent.Instance.Get(unit.Id)?.NickName} ({ unit.Id})】已经进入游戏");
                PlayerData data = unit.GetComponent<PlayerData>();


-                //!测试结束
                Team team = TeamComponent.Instance.Get(unit.TeamLeaderId);

                //!+发送玩家基础性息
--- a/Server/Hotfix/Game/Handler/User/G2M_CreateUnitHandler.cs
+++ b/Server/Hotfix/Game/Handler/User/G2M_CreateUnitHandler.cs
@ -52,7 +52,6 @@ namespace ET
                    unit.RemoveComponent<UserGateComponent>();
                    unit.AddComponent<UserGateComponent, long>(request.GateSessionId);

-                    TeamComponent.Instance.Get(unit.TeamLeaderId);
                }
                else
                {
@ -82,18 +81,11 @@ namespace ET
                    unit.AddComponent<UserGateComponent, long>(request.GateSessionId);
                    unit.AddComponent<BrocastComponent, bool>(true);

-                    MapScene map = unit.GetMapByUnitScene();
-                    await map.Enter(unit);
-                    //!队伍
-                    TeamComponent.Instance.CreateTeam(unit.Id);
                    //!战斗组件
                    unit.AddComponent<BattleComponent>().BattleType = BattleType.None;
                    unit.AddComponent<AttackComponent>();
                    unit.AddComponent<TargetableUnitComponent>();
                    unit.AddComponent<Combat>();
-
-                    var pet = unit.GetComponent<Pet>();
-                    Game.EventSystem.Change(pet);
                }
                Log.Debug($"【{ UserComponent.Instance.Get(unit.Id)?.NickName} ({ unit.Id})】 组件添加完毕");

@ -119,6 +111,8 @@ namespace ET


                Log.Debug($"【{ UserComponent.Instance.Get(unit.Id)?.NickName} ({ unit.Id})】请求进入地图完成");
+
+                await UnitHelper.SendUnitInfo(unit);
            }
            catch (System.Exception e)
            {
--- a/Server/Hotfix/Game/Helper/CharacterHelper.cs
+++ b/Server/Hotfix/Game/Helper/CharacterHelper.cs
@ -392,7 +392,7 @@ namespace ET
                Title = num.GetAsInt(NumericType.Title),
                CampType = user.CampType,
                Family = user.Family,
-                SkinId = user.SkinId,
+                SkinId =  num.GetAsInt(NumericType.SkinId),
                Level = user.Level,
                LeaderId = unit.TeamLeaderId,
                Trans = num.GetAsInt(NumericType.Transmigration),
--- a/Server/Hotfix/Game/Helper/UnitHelper.cs
+++ b/Server/Hotfix/Game/Helper/UnitHelper.cs
@ -235,5 +235,35 @@ namespace ET
            else
                unit.AddComponent(StarSoulBag);
        }
+
+        public static async ETTask SendUnitInfo(Unit unit)
+        {
+            Log.Debug($"【{ UserComponent.Instance.Get(unit.Id)?.NickName} ({ unit.Id})】已经进入游戏");
+            PlayerData data = unit.GetComponent<PlayerData>();
+  
+
+            var num = unit.GetComponent<NumericComponent>();
+            CharacterHelper.ResetAddNumeric(unit, num);
+            data.IsBattleIdle = false;
+            UnitScene unitScene = unit.GetComponent<UnitScene>();
+            if (unitScene == null)
+            {
+                Log.Error($"unitScene == null where id = {unit.Id}");
+                return;
+            }
+            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 });
+            
+            
+        }
+        
    }
 }
--- a/Server/Hotfix/Game/System/Bag/StarSoulBagSystem.cs
+++ b/Server/Hotfix/Game/System/Bag/StarSoulBagSystem.cs
@ -338,6 +338,8 @@ namespace ET
                    Log.Error($"{self.Id.GetPlayerFormatName()} item == null where id = {deleteId}");
                    continue;
                }
+                if (item.isLocked||item.isUsed)
+                    return "系统错误，包含锁定或者已佩戴星魂";

                StarSoulLevelConfig soulLevelConfig = StarSoulLevelConfigCategory.Instance.GetByQualityAndLevel(item.quality, item.level);
                list.List.Add((soulLevelConfig.Exp, soulLevelConfig.NeedCoin));
@ -471,6 +473,13 @@ namespace ET
            }
        }

+        /// <summary>
+        /// 分解
+        /// </summary>
+        /// <param name="self"></param>
+        /// <param name="ids"></param>
+        /// <param name="_list"></param>
+        /// <returns></returns>
        public static string Resolve(this StarSoulBag self, List<long> ids,List<RewardItem> _list)
        {
            foreach (var id in ids)
@ -480,6 +489,8 @@ namespace ET
                    var item = self.Get(id);
                    if (item != null)
                    {
+                        if (item.isLocked||item.isUsed)
+                            return "系统错误，包含锁定或者已佩戴星魂";
                        StarSoulResolveConfig config = StarSoulResolveConfigCategory.Instance.Get((long) item.quality);
                        DropHelper.Drop(self.GetParent<Unit>(),self.Parent.GetComponent<PlayerData>(), BattleType.None,config.DropId,null,1,"星魂分解",list: _list);
                        self.Remove(id);
@ -496,7 +507,7 @@ namespace ET
        }

        /// <summary>
-        /// 
+        /// 碎片兑换星魂
        /// </summary>
        /// <param name="self"></param>
        /// <param name="configId">100101</param>
--- a/Server/Hotfix/Game/System/Cache/PlayerInfoComponentSystem.cs
+++ b/Server/Hotfix/Game/System/Cache/PlayerInfoComponentSystem.cs
@ -36,35 +36,34 @@ namespace ET

        public static async ETTask<Entity> GetInfo(this PlayerInfoComponent self, long id, string type)
        {
-            Log.Info($"{id} 查询 {type}");
            self.unitInfoDic.TryGetDic(type, out var dic);
-            Entity e = null;
+            Entity entity = null;
            if (dic == null)
            {
-                 e = await GetEntity(id, type);
-                if (e == null)
+                 entity = await GetEntity(id, type);
+                if (entity == null)
                {
                    Log.Error($"e == null id = {id} type = {type}");
                    return null;
                }

-                self.unitInfoDic.Add(type, id, e);
+                self.unitInfoDic.Add(type, id, entity);
                dic = self.unitInfoDic[type];
            }

-            dic.TryGetValue(id, out e);
-            if (e == null)
+            dic.TryGetValue(id, out entity);
+            if (entity == null)
            {
-                 e = await GetEntity(id, type);
-                if (e == null)
+                 entity = await GetEntity(id, type);
+                if (entity == null)
                {
-                    Log.Error($"e == null id = {id} type = {type}");
+                    Log.Error($"entity == null id = {id} type = {type}");
                    return null;
                }
-                dic[id] = e;
+                dic[id] = entity;
            }

-            return e;
+            return entity;
        }

        private static async ETTask<Entity> GetEntity(long id, string type)
--- a/Tools/ExcelTool/Excel/..mac运行.sh
+++ b/Tools/ExcelTool/Excel/..mac运行.sh
--- a/Tools/ExcelTool/Excel/..pc运行.bat
+++ b/Tools/ExcelTool/Excel/..pc运行.bat
@ -0,0 +1,2 @@
+cd /d ../
+dotnet ExcelToBsonTool.dll
--- a/Tools/ExcelTool/Excel/ActivePerDayConfig.xlsx
+++ b/Tools/ExcelTool/Excel/ActivePerDayConfig.xlsx
--- a/Tools/ExcelTool/Excel/FamilyShop.xlsx
+++ b/Tools/ExcelTool/Excel/FamilyShop.xlsx
--- a/Tools/ExcelTool/Excel/MaintainRewardConfig.xlsx
+++ b/Tools/ExcelTool/Excel/MaintainRewardConfig.xlsx
--- a/Tools/ExcelTool/Excel/md5.txt
+++ b/Tools/ExcelTool/Excel/md5.txt
@ -1 +1 @@
-{ "fileMD5" : { "Anim.xlsx" : "545a68dfcadddaee53a26a0ba19376c1", "RobotAccount.xlsx" : "31431b89eabb3e5ecb63f20b59d30858", "LevelConfig.xlsx" : "91bc9dc0d28ba5b40afef4365043d3ab", "MapSceneConfig.xlsx" : "08b026a5e74128d9a03bc383fa166489", "PrefabConfig.xlsx" : "46ef389511d1c63705c182088bab0285", "RoleConfig.xlsx" : "b997e8f718e7427c9388ae0e27e93d16", "AnimationConfig.xlsx" : "0a7d708c495799f85a8c2a03ebb0dc49", "BossBase.xlsx" : "b4920d9ab94dfbf7fb7bd8811db3cbe5", "CameraPosition.xlsx" : "fbf71d84ad155465c43ff60240de4284", "CharacterGrowth.xlsx" : "a3d0398ea4ee2e3b8b716f7bb29e5f08", "EquipBase.xlsx" : "303516c5bc74dde57a9d0213bc1e00ea", "EquipForge.xlsx" : "fda15bcdc6b1fb0ec797091089682a23", "FamilyBossConfig.xlsx" : "eac9263d56e558729fa2e2d51ef865bf", "Forbidden.xlsx" : "28bbeeb0ebc58adab5eff9167497c7ac", "GoodsBase.xlsx" : "f902d34806e8737c6a8fffe732bbef3d", "ItemUpgrade.xlsx" : "55b96dc713fe42ed05cbbbd6b0865744", "MainStory.xlsx" : "48cc3d0b944dca80862a27c757d67f01", "MarketBase.xlsx" : "1cf03fdbc8dd3a807c3576cf48544d41", "MaterialBase.xlsx" : "b666503d98558a143051fc09b333a5e4", "MonsterBase.xlsx" : "1679ffcc814f1eddb63242a9159f79fc", "NPCBase.xlsx" : "e64543df667ad4bfcabddd90e50768ce", "OnlineRewardBase.xlsx" : "e376d6f31abc8c39397f03f8c24fc7bc", "QuestConfig.xlsx" : "882de4872ea851fea32138f6d48798b1", "RoleGrowth.xlsx" : "1384845a732285f6affef3cf6c67a672", "RolesPosition.xlsx" : "f5888586a320dfcd693c91c1f7cfc90d", "ShopBase.xlsx" : "717de9348e7b7501a5e819947a7fea7e", "SkillConfig.xlsx" : "e31e92515dcd3663869619ad986596a5", "SkillGroupBase.xlsx" : "e926883a016ef8b883c5c2f69a25ac2a", "SkinBase.xlsx" : "04d3e1c196a7c804e1ba6974f1284c39", "Sys_Code.xlsx" : "8eff5c2fd8743578db17c86a81862d39", "Sys_Prefab.xlsx" : "660338b1b8a84d6aa7545e80e4d623cc", "Sys_Scene.xlsx" : "b2ac2e8a2868bbb1e385c704c138667b", "TaskBase.xlsx" : "f7aa18a2225a75262b9735bf97dabed1", "TrialCopy.xlsx" : "b85d1a4bdc49dbc63a759a499aed8f5f", "Parentset.xlsx" : "dd871b8cd678cf419fba2422934d8494", "SonAdvancedSet.xlsx" : "7128d07efa77d9de70d956b71c926e31", "SonSet.xlsx" : "a8db4613fc0a00e3e0578c9acc1f5148", "EffectConfig.xlsx" : "c49b8ae9632120926c26991a25381e35", "HonorShop.xlsx" : "e7f2f48832e7e5fb6f8d56771c0551a6", "SkillLearn.xlsx" : "fb6cbb056172b57358502f18abd86a62", "FamilyShop.xlsx" : "fceadcf0570b35f1f6f24b0a67c73020", "EquipAffixConfig.xlsx" : "e33e0d8d934d7c145c07f1093f412981", "EquipUpgrade.xlsx" : "dc4758cffc7cf51e2a125969b2fc1d49", "MainStoryExp.xlsx" : "1e191962e19dcae5344f53bda64a5dec", "ManulEquip.xlsx" : "0eb382ad71752f63bf1b235809c0c17f", "ManulEquipAttribute.xlsx" : "c4869a18be4c14784fd26b697fa23f86", "ManulEquipMonsterConfig.xlsx" : "da4ca0343b0c77aed966c3ee9568cf68", "TransmigrationAddConfig.xlsx" : "620912bfbe398914fa8b3bf21afeeccf", "EquipBase .xlsx" : "0d52dbe61e0808bc75f59207e73ad7fb", "TitleConfig.xlsx" : "07d9306032f86e7b9642a61a8a2ee966", "GemInlayConfig.xlsx" : "d2bfb6e76b895f5c8f1caed238eeb0f9", "Strengthentable.xlsx" : "fdb418090e31b0bfb93c9ae9fc9bd9f1", "GemPriceConfig.xlsx" : "011721c1a612634195bffd58fb895279", "MapMonsterConfig.xlsx" : "99b1d7454d78e7679deeb29150abd3db", "TransferJobConfig.xlsx" : "5b0daa2b0837e66196fbda214d72678a", "GMConfig.xlsx" : "c8e6ed377384ace1cf783e12b3ade4c8", "SuitConfig.xlsx" : "b67db1e911e14362e3409cb9f5f94216", "PetConfig.xlsx" : "99345c8836027cb36e42764b78cdd798", "PetLevelConfig.xlsx" : "a86c4cbde022ccd884ccf572ad5edfe7", "PetExploreConfig.xlsx" : "333043bd5c172def36660eca1dc8416a", "AIConfig.xlsx" : "871d248a954d8c59188e41d002135c75", "CopyConfig.xlsx" : "5a5954984cf1dd436c584b3628230a95", "CopyRewordConfig.xlsx" : "f4de20211685f21d15a8170061fdc7d2", "SpaceTravelConfig.xlsx" : "be6486259f73db40a93bdecef00a066e", "SceneTransConfig.xlsx" : "9de417cf0c76a9f96b45b6540f97de8a", "ArenaShop.xlsx" : "3fd4650500dd2bf83064a1fd46e4444d", "StarShop.xlsx" : "e14b5e252416a12318e775d86dd1b2f7", "StarSoulTypeConfig.xlsx" : "c16e5b01ce7261f11f3c1c4c8db1f1d9", "StarSoulAttributeConfig.xlsx" : "eae313d2f6cf4fdba87e53f51dc7d57f", "StarSoulEquipAttributeTypeConfig.xlsx" : "0aadceefcf88bc9d2b6d5c643cad79ce", "StarSoulLevelConfig.xlsx" : "c19aa663716ffb2690e8b93edf3460bd", "ActivePerDayConfig.xlsx" : "cfc99453ab2c1e56534dfb248e555749", "StarSoulCopyConfig.xlsx" : "921a5d72a0a56ef33bbe03285dafe9d5", "StarSoulResolveConfig.xlsx" : "ad1ce53ff0e030c0163ec5bb14b8e483", "MultiShop.xlsx" : "475b1aadad145738801f9eb627b66aa7", "WorldBossConfig.xlsx" : "9b9c766cb9af33316006a292a1e69f88", "SignInRewardConfig.xlsx" : "f97e981df9387a0b09ebddd1708791c4", "SignInRewardMonth.xlsx" : "d9c1f3196940c7b9080841916dd1eccd", "MaintainRewardConfig.xlsx" : "ad1f46fa93ec8be0d5da287172583ad8" } }
+{ "fileMD5" : { "Anim.xlsx" : "545a68dfcadddaee53a26a0ba19376c1", "RobotAccount.xlsx" : "31431b89eabb3e5ecb63f20b59d30858", "LevelConfig.xlsx" : "91bc9dc0d28ba5b40afef4365043d3ab", "MapSceneConfig.xlsx" : "08b026a5e74128d9a03bc383fa166489", "PrefabConfig.xlsx" : "46ef389511d1c63705c182088bab0285", "RoleConfig.xlsx" : "b997e8f718e7427c9388ae0e27e93d16", "AnimationConfig.xlsx" : "0a7d708c495799f85a8c2a03ebb0dc49", "BossBase.xlsx" : "b4920d9ab94dfbf7fb7bd8811db3cbe5", "CameraPosition.xlsx" : "fbf71d84ad155465c43ff60240de4284", "CharacterGrowth.xlsx" : "a3d0398ea4ee2e3b8b716f7bb29e5f08", "EquipBase.xlsx" : "303516c5bc74dde57a9d0213bc1e00ea", "EquipForge.xlsx" : "fda15bcdc6b1fb0ec797091089682a23", "FamilyBossConfig.xlsx" : "eac9263d56e558729fa2e2d51ef865bf", "Forbidden.xlsx" : "28bbeeb0ebc58adab5eff9167497c7ac", "GoodsBase.xlsx" : "f902d34806e8737c6a8fffe732bbef3d", "ItemUpgrade.xlsx" : "55b96dc713fe42ed05cbbbd6b0865744", "MainStory.xlsx" : "48cc3d0b944dca80862a27c757d67f01", "MarketBase.xlsx" : "1cf03fdbc8dd3a807c3576cf48544d41", "MaterialBase.xlsx" : "b666503d98558a143051fc09b333a5e4", "MonsterBase.xlsx" : "1679ffcc814f1eddb63242a9159f79fc", "NPCBase.xlsx" : "e64543df667ad4bfcabddd90e50768ce", "OnlineRewardBase.xlsx" : "e376d6f31abc8c39397f03f8c24fc7bc", "QuestConfig.xlsx" : "882de4872ea851fea32138f6d48798b1", "RoleGrowth.xlsx" : "1384845a732285f6affef3cf6c67a672", "RolesPosition.xlsx" : "f5888586a320dfcd693c91c1f7cfc90d", "ShopBase.xlsx" : "717de9348e7b7501a5e819947a7fea7e", "SkillConfig.xlsx" : "e31e92515dcd3663869619ad986596a5", "SkillGroupBase.xlsx" : "e926883a016ef8b883c5c2f69a25ac2a", "SkinBase.xlsx" : "04d3e1c196a7c804e1ba6974f1284c39", "Sys_Code.xlsx" : "8eff5c2fd8743578db17c86a81862d39", "Sys_Prefab.xlsx" : "660338b1b8a84d6aa7545e80e4d623cc", "Sys_Scene.xlsx" : "b2ac2e8a2868bbb1e385c704c138667b", "TaskBase.xlsx" : "f7aa18a2225a75262b9735bf97dabed1", "TrialCopy.xlsx" : "b85d1a4bdc49dbc63a759a499aed8f5f", "Parentset.xlsx" : "dd871b8cd678cf419fba2422934d8494", "SonAdvancedSet.xlsx" : "7128d07efa77d9de70d956b71c926e31", "SonSet.xlsx" : "a8db4613fc0a00e3e0578c9acc1f5148", "EffectConfig.xlsx" : "c49b8ae9632120926c26991a25381e35", "HonorShop.xlsx" : "e7f2f48832e7e5fb6f8d56771c0551a6", "SkillLearn.xlsx" : "fb6cbb056172b57358502f18abd86a62", "FamilyShop.xlsx" : "fceadcf0570b35f1f6f24b0a67c73020", "EquipAffixConfig.xlsx" : "e33e0d8d934d7c145c07f1093f412981", "EquipUpgrade.xlsx" : "dc4758cffc7cf51e2a125969b2fc1d49", "MainStoryExp.xlsx" : "1e191962e19dcae5344f53bda64a5dec", "ManulEquip.xlsx" : "0eb382ad71752f63bf1b235809c0c17f", "ManulEquipAttribute.xlsx" : "c4869a18be4c14784fd26b697fa23f86", "ManulEquipMonsterConfig.xlsx" : "da4ca0343b0c77aed966c3ee9568cf68", "TransmigrationAddConfig.xlsx" : "620912bfbe398914fa8b3bf21afeeccf", "EquipBase .xlsx" : "0d52dbe61e0808bc75f59207e73ad7fb", "TitleConfig.xlsx" : "07d9306032f86e7b9642a61a8a2ee966", "GemInlayConfig.xlsx" : "d2bfb6e76b895f5c8f1caed238eeb0f9", "Strengthentable.xlsx" : "fdb418090e31b0bfb93c9ae9fc9bd9f1", "GemPriceConfig.xlsx" : "011721c1a612634195bffd58fb895279", "MapMonsterConfig.xlsx" : "99b1d7454d78e7679deeb29150abd3db", "TransferJobConfig.xlsx" : "5b0daa2b0837e66196fbda214d72678a", "GMConfig.xlsx" : "c8e6ed377384ace1cf783e12b3ade4c8", "SuitConfig.xlsx" : "b67db1e911e14362e3409cb9f5f94216", "PetConfig.xlsx" : "99345c8836027cb36e42764b78cdd798", "PetLevelConfig.xlsx" : "a86c4cbde022ccd884ccf572ad5edfe7", "PetExploreConfig.xlsx" : "333043bd5c172def36660eca1dc8416a", "AIConfig.xlsx" : "871d248a954d8c59188e41d002135c75", "CopyConfig.xlsx" : "5a5954984cf1dd436c584b3628230a95", "CopyRewordConfig.xlsx" : "f4de20211685f21d15a8170061fdc7d2", "SpaceTravelConfig.xlsx" : "be6486259f73db40a93bdecef00a066e", "SceneTransConfig.xlsx" : "9de417cf0c76a9f96b45b6540f97de8a", "ArenaShop.xlsx" : "3fd4650500dd2bf83064a1fd46e4444d", "StarShop.xlsx" : "e14b5e252416a12318e775d86dd1b2f7", "StarSoulTypeConfig.xlsx" : "c16e5b01ce7261f11f3c1c4c8db1f1d9", "StarSoulAttributeConfig.xlsx" : "eae313d2f6cf4fdba87e53f51dc7d57f", "StarSoulEquipAttributeTypeConfig.xlsx" : "0aadceefcf88bc9d2b6d5c643cad79ce", "StarSoulLevelConfig.xlsx" : "c19aa663716ffb2690e8b93edf3460bd", "ActivePerDayConfig.xlsx" : "ff22e45938e36e54230ba3b764eeda83", "StarSoulCopyConfig.xlsx" : "921a5d72a0a56ef33bbe03285dafe9d5", "StarSoulResolveConfig.xlsx" : "ad1ce53ff0e030c0163ec5bb14b8e483", "MultiShop.xlsx" : "475b1aadad145738801f9eb627b66aa7", "WorldBossConfig.xlsx" : "9b9c766cb9af33316006a292a1e69f88", "SignInRewardConfig.xlsx" : "f97e981df9387a0b09ebddd1708791c4", "SignInRewardMonth.xlsx" : "d9c1f3196940c7b9080841916dd1eccd", "MaintainRewardConfig.xlsx" : "e368f00494b5dab8d2c75359c5ad1029" } }
--- a/Unity/Assets/Download/CommonPrefab/HUD.prefab
+++ b/Unity/Assets/Download/CommonPrefab/HUD.prefab
@ -0,0 +1,60 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &7804634078416806867
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 530005932463532173}
+  - component: {fileID: 8395545787510141585}
+  m_Layer: 0
+  m_Name: HUD
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &530005932463532173
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7804634078416806867}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.009259259, y: 0.009259259, z: 0.009259259}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &8395545787510141585
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7804634078416806867}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4bf8696150654a94ebb9e7b9f76db2f3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  packageName: Common
+  componentName: HeadTitleInfo
+  fitScreen: 0
+  sortingOrder: 0
+  packagePath: Assets/Download/FGUI/Common/Common
+  renderMode: 2
+  renderCamera: {fileID: 0}
+  position: {x: 0, y: 0, z: 0}
+  scale: {x: 1, y: 1, z: 1}
+  rotation: {x: 0, y: 0, z: 0}
+  fairyBatching: 0
+  touchDisabled: 1
+  cachedUISize: {x: 210, y: 70}
+  hitTestMode: 0
+  setNativeChildrenOrder: 0
--- a/Unity/Assets/Download/CommonPrefab/HUD.prefab.meta
+++ b/Unity/Assets/Download/CommonPrefab/HUD.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 346a11390734fb941941065914043a58
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Unity/Assets/Download/Config/Hotfix.dll.bytes
+++ b/Unity/Assets/Download/Config/Hotfix.dll.bytes
--- a/Unity/Assets/Download/Config/Hotfix.pdb.bytes
+++ b/Unity/Assets/Download/Config/Hotfix.pdb.bytes
--- a/Unity/Assets/Download/Config/HotfixView.dll.bytes
+++ b/Unity/Assets/Download/Config/HotfixView.dll.bytes
--- a/Unity/Assets/Download/Config/HotfixView.pdb.bytes
+++ b/Unity/Assets/Download/Config/HotfixView.pdb.bytes
--- a/Unity/Assets/Download/Config/updateNotice1.txt
+++ b/Unity/Assets/Download/Config/updateNotice1.txt
@ -1,3 +1,8 @@
+2021.8.7
+1.星魂二次验证，增加安全性。
+2.修复多个名字的bug。
+3.减少战斗开始时卡顿。
+
 2021.8.1
 1.修改血条样式。
 2.修改服务器存档方式，减少丢档几率。
@ -8,11 +13,3 @@
 2.维护奖励会在整点发放，请耐心等待。
 3.维护降低等级要求更改为2000级。
 4.调整军官的反伤技能，修改承伤线路技能。
-
-
-
-1.新增兑换星魂
-2.点击左上角头像显示信息，增加boss行动值、时空之旅战斗次数。
-3.修复一个宠物无法完成的bug。
-4.修改宠物属性加成，增加基础值。
-5.背景替换。
--- a/Unity/Assets/Download/DataTable/ActivePerDayConfig.json
+++ b/Unity/Assets/Download/DataTable/ActivePerDayConfig.json
@ -1 +1 @@
-eNq12M9rE0EUwPF7of+DzNU57Mxu0qS3JPXQg1Ks4CEEWZtVA2m3bLZKkEJaEAyNP6C0KRrwVFNBW2+WNLb/THbXnPovOJDskKcWhHnvlt2ZZPfD8IVHyvNzZWFZluC3XrJHtSpbnFyxJbfJFsuCZ7lV4exBc9NTS5zdc9fVBxYffRp/243aZ3HvK1ObvcaauhsNW1F/L3p1PO6eJIN+YXZX/PooPuyqvUU3DOveXS985qunscJaWHvurYZusOpv1Uv+ZlPtWXEDd72hns+EuhJMvcF974UbVAtBoO6qNw31V1e8QL1ryd94Unt6e7KLpduX1RMszkr+1ob6grXNK9sVPhVLIJYm4uS0Fb05QBRLErENxLbRGX/8Pv5wiSi2ScQOEDsm4tHVafKziyh2SMQZIM6kYmnScRFBLMk6zgJx1kSsO8YS03S8AMQLRmecdowlpuk4B8Q5E7HuGEtM03EeiPOp2DbpuIQgtqk6FtasWF0ZiHXHWGKSjgWYuYQwOuO0YywxSccCzFxCmoh1x1hiko4FmLmEnrkck46XEMQOWcdg5hKOiVh3jCWm6RjMXCJjdMZpx1himo7BzCWyJmLdMZaYpmMwcwk9c2VMOr6DIM6QdQxmLpEzEeuOscQ0HYOZS+SNzjjtGEtM0rEEM5e0TMS6YywxSccSzFxy5n8uyW3u8Bvlnd24N9CaqXx0fpEMrv5Y+6d0uVr3JguMAAXGKin/FzU6P0wOOo/9RuOvw9QrE1b0vn897ETvzkYXx7/e/oguu8lJK+61k/aXaH8n2v98Pdy5if7QD+rVovqp6Slj6ivzc78By/7EWQ==
+eNrNmE9rE0EYxu+FfgeZq3vYmf2TpLck9dCDUqxgIQRZm1UDabdstkoohbQgGoy2UJpUjXixpoK2vVnS2H6Z7K459Ss4kuw0b9pAYWZgb9nMbPb55c2PfbK56akcVlUVK3fW0ZNiAc0MjtCsVUEzOayYippX0KPKqk2XFPTAWqYvULD/tf9ry68dB62fiG62y0v0Xb9b9dvv/NcH/eZh2GmnR3cFb/eDRpPuzVieV7Lv294Lh14NpZe84kt7wbPcBWetlHVWK3TPvOVay2V6fYTpEUY0wUP7leUW0q5L36VJPXbqvO3SrFln5Vnx+d3BLhRtn6NXUBWUddZW6AnqhpLfyCtDYgKICQ9xeFT13+8JJCZSiDVArHHN+PNJ/9O5QGJNCrEOiHUe4t7FUfinKZBYl0JsAGIjIiY8HmcEEBNpHpuA2OQhZh6LIpbjcQIQJ7hmHHksiliOx0lAnOQhZh6LIpbjcQoQpyJijcfjrABiTZbHWB0lpkccxMxjUcRSPMagc2HMNePIY1HEUjzGoHNhwkPMPBZFLMVjDDoXZp1L5/F4VgCxLs1j0LmwzkPMPBZFLMdj0LmwwTXjyGNRxHI8Bp0LmzzEzGNRxHI8Bp0Ls85l8Hh8TwCxIc1j0LlwkoeYeSyKWI7HoHPhFNeMI49FEUvxmIDORVQeYuaxKGIpHhPQucjIcy6iaIquTCSvbwWtDqMZkvdOz8LOxdjajaRzhZI9WEASoECtIuS2UL3TRrhXf+qUy9eGyVYGWP5O+7Jb97ePe2cHfz/89s+b4WE1aNXC2g9/d9Pf/X7Z3ZyE/thxS4UM/ajhlIXTg4pFtFuPtHFy8y+ZLVDkAaz/rd1/sx182QkaHydhLi5e+xWb9J8bGgkKmhHRYxTUgEFBoSFGfIImxr5R0EOIGZ+gybGgoD6QRHyCpsaCgrs+ScYn6P/HICApuFuTVIySYphUA3dZTY1RUnKVND899Q/Dks/s
--- a/Unity/Assets/Download/DataTable/MaintainRewardConfig.json
+++ b/Unity/Assets/Download/DataTable/MaintainRewardConfig.json
@ -1 +1 @@
-eNolTrsKwjAU3QP5Bzmrd0irg2STujjUwUGQUEqxVbIkECMO0sHNzdHFUQR3R3+niJO/YGyHC/dwnoozFQkRUe+AXJeQLcASMhZxeFLIEWECOSAsKrfV1gQNYWa9XlWQaG7Xz+X5vp+b0+P7OoIwr/aFK8fOQaoQ6oMoLbTx4ToqsWatN/0OBEM+/fdGIhZDQmJ3xrczasrqjDjLOPsBxyU0dw==
+eNoljL0KwjAUhfdA3kHO6h1uggW5m9TFoYuDICGUQmvJkkCsOEjf3asdDpyP8xOsCY7Z0e6DPo2QP+AO8ezVdJAj4azYEG5TfaaStUS4Tu+hjqdaIUGnCwTdkPKi2qK25Eea9xuA0F9+7449HwhteWWduIZ5pbhGsiZa8wVkqSbZ
--- a/Unity/Assets/Download/Role/RolePrefab/Skin/Skin35.prefab
+++ b/Unity/Assets/Download/Role/RolePrefab/Skin/Skin35.prefab
@ -127,6 +127,7 @@ SpriteRenderer:
  m_CastShadows: 0
  m_ReceiveShadows: 0
  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
--- a/Unity/Assets/Hotfix/Logic/Behaviour/Game/Handler/Other/M2C_ChangeMapHandler.cs
+++ b/Unity/Assets/Hotfix/Logic/Behaviour/Game/Handler/Other/M2C_ChangeMapHandler.cs
@ -12,10 +12,10 @@ namespace ET
            var zoneScene = session.ZoneScene();
            zoneScene.GetComponent<GlobalVariable>().MapId = message.MapId;

-            Game.EventSystem.Publish(new ET.EventType.ChangeMap
+            await Game.EventSystem.Publish(new ET.EventType.ChangeMap
            {
                zoneScene = session.ZoneScene(), mapId = message.MapId, pos = new Vector3(message.X, message.Y, 0)
-            }).Coroutine();
+            });

            try
            {
--- a/Unity/Assets/Hotfix/Logic/Behaviour/Game/Helper/EnterGameHelper.cs
+++ b/Unity/Assets/Hotfix/Logic/Behaviour/Game/Helper/EnterGameHelper.cs
@ -35,11 +35,7 @@ namespace ET
                    return ret.Message;
                }
                
-                Unit unit = zoneScene.GetComponent<UnitComponent>().Get(ret.Id);
-                //!创建Unit
-                if (unit == null)
-                    unit = await UnitFactory.Create(zoneScene, ret.Id, ret.SkinId, CharacterHelper.GetJobTypeById(ret.JobId), jobId: ret.JobId);
-                zoneScene.GetComponent<UnitComponent>().MyUnit = unit;
+                
                zoneScene.GetComponent<GlobalVariable>().isOnLine = ret.IsOnline;

                await Game.EventSystem.Publish(new ET.EventType.EnterGameFinish_CreateMainUI
--- a/Unity/Assets/HotfixView/Entity/Hud.cs
+++ b/Unity/Assets/HotfixView/Entity/Hud.cs
@ -0,0 +1,7 @@
+namespace ET
+{
+    public class Hud:Entity
+    {
+        public FUI_HeadTitleInfo hudUI;
+    }
+}
--- a/Unity/Assets/HotfixView/Entity/Hud.cs.meta
+++ b/Unity/Assets/HotfixView/Entity/Hud.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 1abab6184b4638f4f9dfe0078bab78b5
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Unity/Assets/HotfixView/Entity/HudCharacter.cs
+++ b/Unity/Assets/HotfixView/Entity/HudCharacter.cs
@ -5,6 +5,7 @@ using FairyGUI;
 using System;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.Profiling;

 namespace ET
 {
@ -16,16 +17,10 @@ namespace ET
        private bool isVisible;

        private FUI_HeadTitleInfo _fui;
-        private FUI_HeadTitleInfo fui
+        public FUI_HeadTitleInfo fui
        {
-            get
-            {
-                if (!_fui)
-                {
-                    _fui = Parent.GetComponent<FUI_HeadTitleInfo>();
-                }
-                return _fui;
-            }
+            set => this._fui = value;
+            get=> _fui;
        }

        public void Init(SetHudCharacter unitCharacter, ProgressTitleType progressTitleType)
--- a/Unity/Assets/HotfixView/Entity/HudComponent.cs
+++ b/Unity/Assets/HotfixView/Entity/HudComponent.cs
@ -9,8 +9,7 @@ using UnityEngine;

 namespace ET
 {
-
-    public class HudComponentAwakeSystem : AwakeSystem<HudComponent>
+    public class HudComponentAwakeSystem: AwakeSystem<HudComponent>
    {
        public override void Awake(HudComponent self)
        {
@ -18,9 +17,8 @@ namespace ET
        }
    }

-    public class HudComponent : Entity
+    public class HudComponent: Entity
    {
-
        public static HudComponent Instance { get; set; }

        /// <summary>
@ -28,23 +26,24 @@ namespace ET
        /// </summary>
        private Queue<GComponent> PreQue = new Queue<GComponent>();

-
        private readonly int sortingOrder = 100;
+
        public void Init(Unit unit)
        {
-            // if (PreQue.Count == 0)
-            // {
-            //     GameObject hud = new GameObject("Hud");
-            //     GComponent c = hud.Add3DUI(FUI_HeadTitleInfo.UIPackageName, FUI_HeadTitleInfo.UIResName, Camera.main, sortingOrder);
-            //     this.PreQue.Enqueue(c);
-            // }
-            // GComponent gComponent = this.PreQue.Dequeue();
-            GameObject hud = new GameObject("Hud");
-            GComponent gComponent = hud.Add3DUI(FUI_HeadTitleInfo.UIPackageName, FUI_HeadTitleInfo.UIResName, Camera.main, sortingOrder);
+            if (PreQue.Count == 0)
+            {
+                GameObject hud = new GameObject("Hud");
+                GComponent c = hud.Add3DUI(FUI_HeadTitleInfo.UIPackageName, FUI_HeadTitleInfo.UIResName, Camera.main, sortingOrder);
+                this.PreQue.Enqueue(c);
+            }
+            HudCharacter hudCharacter = unit.AddComponent<HudCharacter>();
+
+            GComponent gComponent = this.PreQue.Dequeue();
+            UnitView unitView = unit.GetComponent<UnitView>();
            FUI_HeadTitleInfo fui = FUI_HeadTitleInfo.GetFormPool(FUIComponent.Instance, gComponent);
            fui.Name = fui.Id.ToString();
-            unit.AddComponent(fui);
-            UnitView unitView = unit.GetComponent<UnitView>();
+            hudCharacter.fui = fui;
+            
            Transform go = fui.self.container.cachedTransform.parent.parent;
            go.SetParent(unitView.transform);
            go.position = unitView.HeadPoint.position;
@ -52,24 +51,23 @@ namespace ET
            go.gameObject.SetActive(true);
            FairyGUI.Stage.inst.SortWorldSpacePanelsByZOrder(sortingOrder);

-            HudCharacter hudCharacter = unit.AddComponent<HudCharacter>();
            hudCharacter.SetUnitType(unit);
        }
+
        public void Remove(Unit unit)
        {
-            FUI_HeadTitleInfo fui = unit.GetComponent<FUI_HeadTitleInfo>();
+            FUI_HeadTitleInfo fui = unit.GetComponent<HudCharacter>().fui;
            if (fui == null)
            {
                Log.Error($"fui == null");
                return;
            }
-            // this.PreQue.Enqueue(fui.self);
-            // Transform go = fui.self.container.cachedTransform.parent.parent;
-            // go.SetParent(UnityRoot.Instance.ObjPoolParent);
-            // go.gameObject.SetActive(false);
-            unit.RemoveComponent(fui);
+
+            this.PreQue.Enqueue(fui.self);
+            Transform go = fui.self.container.cachedTransform.parent.parent;
+            go.SetParent(UnityRoot.Instance.ObjPoolParent);
+            go.gameObject.SetActive(false);
            unit.RemoveComponent<HudCharacter>();
        }
-
    }
-}
+}
--- a/Unity/Assets/HotfixView/Entity/OperaComponent.cs
+++ b/Unity/Assets/HotfixView/Entity/OperaComponent.cs
@ -51,7 +51,6 @@ namespace ET

            frameClickMap.UnitInfo = new UnitPosInfo();
            zoneScene = this.ZoneScene();
-            unit = zoneScene.GetComponent<UnitComponent>().MyUnit;

            InitShortKey();
        }
@ -149,7 +148,10 @@ namespace ET
        public void Update()
        {
            if (!unit)
+            {
+                unit = zoneScene.GetComponent<UnitComponent>().MyUnit;
                return;
+            }
            //暂时回城
            if (!unit.IsFight &&
                Input.GetKey(KeyCode.LeftControl) &&
--- a/Unity/Assets/HotfixView/Event/ChangeMapEvent.cs
+++ b/Unity/Assets/HotfixView/Event/ChangeMapEvent.cs
@ -23,9 +23,17 @@ namespace ET
                });
                try
                {
+                    var gv = zoneScene.GetComponent<GlobalVariable>();
+                    Unit unit = zoneScene.GetComponent<UnitComponent>().Get(gv.MyId);
+                    //!创建Unit
+                    if (unit == null)
+                    {
+                        ClientUnitCharacter unitCharacter = ClientUnitCharacterComponent.Instance.Get();
+                        unit = await UnitFactory.Create(zoneScene, gv.MyId, unitCharacter.SkinId, CharacterHelper.GetJobTypeById(unitCharacter.JobId), jobId: unitCharacter.JobId);
+                        zoneScene.GetComponent<UnitComponent>().MyUnit = unit;
+                    }
                    //相机
                    Sys_Scene cameraPosition = Sys_SceneCategory.Instance.Get(sceneId);
-                    Unit unit = zoneScene.GetComponent<UnitComponent>().MyUnit;
                    CameraComponent cameraComponent = unit.GetComponent<CameraComponent>();
                    cameraComponent.ChangeRange(cameraPosition);
                }
--- a/Unity/Assets/HotfixView/System/UnitViewSystem.cs
+++ b/Unity/Assets/HotfixView/System/UnitViewSystem.cs
@ -59,8 +59,10 @@ namespace ET

            if (self.FootPoint)
            {
-                self.yDelta = self.transform.position.y - self.FootPoint.position.y;
-                self.xDelta = self.transform.position.x - self.FootPoint.position.x;
+                var position = self.transform.position;
+                var position1 = self.FootPoint.position;
+                self.yDelta = position.y - position1.y;
+                self.xDelta = position.x - position1.x;
            }

            SetColor().Coroutine();
--- a/Unity/Assets/HotfixView/UI/ActiveUI/ActiveUI.cs
+++ b/Unity/Assets/HotfixView/UI/ActiveUI/ActiveUI.cs
@ -220,7 +220,7 @@ namespace ET
                    }

                    controller.selectedIndex = 1;
-                    uiItem.self.title = $"当月你已经累计签到{activeComponent.signinMonthCount}天 累计{config.Times}天奖励如下，请按时接收！";
+                    uiItem.self.title = $"当月你已经连续签到{activeComponent.signinMonthCount}天 连续{config.Times}天奖励如下，请及时接收！";
                    uiItem.m_list.RemoveChildrenToPool();
                    foreach (var rewards in config.RewardsArr)
                    {
--- a/Unity/Assets/Model/Cal/CalAssets/BulildAB.asset
+++ b/Unity/Assets/Model/Cal/CalAssets/BulildAB.asset
@ -24,7 +24,7 @@ MonoBehaviour:
  ClientVersion: 2.3
  IsEditorMode: 1
  IsLocal: 1
-  LocalResPath: http://127.0.0.1:2085/
+  LocalResPath: http://127.0.0.1:2083/
  LocalServerPath: 127.0.0.1:7756
  ResPath: http://121.196.171.57:2085/
  ServerPath: 121.196.171.57:7756
--- a/Unity/Assets/Model/Core/Object/Entity.cs
+++ b/Unity/Assets/Model/Core/Object/Entity.cs
@ -714,7 +714,32 @@ namespace ET
            this.RemoveFromComponent(type, c);
            c.Dispose();
        }
+        public void RemoveComponentNoDispose(Entity component)
+        {
+            if (this.IsDisposed)
+            {
+                return;
+            }

+            if (this.components == null)
+            {
+                return;
+            }
+
+            Type type = component.GetType();
+            Entity c = this.GetComponent(component.GetType());
+            if (c == null)
+            {
+                return;
+            }
+
+            if (c.InstanceId != component.InstanceId)
+            {
+                return;
+            }
+
+            this.RemoveFromComponent(type, c);
+        }
        public void RemoveComponent(Type type)
        {
            if (this.IsDisposed)
--- a/Unity/Assets/Plugins/DoTween/DOTween/DOTween.dll.mdb.meta
+++ b/Unity/Assets/Plugins/DoTween/DOTween/DOTween.dll.mdb.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 72cc0015865834349bf8098bebfc95bd
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Unity/Assets/Plugins/DoTween/DOTween/DOTween43.dll.mdb.meta
+++ b/Unity/Assets/Plugins/DoTween/DOTween/DOTween43.dll.mdb.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 1e951dba7d044f4459e4313528d3731e
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Unity/Assets/Plugins/DoTween/DOTween/DOTween46.dll.mdb.meta
+++ b/Unity/Assets/Plugins/DoTween/DOTween/DOTween46.dll.mdb.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 2ebbf7aaacd05cd4b9dcbb95e6c8a24c
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Unity/Assets/Plugins/DoTween/DOTween/DOTween50.dll.mdb.meta
+++ b/Unity/Assets/Plugins/DoTween/DOTween/DOTween50.dll.mdb.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: cde3cbae4ec80074aa15c549fb899e49
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Unity/Assets/Plugins/DoTween/DOTween/Editor/DOTweenEditor.dll.mdb.meta
+++ b/Unity/Assets/Plugins/DoTween/DOTween/Editor/DOTweenEditor.dll.mdb.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: cc660d742fd57a740abee82edbee60ec
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Unity/Assets/Plugins/DoTween/DOTweenPro/DOTweenPro.dll.mdb.meta
+++ b/Unity/Assets/Plugins/DoTween/DOTweenPro/DOTweenPro.dll.mdb.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 7502ed689c6d5864eb1fe5f882ec3112
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Unity/Assets/Plugins/DoTween/DOTweenPro/Editor/DOTweenProEditor.dll.mdb.meta
+++ b/Unity/Assets/Plugins/DoTween/DOTweenPro/Editor/DOTweenProEditor.dll.mdb.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: f7ebcbb35b79ab242a8a5903d494904e
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Unity/Assets/Plugins/DoTween/DemiLib/DemiLib.dll.mdb.meta
+++ b/Unity/Assets/Plugins/DoTween/DemiLib/DemiLib.dll.mdb.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 15768a161ec22e943aca9c73a919bad5
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Unity/Assets/Plugins/DoTween/DemiLib/Editor/DemiEditor.dll.mdb.meta
+++ b/Unity/Assets/Plugins/DoTween/DemiLib/Editor/DemiEditor.dll.mdb.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 35dc768856dfd7048a68c47cb3d1aa56
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Unity/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Serialization.dll.mdb.meta
+++ b/Unity/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Serialization.dll.mdb.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 91c8430135b329442ab8ba4c231565f8
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Unity/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Utilities.dll.mdb.meta
+++ b/Unity/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Utilities.dll.mdb.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 2683399cfe663004f945d42c6bb98414
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Unity/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Serialization.dll.mdb.meta
+++ b/Unity/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Serialization.dll.mdb.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 0f747e3b7494d65478b779e7c7691635
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Unity/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Utilities.dll.mdb.meta
+++ b/Unity/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Utilities.dll.mdb.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 747513be9e3c2db4f9b11a219a0c4c88
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Unity/Assets/Plugins/Sirenix/Assemblies/Sirenix.OdinInspector.Attributes.dll.mdb.meta
+++ b/Unity/Assets/Plugins/Sirenix/Assemblies/Sirenix.OdinInspector.Attributes.dll.mdb.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 404aef5717c67d544a878aa354f282ef
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Unity/Assets/Plugins/Sirenix/Assemblies/Sirenix.OdinInspector.Editor.dll.mdb.meta
+++ b/Unity/Assets/Plugins/Sirenix/Assemblies/Sirenix.OdinInspector.Editor.dll.mdb.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 034205d52a355a9419902481422f0de0
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Unity/Assets/Plugins/Sirenix/Assemblies/Sirenix.Serialization.Config.dll.mdb.meta
+++ b/Unity/Assets/Plugins/Sirenix/Assemblies/Sirenix.Serialization.Config.dll.mdb.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: f7bdc62aac7d74c4185d6067dae8c9c7
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Unity/Assets/Plugins/Sirenix/Assemblies/Sirenix.Serialization.dll.mdb.meta
+++ b/Unity/Assets/Plugins/Sirenix/Assemblies/Sirenix.Serialization.dll.mdb.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 98f5ae7f62d3d9048b5fa4b842ac455d
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Unity/Assets/Plugins/Sirenix/Assemblies/Sirenix.Utilities.Editor.dll.mdb.meta
+++ b/Unity/Assets/Plugins/Sirenix/Assemblies/Sirenix.Utilities.Editor.dll.mdb.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: ba5916964d11e0f42ac01678f72b4115
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Unity/Assets/Plugins/Sirenix/Assemblies/Sirenix.Utilities.dll.mdb.meta
+++ b/Unity/Assets/Plugins/Sirenix/Assemblies/Sirenix.Utilities.dll.mdb.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 65e093ae4a5d95446acebb171990d7f8
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Unity/Assets/Res/Common/Init.unity
+++ b/Unity/Assets/Res/Common/Init.unity
@ -38,7 +38,7 @@ RenderSettings:
  m_ReflectionIntensity: 1
  m_CustomReflection: {fileID: 0}
  m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.3731193, g: 0.38073996, b: 0.3587269, a: 1}
+  m_IndirectSpecularColor: {r: 0.37311918, g: 0.3807398, b: 0.35872716, a: 1}
  m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@ -760,6 +760,94 @@ MonoBehaviour:
  m_OnValueChanged:
    m_PersistentCalls:
      m_Calls: []
+--- !u!1 &949072731
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 949072734}
+  - component: {fileID: 949072733}
+  - component: {fileID: 949072732}
+  m_Layer: 0
+  m_Name: Stage Camera
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &949072732
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 949072731}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: afd658ab27865814e83552b910cf92e3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  constantSize: 1
+--- !u!20 &949072733
+Camera:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 949072731}
+  m_Enabled: 1
+  serializedVersion: 2
+  m_ClearFlags: 3
+  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
+  m_projectionMatrixMode: 1
+  m_GateFitMode: 2
+  m_FOVAxisMode: 0
+  m_SensorSize: {x: 36, y: 24}
+  m_LensShift: {x: 0, y: 0}
+  m_FocalLength: 50
+  m_NormalizedViewPortRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+  near clip plane: -30
+  far clip plane: 30
+  field of view: 60
+  orthographic: 1
+  orthographic size: 5
+  m_Depth: 1
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 32
+  m_RenderingPath: -1
+  m_TargetTexture: {fileID: 0}
+  m_TargetDisplay: 0
+  m_TargetEye: 0
+  m_HDR: 0
+  m_AllowMSAA: 0
+  m_AllowDynamicResolution: 0
+  m_ForceIntoRT: 0
+  m_OcclusionCulling: 1
+  m_StereoConvergence: 10
+  m_StereoSeparation: 0.022
+--- !u!4 &949072734
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 949072731}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 8.888889, y: -5, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 9
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &950385331
 GameObject:
  m_ObjectHideFlags: 0
--- a/Unity/Assets/Res/Common/Manifest.asset
+++ b/Unity/Assets/Res/Common/Manifest.asset
--- a/Unity/Assets/Res/Common/Rules.asset
+++ b/Unity/Assets/Res/Common/Rules.asset
@ -29,7 +29,7 @@ MonoBehaviour:
  searchPatternPrefab: '*.prefab'
  searchPatternScene: '*.unity'
  searchPatternText: '*.txt,*.bytes,*.json,*.csv,*.xml,*htm,*.html,*.yaml,*.fnt'
-  version: 402
+  version: 406
  scenesInBuild:
  - {fileID: 102900000, guid: e0d691ac8c1d0454ba07089ea820e18a, type: 3}
  - {fileID: 102900000, guid: d378f07356e960549add8141397b1462, type: 3}
@ -145,6 +145,8 @@ MonoBehaviour:
    path: Assets/Download/CommonPrefab/Character.prefab
  - bundle: 164f7d27806d919b60ce4cafbd2565c1.unity3d
    path: Assets/Download/CommonPrefab/ClickPoint.prefab
+  - bundle: f628e42c0b4cbd5c3c42b134bf06deca.unity3d
+    path: Assets/Download/CommonPrefab/HUD.prefab
  - bundle: c68d2b81a470148bd2d8be78da584c82.unity3d
    path: Assets/Download/CommonPrefab/PvpDisBoard.prefab
  - bundle: 5312d139a7af9e754bf16c80e014a4cd.unity3d
@ -20272,6 +20274,9 @@ MonoBehaviour:
  - name: 164f7d27806d919b60ce4cafbd2565c1.unity3d
    assets:
    - Assets/Download/CommonPrefab/ClickPoint.prefab
+  - name: f628e42c0b4cbd5c3c42b134bf06deca.unity3d
+    assets:
+    - Assets/Download/CommonPrefab/HUD.prefab
  - name: c68d2b81a470148bd2d8be78da584c82.unity3d
    assets:
    - Assets/Download/CommonPrefab/PvpDisBoard.prefab
--- a/Unity/Assets/Res/Config/GlobalProto.txt
+++ b/Unity/Assets/Res/Config/GlobalProto.txt
@ -1 +1 @@
-{ "_t" : "GlobalProto", "AssetBundleServerUrl" : "http://121.196.171.57:2085/", "Address" : "121.196.171.57:7756", "LocalAssetBundleServerUrl" : "http://127.0.0.1:2085/", "LocalAddress" : "127.0.0.1:7756", "isLocal" : true, "isEditorMode" : true, "ClientVersion" : "2.3" }
+{ "_t" : "GlobalProto", "AssetBundleServerUrl" : "http://121.196.171.57:2085/", "Address" : "121.196.171.57:7756", "LocalAssetBundleServerUrl" : "http://127.0.0.1:2083/", "LocalAddress" : "127.0.0.1:7756", "isLocal" : true, "isEditorMode" : true, "ClientVersion" : "2.3" }
--- a/Unity/Assets/ThirdParty/protobuf-net/protobuf-net.csproj.meta
+++ b/Unity/Assets/ThirdParty/protobuf-net/protobuf-net.csproj.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: a7e2b03d20b124e4cbf256b42eab3fd8
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/编译.bat
+++ b/编译.bat
@ -0,0 +1,2 @@
+dotnet build Client-Server.sln
+pause