Core/MapEditor/Behavior/Bhv_Evt_RefreshMonster.cs
@@ -142,6 +142,10 @@ { _go = Instantiate(_go); } else { _go = GameObject.CreatePrimitive(PrimitiveType.Capsule); } } else { Core/NetworkPackage/DTCFile/ServerPack/H08_Event/DTC0823_tagDelMission.cs
@@ -29,6 +29,7 @@ { taskmodel.DelMission((int)vNetData.MissionID); treasureModel.ReceivePackage(vNetData); BossShowModel.Instance.ReceivePackage(vNetData); } // PlayerDatas.Inst.missionDetail.DeleteMission((int)vNetData.MissionID); } Fight/Actor/State/SMB/STM_BaseAttack.cs
@@ -411,7 +411,7 @@ continue; } if (_target.ActorInfo.serverDie) if (_target.ActorInfo.serverDie && !(StageLoad.Instance.currentStage is ClientHazyDemonKingStage)) { _target.Die(owner.ServerInstID, 0, m_CacheSkill.hurtClientList[i].AttackType); } @@ -426,7 +426,8 @@ continue; } if (_target.ActorInfo.serverDie) if (_target.ActorInfo.serverDie && !(StageLoad.Instance.currentStage is ClientHazyDemonKingStage)) { _target.Die(owner.ServerInstID, 0, m_CacheSkill.hurtClntFightNpcList[i].AttackType); } Fight/GameActor/GActorNpcFight.cs
@@ -386,6 +386,13 @@ public override void Die() { #if UNITY_EDITOR if (this is GA_NpcClientFightNorm) { Debug.LogFormat("调用了死亡"); } #endif if (m_Animator == null) { ReleaseShadow(); Fight/GameActor/GActorNpcNoFight.cs
@@ -271,7 +271,7 @@ m_Model.transform.SetParent(m_Root); m_Model.transform.localPosition = Vector3.zero; m_Model.transform.localScale = Vector3.one; m_Model.transform.localScale = Vector3.one * NpcConfig.ModeProportion; m_Model.transform.localRotation = Quaternion.identity; RequestName(); Fight/MapTransferUtility.cs
@@ -300,7 +300,7 @@ NpcID = NpcID; MapTransferDoType = E_MapTransferDoType.Npc; _hero.MoveToPosition(_destPostion); _hero.MoveToPosition(_destPostion, 1); yield break; } } Lua/Gen/LimitedTimePackageItemClassModelWrap.cs
@@ -295,7 +295,7 @@ { bool gen_ret = gen_to_be_invoked.IsExpired( ); bool gen_ret = !gen_to_be_invoked.IsExpired( ); LuaAPI.lua_pushboolean(L, gen_ret);
@@ -155,6 +155,9 @@ case DailyQuestType.HazyRegion: WindowCenter.Instance.Open<CrossServerWin>(false, 0); break; case DailyQuestType.RidingPetActivity: WindowCenter.Instance.Open<LootPreciousFrameWin>(false, 1); break; } } else System/BossShow/BossShowModel.cs
@@ -61,20 +61,20 @@ } satisfyStep = SatisfyBossShowStep(actorShowModel); SaveBossShowStep(actorShowModel); if (actorShowModel.BindMissionID != 0) { MissionDetailDates missionDetailDates = null; taskmodel.allMissionDict.TryGetValue(actorShowModel.BindMissionID, out missionDetailDates); if (missionDetailDates == null || missionDetailDates.MissionState != 1) { return; } if (GetMisstionShow(actorShowModel.BindMissionID)) { return; } SetMisstionShow(actorShowModel.BindMissionID); } //if (actorShowModel.BindMissionID != 0) //{ // MissionDetailDates missionDetailDates = null; // taskmodel.allMissionDict.TryGetValue(actorShowModel.BindMissionID, out missionDetailDates); // if (missionDetailDates == null || missionDetailDates.MissionState != 1) // { // return; // } // if (GetMisstionShow(actorShowModel.BindMissionID)) // { // return; // } // SetMisstionShow(actorShowModel.BindMissionID); //} if (BossShowing && StageLoad.Instance.currentStage is DungeonStage) { return; @@ -458,6 +458,22 @@ return null; } public void ReceivePackage(H0823_tagDelMission vNetData) { if (DTC0403_tagPlayerLoginLoadOK.finishedLogin) { var configs = ActorShowConfig.GetValues(); foreach (var config in configs) { if (config.BindMissionID == vNetData.MissionID) { StartBossShow(config.MapID, config.NpcID); return; } } } } public void OnNpcAppear(int npcID) { if (BossShowing) @@ -468,10 +484,10 @@ { return; } if (actorShowModel.BindMissionID == 0 || actorShowModel.type == 2) { return; } //if (actorShowModel.BindMissionID == 0 || actorShowModel.type == 2) //{ // return; //} serverNotify = false; StartBossShow(npcID); } System/EquipStar/EquipStarModel.cs
@@ -527,8 +527,8 @@ if (upgradable) { var currentStarLevel = GetEquipStarLevel(equipPosition); var config = EquipStarConfig.Get(equipPosition.x, equipPosition.y, currentStarLevel); if (config.CostEquipCnt == 0) var config = EquipStarConfig.Get(equipPosition.x, equipPosition.y, currentStarLevel + 1); if (config != null && config.CostEquipCnt == 0) { if (config.CostItemDict.x > 0) { System/FindPrecious/FindPreciousBossRebornBehaviour.cs
@@ -156,7 +156,7 @@ WindowCenter.Instance.Close<MainInterfaceWin>(); demonJarModel.selectedBoss = _bossId; demonJarModel.lockSelectedBoss = true; WindowCenter.Instance.Open<FindPreciousFrameWin>(false, 3); WindowCenter.Instance.Open<FindPreciousFrameWin>(false); } else { System/HazyRegion/HazyRegionModel.cs
@@ -43,7 +43,7 @@ { get { return hazyRegionOpenTimes <= fakeOpenTimes return hazyRegionOpenTimes < fakeOpenTimes || !FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.HazyRegion); } } @@ -81,6 +81,11 @@ public void OnPlayerLoginOk() { isServerPrepare = true; if (AdventureStage.Instance.IsInAdventureStage) { ClientDungeonStageUtility.RequestStartClientDungeon(0, 0); } } public override void UnInit() System/HazyRegion/HazyRegionWin.cs
@@ -92,6 +92,10 @@ StopAllCoroutines(); m_BottomScaleTween.Stop(); m_BottomScaleTween.SetStartState(); m_AlphaTween.SetStartState(); model.onHazyRegionStateRefresh -= OnHazyRegionStateRefresh; }
@@ -21,7 +21,7 @@ DailyQuestModel dailyQuestModel { get { return ModelCenter.Instance.GetModel<DailyQuestModel>(); } } RidingPetBossModel ridingPetMdoel { get { return ModelCenter.Instance.GetModel<RidingPetBossModel>(); } } public int RawImagetestBossID = 50103006; //public int RawImagetestBossID = 50103006; public RewardPositionType rewardPositonType; [SerializeField] ItemCell[] m_RewardArray;
@@ -108,7 +108,7 @@ for (int i = 0; i < m_SkillExperts.Length; i++) { var potential = skill.potentials[i]; m_SkillExperts[i].Display(potential.id, skill.level >= potential.limitLevel, OnSelect); m_SkillExperts[i].Display(potential.id, PlayerDatas.Instance.baseData.LV >= potential.limitLevel, OnSelect); } } } @@ -125,9 +125,6 @@ { if (selectExpert != 0) { TreasureSkill skill; model.TryGetSkill(selectSkillId, out skill); var level = 0; TreasurePotential expert; if (model.TryGetPotential(selectExpert, out expert)) @@ -135,7 +132,7 @@ level = expert.level; } m_Select.gameObject.SetActive(skill.level >= expert.limitLevel); m_Select.gameObject.SetActive(PlayerDatas.Instance.baseData.LV >= expert.limitLevel); SkillConfig skillConfig; if (level == 0) System/Skill/TreasureSkillModel.cs
@@ -52,6 +52,7 @@ packModel.refreshItemCountEvent += RefreshItemCountAct; FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChangeEvent; PlayerDatas.Instance.playerDataRefreshEvent += PlayerDataRefreshEvent; } public void OnBeforePlayerDataInitialize() @@ -75,6 +76,15 @@ { packModel.refreshItemCountEvent -= RefreshItemCountAct; FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChangeEvent; PlayerDatas.Instance.playerDataRefreshEvent -= PlayerDataRefreshEvent; } private void PlayerDataRefreshEvent(PlayerDataType dataType) { if (dataType == PlayerDataType.LV) { UpdateRedpoint(); } } private void OnFuncStateChangeEvent(int id) @@ -379,7 +389,7 @@ { for (int i = 0; i < treasureSkill.potentials.Count; i++) { if (treasureSkill.level >= treasureSkill.potentials[i].limitLevel) if (PlayerDatas.Instance.baseData.LV >= treasureSkill.potentials[i].limitLevel) { return true; } System/Vip/LimitedTimePackageModel.cs
@@ -27,7 +27,7 @@ { get { return IsExpired(); return !IsExpired(); } } @@ -108,8 +108,8 @@ } int GetDayOfYear = DateTime.Now.DayOfYear; int day = LocalSave.GetInt("IsOpenLimitedTime"); bool Isbool = IsExpired(); if (day != GetDayOfYear && IsExpired()) bool Isbool = !IsExpired(); if (day != GetDayOfYear && !IsExpired()) { // LocalSave.SetInt("IsOpenLimitedTime", GetDayOfYear); redPointStre1.state = RedPointState.Simple; System/YinJi.meta
@@ -1,7 +1,7 @@ fileFormatVersion: 2 guid: 80212c8f087439f4a8bd063acaf6d098 guid: d0b00b50908bef240aab8e11fa0119e0 folderAsset: yes timeCreated: 1556337107 timeCreated: 1556421759 licenseType: Pro DefaultImporter: userData:
