| Core/NetworkPackage/DTCFile/ServerPack/H01_System/DTC0102_tagCDBPlayer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Dogz/DogzModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/KnapSack/Logic/ItemTipsModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/RuneTower/RuneTowerSweepResultWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Strengthening/GodBeastAttributes.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Strengthening/GodBeastModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Strengthening/GodBeastReinforcementWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Team/TeamModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Core/NetworkPackage/DTCFile/ServerPack/H01_System/DTC0102_tagCDBPlayer.cs
@@ -189,6 +189,7 @@ } } DropItemManager.ReleaseAll(); DEBUG_STEP = 8; _hero.OnPathFindStop -= MapTransferUtility.Instance.OnHeroStopPathFind; _hero.OnPathFindStop += MapTransferUtility.Instance.OnHeroStopPathFind; System/Dogz/DogzModel.cs
@@ -9,6 +9,7 @@ public class DogzModel : Model,IBeforePlayerDataInitialize,IAfterPlayerDataInitialize,IPlayerLoginOk { PlayerPackModel playerPack { get { return ModelCenter.Instance.GetModel<PlayerPackModel>(); } } GodBeastModel beastModel { get { return ModelCenter.Instance.GetModel<GodBeastModel>(); } } public override void Init() { @@ -308,7 +309,8 @@ m_DogzEquipAttrDict.Clear(); DogzConfig dogzConfig = Config.Instance.Get<DogzConfig>(dogzId); int[] baseAttrIds = dogzConfig.BaseAttrTypes; for(int i = 0; i < baseAttrIds.Length; i++) Dictionary<int, int> dogzStrenDict = beastModel.AllEnhancedProperties(dogzId); for (int i = 0; i < baseAttrIds.Length; i++) { int attrValue = 0; List<ItemModel> itemModels = GetDogzEquips(dogzId); @@ -340,7 +342,10 @@ } } } if(dogzStrenDict.ContainsKey(baseAttrIds[i])) { attrValue += dogzStrenDict[baseAttrIds[i]]; } m_DogzEquipAttrDict.Add(baseAttrIds[i], attrValue); } return m_DogzEquipAttrDict; System/KnapSack/Logic/ItemTipsModel.cs
@@ -1689,6 +1689,7 @@ } RuneModel runeModel { get { return ModelCenter.Instance.GetModel<RuneModel>(); } } GodBeastModel beastModel { get { return ModelCenter.Instance.GetModel<GodBeastModel>(); } } public ItemAttrData(int id,bool isPreview = false,ulong count = 0,int index = -1, int isBind = 0,bool isCompare = false,PackType type = PackType.rptDeleted, string guid = "", Dictionary<int, List<int>> useDataDict = null,ItemTipChildType childType = ItemTipChildType.Normal) { @@ -1847,6 +1848,7 @@ { StrengthLV = GetUseDataModel((int)ItemUseDataKey.Def_IudetDogzEquipPlus)[0]; } strengthDataDict = beastModel.SiteEnhancementAttribute(type,index); } SetWinType(); System/RuneTower/RuneTowerSweepResultWin.cs
@@ -15,6 +15,7 @@ public class RuneTowerSweepResultWin : Window { [SerializeField] Button m_Skip; [SerializeField] Text m_Title; [SerializeField] ScrollRect m_ResultScrollRect; [SerializeField] Button m_Close; @@ -29,6 +30,7 @@ float floorHeight = 0; float totalResultHeight = 0; bool skip = false; #region Built-in protected override void BindController() @@ -39,10 +41,12 @@ { m_Close.AddListener(CloseClick); m_Continue.AddListener(Continue); m_Skip.AddListener(Skip); } protected override void OnPreOpen() { skip = false; m_Close.gameObject.SetActive(false); m_Continue.gameObject.SetActive(false); } @@ -72,7 +76,7 @@ private void ShowResults() { m_Title.text = Language.Get("RuneTowerSweepText9"); GeneSweepResultBehaviours(m_ResultScrollRect.content, runeTowerModel.towerSweepResults.Count); GenerateSweepResultBehaviours(m_ResultScrollRect.content, runeTowerModel.towerSweepResults.Count); for (int i = 0; i < resultBehavioursBuf.Count; i++) { var behaviour = resultBehavioursBuf[i]; @@ -100,7 +104,7 @@ StartCoroutine("Co_ShowResultTowerByTower"); } private void GeneSweepResultBehaviours(Transform _parent, int _needCount) private void GenerateSweepResultBehaviours(Transform _parent, int _needCount) { var currentCount = resultBehavioursBuf.Count; if (_needCount > currentCount) @@ -120,7 +124,7 @@ IEnumerator Co_ShowResultTowerByTower() { var raycastFilter = this.AddMissingComponent<CanvasRaycastFilter>(); var raycastFilter = m_ResultScrollRect.AddMissingComponent<CanvasRaycastFilter>(); raycastFilter.raycastTarget = false; foreach (var behaviour in resultBehavioursBuf) @@ -169,10 +173,23 @@ m_ResultScrollRect.content.anchoredPosition = m_ResultScrollRect.content.anchoredPosition.SetY(end); } if (skip) { break; } yield return WaitingForSecondConst.WaitMS500; } yield return null; for (int i = 0; i < count; i++) { resultBehavioursBuf[i].transform.localScale = Vector3.one; } if (!skip) { yield return null; } resultTotalBehaviour.transform.localScale = Vector3.one; resultTotalBehaviour.UpdateSizeAndPosition(); @@ -191,11 +208,16 @@ { m_ResultScrollRect.content.anchoredPosition = m_ResultScrollRect.content.anchoredPosition.SetY(y); } if (skip) { break; } yield return null; } m_ResultScrollRect.content.anchoredPosition = m_ResultScrollRect.content.anchoredPosition.SetY(end); foreach (var behaviour in resultBehavioursBuf) { behaviour.interactable = true; @@ -215,6 +237,11 @@ WindowCenter.Instance.Open<RuneTowerSweepBuyWin>(); } private void Skip() { skip = true; } } } System/Strengthening/GodBeastAttributes.cs
@@ -244,9 +244,10 @@ m_FullLevel.SetActive(false); int toLv = ToLv(ToExpTotal); m_LvNowText.text = "+" + DogZLv.ToString(); if (DogZLv == toLv) if (toLv <= DogZLv) { m_LvNextText.text = "+" + (toLv + 1).ToString(); m_LvNextText.text = "+" + (DogZLv + 1).ToString(); toLv = DogZLv + 1; } else { @@ -261,6 +262,8 @@ m_TextAttributesAdd1.gameObject.SetActive(false); m_TextAttributesAdd2.gameObject.SetActive(false); m_ExpNum.text = DogZExp + "/" + DogzEquipConfig.upExpTotal; float value = (float)DogZExp / DogzEquipConfig.upExpTotal; SetExperienceBar(DogZLv, value); if (AttType.Length > 1) { m_TextAttributes1.gameObject.SetActive(true); @@ -294,6 +297,8 @@ int[] AttValueTo = ConfigParse.GetMultipleStr<int>(DogzEquipToConfig.attValue); string strColor = string.Format(Language.Get("DogzGreenText"), ToExpTotal); m_ExpNum.text = DogZExp + strColor + "/" + DogzEquipConfig.upExpTotal; float value= (float)DogZExp / DogzEquipConfig.upExpTotal; SetExperienceBar(DogZLv, value); if (AttType.Length > 1) { m_TextAttributes1.gameObject.SetActive(true); @@ -382,6 +387,28 @@ DogZExp = IudetDogzEquipPlus[1]; } } int GodBeast_Number = 0; int GodBeast_Part = 0; private void SetExperienceBar(int lv,float value)//设置经验条 { if (GodBeast_Number != GodBeastNumber || GodBeast_Part != GodBeastPart) { GodBeast_Number = GodBeastNumber; GodBeast_Part = GodBeastPart; m_ExpSlider.stage = lv; m_ExpSlider.delay = 0f; m_ExpSlider.ResetStage(); m_ExpSlider.value = value; } else { m_ExpSlider.delay = 0.1f; m_ExpSlider.stage = lv; m_ExpSlider.value = value; } } } } System/Strengthening/GodBeastModel.cs
@@ -13,28 +13,32 @@ // 关于神兽强化 public class GodBeastModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk { public Dictionary<int, int> Absorption_Dic=new Dictionary<int, int>();//获取选择的物品 public Dictionary<int, int> Absorption_Dic = new Dictionary<int, int>();//获取选择的物品 public event Action AbsorbEvent; public int ItemInde=0;//物品下标 public int ItemInde = 0;//物品下标 public ItemModel Crystal_ItemModel; DogzModel Dogz_model; DogzModel dogz_model { get { return Dogz_model ?? (Dogz_model = ModelCenter.Instance.GetModel<DogzModel>()); } } PlayerPackModel _playerPack; PlayerPackModel playerPack { get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PlayerPackModel>()); } } public override void Init() { } public void OnBeforePlayerDataInitialize() { } public void OnPlayerLoginOk() { } public override void UnInit() { } public void AbsorbEventUpdate() @@ -44,6 +48,76 @@ AbsorbEvent(); } } private Dictionary<int, int> AllEnhancedPropertiesDic = new Dictionary<int, int>();//key:为属性编号，value是属性值 public Dictionary<int, int> AllEnhancedProperties(int GodBeastNumber)//获取整只神兽强化属性 { AllEnhancedPropertiesDic.Clear(); List<ItemModel> itemModel = dogz_model.GetDogzEquips(GodBeastNumber); if (itemModel == null) { return AllEnhancedPropertiesDic; } for (int i = 0; i < itemModel.Count; i++) { ItemModel item = itemModel[i]; var IudetDogzEquipPlus = item.GetUseDataModel((int)ItemUseDataKey.Def_IudetDogzEquipPlus); if (IudetDogzEquipPlus != null) { int lv = IudetDogzEquipPlus[0]; if (lv > 0) { var DogzEquipConfig = DogzEquipPlusConfig.GetEquipplaceAndLevel(item.EquipPlace, lv); int[] AttType = ConfigParse.GetMultipleStr<int>(DogzEquipConfig.attType); int[] AttValue = ConfigParse.GetMultipleStr<int>(DogzEquipConfig.attValue); for (int j = 0; j < AttType.Length; j++) { if (AllEnhancedPropertiesDic.ContainsKey(AttType[j])) { var value = AllEnhancedPropertiesDic[(AttType[j])]; AllEnhancedPropertiesDic[(AttType[j])] = value + AttValue[j]; } else { AllEnhancedPropertiesDic.Add(AttType[j], AttValue[j]); } } } } } return AllEnhancedPropertiesDic; } private Dictionary<int, int> SiteEnhancementAttributeDic = new Dictionary<int, int>();//key:为属性编号，value是属性值 public Dictionary<int, int> SiteEnhancementAttribute(PackType PackTypeGodBeast, int GodBeastIndex)//获取某只神兽身上某个装备属性值 { SiteEnhancementAttributeDic.Clear(); ItemModel item = playerPack.GetItemModelByIndex(PackTypeGodBeast, GodBeastIndex); if (item == null) { return SiteEnhancementAttributeDic; } var IudetDogzEquipPlus = item.GetUseDataModel((int)ItemUseDataKey.Def_IudetDogzEquipPlus); if (IudetDogzEquipPlus != null && IudetDogzEquipPlus[0] > 0) { var DogzEquipConfig = DogzEquipPlusConfig.GetEquipplaceAndLevel(item.EquipPlace, IudetDogzEquipPlus[0]); int[] AttType = ConfigParse.GetMultipleStr<int>(DogzEquipConfig.attType); int[] AttValue = ConfigParse.GetMultipleStr<int>(DogzEquipConfig.attValue); for (int j = 0; j < AttType.Length; j++) { if (SiteEnhancementAttributeDic.ContainsKey(AttType[j])) { SiteEnhancementAttributeDic[(AttType[j])] = AttValue[j]; } else { SiteEnhancementAttributeDic.Add(AttType[j], AttValue[j]); } } } return SiteEnhancementAttributeDic; } }
@@ -30,6 +30,8 @@ [SerializeField] GodBeastAttributes m_GodBeastAttributes; DogzModel Dogz_model; DogzModel dogz_model { get { return Dogz_model ?? (Dogz_model = ModelCenter.Instance.GetModel<DogzModel>()); } } PlayerPackModel _playerPack; PlayerPackModel playerPack { get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PlayerPackModel>()); } } public static event Action<int> ChooseToModify; private List<GodBeastClass> GodBeastList = new List<GodBeastClass>(); private int CurrentlySelected = 0; @@ -61,14 +63,25 @@ protected override void OnAfterOpen() { playerPack.RefreshItemCountAct += RefreshItemCountAct; } protected override void OnPreClose() { { playerPack.RefreshItemCountAct -= RefreshItemCountAct; m_ScrollerController.OnRefreshCell -= OnRefreshGridCell; } private void RefreshItemCountAct(PackType arg1, int arg2, int arg3) { if (arg1 == PackType.rptDogzEquip) { OnCreateGridLineCell(m_ScrollerController); m_GodBeastSlidingList.Init(); m_GodBeastAttributes.Init(); m_GodBeastAttributes.GetGodBeastLocationMarker(CurrentlySelected); } } protected override void OnAfterClose() { System/Team/TeamModel.cs
@@ -16,11 +16,9 @@ FriendsModel friendsModel { get { return ModelCenter.Instance.GetModel<FriendsModel>(); } } DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } } public bool autoAcceptApplication { public bool autoAcceptApplication { get { return (PlayerDatas.Instance.baseData.ExAttr2 / 10) % 10 == 0; } set { set { var sendInfo = new CB904_tagCMChangeTeamCheckState(); sendInfo.JoinReqCheck = (byte)(value ? 0 : 1); sendInfo.InviteCheck = (byte)(autoAcceptInvitation ? 0 : 1); @@ -28,11 +26,9 @@ } } public bool autoAcceptInvitation { public bool autoAcceptInvitation { get { return PlayerDatas.Instance.baseData.ExAttr2 % 10 == 0; } set { set { if ((PlayerDatas.Instance.baseData.ExAttr2 % 10 == 0) != value) { var sendInfo = new CB904_tagCMChangeTeamCheckState(); @@ -51,18 +47,15 @@ public Dictionary<int, TeamTargetPreference> targetPreferences = new Dictionary<int, TeamTargetPreference>(); MyTeam m_MyTeam = new MyTeam(); public MyTeam myTeam { public MyTeam myTeam { get { return m_MyTeam; } private set { m_MyTeam = value; } } TeamMission m_CurrentMission; public TeamMission currentMission { public TeamMission currentMission { get { return m_CurrentMission; } set { set { if (m_CurrentMission != value) { m_CurrentMission = value; @@ -71,11 +64,9 @@ } TeamMission m_MissionBuf = new TeamMission(CURRENTMAP_MISSION, 0); public TeamMission missionBuf { public TeamMission missionBuf { get { return m_MissionBuf; } set { set { m_MissionBuf = value; if (missionLevelLimitChangeEvent != null) { @@ -85,32 +76,27 @@ } int m_LevelMinBuf = 1; public int levelMinBuf { public int levelMinBuf { get { return m_LevelMinBuf; } set { m_LevelMinBuf = value; } } int m_LevelMaxBuf = 1; public int levelMaxBuf { public int levelMaxBuf { get { return m_LevelMaxBuf; } set { m_LevelMaxBuf = value; } } TeamInviteType m_CurrentInviteType = TeamInviteType.Friend; public TeamInviteType currentInviteType { public TeamInviteType currentInviteType { get { return m_CurrentInviteType; } private set { m_CurrentInviteType = value; } } int m_CurrentSelectedInvitation = 0; public int currentSelectedInvitation { public int currentSelectedInvitation { get { return m_CurrentSelectedInvitation; } set { set { if (m_CurrentSelectedInvitation != value) { m_CurrentSelectedInvitation = value; @@ -126,11 +112,9 @@ public DateTime matchingEndTime { get; private set; } bool m_IsMatching = false; public bool isMatching { public bool isMatching { get { return m_IsMatching; } set { set { if (m_IsMatching != value) { m_IsMatching = value; @@ -168,15 +152,13 @@ } DateTime m_PrepareBeginTime; public DateTime prepareBeginTime { public DateTime prepareBeginTime { get { return m_PrepareBeginTime; } private set { m_PrepareBeginTime = value; } } TeamPrepare m_TeamPreapare = new TeamPrepare(); public TeamPrepare teamPrepare { public TeamPrepare teamPrepare { get { return m_TeamPreapare; } private set { m_TeamPreapare = value; } } @@ -408,21 +390,8 @@ case 311101: if (Config.Instance.Get<RealmConfig>(PlayerDatas.Instance.baseData.realmLevel).IsBigRealm == 1) { var index = 0; foreach (var item in Config.Instance.GetAllValues<RealmConfig>()) { if (item.IsBigRealm == 1) { index++; } if (item.Lv == PlayerDatas.Instance.baseData.realmLevel) { break; } } if (index <= 2) var index = GetBigRealmIndex(); if (index == 1 || index == 2) { invite = true; int.TryParse(json["311101"][index - 1].ToString(), out level); @@ -450,7 +419,7 @@ } } var content = Language.Get("WorldInvite", missionName, levelRequirement); var content = Language.Get(dungeonId == 311101 ? "RealmTeamWorldInvite" : "WorldInvite", missionName, levelRequirement); ChatCtrl.Inst.SendInvite(content); SysNotifyMgr.Instance.ShowTip("SendWorldMessage"); } @@ -948,6 +917,16 @@ if (!oldInTeam && myTeam.inTeam) { var dungeonId = dungeonModel.DungeonMap(myTeam.mission.mapId, myTeam.mission.mapEx); if (dungeonId == 311101) { var bigRealmIndex = GetBigRealmIndex(); if (bigRealmIndex == 1 || bigRealmIndex == 2) { RequestWorldInvite(); } } if (createTeamEvent != null) { createTeamEvent(); @@ -1185,6 +1164,28 @@ } } private int GetBigRealmIndex() { var index = 0; if (Config.Instance.Get<RealmConfig>(PlayerDatas.Instance.baseData.realmLevel).IsBigRealm == 1) { foreach (var item in Config.Instance.GetAllValues<RealmConfig>()) { if (item.IsBigRealm == 1) { index++; } if (item.Lv == PlayerDatas.Instance.baseData.realmLevel) { break; } } } return index; } public bool autoHandupRecord = false; public int moveToNPCRecord = 0; public void RecordHeroAI()
