Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0406_tagNPCAppear.cs
@@ -114,7 +114,7 @@ break; } } //Debug.Log("刷出助战的人...........: " + vNetData.ObjID); if (_findedInfo == null) { var _valueInfo = LocalSave.GetString("GA_NpcFightZZPlayer_" + vNetData.ObjID); @@ -124,7 +124,7 @@ if (!GA_NpcFightZZPlayer.s_UnCreateObjIDList.Contains(vNetData.ObjID)) { GA_NpcFightZZPlayer.s_UnCreateObjIDList.Add(vNetData.ObjID); Debug.LogFormat("添加: {0}", vNetData.ObjID); //Debug.LogFormat("添加: {0}", vNetData.ObjID); } else { Core/NetworkPackage/DTCFile/ServerPack/HA1_Sys/DTCA127_tagMCStartChangeMap.cs
@@ -150,6 +150,7 @@ } DTCB206_tagMCHelpBattleCallResult.s_CacheObjIdList.Clear(); GA_NpcFightZZPlayer.s_UnCreateObjIDList.Clear(); GA_NpcFightZZPlayer.cacheMapDataId = -1; break; default: ModelCenter.Instance.GetModel<DungeonModel>().ResetBufData(); Core/NetworkPackage/DTCFile/ServerPack/HB2_ActionMap/DTCB206_tagMCHelpBattleCallResult.cs
@@ -27,7 +27,7 @@ if (!s_CacheObjIdList.Contains(vNetData.ObjID)) { s_CacheObjIdList.Add(vNetData.ObjID); Debug.LogFormat("--------{0}:{1}", vNetData.ObjID, _content); //Debug.LogFormat("--------{0}:{1}", vNetData.ObjID, _content); } if (GA_NpcFightZZPlayer.s_UnCreateObjIDList.Contains(vNetData.ObjID)) Fight/GameActor/GA_NpcFightZZPlayer.cs
@@ -16,6 +16,8 @@ private H0406_tagNPCAppear m_H0406; private CmdManager m_CmdManager; public static int cacheMapDataId; protected override void OnInit(GameNetPackBasic package) { base.OnInit(package); @@ -48,7 +50,7 @@ m_CmdManager = new CmdManager(); Debug.LogFormat("-------- 关于助战类型的Init: {0}", m_H0406.ObjID); // Debug.LogFormat("-------- 关于助战类型的Init: {0}", m_H0406.ObjID); if (!s_UnCreateObjIDList.Contains(m_H0406.ObjID)) { @@ -58,7 +60,7 @@ string[] _values = _valueInfo.Split('|'); int _playerId = int.Parse(_values[0]); Debug.LogFormat("-------- _playerId: " + _playerId); // Debug.LogFormat("-------- _playerId: " + _playerId); SyncHelpBattle(_playerId); } @@ -67,12 +69,9 @@ public void SyncHelpBattle(int playerID) { var _model = ModelCenter.Instance.GetModel<RoleParticularModel>(); var _playerData = _model.GetViewPlayerData(playerID); if (_playerData == null && (playerID > 100)) if (m_ViewPlayerData == null && (playerID > 100)) { Debug.LogFormat("没有: {0} 信息数据, 这里获取", playerID); // Debug.LogFormat("没有: {0} 信息数据, 这里获取", playerID); CA212_tagCMViewPlayerInfo pak = new CA212_tagCMViewPlayerInfo(); pak.PlayerID = (uint)playerID; GameNetSystem.Instance.SendInfo(pak); @@ -99,8 +98,11 @@ // 读取配置表 if (_playerId >= 1 && _playerId <= 100) { var _mapDataId = PlayerDatas.Instance.baseData.MapID * 10 + PlayerDatas.Instance.baseData.dungeonLineId; var _config = Config.Instance.Get<TableConfig.DungeonHelpBattleConfig>(_mapDataId); if(cacheMapDataId <= 0) { cacheMapDataId = PlayerDatas.Instance.baseData.MapID * 10 + PlayerDatas.Instance.baseData.dungeonLineId; } var _config = Config.Instance.Get<TableConfig.DungeonHelpBattleConfig>(cacheMapDataId); ActorInfo.LV = (ushort)_config.RobotLV; ActorInfo.Job = byte.Parse(_values[1]); @@ -210,7 +212,7 @@ private void OnRevA705(HA705_tagSCQueryPlayerCacheResult package) { Debug.Log("延迟获取了数据: id为 " + package.PlayerID); // Debug.Log("延迟获取了数据: id为 " + package.PlayerID); DTCA705_tagSCQueryPlayerCacheResult.OnRevPackage -= OnRevA705; if (m_ViewPlayerData == null) @@ -251,6 +253,7 @@ DTCA705_tagSCQueryPlayerCacheResult.OnRevPackage -= OnRevA705; m_H0406 = null; m_CmdManager = null; m_ViewPlayerData = null; } public override void Destroy() Fight/GameActor/GActorPlayerBase.cs
@@ -2520,21 +2520,15 @@ switch (type) { case 1: if (m_ClothesModel) if (m_SecondaryModel != null) { _bindBone = m_ClothesModel.transform.GetChildTransformDeeply("Bip001 Spine"); _bindBone = m_SecondaryModel.transform; } break; case 2: if (m_WeaponModel != null) { _bindBone = m_WeaponModel.transform; } break; case 3: if (m_SecondaryModel != null) { _bindBone = m_SecondaryModel.transform; } break; case 4: System/DailyQuest/DailyQuestBehaviour.cs
@@ -284,6 +284,9 @@ case DailyQuestType.Trial: m_Func.gameObject.SetActive(state != DailyQuestModel.DailyQuestState.Locked); m_FuncDisplay.text = Language.Get("ItemHandle_exchange"); break; case DailyQuestType.DungeonAssist: m_Goto.gameObject.SetActive(true); m_Complete.gameObject.SetActive(false); break; default: System/Dungeon/AssistPlayerCell.cs
@@ -55,11 +55,8 @@ var realmConfig = Config.Instance.Get<RealmConfig>(playerInfo.RealmLV); realmIcon.SetSprite(realmConfig == null ? "NoRealm" : realmConfig.Img); fightPowerText.text = StringUtility.Contact(Language.Get("MainInterfacePanel_HeadPortraitTip_ZL"),playerInfo.FightPower); helpBtn.gameObject.SetActive(!playerInfo.IsGoldAssist); goldHelpBtn.gameObject.SetActive(playerInfo.IsGoldAssist); UpdateAssistState(playerInfo.PlayerID); jobNameText.text = OccupationNameConfig.GetOccupationName(playerInfo.Job,1); goldHelpText.text = assistModel.goldAssistPlayer.ToString(); UpdateAssistReward(); UpdateRelation(); int nirvanaLv = playerInfo.LV - friendsModel.OpenGreatLV; @@ -77,18 +74,29 @@ public void UpdateAssistState(int playerId) { if (playerInfo == null || playerInfo.PlayerID != playerId) return; helpBtn.RemoveAllListeners(); if (playerInfo.IsAssist) { helpBtn.gameObject.SetActive(true); goldHelpBtn.gameObject.SetActive(false); helpText.text = Language.Get("DungeonAssist122"); helpBgImg.material = MaterialUtility.GetDefaultSpriteGrayMaterial(); } else { helpBtn.AddListener(ClickHelp); helpText.text = Language.Get("DungeonAssist121"); helpBgImg.material = MaterialUtility.GetUIDefaultGraphicMaterial(); goldHelpBtn.gameObject.SetActive(playerInfo.IsGoldAssist); helpBtn.gameObject.SetActive(!playerInfo.IsGoldAssist); if (playerInfo.IsGoldAssist) { goldHelpText.text = assistModel.goldAssistPlayer.ToString(); } else { helpBtn.AddListener(ClickHelp); helpText.text = Language.Get("DungeonAssist121"); helpBgImg.material = MaterialUtility.GetUIDefaultGraphicMaterial(); } } }
@@ -10,7 +10,7 @@ { [XLua.Hotfix] [XLua.LuaCallCSharp] public class DungeonAssistModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk public class DungeonAssistModel : Model, IBeforePlayerDataInitialize,IAfterPlayerDataInitialize,IPlayerLoginOk { public string helpInfoLocalSave { get; private set; } public List<string> helpInfolist { get; private set; } @@ -35,11 +35,16 @@ SetRedpoint(); } public void OnPlayerLoginOk() public void OnAfterPlayerDataInitialize() { int playerId = (int)PlayerDatas.Instance.baseData.PlayerID; helpInfoLocalSave = StringUtility.Contact("HelpInfoLocalSave", playerId); GetLocalSaveData(); } public void OnPlayerLoginOk() { UpdateRedpoint(); UpdateMainAssistRedpoint(); } @@ -142,12 +147,16 @@ int vipLv = PlayerDatas.Instance.baseData.VIPLv; List<int> vipLvlist = vipDict.Keys.ToList(); vipLvlist.Sort(); int curAddCoins = 0; if(vipDict.ContainsKey(vipLv)) { curAddCoins = vipDict[vipLv]; } for(int i = 0; i < vipLvlist.Count; i++) { var lv = vipLvlist[i]; var addCoins = vipDict[lv]; if (lv > vipLv && addCoins > 0) if (lv > vipLv && addCoins > curAddCoins) { nextVipLv = lv; coins = addCoins; @@ -183,11 +192,16 @@ int vipLv = PlayerDatas.Instance.baseData.VIPLv; List<int> vipLvlist = vipDict.Keys.ToList(); vipLvlist.Sort(); int curAddRatio = 0; if (vipDict.ContainsKey(vipLv)) { curAddRatio = vipDict[vipLv]; } for (int i = 0; i < vipLvlist.Count; i++) { var lv = vipLvlist[i]; var addRatio = vipDict[lv]; if (lv > vipLv && addRatio > 0) if (lv > vipLv && addRatio > curAddRatio) { nextVipLv = lv; ratio = (float)addRatio/100; @@ -328,7 +342,7 @@ private void GetLocalSaveData() { string[] helpInfos = LocalSave.GeStringArray(helpInfoLocalSave); helpInfolist = helpInfos == null ? null : helpInfos.ToList(); helpInfolist = helpInfos == null ? new List<string>() : helpInfos.ToList(); } public void SetHelpInfoLocalSave(string createDate,string info,bool isNew) @@ -579,6 +593,7 @@ public void UpdateRedpoint() { checkInRedpoint.state = RedPointState.None; if (!FuncOpen.Instance.IsFuncOpen(151)) return; if(IsCheckInOk) @@ -593,6 +608,7 @@ public void UpdateMainAssistRedpoint() { main_AssistRedpoint.state = RedPointState.None; if (!FuncOpen.Instance.IsFuncOpen(151)) return; int newInfoNum = GetNewAssistInfoNum(); @@ -911,7 +927,7 @@ addCoins = assistModel.GetAssistReward(1); break; case RelatedToPlayer.Ally: addCoins = assistModel.GetAssistReward(1); addCoins = assistModel.GetAssistReward(2); break; } return addCoins; System/Dungeon/DungeonAssistWin.cs
@@ -22,6 +22,7 @@ [SerializeField] GameObject privilege_02; [SerializeField] GameObject privilege_01Max; [SerializeField] GameObject privilege_02Max; [SerializeField] GameObject noResultObj; DungeonAssistModel assistModel { get { return ModelCenter.Instance.GetModel<DungeonAssistModel>(); } } @@ -83,6 +84,8 @@ } resultCtrl.Restart(); } noResultObj.SetActive(resultlist == null || resultlist.Count < 1); } private void UpdateResult() @@ -164,6 +167,7 @@ private void ClickStore() { CloseClick(); WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.StoreFunc5); }
@@ -370,13 +370,31 @@ protected virtual void DrawGetXianYuanCoins() { var results = dungeonModel.dungeonResult.xianyuanCoin; bool isShow = m_ContainerXianyuanCoins == null || results == null || results.Length < 1 ? false : true; var fbEndInfo = dungeonModel.dungeonResult; var results = fbEndInfo.xianyuanCoin; bool isShow = true; if (fbEndInfo.dataMapID == 51010) { if (m_ContainerXianyuanCoins == null) { isShow = false; } } else { if(m_ContainerXianyuanCoins == null || results == null || results.Length < 1) { isShow = false; } } m_ContainerXianyuanCoins.gameObject.SetActive(isShow); if (!isShow) return; int getCoins = 0; int reason = 0; if(results.Length > 1) if(results != null && results.Length > 1) { getCoins = results[0]; reason = results[1]; @@ -396,6 +414,15 @@ case 2: m_XianyuanCoins.text = UIHelper.AppendStringColor(TextColType.Red, Language.Get("DungeonAssist144")); break; default: if(fbEndInfo.dataMapID == 51010) { if(fbEndInfo.startRewardLineID != 0) { m_XianyuanCoins.text = UIHelper.AppendStringColor(TextColType.Red, Language.Get("DungeonAssist146")); } } break; } } } System/MainInterfacePanel/MainInterfaceWin.cs
@@ -501,7 +501,7 @@ private void OnEnterOrExitArea(MapArea.E_Type _areaType, bool _enter) { // DesignDebug.LogError(_areaType + ".." + _enter); //DebugEx.LogError(_areaType + ".." + _enter); if (PlayerDatas.Instance.baseData.MapID == 10040 && _areaType != MapArea.E_Type.Boss && _enter) { DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)onMainModel.AreaState); @@ -515,15 +515,18 @@ int[] atkInt = pKModel.GetArea(config.AtkType).ToArray(); if (onMainModel.ShieldedArea.Contains(PlayerDatas.Instance.baseData.MapID) || fairyGrabBossModel.grabBossHintOpen) { return; //return; } if (atkInt.Length > 1 && Buffmodel.PkType != 5) else { onMainModel.AreaState = Buffmodel.PkType; DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)5); if (atkInt.Length > 1 && Buffmodel.PkType != 5) { onMainModel.AreaState = Buffmodel.PkType; DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)5); } } } if (_areaType == MapArea.E_Type.Neutral && !_enter) { System/Role/MagicianModel.cs
@@ -367,6 +367,10 @@ { WindowCenter.Instance.CloseImmediately<GodWeaponPreviewWin>(); } if (WindowCenter.Instance.IsOpen<HowToPlayWin>()) { WindowCenter.Instance.CloseImmediately<HowToPlayWin>(); } ActivateShow.GodWeaponStage(_type, _nowLv, _beforeLv); } return; @@ -383,6 +387,10 @@ { WindowCenter.Instance.CloseImmediately<GodWeaponPreviewWin>(); } if (WindowCenter.Instance.IsOpen<HowToPlayWin>()) { WindowCenter.Instance.CloseImmediately<HowToPlayWin>(); } ActivateShow.GodWeaponActivate(_type, _nowLv, _beforeLv); } } System/Role/MagicianWin.cs
@@ -18,6 +18,7 @@ [SerializeField] Button m_AutoHammer; [SerializeField] Text m_AutoHammerLabel; [SerializeField] Button m_Preview; [SerializeField] Button m_Rule; [SerializeField] Text m_PropertyTitle; [SerializeField] Text m_CostItemTitle; @@ -109,6 +110,7 @@ m_Hammer.onPress.AddListener(PressHammer); m_Preview.onClick.AddListener(Preview); m_AutoHammer.onClick.AddListener(AutoHammer); m_Rule.onClick.AddListener(OnRule); for (int i = 0; i < m_Items.Length; i++) { var index = i; @@ -1014,6 +1016,31 @@ return false; } private void OnRule() { var ruleId = 0; switch (model.selectType) { case 1: ruleId = 33; break; case 2: ruleId = 34; break; case 3: ruleId = 35; break; case 4: ruleId = 36; break; } if (ruleId != 0) { ModelCenter.Instance.GetModel<HowToPlayModel>().ruleId = ruleId; WindowCenter.Instance.Open<HowToPlayWin>(); } } bool HandleAchievement() { if (AchievementGoto.achievementType == AchievementGoto.GodWeapon)
