Core/GameEngine/Model/Config/MapEventPointConfig.cs
@@ -1,6 +1,6 @@ //-------------------------------------------------------- // [Author]: Fish // [ Date ]: Thursday, February 14, 2019 // [ Date ]: Wednesday, April 17, 2019 //-------------------------------------------------------- using System.Collections.Generic; @@ -19,6 +19,7 @@ public readonly int IsShowInfo; public readonly int ShowInMipMap; public readonly int Colour; public readonly string NpcDescription; public readonly int LowLV; public readonly int HighestLV; public readonly int Defense; @@ -48,17 +49,19 @@ int.TryParse(tables[5],out Colour); int.TryParse(tables[6],out LowLV); NpcDescription = tables[6]; int.TryParse(tables[7],out HighestLV); int.TryParse(tables[7],out LowLV); int.TryParse(tables[8],out Defense); int.TryParse(tables[8],out HighestLV); Drop1 = tables[9]; int.TryParse(tables[9],out Defense); Drop2 = tables[10]; Drop1 = tables[10]; EXP = tables[11]; Drop2 = tables[11]; EXP = tables[12]; } catch (Exception ex) { Core/GameEngine/Model/Config/MapEventPointConfig.cs.meta
@@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: c1d2ccde5bec1a54ab028c9dbaf5486d timeCreated: 1550121464 timeCreated: 1555487423 licenseType: Pro MonoImporter: serializedVersion: 2 Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0405_tagPlayerDisappear.cs
@@ -20,6 +20,7 @@ return; } GA_Hero _hero = PlayerDatas.Instance.hero; GActor _actor = null; for (int i = 0; i < vNetData.Players.Length; ++i) @@ -41,6 +42,18 @@ DebugEx.LogFormat("DTC0405_tagPlayerDisappear => 找不到{0}.", vNetData.Players[i]); } if (_hero != null) { if (_hero.SelectTarget == _actor) { _hero.SelectTarget = null; } if (_hero.LockTarget == _actor) { _hero.LockTarget = null; } } } } Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0407_tagNPCDisappear.cs
@@ -22,6 +22,8 @@ GActor _actor = null; NPCConfig _npcConfig = null; GA_Hero _hero = PlayerDatas.Instance.hero; for (int i = 0; i < vNetData.NPCID.Length; ++i) { _actor = GAMgr.Instance.GetBySID(vNetData.NPCID[i]); @@ -38,13 +40,26 @@ if (WorldBossConfig.Has(_npcConfig.NPCID)) { BossFakeLineUtility.Instance.RecordSawBoss(_npcConfig.NPCID,PlayerDatas.Instance.baseData.FBID); BossFakeLineUtility.Instance.RecordSawBoss(_npcConfig.NPCID, PlayerDatas.Instance.baseData.FBID); } } GAMgr.Instance.ServerDie(vNetData.NPCID[i]); GAMgr.Instance.Release(_actor); if (_hero != null) { if (_hero.SelectTarget == _actor) { _hero.SelectTarget = null; } if (_hero.LockTarget == _actor) { _hero.LockTarget = null; } } #if UNITY_EDITOR string _content = string.Format("DTC0407_tagNPCDisappear => S:{0}, C:{1} 收到消失包", vNetData.NPCID[i], _actor.ClientInstID); RuntimeLogUtility.AddLog_Blue(_content, vNetData.NPCID[i]); Core/NetworkPackage/DTCFile/ServerPack/H06_PlayerVsNPC/DTC0608_tagNPCDie.cs
@@ -67,6 +67,11 @@ { SelectionManager.Release(SelectionManager.E_Type.Red); } if (_hero.LockTarget == _actorFight) { _hero.LockTarget = null; } } if (_actorFight.State == E_ActorState.AutoRun) Core/NetworkPackage/DTCFile/ServerPack/H06_PlayerVsNPC/DTC0609_tagPlayerDie.cs
@@ -21,7 +21,7 @@ base.Done(vNetPack); H0609_tagPlayerDie vNetData = vNetPack as H0609_tagPlayerDie; DeadModel.PlayerDie(vNetData.PlayerID); GActorPlayerBase _player = GAMgr.Instance.GetBySID(vNetData.PlayerID) as GActorPlayerBase; @@ -51,7 +51,7 @@ PlayerDatas.Instance.hero.Behaviour.StopHandupAI(); PlayerDatas.Instance.hero.Behaviour.StopKillUntilDieAI(); } if (_hero != null) { _hero.ActorInfo.SyncServerHp = 0; @@ -67,16 +67,6 @@ if (vNetData.PlayerID == PlayerDatas.Instance.PlayerId) { if (_hero.SelectTarget == _player) { _hero.SelectTarget = null; } if (_hero.LockTarget == _player) { _hero.LockTarget = null; } if (ModelCenter.Instance.GetModel<DungeonModel>().IsElderGodExpel() && vNetData.KillerType == 0) { @@ -90,14 +80,17 @@ (_player as GA_Player).StopMoveToPosition(); } if (_hero.LockTarget == _player) if (_hero != null) { _hero.LockTarget = null; } if (_hero.LockTarget == _player) { _hero.LockTarget = null; } if (_hero.SelectTarget == _player) { _hero.SelectTarget = null; if (_hero.SelectTarget == _player) { _hero.SelectTarget = null; } } } } Fight/Stage/MapEditor/Game/TransferGroup.cs
@@ -124,8 +124,8 @@ GameNetSystem.Instance.SendInfo(_pkg); GA_Hero.s_MapSwitching = true; m_Step = 2; _hero.OnHorse(0); DTC0428_tagPlayerRideHorse.Send_tagPlayerRideHorse(false); _hero.OnHorse(0); if (isPositive) { _hero.Play(Animator.StringToHash(m_Data.transferPoints[targetPoint - 1].stateNameFront)); System/EquipStar/EquipStarUpgradeCandidateSlot.cs
@@ -56,7 +56,7 @@ m_EmptyItem.gameObject.SetActive(true); var place = this.candidate.equipPosition.y; m_Description1.text = string.Format("部位：{0}", UIHelper.GetEquipPlaceName(place)); m_Description1.color = UIHelper.GetUIColor(TextColType.Black, true); m_Description1.color = UIHelper.GetUIColor(TextColType.NavyBrown, true); m_Description2.text = "未穿戴装备"; } else System/EquipTrain/EquipTrainCandidateBehaviour.cs
@@ -55,7 +55,7 @@ m_Star.gameObject.SetActive(false); var place = this.candidate.equipPosition.y; m_Description1.text = string.Format("部位：{0}", UIHelper.GetEquipPlaceName(place)); m_Description1.color = UIHelper.GetUIColor(TextColType.Black, true); m_Description1.color = UIHelper.GetUIColor(TextColType.NavyBrown, true); m_Description2.text = "未穿戴装备"; m_Description2.color = UIHelper.GetUIColor(TextColType.Red, true); } @@ -68,7 +68,7 @@ m_Description1.text = item.config.ItemName; m_Description1.color = UIHelper.GetUIColor(item.config.ItemColor, true); m_Description2.text = string.Format("洗练等级：{0}级", this.candidate.trainLevel.Fetch()); m_Description2.color = UIHelper.GetUIColor(TextColType.Black, true); m_Description2.color = UIHelper.GetUIColor(TextColType.NavyBrown, true); var starLevel = this.candidate.starLevel.Fetch(); m_Star.gameObject.SetActive(true); @@ -90,7 +90,7 @@ if (!string.IsNullOrEmpty(this.candidate.equipGuid.value)) { m_Description2.text = string.Format("洗练等级：{0}级", trainLevel); m_Description2.color = UIHelper.GetUIColor(TextColType.Black, true); m_Description2.color = UIHelper.GetUIColor(TextColType.NavyBrown, true); } } } System/Login/LoginWin.cs
@@ -48,6 +48,9 @@ protected override void AddListeners() { #if UNITY_EDITOR m_Account.onEndEdit.AddListener(x => { EnterGame(); }); #endif m_EnterGame.SetListener(EnterGame); m_QQLogin.SetListener(QQLogin); m_WXLogin.SetListener(WXLogin); System/WorldMap/LocalMapEventPointToggle.cs
@@ -14,11 +14,9 @@ public class LocalMapEventPointToggle : ScrollItem { [SerializeField] RectTransform m_LayoutLeft; [SerializeField] RectTransform m_LayoutRight; [SerializeField] ButtonEx m_Button; [SerializeField] Image m_Icon; [SerializeField] TextEx m_Title; [SerializeField] Text m_Level; [SerializeField] Text m_Description; [SerializeField] Transform m_Selected; [SerializeField] Button m_FlyBoot; [SerializeField] Image m_MonsterType; @@ -37,7 +35,7 @@ var mapConfig = MapConfig.Get(PlayerDatas.Instance.baseData.MapID); m_LayoutLeft.gameObject.SetActive(mapConfig.MapFBType == (int)MapType.OpenCountry); DrawEventInfo(); DisplayEventInfo(); OnSelected(model.selectedMapEventPoint); model.selectMapEventPointEvent += OnSelected; } @@ -50,41 +48,57 @@ private void Awake() { this.m_Button.AddListener(SelectEventPoint); this.m_FlyBoot.AddListener(FlyToEventPoint); this.m_Button.SetListener(SelectEventPoint); this.m_FlyBoot.SetListener(FlyToEventPoint); } private void DrawEventInfo() private void DisplayEventInfo() { var config = MapEventPointConfig.Get(this.m_EventId); var tagChinNpcMod = NPCConfig.Get(config.NPCID); this.m_Title.text = tagChinNpcMod != null ? tagChinNpcMod.charName : ""; if (config.LowLV == config.HighestLV) var npcConfig = NPCConfig.Get(config.NPCID); this.m_Title.text = npcConfig != null ? npcConfig.charName : ""; if (npcConfig.NPCType == 0) { this.m_Level.text = Language.Get("Z1024", config.LowLV); this.m_Description.text = config.NpcDescription; this.m_MonsterType.gameObject.SetActive(true); } else { this.m_Level.text = StringUtility.Contact(Language.Get("Z1024", config.LowLV), "-", config.HighestLV); if (config.LowLV == config.HighestLV) { this.m_Description.text = Language.Get("Z1024", config.LowLV); } else { this.m_Description.text = StringUtility.Contact(Language.Get("Z1024", config.LowLV), "-", config.HighestLV); } this.m_MonsterType.gameObject.SetActive(false); this.m_MonsterType.SetSprite(StringUtility.Contact("MapNPC_Colour_", config.Colour)); } this.m_MonsterType.SetSprite(StringUtility.Contact("MapNPC_Colour_", config.Colour)); } private void FlyToEventPoint() { var flyBootOwn = playerPack.GetItemCountByID(PackType.Item, GeneralDefine.flyBootItemId); var isVipFreeTransfer = ModelCenter.Instance.GetModel<VipModel>().GetVipPrivilegeCnt(VipPrivilegeType.FreeTransfer) > 0; if (isVipFreeTransfer || flyBootOwn > 0) var free = ModelCenter.Instance.GetModel<VipModel>().GetVipPrivilegeCnt(VipPrivilegeType.FreeTransfer) > 0; if (free) { MoveToNpc(); return; } else var hasFlyBoot = playerPack.GetItemCountByID(PackType.Item, GeneralDefine.flyBootItemId) > 0; if (hasFlyBoot) { FlyShoseConfirmwin.useEnvironment = FlyShoseConfirmwin.UseEnvironment.LocalMap; FlyShoseConfirmwin.confirmCallBack = MoveToNpc; WindowCenter.Instance.Open<FlyShoseConfirmwin>(); MoveToNpc(); return; } FlyShoseConfirmwin.useEnvironment = FlyShoseConfirmwin.UseEnvironment.LocalMap; FlyShoseConfirmwin.confirmCallBack = MoveToNpc; WindowCenter.Instance.Open<FlyShoseConfirmwin>(); } private void MoveToNpc() @@ -106,7 +120,7 @@ { var selected = _event == m_EventId; m_Selected.gameObject.SetActive(selected); this.m_Title.color = this.m_Level.color = m_FontColor.GetColorSize(selected ? "Selected" : "Normal").color; this.m_Title.color = this.m_Description.color = m_FontColor.GetColorSize(selected ? "Selected" : "Normal").color; } }
