Core/AI/NavmeshPathFind/PathFinder.cs
@@ -29,7 +29,7 @@ public static float CalculateDistance(Vector3 start, Vector3 dest) { float _dis = float.MaxValue; float _dis = 0; start.y = 0; dest.y = 0; NavMesh.CalculatePath(start, dest, -1, _path); Core/GameEngine/Model/Player/Skill/PlayerSkillDatas.cs
@@ -199,7 +199,7 @@ public void SetQuickSkill(int pos, int id) { if (model.GetXpSkillID() == id) if (model.IsXpSkill(id)) { return; } @@ -349,6 +349,8 @@ public void ClearSkillData() { hasInitQuickSkill = false; isServerPrepare = false; m_QuickSkills.Clear(); m_PlayerSkills.Clear(); } Core/NetworkPackage/DTCFile/ServerPack/HAD_SaleActivity.meta
File was deleted Core/NetworkPackage/DTCFile/ServerPack/HAE_Truck.meta
File was deleted Core/NetworkPackage/DTCFile/ServerPack/HAF_Merge.meta
File was deleted Core/NetworkPackage/DTCFile/ServerPack/HB0_Event.meta
File was deleted Core/NetworkPackage/ServerPack/HAD_SaleActivity.meta
File was deleted Core/NetworkPackage/ServerPack/HAE_Truck.meta
File was deleted Core/NetworkPackage/ServerPack/HAF_Merge.meta
File was deleted Core/NetworkPackage/ServerPack/HB0_Event.meta
File was deleted Fight/GameActor/GA_Hero.cs
@@ -1142,23 +1142,23 @@ return; } // if (taskmodel.IsTaskMove()) // { // if (Time.realtimeSinceStartup - m_CalculAutoFightTime > taskmodel.TaskAutoTime // && !NewBieCenter.Instance.inGuiding // && TaskModel.IsOPenAutoResolve()) // { // if (PlayerDatas.Instance.hero != null && PlayerDatas.Instance.hero.State == E_ActorState.AutoRun // && onMainModel.MoveBool) // { if (taskmodel.IsTaskMove()) { if (Time.realtimeSinceStartup - m_CalculAutoFightTime > taskmodel.TaskAutoTime && !NewBieCenter.Instance.inGuiding && TaskModel.IsOPenAutoResolve()) { if (PlayerDatas.Instance.hero != null && PlayerDatas.Instance.hero.State == E_ActorState.AutoRun && onMainModel.MoveBool) { // } // else // { // SnxxzGame.Instance.StartCoroutine(Wait()); // } // } // } } else { SnxxzGame.Instance.StartCoroutine(Wait()); } } } if (MapArea.IsInMapArea(CurMapArea, MapArea.E_Type.Safe) || MapArea.IsInMapArea(CurMapArea, MapArea.E_Type.RebornSafe)) Fight/MapTransferUtility.cs
@@ -262,8 +262,6 @@ yield break; } ClientSceneManager.Instance.ExitTransStatus(); var sid = data.sid; NpcID = data.npcID; MapTransferDoType = E_MapTransferDoType.Npc; @@ -445,6 +443,7 @@ { break; } ClientSceneManager.Instance.ExitTransStatus(); float _dis = MathUtility.DistanceSqrtXZ(_hero.Pos, _nextPos); while (_dis > 0.01f) { @@ -477,6 +476,7 @@ Debug.LogErrorFormat("移动至NPC: {0} 时找不到任何跳跃点, NextPos: {1}", NpcID, _nextPos); break; } ClientSceneManager.Instance.ExitTransStatus(); float _dis = MathUtility.DistanceSqrtXZ(_hero.Pos, _nextPos); while (_dis > 0.01f) { Lua/Gen/DelegatesGensBridge.cs
@@ -6347,29 +6347,6 @@ #endif } public bool __Gen_Delegate_Imp275(Snxxz.UI.EquipShowSwitch.EquipShowSwitchType p0, uint p1) { #if THREAD_SAFE || HOTFIX_ENABLE lock (luaEnv.luaEnvLock) { #endif RealStatePtr L = luaEnv.rawL; int errFunc = LuaAPI.pcall_prepare(L, errorFuncRef, luaReference); ObjectTranslator translator = luaEnv.translator; translator.Push(L, p0); LuaAPI.xlua_pushuint(L, p1); PCall(L, 2, 1, errFunc); bool __gen_ret = LuaAPI.lua_toboolean(L, errFunc + 1); LuaAPI.lua_settop(L, errFunc - 1); return __gen_ret; #if THREAD_SAFE || HOTFIX_ENABLE } #endif } public void __Gen_Delegate_Imp276(uint p0) { #if THREAD_SAFE || HOTFIX_ENABLE System/Equip/RealmEquipWin.cs
@@ -42,6 +42,7 @@ var titleIcon = oneLevelFrame.GetComponent<Image>("Container_BackGround/Img_Title"); titleIcon.SetSprite("OneLevelTitle_30"); titleIcon.SetNativeSize(); m_LevelsContainer = oneLevelFrame.GetComponent<RectTransform>("Container_Functions/Content"); m_Close = oneLevelFrame.GetComponent<Button>("Container_Buttons/Btn_Close"); System/FairyAu/FairyAuTaskWin.cs
@@ -30,6 +30,8 @@ [SerializeField] Text _ReceiveImageText;//领奖倒计时2 [SerializeField] Transform m_GridLeft;//左侧奖励 [SerializeField] Slider m_Slider;//进度条 [SerializeField] UIEffect m_LeaveBtnEffect; [SerializeField] Text m_LeaveText; [Header("等待时间(秒)")] public int Second = 20; @@ -292,6 +294,7 @@ void FairyAuTask(int _taskID)//仙盟任务 { if (TaskAllocation.Instance.FairyAuNumber() >= taskmodel.FairyAuTaskCount_Round) { Btn_Leave.gameObject.SetActive(false); @@ -324,10 +327,13 @@ string _RewardStr = TaskAllocation.Instance.GetTaskInfo(rewardConfig.show_writing, _taskID); RewardAnalysis.Inst.GetReward(_RewardStr, ref rewardList); RewardInformationDisplay(rewardList); m_LeaveText.text = Language.Get("CoinTaskText_8"); } void TheDefaultTask(int _taskID)//仙盟任务未接取特殊状态 { m_LeaveBtnEffect.Play(); m_LeaveText.text = Language.Get("CoinTaskText_11"); Btn_Finish.gameObject.SetActive(false); Btn_Leave.gameObject.SetActive(true); RoundText_L.text = Language.Get("FairyAuTaskWin_Text3", SetNumberOfRounds(0)); @@ -363,6 +369,7 @@ DestroyImmediate(_Grid.GetChild(i).gameObject); } } m_LeaveText.text = Language.Get("CoinTaskText_8"); } void RewardInformationDisplay(List<RewardAnalysis.RewardInfo> rewardList)//奖励信息 { System/MainInterfacePanel/LowSettingTip.cs
@@ -88,6 +88,10 @@ { WindowCenter.Instance.Open<SkillWin>(); } else if (skillModel.redpoint.state == RedPointState.Simple) { WindowCenter.Instance.Open<SkillWin>(false, 1); } else if (skillModel.passSkillRedpoint.state == RedPointState.Simple) { WindowCenter.Instance.Open<SkillWin>(false, 2); System/Role/EquipShowSwitch.cs
File was deleted System/Role/EquipShowSwitch.cs.meta
File was deleted System/Role/ReikiRootResetWin.cs
@@ -27,6 +27,7 @@ ReikiRootModel model { get { return ModelCenter.Instance.GetModel<ReikiRootModel>(); } } PackModel packModel { get { return ModelCenter.Instance.GetModel<PackModel>(); } } SkillModel skillModel { get { return ModelCenter.Instance.GetModel<SkillModel>(); } } #region Built-in protected override void BindController() { @@ -113,6 +114,7 @@ var pak = new CB207_tagCMResetAttrPoint(); GameNetSystem.Instance.SendInfo(pak); model.resetReikiRootRecord = true; skillModel.skillMatchRedpointable = true; CloseImmediately(); } else @@ -142,6 +144,7 @@ var pak = new CB207_tagCMResetAttrPoint(); GameNetSystem.Instance.SendInfo(pak); model.resetReikiRootRecord = true; skillModel.skillMatchRedpointable = true; CloseImmediately(); } } System/Skill/SkillAccordWin.cs
@@ -89,6 +89,10 @@ m_SkillMatch.AddListener(() => { WindowCenter.Instance.Open("SkillMatchWin"); if (model.skillMatchRedpointable) { model.skillMatchRedpointable = false; } }); for (int i = 0; i < m_QuickSkills.Count; i++) { System/Skill/SkillCell.cs
@@ -13,15 +13,19 @@ [SerializeField] SkillData skill; [SerializeField] RedpointBehaviour m_Redpoint; public SkillData skillData { get { public SkillData skillData { get { return skill; } } SkillModel m_Model; SkillModel model { get { SkillModel model { get { return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<SkillModel>()); } } @@ -37,13 +41,16 @@ public void OnPointerDown(PointerEventData eventData) { skill.m_SkillBtn.OnPointerClick(eventData); if (model.skillDraging) { if (model.skillDraging) { return; } if (PlayerDatas.Instance.skill.GetSKillById(skill.skillId) == null) { if (PlayerDatas.Instance.skill.GetSKillById(skill.skillId) == null) { return; } if (model.GetXpSkillID() == skill.skillId) { if (model.IsXpSkill(skill.skillId)) { return; } onPress = true; @@ -66,10 +73,12 @@ public void Refresh(int skillId) { skill.SetSkillData(skillId); if (model.presentSltSkillID == skillId) { if (model.presentSltSkillID == skillId) { skill.m_SelectImg.gameObject.SetActive(true); } else { else { skill.m_SelectImg.gameObject.SetActive(false); } @@ -96,9 +105,11 @@ private void LateUpdate() { if (onPress && !model.skillDraging) { if (onPress && !model.skillDraging) { m_Time += Time.deltaTime; if (m_Time > model.onDragDelay) { if (m_Time > model.onDragDelay) { model.skillDragId = skill.skillId; model.skillDraging = true; m_Time = 0; System/Skill/SkillModel.cs
@@ -57,7 +57,18 @@ public int minTaskHole { get; private set; } public int maxTaskHole { get; private set; } public bool skillMatchRedpointable { get { return LocalSave.GetBool("SkillMatchRedpointable_" + PlayerDatas.Instance.baseData.PlayerID); } set { LocalSave.SetBool("SkillMatchRedpointable_" + PlayerDatas.Instance.baseData.PlayerID, value); UpdateSkillMatchRedpoint(); } } public readonly Redpoint redpoint = new Redpoint(103, 10301); public readonly Redpoint skillMatchRedpoint = new Redpoint(10301, 1030101); void ParseConfig() { @@ -193,6 +204,92 @@ return skill.GetSkillConfig(skill.level).SkillID; } return skillID; } public bool IsXpSkill(int skillId) { var config = SkillConfig.Get(skillId); if (config != null) { var job = PlayerDatas.Instance.baseData.Job; if (xpSkillsDic.ContainsKey(job)) { return xpSkillsDic[job] == config.SkillTypeID; } } return false; } void VerifyQuickSkillExistXp() { var quickSkills = PlayerDatas.Instance.skill.GetQuickSkills(); var existXp = false; var lastIndex = 0; foreach (var index in quickSkills.Keys) { if (quickSkills[index] != null) { if (IsXpSkill(quickSkills[index].id)) { existXp = true; QuickSetting.Instance.SetQuickSetting(QuickSetting.QuickSettingType.Skill, "***", index); continue; } if (existXp) { var temp = QuickSetting.Instance.GetQuickSetting(QuickSetting.QuickSettingType.Skill, index); QuickSetting.Instance.SetQuickSetting(QuickSetting.QuickSettingType.Skill, temp, index - 1); QuickSetting.Instance.SetQuickSetting(QuickSetting.QuickSettingType.Skill, "***", index); } lastIndex = index; } } if (existXp) { if (lastIndex == QUICK_SKILL_COUNT - 1) { var skills = GetActSkills(); for (int i = 0; i < skills.Count; i++) { if (PlayerDatas.Instance.skill.GetSKillById(skills[i]) != null && !IsXpSkill(skills[i]) && PlayerDatas.Instance.skill.ContainsQuickSkill(skills[i]) == -1) { string value = MathUtils.Convert10To64(skills[i]); QuickSetting.Instance.SetQuickSetting(QuickSetting.QuickSettingType.Skill, value, lastIndex); break; } } } QuickSetting.Instance.SendPackage(); PlayerDatas.Instance.skill.SetQuickSkills(); } } List<int> GetActSkills() { List<int> skills = new List<int>(); var skillType = (int)Math.Pow(2, PlayerDatas.Instance.baseData.Job); Dictionary<int, List<int>> dict = skillActDict[skillType]; foreach (int key in dict.Keys) { List<int> list = dict[key]; var skillId = list[0]; foreach (var id in list) { if (PlayerDatas.Instance.skill.GetSKillById(id) != null) { skillId = id; break; } } if (PlayerDatas.Instance.skill.GetFilterPlayerSkill(PlayerDatas.Instance.baseData.Job).Contains(skillId)) { continue; } skills.Add(skillId); } return skills; } #endregion @@ -545,6 +642,8 @@ } playerLoginOk = true; UpdateRedpoint(); VerifyQuickSkillExistXp(); UpdateSkillMatchRedpoint(); //UpdateTaskHoleRedpoint(); } @@ -659,6 +758,11 @@ } } void UpdateSkillMatchRedpoint() { skillMatchRedpoint.state = skillMatchRedpointable ? RedPointState.Simple : RedPointState.None; } public void SetDayRemind() { DayRemind.Instance.SetDayRemind(DayRemind.PASS_SKILL_REDPOINT, true); System/Skill/TreasureSkillModel.cs
@@ -269,6 +269,27 @@ return level; } public int GetSatisfyLevelUpMinCostSkillId() { var minCost = int.MaxValue; var minSkillId = 0; foreach (var skill in treasureSkills.Values) { var error = 0; if (TryLevelUpTreasureSkill(skill.skillId, out error) && skill.level > 0) { var config = skill.GetSkillConfig(skill.level + 1); if (config.ExAttr5 < minCost) { minCost = config.ExAttr5; minSkillId = skill.skillId; } } } return minSkillId; } public void OnReceivePackage(int oldSkillID, int newSkillID) { var config = SkillConfig.Get(newSkillID); @@ -565,12 +586,11 @@ void UpdateRedpoint() { var funcOpen = FuncOpen.Instance.IsFuncOpen(82); var satisfyLevelUpMinSkillId = GetSatisfyLevelUpMinCostSkillId(); foreach (var skill in treasureSkills.Values) { var error = 0; if (requireRemind && funcOpen && FuncOpen.Instance.IsFuncOpen(177) && TryLevelUpTreasureSkill(skill.skillId, out error) && skill.level > 0) && satisfyLevelUpMinSkillId == skill.skillId) { skill.levelUpRedpoint.state = RedPointState.Simple; }