Core/GameEngine/Login/LaunchPostProcess.cs
@@ -28,7 +28,7 @@ try { Config.Instance.ConfigParsePostProcess(); GeneralConfig.Instance.Init(); GeneralDefine.Init(); InGameDownLoad.Instance.ParseRewardConfig(); ModelCenter.Instance.Init(); SkillHelper.Instance.Init(); Core/GameEngine/Model/Player/Skill/PlayerSkillDatas.cs
@@ -67,9 +67,9 @@ UpdateQuickSkill(data); for (int i = 0; i < GeneralConfig.Instance.EarlierGetTreasure.Count; i++) for (int i = 0; i < GeneralDefine.EarlierGetTreasure.Count; i++) { var _treasureId = GeneralConfig.Instance.EarlierGetTreasure[i]; var _treasureId = GeneralDefine.EarlierGetTreasure[i]; var _mapId = treasureModel.GetMapIdByTreasure(_treasureId); if (PlayerDatas.Instance.baseData.MapID == _mapId) { Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0419_tagPlayerReborn.cs
@@ -59,7 +59,7 @@ case 0: if (DungeonStage.CurrentMapType != MapType.OpenCountry) { if (GeneralConfig.Instance.RebornAutoFightMapID.Contains(PlayerDatas.Instance.baseData.MapID)) if (GeneralDefine.RebornAutoFightMapID.Contains(PlayerDatas.Instance.baseData.MapID)) { _hero.Behaviour.StartHandupAI(); } Core/NetworkPackage/DTCFile/ServerPack/H06_PlayerVsNPC/DTC0614_tagUseSkillPos.cs
@@ -117,7 +117,7 @@ { if (vNetData.ObjID == PlayerDatas.Instance.PlayerId) { if (GeneralConfig.Instance.PassiveSkillShow.Contains(_skill.id)) if (GeneralDefine.PassiveSkillShow.Contains(_skill.id)) { HeadUpSkillName.Popup(_skill.id, _attacker.MP_Name1.position, CameraController.Instance.CameraObject); } Core/ResModule/GameObjectPoolManager.cs
@@ -147,8 +147,8 @@ public GameObject RequestDefaultPet() { GameObject _prefab = InstanceResourcesLoader.LoadMob(GeneralConfig.Instance.ModeDefaultConfig[2][0], GeneralConfig.Instance.ModeDefaultConfig[2][1]); GameObject _prefab = InstanceResourcesLoader.LoadMob(GeneralDefine.ModeDefaultConfig[2][0], GeneralDefine.ModeDefaultConfig[2][1]); if (!_prefab) { @@ -157,16 +157,16 @@ GameObjectPool _pool = RequestPool(_prefab); _pool.assetName = GeneralConfig.Instance.ModeDefaultConfig[2][1]; _pool.assetBundleName = GeneralConfig.Instance.ModeDefaultConfig[2][0]; _pool.assetName = GeneralDefine.ModeDefaultConfig[2][1]; _pool.assetBundleName = GeneralDefine.ModeDefaultConfig[2][0]; return _pool.Request(); } public GameObject RequestDefaultFightNpc() { GameObject _prefab = InstanceResourcesLoader.LoadMob(GeneralConfig.Instance.ModeDefaultConfig[1][0], GeneralConfig.Instance.ModeDefaultConfig[1][1]); GameObject _prefab = InstanceResourcesLoader.LoadMob(GeneralDefine.ModeDefaultConfig[1][0], GeneralDefine.ModeDefaultConfig[1][1]); if (!_prefab) { @@ -175,16 +175,16 @@ GameObjectPool _pool = RequestPool(_prefab); _pool.assetName = GeneralConfig.Instance.ModeDefaultConfig[1][1]; _pool.assetBundleName = GeneralConfig.Instance.ModeDefaultConfig[1][0]; _pool.assetName = GeneralDefine.ModeDefaultConfig[1][1]; _pool.assetBundleName = GeneralDefine.ModeDefaultConfig[1][0]; return _pool.Request(); } public GameObject RequestDefaultFuncNpc() { GameObject _prefab = InstanceResourcesLoader.LoadMob(GeneralConfig.Instance.ModeDefaultConfig[0][0], GeneralConfig.Instance.ModeDefaultConfig[0][1]); GameObject _prefab = InstanceResourcesLoader.LoadMob(GeneralDefine.ModeDefaultConfig[0][0], GeneralDefine.ModeDefaultConfig[0][1]); if (!_prefab) { @@ -193,16 +193,16 @@ GameObjectPool _pool = RequestPool(_prefab); _pool.assetName = GeneralConfig.Instance.ModeDefaultConfig[0][1]; _pool.assetBundleName = GeneralConfig.Instance.ModeDefaultConfig[0][0]; _pool.assetName = GeneralDefine.ModeDefaultConfig[0][1]; _pool.assetBundleName = GeneralDefine.ModeDefaultConfig[0][0]; return _pool.Request(); } public void ReleaseDefaultPet(GameObject go) { GameObject _prefab = InstanceResourcesLoader.LoadMob(GeneralConfig.Instance.ModeDefaultConfig[2][0], GeneralConfig.Instance.ModeDefaultConfig[2][1]); GameObject _prefab = InstanceResourcesLoader.LoadMob(GeneralDefine.ModeDefaultConfig[2][0], GeneralDefine.ModeDefaultConfig[2][1]); if (!_prefab) { return; @@ -218,8 +218,8 @@ public void ReleaseDefaultHorse(GameObject go) { GameObject _prefab = InstanceResourcesLoader.LoadMob(GeneralConfig.Instance.ModeDefaultConfig[3][0], GeneralConfig.Instance.ModeDefaultConfig[3][1]); GameObject _prefab = InstanceResourcesLoader.LoadMob(GeneralDefine.ModeDefaultConfig[3][0], GeneralDefine.ModeDefaultConfig[3][1]); if (!_prefab) { return; @@ -235,8 +235,8 @@ public void ReleaseDefaultFightNPC(GameObject go) { GameObject _prefab = InstanceResourcesLoader.LoadMob(GeneralConfig.Instance.ModeDefaultConfig[1][0], GeneralConfig.Instance.ModeDefaultConfig[1][1]); GameObject _prefab = InstanceResourcesLoader.LoadMob(GeneralDefine.ModeDefaultConfig[1][0], GeneralDefine.ModeDefaultConfig[1][1]); if (!_prefab) { @@ -253,8 +253,8 @@ public void ReleaseDefaultFuncNPC(GameObject go) { GameObject _prefab = InstanceResourcesLoader.LoadMob(GeneralConfig.Instance.ModeDefaultConfig[0][0], GeneralConfig.Instance.ModeDefaultConfig[0][1]); GameObject _prefab = InstanceResourcesLoader.LoadMob(GeneralDefine.ModeDefaultConfig[0][0], GeneralDefine.ModeDefaultConfig[0][1]); if (!_prefab) { Core/ResModule/InstanceResourcesLoader.cs
@@ -29,49 +29,49 @@ public static RuntimeAnimatorController LoadDefaultMobAnimatorController_Fight() { return AnimatorControllerLoader.LoadMobController(AnimatorControllerLoader.controllerSuffix, GeneralConfig.Instance.ModeDefaultConfig[1][1]); GeneralDefine.ModeDefaultConfig[1][1]); } public static RuntimeAnimatorController LoadDefaultMobAnimatorController_Func() { return AnimatorControllerLoader.LoadMobController(AnimatorControllerLoader.controllerSuffix, GeneralConfig.Instance.ModeDefaultConfig[0][1]); GeneralDefine.ModeDefaultConfig[0][1]); } public static RuntimeAnimatorController LoadDefaultMobAnimatorController_Horse() { return AnimatorControllerLoader.LoadMobController(AnimatorControllerLoader.controllerSuffix, GeneralConfig.Instance.ModeDefaultConfig[3][1]); GeneralDefine.ModeDefaultConfig[3][1]); } public static RuntimeAnimatorController LoadDefaultMobAnimatorController_Pet() { return AnimatorControllerLoader.LoadMobController(AnimatorControllerLoader.controllerSuffix, GeneralConfig.Instance.ModeDefaultConfig[2][1]); GeneralDefine.ModeDefaultConfig[2][1]); } public static GameObject LoadDefaultFightNPC() { return LoadMob(GeneralConfig.Instance.ModeDefaultConfig[1][0], GeneralConfig.Instance.ModeDefaultConfig[1][1]); return LoadMob(GeneralDefine.ModeDefaultConfig[1][0], GeneralDefine.ModeDefaultConfig[1][1]); } public static GameObject LoadDefaultFuncNPC() { return LoadMob(GeneralConfig.Instance.ModeDefaultConfig[0][0], GeneralConfig.Instance.ModeDefaultConfig[0][1]); return LoadMob(GeneralDefine.ModeDefaultConfig[0][0], GeneralDefine.ModeDefaultConfig[0][1]); } public static GameObject LoadDefaultHorse() { return LoadMob(GeneralConfig.Instance.ModeDefaultConfig[3][0], GeneralConfig.Instance.ModeDefaultConfig[3][1]); return LoadMob(GeneralDefine.ModeDefaultConfig[3][0], GeneralDefine.ModeDefaultConfig[3][1]); } public static GameObject LoadDefaultPet() { return LoadMob(GeneralConfig.Instance.ModeDefaultConfig[2][0], GeneralConfig.Instance.ModeDefaultConfig[2][1]); return LoadMob(GeneralDefine.ModeDefaultConfig[2][0], GeneralDefine.ModeDefaultConfig[2][1]); } public static GameObject LoadNpcPrefab(int npcID) Fight/Actor/AI/HeroAI_Base.cs
@@ -160,7 +160,7 @@ GA_Hero _hero = PlayerDatas.Instance.hero; if ((!skillModel.AutoUseXp() || GeneralConfig.Instance.NoXpDungeons.Contains(PlayerDatas.Instance.baseData.MapID) || GeneralDefine.NoXpDungeons.Contains(PlayerDatas.Instance.baseData.MapID) || (_hero.SelectTarget != null && _hero.SelectTarget is GActorPlayerBase)) && !userClick) { return false; @@ -215,7 +215,7 @@ // 如果有守护 var _itemModel = _singleModel.GetItemModelByIndex((int)RoleEquipType.retSpiritAnimal); if (_itemModel != null // 有守护 && GeneralConfig.Instance.GuardianPickUpID.Contains(_itemModel.itemId))// 守护有拾取功能 && GeneralDefine.GuardianPickUpID.Contains(_itemModel.itemId))// 守护有拾取功能 { _needPickupSelf = false; } @@ -230,7 +230,7 @@ // 如果有守护 var _itemModel = _singleModel.GetItemModelByIndex((int)RoleEquipType.retSpiritAnimal); if (_itemModel != null // 有守护 && GeneralConfig.Instance.GuardianPickUpID.Contains(_itemModel.itemId))// 守护有拾取功能 && GeneralDefine.GuardianPickUpID.Contains(_itemModel.itemId))// 守护有拾取功能 { _needPickupSelf = false; } Fight/Actor/HeroBehaviour.cs
@@ -268,7 +268,7 @@ public int DoCommonAttack() { if (Time.realtimeSinceStartup - m_LastCommonAtkTime > GeneralConfig.Instance.ResetComAtkTime) if (Time.realtimeSinceStartup - m_LastCommonAtkTime > GeneralDefine.ResetComAtkTime) { m_Hero.nextComAtkIndex = 0; } @@ -1000,7 +1000,7 @@ if (!PreFightMission.Instance.IsFinished()) { _chkDistance = GeneralConfig.Instance.PrefightAtkRange; _chkDistance = GeneralDefine.PrefightAtkRange; } SkillHelper.EffectValue _effectValue; Fight/Actor/Skill/AttackHandler.cs
@@ -25,11 +25,11 @@ int _hitEffectId = -1; Skill _skill = attacker.SkillMgr.Get(skillID); foreach (var _buffId in GeneralConfig.Instance.BuffToHitEffect.Keys) foreach (var _buffId in GeneralDefine.BuffToHitEffect.Keys) { if (_skill.cacheBuffList.Contains(_buffId)) { _hitEffectId = GeneralConfig.Instance.BuffToHitEffect[_buffId]; _hitEffectId = GeneralDefine.BuffToHitEffect[_buffId]; break; } } Fight/Actor/State/SMB/AirRun_9.cs
@@ -20,7 +20,7 @@ { if (m_SendOnce == false) { if (Time.time - m_CalculateRideTime > GeneralConfig.Instance.autoRideHorse) if (Time.time - m_CalculateRideTime > GeneralDefine.autoRideHorse) { DTC0428_tagPlayerRideHorse.Send_tagPlayerRideHorse(true); m_SendOnce = true; Fight/Actor/State/SMB/Idle_0.cs
@@ -17,7 +17,7 @@ GA_Pet _pet = owner as GA_Pet; if (_pet != null) { if (Time.time - m_LastDanceTime > GeneralConfig.Instance.PetDanceInterval) if (Time.time - m_LastDanceTime > GeneralDefine.PetDanceInterval) { _pet.Play(GAStaticDefine.State_Dance); m_LastDanceTime = Time.time; @@ -29,7 +29,7 @@ GA_NpcFunc _funcNpc = owner as GA_NpcFunc; if (_funcNpc != null && _funcNpc.NpcConfig.NPCType == 0) { if (Time.time - m_LastDanceTime > GeneralConfig.Instance.FuncNpcDanceInterval) if (Time.time - m_LastDanceTime > GeneralDefine.FuncNpcDanceInterval) { _funcNpc.Play(GAStaticDefine.State_Dance); m_LastDanceTime = Time.time; Fight/Actor/State/SMB/RunBase.cs
@@ -18,7 +18,7 @@ if (owner.destForward != Vector3.zero) { Quaternion _q = Quaternion.LookRotation(owner.destForward, Vector3.up); owner.Rotation = Quaternion.RotateTowards(owner.Rotation, _q, GeneralConfig.Instance.RotateSpeed); owner.Rotation = Quaternion.RotateTowards(owner.Rotation, _q, GeneralDefine.RotateSpeed); } Vector3 _position = owner.Pos; Fight/Actor/State/SMB/Run_1.cs
@@ -21,7 +21,7 @@ { if (m_SendOnce == false) { if (Time.time - m_CalculateRideTime > GeneralConfig.Instance.autoRideHorse) if (Time.time - m_CalculateRideTime > GeneralDefine.autoRideHorse) { DTC0428_tagPlayerRideHorse.Send_tagPlayerRideHorse(true); m_SendOnce = true; Fight/BossFakeLineUtility.cs
@@ -16,8 +16,8 @@ bool m_ShowFakeLine = false; public bool showFakeLine { get { if (TimeUtility.OpenDay < GeneralConfig.Instance.bossShuntDays && GeneralConfig.Instance.neutralMaps.Contains(PlayerDatas.Instance.baseData.MapID)) if (TimeUtility.OpenDay < GeneralDefine.bossShuntDays && GeneralDefine.neutralMaps.Contains(PlayerDatas.Instance.baseData.MapID)) { return true; } @@ -40,7 +40,7 @@ public bool IsShuntBoss(int _bossId) { if (TimeUtility.OpenDay >= GeneralConfig.Instance.bossShuntDays) if (TimeUtility.OpenDay >= GeneralDefine.bossShuntDays) { return false; } @@ -48,7 +48,7 @@ { GAStaticDefine.NPCLocation location; var find = GAStaticDefine.TryGetMapNPCLocation(_bossId, out location); return find && GeneralConfig.Instance.bossShuntMaps.Contains(location.mapId); return find && GeneralDefine.bossShuntMaps.Contains(location.mapId); } }
@@ -11,15 +11,15 @@ { if (SystemSetting.Instance.GetCurrentQualityLevel() == GameQuality.High) { return GeneralConfig.Instance.highQualityCount; return GeneralDefine.highQualityCount; } else if (SystemSetting.Instance.GetCurrentQualityLevel() == GameQuality.Medium) { return GeneralConfig.Instance.medQualityCount; return GeneralDefine.medQualityCount; } else { return GeneralConfig.Instance.lowQualityCount; return GeneralDefine.lowQualityCount; } } } Fight/GameActor/GAStaticDefine.cs
@@ -343,7 +343,7 @@ { if (target is GActorPlayerBase) { int[] _grounp = GeneralConfig.Instance.RealmGroup; int[] _grounp = GeneralDefine.RealmGroup; for (int i = 0; i < _grounp.Length; ++i) { if (PlayerDatas.Instance.baseData.realmLevel > _grounp[i]) @@ -367,7 +367,7 @@ { if (caster is GActorPlayerBase) { int[] _grounp = GeneralConfig.Instance.RealmGroup; int[] _grounp = GeneralDefine.RealmGroup; for (int i = 0; i < _grounp.Length; ++i) { if (caster.ActorInfo.realm > _grounp[i]) Fight/GameActor/GA_NpcClientFightBoss.cs
@@ -83,7 +83,7 @@ { base.PlayHurtAudio(attacker); if (Time.time - m_LastPlayTime > GeneralConfig.Instance.PlayBossHurtInterval) if (Time.time - m_LastPlayTime > GeneralDefine.PlayBossHurtInterval) { if (m_AudioSource) { Fight/GameActor/GA_NpcCollect.cs
@@ -195,7 +195,7 @@ { float _distSqrt = MathUtility.DistanceSqrtXZ(_hero.Pos, Pos); if (_distSqrt < Mathf.Pow(NpcConfig.ModelRadius + 0.4f + GeneralConfig.Instance.CloseNpcDist, 2)) if (_distSqrt < Mathf.Pow(NpcConfig.ModelRadius + 0.4f + GeneralDefine.CloseNpcDist, 2)) { Arrive(); } @@ -248,7 +248,7 @@ { float _distSqrt = MathUtility.DistanceSqrtXZ(_hero.Pos, Pos); if (_distSqrt < Mathf.Pow(NpcConfig.ModelRadius + 0.4f + GeneralConfig.Instance.CloseNpcDist, 2)) if (_distSqrt < Mathf.Pow(NpcConfig.ModelRadius + 0.4f + GeneralDefine.CloseNpcDist, 2)) { Arrive(); } @@ -277,7 +277,7 @@ { base.OnClick(); if (!GeneralConfig.Instance.SpecialNpcIDs.Contains(NpcConfig.NPCID)// 不是特殊npc if (!GeneralDefine.SpecialNpcIDs.Contains(NpcConfig.NPCID)// 不是特殊npc && !m_CanCollect) { return; Fight/GameActor/GA_NpcFightBoss.cs
@@ -91,7 +91,7 @@ { base.PlayHurtAudio(attacker); if (Time.time - m_LastPlayTime > GeneralConfig.Instance.PlayBossHurtInterval) if (Time.time - m_LastPlayTime > GeneralDefine.PlayBossHurtInterval) { if (m_AudioSource) { Fight/GameActor/GA_NpcFunc.cs
@@ -97,7 +97,7 @@ // 这里判断是否要走向此对象 float _distSqrt = MathUtility.DistanceSqrtXZ(_hero.Pos, Pos); if (_distSqrt > Mathf.Pow(GeneralConfig.Instance.CloseNpcDist + NpcConfig.ModelRadius + 0.4f, 2)) if (_distSqrt > Mathf.Pow(GeneralDefine.CloseNpcDist + NpcConfig.ModelRadius + 0.4f, 2)) { MapTransferUtility.Instance.MoveToNPC(NpcConfig.NPCID, (int)ServerInstID); } Fight/GameActor/GA_Player.cs
@@ -246,7 +246,7 @@ //if (_dir != Vector3.zero) //{ // Quaternion _quaternion = Quaternion.LookRotation(_dir, Vector3.up); // Rotation = Quaternion.RotateTowards(Rotation, _quaternion, GeneralConfig.Instance.RotateSpeed); // Rotation = Quaternion.RotateTowards(Rotation, _quaternion, GeneralDefine.RotateSpeed); // destForward = _dir; //}
@@ -459,7 +459,7 @@ if (_dir != Vector3.zero) { Quaternion _quaternion = Quaternion.LookRotation(_dir, Vector3.up); Rotation = Quaternion.RotateTowards(Rotation, _quaternion, GeneralConfig.Instance.RotateSpeed); Rotation = Quaternion.RotateTowards(Rotation, _quaternion, GeneralDefine.RotateSpeed); destForward = _dir; } float _deltaDis = ActorInfo.moveSpeed * Time.deltaTime; Fight/GameActor/GActorNpcNoFight.cs
@@ -84,9 +84,9 @@ RequestName(); // 这里针对指定的NPC特殊矫正位置 if (GeneralConfig.Instance.NpcPosOffset.ContainsKey(NpcConfig.NPCID)) if (GeneralDefine.NpcPosOffset.ContainsKey(NpcConfig.NPCID)) { Pos = GeneralConfig.Instance.NpcPosOffset[NpcConfig.NPCID]; Pos = GeneralDefine.NpcPosOffset[NpcConfig.NPCID]; } // 执行挖洞逻辑 Fight/MapTransferUtility.cs
@@ -318,10 +318,10 @@ { //Debug.LogFormat(" |-- 这是一只活动boss"); // 取得分线 if (GeneralConfig.Instance.fairyGrabBossMapLines != null) if (GeneralDefine.fairyGrabBossMapLines != null) { _lineID = GeneralConfig.Instance.fairyGrabBossMapLines.ContainsKey(_npcLocation.mapId) ? GeneralConfig.Instance.fairyGrabBossMapLines[_npcLocation.mapId] : 0; _lineID = GeneralDefine.fairyGrabBossMapLines.ContainsKey(_npcLocation.mapId) ? GeneralDefine.fairyGrabBossMapLines[_npcLocation.mapId] : 0; // 如果当前处于不同的分线, 则下面的处理中,地图ID相同也切线 if (_lineID != PlayerDatas.Instance.baseData.FBID) { @@ -521,7 +521,7 @@ DTC0428_tagPlayerRideHorse.Send_tagPlayerRideHorse(true); } float _chkDist = Mathf.Max(GeneralConfig.Instance.CloseNpcDist + _config.ModelRadius - 0.3f, 0); float _chkDist = Mathf.Max(GeneralDefine.CloseNpcDist + _config.ModelRadius - 0.3f, 0); if (_config.NPCType == (int)E_NpcType.OpenWorldMap) { @@ -917,7 +917,7 @@ } else if (_npcConfig.NPCType == (int)E_NpcType.Collect) { float _chkDist = GeneralConfig.Instance.CloseNpcDist + _npcConfig.ModelRadius + 0.3f; float _chkDist = GeneralDefine.CloseNpcDist + _npcConfig.ModelRadius + 0.3f; if (_chkDistSqrt <= Mathf.Pow(_chkDist, 2)) { if (!UserInputHandler.isTouched @@ -929,7 +929,7 @@ } else { float _chkDist = GeneralConfig.Instance.CloseNpcDist + _npcConfig.ModelRadius + 0.3f; float _chkDist = GeneralDefine.CloseNpcDist + _npcConfig.ModelRadius + 0.3f; // 因为守护副本美术有挖洞, 洞太大了. 这里无法按照配置走,特殊处理 if (_npcConfig.NPCID == 32504001) { Fight/Stage/Dungeon/DungeonStage.cs
@@ -162,7 +162,7 @@ { var teamModel = ModelCenter.Instance.GetModel<TeamModel>(); var isPreparing = !teamModel.teamPrepare.IsAllOk() && !teamModel.teamPrepare.isError && !teamModel.teamPrepare.IsReject(); var prepareEndTime = teamModel.prepareBeginTime + new TimeSpan(GeneralConfig.Instance.teamReadyTime * TimeSpan.TicksPerSecond); var prepareEndTime = teamModel.prepareBeginTime + new TimeSpan(GeneralDefine.teamReadyTime * TimeSpan.TicksPerSecond); if (prepareEndTime > DateTime.Now) { WindowCenter.Instance.Open<TeamPrepareWin>(); Fight/Stage/Dungeon/GuardDungeonStage.cs
@@ -273,7 +273,7 @@ var showActor = showActors[i]; if (dungeonStage.guardNPCID == showActor.npcId) { dungeonStage.guardDialogueAbleTime = Time.time + GeneralConfig.Instance.guardBubbleInterval; dungeonStage.guardDialogueAbleTime = Time.time + GeneralDefine.guardBubbleInterval; var mountPoint = showActor.m_Model.transform.GetChildTransformDeeply("A_Name"); var index = dungeonStage.guardDialogueIndex % 5 + 1; @@ -327,8 +327,8 @@ guideTarget.transform.localScale = Vector3.zero; } xpSkillGuideTime = Time.time + GeneralConfig.Instance.xpGuideDelay; xpSkillGuideEndTime = xpSkillGuideTime + GeneralConfig.Instance.xpGuideDuration; xpSkillGuideTime = Time.time + GeneralDefine.xpGuideDelay; xpSkillGuideEndTime = xpSkillGuideTime + GeneralDefine.xpGuideDuration; } public void OnUpdate() @@ -358,7 +358,7 @@ { var actor = actors[i] as GActorNpcFight; if (actor != null && actor.NpcConfig.NPCID == GeneralConfig.Instance.guardDungeonCageNPCID) && actor.NpcConfig.NPCID == GeneralDefine.guardDungeonCageNPCID) { cageInvincibleEffect = SFXPlayUtility.Instance.PlayBattleEffect(3010, actor, 2f); break; @@ -440,7 +440,7 @@ var showActor = functionNpcs[i] as GA_NpcFunc; if (dungeonStage.guardNPCID == showActor.NpcConfig.NPCID) { dungeonStage.guardDialogueAbleTime = Time.time + GeneralConfig.Instance.guardBubbleInterval; dungeonStage.guardDialogueAbleTime = Time.time + GeneralDefine.guardBubbleInterval; var mountPoint = showActor.MP_Name; var index = dungeonStage.guardDialogueIndex % 5 + 1; @@ -482,7 +482,7 @@ public void OnUpdate() { PlayerDatas.Instance.hero.aiHandler.PriorityNpcID = GeneralConfig.Instance.guardDungeonCageNPCID; PlayerDatas.Instance.hero.aiHandler.PriorityNpcID = GeneralDefine.guardDungeonCageNPCID; if (Time.time > dungeonStage.guardDialogueAbleTime) { @@ -494,7 +494,7 @@ var showActor = functionNpcs[i] as GA_NpcFunc; if (dungeonStage.guardNPCID == showActor.NpcConfig.NPCID) { dungeonStage.guardDialogueAbleTime = Time.time + GeneralConfig.Instance.guardBubbleInterval; dungeonStage.guardDialogueAbleTime = Time.time + GeneralDefine.guardBubbleInterval; var mountPoint = showActor.MP_Name; var index = dungeonStage.guardDialogueIndex % 5 + 1; Fight/Stage/Dungeon/MapArea.cs
@@ -92,7 +92,7 @@ { PlayerDatas.Instance.hero.EnterArea((int)E_Type.Boss); PlayerDatas.Instance.hero.currentBossArea = this; //SoundPlayer.Instance.PlayBackGroundMusic(GeneralConfig.Instance.BossSound); //SoundPlayer.Instance.PlayBackGroundMusic(GeneralDefine.BossSound); } else { System/Achievement/AchievementData.cs
@@ -75,7 +75,7 @@ for (int i = 0; i < rewardCurrency.Length; i++) { int displayId = GeneralConfig.Instance.moneyDisplayIds.ContainsKey(rewardCurrency[i].id) ? GeneralConfig.Instance.moneyDisplayIds[rewardCurrency[i].id] : rewardCurrency[i].id; int displayId = GeneralDefine.moneyDisplayIds.ContainsKey(rewardCurrency[i].id) ? GeneralDefine.moneyDisplayIds[rewardCurrency[i].id] : rewardCurrency[i].id; items[index] = new Item(displayId, rewardCurrency[i].count); index++; } @@ -88,7 +88,7 @@ if (rewardExp > 0) { items[index] = new Item(GeneralConfig.Instance.expDisplayId, rewardExp); items[index] = new Item(GeneralDefine.expDisplayId, rewardExp); } return items; System/AssetVersion/InGameDownLoad.cs
@@ -454,17 +454,17 @@ return false; } if (GeneralConfig.Instance.inGameDownLoadLevelCheckPoints == null || GeneralConfig.Instance.inGameDownLoadLevelCheckPoints.Count == 0) if (GeneralDefine.inGameDownLoadLevelCheckPoints == null || GeneralDefine.inGameDownLoadLevelCheckPoints.Count == 0) { return false; } if (PlayerDatas.Instance.baseData.LV < GeneralConfig.Instance.inGameDownLoadLevelCheckPoints[0]) if (PlayerDatas.Instance.baseData.LV < GeneralDefine.inGameDownLoadLevelCheckPoints[0]) { return false; } if (PlayerDatas.Instance.baseData.LV < GeneralConfig.Instance.inGameDownLoadHighLevel) if (PlayerDatas.Instance.baseData.LV < GeneralDefine.inGameDownLoadHighLevel) { if (InGameDownTestUtility.enable) { @@ -497,14 +497,14 @@ public bool IsHighLevelPlayer() { if (GeneralConfig.Instance.inGameDownLoadLevelCheckPoints == null || GeneralConfig.Instance.inGameDownLoadLevelCheckPoints.Count == 0) if (GeneralDefine.inGameDownLoadLevelCheckPoints == null || GeneralDefine.inGameDownLoadLevelCheckPoints.Count == 0) { return false; } var level = PlayerDatas.Instance.baseData.LV; return level > GeneralConfig.Instance.inGameDownLoadHighLevel; return level > GeneralDefine.inGameDownLoadHighLevel; } private void OnPlayerLevelChange(PlayerDataRefresh refreshType) @@ -513,9 +513,9 @@ { case PlayerDataRefresh.LV: var level = PlayerDatas.Instance.baseData.LV; var count = GeneralConfig.Instance.inGameDownLoadLevelCheckPoints.Count; var lastLevelCheckPoint = GeneralConfig.Instance.inGameDownLoadLevelCheckPoints[count - 1]; if (GeneralConfig.Instance.inGameDownLoadLevelCheckPoints.Contains(level) || IsHighLevelPlayer()) var count = GeneralDefine.inGameDownLoadLevelCheckPoints.Count; var lastLevelCheckPoint = GeneralDefine.inGameDownLoadLevelCheckPoints[count - 1]; if (GeneralDefine.inGameDownLoadLevelCheckPoints.Contains(level) || IsHighLevelPlayer()) { if (CheckDominantDownLoad()) { @@ -529,7 +529,7 @@ private void OnMainTaskChange(int _taskId, int _state) { var mainTaskId = taskModel.currentMission; if (GeneralConfig.Instance.inGameDownLoadTaskCheckPoints.Contains(mainTaskId) if (GeneralDefine.inGameDownLoadTaskCheckPoints.Contains(mainTaskId) && taskModel.currentMissionState == 1) { if (CheckDominantDownLoad()) System/Chat/ChatFriendCell.cs
@@ -38,7 +38,7 @@ m_ImageFitter.FiterRealTxtWidth = m_ChatText.alignment == TextAnchor.UpperRight; m_VipText.text = chat.vipLv > 0 ? StringUtility.Contact("V", chat.vipLv) : string.Empty; m_NameText.text = chat.name; m_ChatIcon.SetSprite(GeneralConfig.Instance.GetJobHeadPortrait(chat.job, 0)); m_ChatIcon.SetSprite(GeneralDefine.GetJobHeadPortrait(chat.job, 0)); m_ChatText.text = chat.content; } } System/Chat/ChatMineVoiceCell.cs
@@ -48,7 +48,7 @@ m_ChatTxt.AutoNewLine = true; #endregion m_ChatIcon.SetSprite(GeneralConfig.Instance.GetJobHeadPortrait(_data.job, 0)); m_ChatIcon.SetSprite(GeneralDefine.GetJobHeadPortrait(_data.job, 0)); playerNameText.text = _data.name; if (_data.vipLv > 0) { System/Chat/ChatOtherVoiceCell.cs
@@ -40,7 +40,7 @@ }); m_ChatTxt.text = _data.content; m_Fitter.gameObject.SetActive(!string.IsNullOrEmpty(_data.content)); m_ChatIcon.SetSprite(GeneralConfig.Instance.GetJobHeadPortrait(_data.job, 0)); m_ChatIcon.SetSprite(GeneralDefine.GetJobHeadPortrait(_data.job, 0)); playerNameText.text = _data.name; if (_data.vipLv > 0) { System/Chat/ChatPlayerMineCell.cs
@@ -44,7 +44,7 @@ m_Fitter.FiterRealTxtWidth = chatText.alignment == TextAnchor.UpperRight; } chatText.AutoNewLine = true; chatIcon.SetSprite(GeneralConfig.Instance.GetJobHeadPortrait((_data as ChatUeseData).job, 0)); chatIcon.SetSprite(GeneralDefine.GetJobHeadPortrait((_data as ChatUeseData).job, 0)); #endregion Button headBtn = chatIcon.GetComponent<Button>(); headBtn.onClick.RemoveAllListeners(); System/Chat/ChatPlayerOtherCell.cs
@@ -48,7 +48,7 @@ { OnHeadIconClick(cell); }); chatIcon.SetSprite(GeneralConfig.Instance.GetJobHeadPortrait((_data as ChatUeseData).job, 0)); chatIcon.SetSprite(GeneralDefine.GetJobHeadPortrait((_data as ChatUeseData).job, 0)); playerNameText.text = (_data as ChatUeseData).name; if ((_data as ChatUeseData).vipLv > 0) { System/Chat/ChatRecentlyCell.cs
@@ -43,8 +43,8 @@ } m_Select.gameObject.SetActive(_playerId == ChatCtrl.Inst.PteChatID); m_PlayerName.text = _friendPlayer.PlayerName; m_LvSign.gameObject.SetActive(_friendPlayer.LV > GeneralConfig.Instance.greatMasterStartLV); var _lv = _friendPlayer.LV - GeneralConfig.Instance.greatMasterStartLV; m_LvSign.gameObject.SetActive(_friendPlayer.LV > GeneralDefine.greatMasterStartLV); var _lv = _friendPlayer.LV - GeneralDefine.greatMasterStartLV; m_LvText.text = (_lv > 0 ? _lv : _friendPlayer.LV).ToString(); m_DetailBtn.onClick.RemoveAllListeners(); m_DetailBtn.onClick.AddListener(() => System/Compose/New/ComposeEquipWin.cs
@@ -406,7 +406,7 @@ Button cellBtn = typeCell.GetComponent<Button>(); icon.SetSprite(tagChinItem.IconKey); bgIcon.SetItemBackGround(tagChinItem.ItemColor); nameText.text = GeneralConfig.Instance.equipPlaceNameDict[tagChinItem.EquipPlace]; nameText.text = GeneralDefine.equipPlaceNameDict[tagChinItem.EquipPlace]; cellBtn.RemoveAllListeners(); cellBtn.AddListener(()=> { ClickEquipTypeCell(tagItemCompound,index); System/DailyQuest/DailyQuestCalendarColumn.cs
@@ -23,9 +23,9 @@ { var dayOfWeek = (int)TimeUtility.ServerNow.DayOfWeek; m_Sign.gameObject.SetActive(m_DayOfWeek == dayOfWeek); for (int i = 0; i < GeneralConfig.Instance.dailyQuestOpenTime.Count; i++) for (int i = 0; i < GeneralDefine.dailyQuestOpenTime.Count; i++) { var timeNode = GeneralConfig.Instance.dailyQuestOpenTime[i]; var timeNode = GeneralDefine.dailyQuestOpenTime[i]; var quests = model.GetQuestByWeekTimeNode(m_DayOfWeek % 7, timeNode); if (quests != null) { System/DailyQuest/DailyQuestCalendarTimeNode.cs
@@ -19,10 +19,10 @@ for (int i = 0; i < m_TimeNodes.Length; i++) { var behaviour = m_TimeNodes[i]; if (i < GeneralConfig.Instance.dailyQuestOpenTime.Count) if (i < GeneralDefine.dailyQuestOpenTime.Count) { behaviour.gameObject.SetActive(true); var timeNode = GeneralConfig.Instance.dailyQuestOpenTime[i]; var timeNode = GeneralDefine.dailyQuestOpenTime[i]; var hour = timeNode / 60; var minute = timeNode % 60; m_TimeNodes[i].text = StringUtility.Contact(hour > 9 ? hour.ToString() : "0" + hour, ":", minute > 9 ? minute.ToString() : "0" + minute); System/DailyQuest/DailyQuestModel.cs
@@ -459,7 +459,7 @@ public Dictionary<int, List<int>> GetQuestByWeekTime(int _week) { var timeNodes = new Dictionary<int, List<int>>(); foreach (var item in GeneralConfig.Instance.dailyQuestOpenTime) foreach (var item in GeneralDefine.dailyQuestOpenTime) { timeNodes[item] = GetQuestByWeekTimeNode(_week, item); } @@ -493,7 +493,7 @@ switch (_refreshType) { case PlayerDataRefresh.LV: if (_value == GeneralConfig.Instance.dailyQuestRedpointLevelLimit) if (_value == GeneralDefine.dailyQuestRedpointLevelLimit) { UpdateRedpoints(); } @@ -544,7 +544,7 @@ dailyQuest.redpoint.state = RedPointState.None; break; default: if (PlayerDatas.Instance.baseData.LV <= GeneralConfig.Instance.dailyQuestRedpointLevelLimit if (PlayerDatas.Instance.baseData.LV <= GeneralDefine.dailyQuestRedpointLevelLimit && (dailyQuestState == DailyQuestState.CanBuyTimes || dailyQuestState == DailyQuestState.Normal)) { dailyQuest.redpoint.state = RedPointState.Simple; @@ -821,7 +821,7 @@ { case 11: var dailyQuestOpenTime = Config.Instance.Get<DailyQuestOpenTimeConfig>(config.RelatedID); if (completedTimes >= dailyQuestOpenTime.DayTimes + GeneralConfig.Instance.runeTowerSweepBuyTimes) if (completedTimes >= dailyQuestOpenTime.DayTimes + GeneralDefine.runeTowerSweepBuyTimes) { return DailyQuestState.Completed; } System/DogzDungeon/DogzDungeonModel.cs
@@ -117,12 +117,12 @@ public int GetRecommendNpc() { if (bigBoxCollectCount < GeneralConfig.Instance.dogzBoxLimit) if (bigBoxCollectCount < GeneralDefine.dogzBoxLimit) { return bigBoxNpcId; } if (wearyValue < GeneralConfig.Instance.bossWearyValues[2]) if (wearyValue < GeneralDefine.bossWearyValues[2]) { var playerLevel = PlayerDatas.Instance.baseData.LV; for (int i = sortedBossIds.Count - 1; i >= 0; i--) @@ -345,7 +345,7 @@ } else { var wearyValueLimit = GeneralConfig.Instance.bossWearyValues[2]; var wearyValueLimit = GeneralDefine.bossWearyValues[2]; redpoint.count = wearyValueLimit - wearyValue; }
@@ -290,7 +290,7 @@ case 2: m_ContainerBoxCollectWeary.gameObject.SetActive(true); m_ContainerBossKillWeary.gameObject.SetActive(false); var bigBoxCollectCountLimit = GeneralConfig.Instance.dogzBoxLimit; var bigBoxCollectCountLimit = GeneralDefine.dogzBoxLimit; m_BoxCollectWearyValue.text = StringUtility.Contact(model.bigBoxCollectCount, "/", bigBoxCollectCountLimit); m_BoxCollectWearyValue.colorType = model.bigBoxCollectCount >= bigBoxCollectCountLimit ? TextColType.Red : TextColType.DarkGreen; break; @@ -298,7 +298,7 @@ case 4: m_ContainerBoxCollectWeary.gameObject.SetActive(false); m_ContainerBossKillWeary.gameObject.SetActive(true); var wearyValueLimit = GeneralConfig.Instance.bossWearyValues[2]; var wearyValueLimit = GeneralDefine.bossWearyValues[2]; m_BossKillWearyValue.text = StringUtility.Contact(model.wearyValue, "/", wearyValueLimit); m_BossKillWearyValue.colorType = model.wearyValue >= wearyValueLimit ? TextColType.Red : TextColType.DarkGreen; break; System/Dungeon/AchieveTargetBehaviour.cs
@@ -47,8 +47,8 @@ switch (currentDungeonId) { case 31160: if (GeneralConfig.Instance.ancientGrandTotalAchievements.Contains(achieveId) || GeneralConfig.Instance.ancientContinueKillAchievements.Contains(achieveId)) if (GeneralDefine.ancientGrandTotalAchievements.Contains(achieveId) || GeneralDefine.ancientContinueKillAchievements.Contains(achieveId)) { ShowAncientAchieve(); } @@ -58,8 +58,8 @@ private void ShowAncientAchieve() { ParseAchieve(GeneralConfig.Instance.ancientGrandTotalAchievements, m_Achievements[0]); ParseAchieve(GeneralConfig.Instance.ancientContinueKillAchievements, m_Achievements[1]); ParseAchieve(GeneralDefine.ancientGrandTotalAchievements, m_Achievements[0]); ParseAchieve(GeneralDefine.ancientContinueKillAchievements, m_Achievements[1]); } private void ParseAchieve(List<int> _achieveList, AchievementDesc _achievement) System/Dungeon/DungeonAncientKingWin.cs
@@ -62,7 +62,7 @@ private void DisplayAward() { var awards = GeneralConfig.Instance.ancientKingAwards; var awards = GeneralDefine.ancientKingAwards; for (int i = 0; i < m_Items.Length; i++) { m_Items[i].cellBtn.RemoveAllListeners(); System/Dungeon/DungeonFightWin.cs
@@ -115,9 +115,9 @@ switch (dataMapId) { case 31080: if (!NewBieCenter.Instance.completeGuidesBuf.Contains(GeneralConfig.Instance.fairyLandGuideId)) if (!NewBieCenter.Instance.completeGuidesBuf.Contains(GeneralDefine.fairyLandGuideId)) { NewBieCenter.Instance.StartNewBieGuide(GeneralConfig.Instance.fairyLandGuideId); NewBieCenter.Instance.StartNewBieGuide(GeneralDefine.fairyLandGuideId); } break; } @@ -176,7 +176,7 @@ var dataMapId = model.GetDataMapIdByMapId(PlayerDatas.Instance.baseData.MapID); var config = Config.Instance.Get<DungeonOpenTimeConfig>(dataMapId); string language = string.Empty; if (dataMapId == GeneralConfig.Instance.ruinsTranscriptMapId) if (dataMapId == GeneralDefine.ruinsTranscriptMapId) { language = Language.Get(model.mission.lineID > main.LayerNumberNow ? "WHMJ_Quit2" : "WHMJ_Quit1"); } @@ -220,7 +220,7 @@ if (PlayerDatas.Instance.baseData.MapID == 31190) { m_ItemCollect.gameObject.SetActive(true); collectItem = GeneralConfig.Instance.kylinHomeCollectItems[model.currentDungeon.lineId]; collectItem = GeneralDefine.kylinHomeCollectItems[model.currentDungeon.lineId]; m_ItemCollect.Init(collectItem); } else @@ -378,7 +378,7 @@ private bool WHYJBool()//判断是否在娲皇遗迹副本 { var dataMapId = model.GetDataMapIdByMapId(PlayerDatas.Instance.baseData.MapID); if (dataMapId == GeneralConfig.Instance.ruinsTranscriptMapId) if (dataMapId == GeneralDefine.ruinsTranscriptMapId) { return true; } System/Dungeon/DungeonInspireWin.cs
@@ -253,7 +253,7 @@ bool InGuiding() { if (NewBieCenter.Instance.inGuiding && NewBieCenter.Instance.currentGuide == GeneralConfig.Instance.fairyLandGuideId) && NewBieCenter.Instance.currentGuide == GeneralDefine.fairyLandGuideId) { return true; } System/Dungeon/DungeonModel.cs
@@ -957,9 +957,9 @@ WindowCenter.Instance.Close<DungeonPickUpItemCoolDownWin>(); if (m_DungeonResult.dataMapID == 31080 && !NewBieCenter.Instance.completeGuidesBuf.Contains(GeneralConfig.Instance.fairyLandGuideId)) && !NewBieCenter.Instance.completeGuidesBuf.Contains(GeneralDefine.fairyLandGuideId)) { NewBieCenter.Instance.FinishNewBieGuide(GeneralConfig.Instance.fairyLandGuideId); NewBieCenter.Instance.FinishNewBieGuide(GeneralDefine.fairyLandGuideId); } if (m_DungeonResult.isPass == 1) System/Dungeon/DungeonSuppliesLackWin.cs
@@ -182,7 +182,7 @@ return config2.TicketPrice; case LackType.Kylin: case LackType.IceCrystal: return GeneralConfig.Instance.autoBuyItemPrices[0]; return GeneralDefine.autoBuyItemPrices[0]; case LackType.FairyLand: var dungeonId3 = dungeonModel.GetDungeonId(31080, 0); var config3 = Config.Instance.Get<DungeonConfig>(dungeonId3); System/Dungeon/DungeonSweepResultWin.cs
@@ -170,7 +170,7 @@ case 4: var cost = model.GetSweepCost(model.currentDungeon); var itemOwn = playerPack.GetItemCountByID(PackType.rptItem, cost.id); var moneyNeed = GeneralConfig.Instance.autoBuyItemPrices[0] * (cost.count - itemOwn); var moneyNeed = GeneralDefine.autoBuyItemPrices[0] * (cost.count - itemOwn); ConfirmCancel.ShowPopConfirm( Language.Get("Mail101"), Language.Get("MultipleSweep_Text3", cost.count - itemOwn, moneyNeed), System/Dungeon/DungeonSweepWin.cs
@@ -97,7 +97,7 @@ case 3: var cost = model.GetSweepCost(model.currentDungeon); var itemOwn = playerPack.GetItemCountByID(PackType.rptItem, cost.id); var moneyNeed = GeneralConfig.Instance.autoBuyItemPrices[0] * (cost.count - itemOwn); var moneyNeed = GeneralDefine.autoBuyItemPrices[0] * (cost.count - itemOwn); ConfirmCancel.ShowPopConfirm( Language.Get("Mail101"), Language.Get("MultipleSweep_Text3", cost.count - itemOwn, moneyNeed), System/Dungeon/NormalDungeonEntranceWin.cs
@@ -222,7 +222,7 @@ var error = 0; if (model.TestChallange(model.currentDungeon, out error)) { if (GeneralConfig.Instance.dungeonCanUseMoneyIds.Contains(model.currentDungeon.mapId)) if (GeneralDefine.dungeonCanUseMoneyIds.Contains(model.currentDungeon.mapId)) { CheckUseMoneyDungeon(model.currentDungeon); } @@ -233,7 +233,7 @@ } else { if (GeneralConfig.Instance.dungeonCanUseMoneyIds.Contains(model.currentDungeon.mapId) if (GeneralDefine.dungeonCanUseMoneyIds.Contains(model.currentDungeon.mapId) && error == 5) { CheckUseMoneyDungeon(model.currentDungeon); System/Dungeon/TrialDungeonEntranceWin.cs
@@ -146,10 +146,10 @@ star = 5; } m_GradeLimit.gameObject.SetActive(star < GeneralConfig.Instance.munekadolockLimit); if (star < GeneralConfig.Instance.munekadolockLimit) m_GradeLimit.gameObject.SetActive(star < GeneralDefine.munekadolockLimit); if (star < GeneralDefine.munekadolockLimit) { m_GradeLimit.text = Language.Get("TrialDungeonGradeLimit2", UIHelper.GetGrade(GeneralConfig.Instance.munekadolockLimit)); m_GradeLimit.text = Language.Get("TrialDungeonGradeLimit2", UIHelper.GetGrade(GeneralDefine.munekadolockLimit)); } UpdateDungeonTimes(model.GetTrialMaps()[0]); @@ -271,7 +271,7 @@ { star = 5; } if (star < GeneralConfig.Instance.munekadolockLimit) if (star < GeneralDefine.munekadolockLimit) { return false; } System/Dungeon/TrialDungeonSelectBehaviour.cs
@@ -120,10 +120,10 @@ m_LevelLimit.color = UIHelper.GetUIColor(TextColType.Red, true); SetImageGray(true); } else if (prestar < GeneralConfig.Instance.munekadolockLimit) else if (prestar < GeneralDefine.munekadolockLimit) { m_LevelLimit.text = Language.Get("TrialDungeonGradeLimit", Language.Get(StringUtility.Contact("Num_CHS_", config.LineID)), UIHelper.GetGrade(GeneralConfig.Instance.munekadolockLimit)); Language.Get(StringUtility.Contact("Num_CHS_", config.LineID)), UIHelper.GetGrade(GeneralDefine.munekadolockLimit)); m_LevelLimit.color = UIHelper.GetUIColor(TextColType.Red, true); SetImageGray(true); } @@ -134,9 +134,9 @@ SetImageGray(false); } if (GeneralConfig.Instance.trailBossHeadIcons.ContainsKey(_npcId)) if (GeneralDefine.trailBossHeadIcons.ContainsKey(_npcId)) { m_BossIcon.SetSprite(GeneralConfig.Instance.trailBossHeadIcons[_npcId]); m_BossIcon.SetSprite(GeneralDefine.trailBossHeadIcons[_npcId]); } var selected = m_TrailDungeonSelectWin.currentSelectDungeon == _dungeon; System/FairyAu/FairyGrabBossModel.cs
@@ -229,8 +229,8 @@ return; } var mapId = PlayerDatas.Instance.baseData.MapID; var grabBossLine = GeneralConfig.Instance.fairyGrabBossMapLines.ContainsKey(mapId) ? GeneralConfig.Instance.fairyGrabBossMapLines[mapId] : 0; var grabBossLine = GeneralDefine.fairyGrabBossMapLines.ContainsKey(mapId) ? GeneralDefine.fairyGrabBossMapLines[mapId] : 0; if (PlayerDatas.Instance.baseData.FBID != grabBossLine) { CloseGrabBossHint(); @@ -445,7 +445,7 @@ { lineId = 0; var mapId = PlayerDatas.Instance.baseData.MapID; var mapLinesDict = GeneralConfig.Instance.fairyGrabBossMapLines; var mapLinesDict = GeneralDefine.fairyGrabBossMapLines; if (mapLinesDict != null && mapLinesDict.ContainsKey(mapId)) { lineId = mapLinesDict[mapId]; @@ -659,8 +659,8 @@ return false; } var mapId = PlayerDatas.Instance.baseData.MapID; var grabBossLine = GeneralConfig.Instance.fairyGrabBossMapLines.ContainsKey(mapId) ? GeneralConfig.Instance.fairyGrabBossMapLines[mapId] : 0; var grabBossLine = GeneralDefine.fairyGrabBossMapLines.ContainsKey(mapId) ? GeneralDefine.fairyGrabBossMapLines[mapId] : 0; if (PlayerDatas.Instance.baseData.FBID != grabBossLine) { return false; System/FairyAu/FairyLeagueMap.cs
@@ -53,7 +53,7 @@ } var job = PlayerDatas.Instance.baseData.Job; m_HeroHead.SetSprite(GeneralConfig.Instance.GetJobHeadPortrait(job, 0)); m_HeroHead.SetSprite(GeneralDefine.GetJobHeadPortrait(job, 0)); if (fairyCrystalCfgs.Count == 0) { System/FairyAu/FairyLeagueResPointBehaviour.cs
@@ -278,7 +278,7 @@ } float _chkDistSqrt = MathUtility.DistanceSqrtXZ(_hero.Pos, _npc.Pos); float _chkDist = GeneralConfig.Instance.CloseNpcDist + _npcConfig.ModelRadius + 0.3f; float _chkDist = GeneralDefine.CloseNpcDist + _npcConfig.ModelRadius + 0.3f; if (_chkDistSqrt <= Mathf.Pow(_chkDist, 2)) { System/FairyAu/RedDetailsTipsWin.cs
@@ -150,11 +150,11 @@ } if (redPacket._DicRedGrabinfo[Index].PlayerJob > 10) { _redbag.HeadshotImage.SetSprite(GeneralConfig.Instance.GetJobHeadPortrait(redPacket._DicRedGrabinfo[Index].PlayerJob % 10, 0)); _redbag.HeadshotImage.SetSprite(GeneralDefine.GetJobHeadPortrait(redPacket._DicRedGrabinfo[Index].PlayerJob % 10, 0)); } else { _redbag.HeadshotImage.SetSprite(GeneralConfig.Instance.GetJobHeadPortrait(redPacket._DicRedBag[Index].PlayeJob, 0)); _redbag.HeadshotImage.SetSprite(GeneralDefine.GetJobHeadPortrait(redPacket._DicRedBag[Index].PlayeJob, 0)); } _redbag.BestLuck.SetActive(false); @@ -183,11 +183,11 @@ } if (redPacket._DicRedBag[_redID].PlayeJob > 10) { _HeadshotImage.SetSprite(GeneralConfig.Instance.GetJobHeadPortrait(redPacket._DicRedBag[_redID].PlayeJob % 10, 0)); _HeadshotImage.SetSprite(GeneralDefine.GetJobHeadPortrait(redPacket._DicRedBag[_redID].PlayeJob % 10, 0)); } else { _HeadshotImage.SetSprite(GeneralConfig.Instance.GetJobHeadPortrait(redPacket._DicRedBag[_redID].PlayeJob, 0)); _HeadshotImage.SetSprite(GeneralDefine.GetJobHeadPortrait(redPacket._DicRedBag[_redID].PlayeJob, 0)); } _NameText.text = redPacket._DicRedBag[_redID].Name + Language.Get("Z1056")+Language.Get("RedEnvelope_Z"); bool _self = false; System/FairyAu/RedOPenBGMWin.cs
@@ -40,11 +40,11 @@ } if (redPacket._DicRedBag[_redBagID].PlayeJob > 10) { _HeadshotImage.SetSprite(GeneralConfig.Instance.GetJobHeadPortrait(redPacket._DicRedBag[_redBagID].PlayeJob % 10, 0)); _HeadshotImage.SetSprite(GeneralDefine.GetJobHeadPortrait(redPacket._DicRedBag[_redBagID].PlayeJob % 10, 0)); } else { _HeadshotImage.SetSprite(GeneralConfig.Instance.GetJobHeadPortrait(redPacket._DicRedBag[_redBagID].PlayeJob, 0)); _HeadshotImage.SetSprite(GeneralDefine.GetJobHeadPortrait(redPacket._DicRedBag[_redBagID].PlayeJob, 0)); } _NameText.text = redPacket._DicRedBag[_redBagID].Name + Language.Get("Z1056"); var _wish = UIHelper.ServerStringTrim(redPacket._DicRedBag[_redBagID].Wish); System/FakeDungeon/FakeDemonJarDungeonStage.cs
@@ -270,8 +270,8 @@ while (_count > 0) { var index = (byte)(Random.Range(0, GeneralConfig.Instance.openJobs.Length)); var playerJob = (byte)GeneralConfig.Instance.openJobs[index]; var index = (byte)(Random.Range(0, GeneralDefine.openJobs.Length)); var playerJob = (byte)GeneralDefine.openJobs[index]; var playerName = StringUtility.Contact(RandomNameConfig.GetFirstName(playerJob), RandomNameConfig.GetSecondName(playerJob)); int[] equips = null; System/FindPrecious/DemonJarModel.cs
@@ -227,7 +227,7 @@ for (int i = 0; i < 5; i++) { var index = (byte)(UnityEngine.Random.Range(0, GeneralConfig.Instance.openJobs.Length)); var index = (byte)(UnityEngine.Random.Range(0, GeneralDefine.openJobs.Length)); var playerName = StringUtility.Contact(RandomNameConfig.GetFirstName(1), RandomNameConfig.GetSecondName(1)); var exitFakePlayer = false; @@ -266,7 +266,7 @@ var bossId = GetLatestUnLockBoss(); AutoSubscribeLastUnLockBoss(bossId); if (PlayerDatas.Instance.baseData.LV == GeneralConfig.Instance.demonJarRedPoint) if (PlayerDatas.Instance.baseData.LV == GeneralDefine.demonJarRedPoint) { UpdateRedpoint(); } @@ -341,7 +341,7 @@ private void OnDungeonRecordUpdate(int _dataMapId) { if (DEMONJAR_MAPID == _dataMapId && PlayerDatas.Instance.baseData.LV >= GeneralConfig.Instance.demonJarRedPoint) if (DEMONJAR_MAPID == _dataMapId && PlayerDatas.Instance.baseData.LV >= GeneralDefine.demonJarRedPoint) { UpdateRedpoint(); } @@ -349,7 +349,7 @@ private void OnDungeonBuyCount() { if (PlayerDatas.Instance.baseData.LV >= GeneralConfig.Instance.demonJarRedPoint) if (PlayerDatas.Instance.baseData.LV >= GeneralDefine.demonJarRedPoint) { UpdateRedpoint(); } System/FindPrecious/DemonJarWin.cs
@@ -109,7 +109,7 @@ if (!findPreciousModel.IsBossAlive(targetBoss)) { var priorConfig = Config.Instance.Get<NPCConfig>(targetBoss); if (priorConfig.NPCLV <= GeneralConfig.Instance.demonJarLevelLimit) if (priorConfig.NPCLV <= GeneralDefine.demonJarLevelLimit) { targetBoss = bosses[0]; for (int i = bosses.Count - 1; i >= 0; i--) @@ -218,7 +218,7 @@ if (TestEnterDungeon(out error)) { var config = Config.Instance.Get<DemonJarConfig>(model.selectedBoss); if (config.LineID == GeneralConfig.Instance.demonJarHintLineId && PlayerDatas.Instance.baseData.LV < GeneralConfig.Instance.demonJarHintLevelLimit) if (config.LineID == GeneralDefine.demonJarHintLineId && PlayerDatas.Instance.baseData.LV < GeneralDefine.demonJarHintLevelLimit) { var grade = dungeonModel.GetGrade(new Dungeon(DemonJarModel.DEMONJAR_MAPID, config.LineID)); if (grade <= 0) System/FindPrecious/ElderGodAngerWin.cs
@@ -109,8 +109,8 @@ private void DisplayAnger() { m_AngerSlider.value = (float)model.mission.score / GeneralConfig.Instance.elderGodAreaAngerTotal; m_AngerValue.text = StringUtility.Contact(model.mission.score, "/", GeneralConfig.Instance.elderGodAreaAngerTotal); m_AngerSlider.value = (float)model.mission.score / GeneralDefine.elderGodAreaAngerTotal; m_AngerValue.text = StringUtility.Contact(model.mission.score, "/", GeneralDefine.elderGodAreaAngerTotal); if (model.mission.score == 100) { @@ -121,24 +121,24 @@ else if (angerBuf == 0) { m_ElderGodBBContent.text = Language.Get("ElderGodBB1"); elderGodBBEndTime = Time.time + GeneralConfig.Instance.elderGodTalkingTime; elderGodBBEndTime = Time.time + GeneralDefine.elderGodTalkingTime; } else if (angerBuf < 75 && model.mission.score >= 75) { m_ElderGodBBContent.text = Language.Get("ElderGodBB4"); elderGodBBEndTime = Time.time + GeneralConfig.Instance.elderGodTalkingTime; elderGodBBEndTime = Time.time + GeneralDefine.elderGodTalkingTime; } else { if (model.mission.KillBOSS == GeneralConfig.Instance.elderGodBigBoss) if (model.mission.KillBOSS == GeneralDefine.elderGodBigBoss) { m_ElderGodBBContent.text = Language.Get("ElderGodBB3"); elderGodBBEndTime = Time.time + GeneralConfig.Instance.elderGodTalkingTime; elderGodBBEndTime = Time.time + GeneralDefine.elderGodTalkingTime; } else if (model.mission.KillBOSS != 0) { m_ElderGodBBContent.text = Language.Get("ElderGodBB2"); elderGodBBEndTime = Time.time + GeneralConfig.Instance.elderGodTalkingTime; elderGodBBEndTime = Time.time + GeneralDefine.elderGodTalkingTime; } }
@@ -40,7 +40,7 @@ try { rebornTime = Time.time + GeneralConfig.Instance.dungeonRebornClientTimes[ElderGodAreaModel.ELDERGODAREA_MAPID]; rebornTime = Time.time + GeneralDefine.dungeonRebornClientTimes[ElderGodAreaModel.ELDERGODAREA_MAPID]; if (rebornTime <= Time.time) { Reborn(); System/FindPrecious/FindPreciousModel.cs
@@ -556,7 +556,7 @@ { var worldBossConfig = Config.Instance.Get<WorldBossConfig>(bossId); currentNeutralMap = worldBossConfig.MapID == PlayerDatas.Instance.baseData.MapID; currentNeutralMap = currentNeutralMap && GeneralConfig.Instance.neutralMaps.Contains(worldBossConfig.MapID); currentNeutralMap = currentNeutralMap && GeneralDefine.neutralMaps.Contains(worldBossConfig.MapID); } if (currentNeutralMap) System/FindPrecious/IceCrystalScoreBehaviour.cs
@@ -16,11 +16,11 @@ public void Display(int _npcId) { var isIceCrystalNpc = GeneralConfig.Instance.iceCrystalMonsterScores.ContainsKey(_npcId); var isIceCrystalNpc = GeneralDefine.iceCrystalMonsterScores.ContainsKey(_npcId); this.gameObject.SetActive(isIceCrystalNpc); if (isIceCrystalNpc) { m_Score.text = GeneralConfig.Instance.iceCrystalMonsterScores[_npcId].ToString(); m_Score.text = GeneralDefine.iceCrystalMonsterScores[_npcId].ToString(); } }
@@ -36,7 +36,7 @@ get { return m_WearyValue; } set { m_WearyValue = value; var count = GeneralConfig.Instance.bossWearyValues[0] + extraBossWearyValue - m_WearyValue; var count = GeneralDefine.bossWearyValues[0] + extraBossWearyValue - m_WearyValue; worldBossRedPoint.count = count; worldBossRedPoint.state = count > 0 ? RedPointState.Quantity : RedPointState.None; if (bossWearyValueChangeEvent != null) System/FindPrecious/WorldBossWin.cs
@@ -43,7 +43,7 @@ protected override void OnPreOpen() { var wearyValueLimit = GeneralConfig.Instance.bossWearyValues[0] + model.extraBossWearyValue; var wearyValueLimit = GeneralDefine.bossWearyValues[0] + model.extraBossWearyValue; m_WearyValue.text = StringUtility.Contact(model.wearyValue, "/", wearyValueLimit); m_WearyValue.colorType = model.wearyValue >= wearyValueLimit ? TextColType.Red : TextColType.DarkGreen; } @@ -138,7 +138,7 @@ private void OnBossWearyValue() { m_WearyValue.text = StringUtility.Contact(model.wearyValue, "/", GeneralConfig.Instance.bossWearyValues[0] + model.extraBossWearyValue); m_WearyValue.text = StringUtility.Contact(model.wearyValue, "/", GeneralDefine.bossWearyValues[0] + model.extraBossWearyValue); } private bool TestGotoKillBoss(out int _error) System/FriendSystem/New/AddCell.cs
@@ -31,7 +31,7 @@ if (friendPlayer == null) return; nameText.text = friendPlayer.PlayerName; playerIcon.SetSprite(GeneralConfig.Instance.GetOtherJobHeadPortrait(friendPlayer.Job, 0)); playerIcon.SetSprite(GeneralDefine.GetOtherJobHeadPortrait(friendPlayer.Job, 0)); int nirvanaLv = friendPlayer.LV - friendsModel.OpenGreatLV; if (nirvanaLv > 0) System/FriendSystem/New/AddFriendTips.cs
@@ -157,7 +157,7 @@ Image titleIcon = cell.transform.Find("titleImage").GetComponent<Image>(); Image stateText = cell.transform.Find("StateText").GetComponent<Image>(); Image pictureIcon = cell.transform.Find("Picture/ChatIcon").GetComponent<Image>(); pictureIcon.SetSprite(GeneralConfig.Instance.GetOtherJobHeadPortrait(data.Job, 0)); pictureIcon.SetSprite(GeneralDefine.GetOtherJobHeadPortrait(data.Job, 0)); int nirvanaLv = data.LV - friendsModel.OpenGreatLV; if (nirvanaLv > 0) System/FriendSystem/New/FriendPanel.cs
@@ -351,7 +351,7 @@ Text isOnline = cell.transform.Find("OnText").GetComponent<Text>(); Image titleIcon = cell.transform.Find("titleImage").GetComponent<Image>(); Image pictureIcon = cell.transform.Find("Picture/ChatIcon").GetComponent<Image>(); pictureIcon.SetSprite(GeneralConfig.Instance.GetOtherJobHeadPortrait(data.Job,0)); pictureIcon.SetSprite(GeneralDefine.GetOtherJobHeadPortrait(data.Job,0)); int nirvanaLv = data.LV - friendsModel.OpenGreatLV; if (nirvanaLv > 0) { System/FriendSystem/New/PlayerInfoCell.cs
@@ -42,7 +42,7 @@ behaviour.redpointId = friendsModel.GetFriendRedPointId(type,playerId); nameText.text = friendPlayer.PlayerName; onlineText.text = friendsModel.GetOnlineType(friendPlayer.OnlineType); playerIcon.SetSprite(GeneralConfig.Instance.GetOtherJobHeadPortrait(friendPlayer.Job, 0)); playerIcon.SetSprite(GeneralDefine.GetOtherJobHeadPortrait(friendPlayer.Job, 0)); if(friendPlayer.OnlineType == 1) { System/GeneralConfig/GeneralDefine.cs
File was renamed from System/GeneralConfig/GeneralConfig.cs @@ -1,699 +1,699 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; using TableConfig; using System; using System.Text.RegularExpressions; using System.Linq; using Snxxz.UI; public class GeneralConfig : Singleton<GeneralConfig> { public int greatMasterStartLV { get; private set; } public int playerMaxLevel { get; private set; } public float potentialUpSuccessRecommend { get; private set; } public int[] kylinHomeCollectItems; public List<int> dailyQuestOpenTime; public int flyBootItemId { get; private set; } public int teamReadyTime { get; private set; } public int elderGodAreaAngerTotal { get; private set; } public float petRandomSpeak { get; private set; } public int[] openJobs { get; private set; } public int playerNameLength { get; private set; } public int guardDungeonCageNPCID { get; private set; } public float guardBubbleInterval { get; private set; } public List<int> autoOnHookMap { get; private set; } public float autoRideHorse { get; private set; } public Dictionary<int, string> equipPlaceNameDict { get; private set; } public Dictionary<int, int> moneyDisplayIds { get; private set; } public int expDisplayId { get; private set; } public float xpGuideDelay { get; private set; } public float xpGuideDuration { get; private set; } public Dictionary<int, string> trailBossHeadIcons { get; private set; } public Dictionary<int, string> godWeaponMobs { get; private set; } public float ResetComAtkTime { get; private set; } public int RotateSpeed { get; private set; } public float CloseNpcDist { get; private set; } public float FarawayNpcDist { get; private set; } public List<int> SpecialNpcIDs { get; private set; } public Dictionary<int, int> wingEquipLimits { get; private set; } public float PetDanceInterval { get; private set; } public float FuncNpcDanceInterval { get; private set; } public float audioScaleWhenFullScreenOn { get; private set; } public int ruinsTranscriptMapId { get; private set; } public List<int> GuardianPickUpID { get; private set; } public List<int> EarlierGetTreasure { get; private set; } public int BossSound { get; private set; } public Dictionary<int, int> iceCrystalMonsterScores { get; private set; } public float PlayBossHurtInterval { get; private set; } public List<int> NoXpDungeons { get; private set; } public List<int> RandomJobs { get; private set; } public int elderGodTalkingTime { get; private set; } public int elderGodBigBoss { get; private set; } public List<int> PassiveSkillShow { get; private set; } public List<int> bossShuntMaps { get; private set; } public int bossShuntDays { get; private set; } public Dictionary<int, int[]> itemDropEffect = new Dictionary<int, int[]>(); public Dictionary<int, int[]> xllyDropEffect = new Dictionary<int, int[]>(); public Dictionary<int, int[]> xqryDropEffect = new Dictionary<int, int[]>(); public Dictionary<int, List<int[]>> customDropEffect = new Dictionary<int, List<int[]>>(); public Dictionary<int, int> dropEffectQuality = new Dictionary<int, int>(); public Dictionary<int, int> BuffToHitEffect = new Dictionary<int, int>(); //参数int，int ，string 分别表示职业，转生等级，icon Dictionary<int, Dictionary<int, string>> jobHeadPortrait = new Dictionary<int, Dictionary<int, string>>(); Dictionary<int, Dictionary<int, string>> otherjobHeadPortrait = new Dictionary<int, Dictionary<int, string>>(); public Dictionary<int, int> bossWearyValues = new Dictionary<int, int>(); public Dictionary<int, Vector3> NpcPosOffset = new Dictionary<int, Vector3>(); public Dictionary<int, string> propertyIconDict = new Dictionary<int, string>(); public int demonJarHintLevelLimit { get; private set; } public int demonJarHintLineId { get; private set; } public int skillPanelUnLock { get; private set; } public int dailyQuestRedpointLevelLimit { get; private set; } public int lowHpRemind { get; private set; } public int munekadolockLimit { get; private set; } public int maxItemDropEffectCount { get; private set; } public int[] autoBuyItemIds; public int[] autoBuyItemPrices; public List<int> neutralMaps = new List<int>(); public List<int> neutralBossMaps = new List<int>(); public int demonJarRedPoint { get; private set; } public string LoadLV { get; private set; } public float mainWinSkillResetTime { get; private set; } public int OffLineTimeLackRemendLevelLimit { get; private set; } public Vector3 heroDialogueOffset { get; private set; } public Vector3 heroDialogueRotation { get; private set; } public float heroDialogueScale { get; private set; } public List<int> ancientGrandTotalAchievements { get; private set; } public List<int> ancientContinueKillAchievements { get; private set; } public int trialDungeonGroupChallengeTipLv { get; private set; } public int prayerRedpointLimitLv { get; private set; } public int demonJarLevelLimit { get; private set; } public int fairyLandGuideId = 82; public int specialGuide41Mission { get; private set; } public int specialGuide41Achievement { get; private set; } public int supremeRechargeVipLv { get; private set; } public int rechargeRedpointLv { get; private set; } public int rechargeRedpointMinLv { get; private set; } public int runeTowerSweepBuyTimes { get; private set; } public int runeTowerSweepBuyPrice { get; private set; } public int teamMatchingTimeOut { get; private set; } public List<int> inGameDownLoadLevelCheckPoints = null; public List<int> inGameDownLoadTaskCheckPoints = null; public int inGameDownLoadHighLevel { get; private set; } public List<int> worldBossNoRebornRemindMaps = null; public List<int> bossHomeNoRebornRemindMaps = null; public List<int> elderGodNoRebornRemindMaps = null; public List<int> demonJarNoRebornRemindMaps = null; public List<int> dogzNoRebornRemindMaps = null; public string[][] ModeDefaultConfig { get; private set; } public int[] RealmGroup { get; private set; } public float PrefightAtkRange { get; private set; } public Dictionary<int, string> multipleRealmImgDict { get; private set; } public int inGameDownLoadHighestLevelPoint { get; private set; } public List<int> dungeonCanUseMoneyIds { get; private set; } public int dogzBoxLimit { get; private set; } public Dictionary<int, int> dungeonRebornClientTimes { get; private set; } public int[] CompareEquipPlaces { get; private set; } public Dictionary<int, int> fairyGrabBossMapLines { get; private set; } public Dictionary<int, List<int>> DropItemEffectMapID { get; private set; } public List<int> RebornAutoFightMapID { get; private set; } public string teamWorldCall; public int teamWorldCallInviteCount; public List<Item> ancientKingAwards = new List<Item>(); public int lowQualityCount { get; private set; } public int medQualityCount { get; private set; } public int highQualityCount { get; private set; } public void Init() { try { CompareEquipPlaces = GetIntArray("EquipUpType"); greatMasterStartLV = GetInt("GreatMasterStartLV"); playerMaxLevel = GetInt("PlayerMaxLV"); potentialUpSuccessRecommend = GetFloat("SPSkillType", 2) * 0.0001f; kylinHomeCollectItems = GetIntArray("KirinNpc", 2); dailyQuestOpenTime = GetTimeArray("ActionTime", 1); flyBootItemId = GetInt("TransportPay"); teamReadyTime = GetInt("TeamReadyTime"); playerNameLength = GetInt("RoleNameLength"); elderGodAreaAngerTotal = GetInt("AngryAdd", 4); petRandomSpeak = GetFloat("PetRandomSpeak"); guardDungeonCageNPCID = GetInt("GuardFBCageNPCID"); guardBubbleInterval = GetFloat("GuardFBCageNPCID", 3); autoRideHorse = GetFloat("AutoRideHorseTime") * Constants.F_DELTA; moneyDisplayIds = ConfigParse.GetDic<int, int>(GetInputString("MoneyDisplayModel", 1)); expDisplayId = GetInt("MoneyDisplayModel", 2); openJobs = GetIntArray("OpenJob"); xpGuideDelay = GetFloat("GuideConfig"); xpGuideDuration = GetFloat("GuideConfig", 2); ResetComAtkTime = GetFloat("AtkWaitingTime"); autoOnHookMap = new List<int>(GetIntArray("AutoOnHookMap")); GuardianPickUpID = new List<int>(GetIntArray("GuardianPickUpID")); RotateSpeed = GetInt("RoleTurnedAngle"); CloseNpcDist = GetFloat("ConversationDistanc", 2); FarawayNpcDist = GetFloat("ConversationDistanc"); SpecialNpcIDs = new List<int>(GetIntArray("SpecialCollectNpcs", 1)); PetDanceInterval = GetInt("PetDanceInterval") * Constants.F_GAMMA; FuncNpcDanceInterval = GetInt("PetDanceInterval",2) * Constants.F_GAMMA; ruinsTranscriptMapId = GetInt("SpRewardMapID"); EarlierGetTreasure = new List<int>(GetIntArray("EarlierGetTreasure")); BossSound = GetInt("BossSound"); PlayBossHurtInterval = GetFloat("BossSound", 2); var jobHeadPortraitConfig1 = Config.Instance.Get<FuncConfigConfig>("Job1Head"); jobHeadPortrait[1] = ConfigParse.GetDic<int, string>(jobHeadPortraitConfig1.Numerical1); otherjobHeadPortrait[1] = ConfigParse.GetDic<int, string>(jobHeadPortraitConfig1.Numerical2); var jobHeadPortraitConfig2 = Config.Instance.Get<FuncConfigConfig>("Job2Head"); jobHeadPortrait[2] = ConfigParse.GetDic<int, string>(jobHeadPortraitConfig2.Numerical1); otherjobHeadPortrait[2] = ConfigParse.GetDic<int, string>(jobHeadPortraitConfig2.Numerical2); var jobHeadPortraitConfig3 = Config.Instance.Get<FuncConfigConfig>("Job3Head"); jobHeadPortrait[3] = ConfigParse.GetDic<int, string>(jobHeadPortraitConfig3.Numerical1); otherjobHeadPortrait[3] = ConfigParse.GetDic<int, string>(jobHeadPortraitConfig3.Numerical2); bossWearyValues = ConfigParse.GetDic<int, int>(GetInputString("KillBossCntLimit", 2)); wingEquipLimits = ConfigParse.GetDic<int, int>(GetInputString("WingRealmLimit", 1)); int i = 0; int[] equipPlaces = GetIntArray("EquipArea", 1); string[] equipPlacesNames = GetStringArray("EquipArea", 2); equipPlaceNameDict = new Dictionary<int, string>(); for (i = 0; i < equipPlaces.Length; i++) { if (!equipPlaceNameDict.ContainsKey(equipPlaces[i])) { equipPlaceNameDict.Add(equipPlaces[i], equipPlacesNames[i]); } else { DebugEx.LogError("EquipArea : 装备位置重复"); } } var _trailBossJson = LitJson.JsonMapper.ToObject(GetInputString("MuneKadoTrialBossHead", 1)); trailBossHeadIcons = new Dictionary<int, string>(); foreach (var _key in _trailBossJson.Keys) { var _npcId = int.Parse(_key); if (!trailBossHeadIcons.ContainsKey(_npcId)) { trailBossHeadIcons.Add(_npcId, _trailBossJson[_key].ToString()); } } var _godWeaponJson = LitJson.JsonMapper.ToObject(GetInputString("GodModel", 1)); godWeaponMobs = new Dictionary<int, string>(); foreach (var _key in _godWeaponJson.Keys) { var _godWeaponType = int.Parse(_key); if (!godWeaponMobs.ContainsKey(_godWeaponType)) { godWeaponMobs.Add(_godWeaponType, _godWeaponJson[_key].ToString()); } } audioScaleWhenFullScreenOn = GetFloat("AudioSound"); iceCrystalMonsterScores = ConfigParse.GetDic<int, int>(GetInputString("IceLodeNeedPoint", 2)); NoXpDungeons = new List<int>(GetIntArray("XpNoUseDungeon")); RandomJobs = new List<int>(GetIntArray("RandomJob")); elderGodTalkingTime = GetInt("ElderGodTalkingTime"); elderGodBigBoss = GetInt("ElderGodBigBoss"); PassiveSkillShow = new List<int>(GetIntArray("PassiveSkillShow")); FuncConfigConfig func = Config.Instance.Get<FuncConfigConfig>("NpcPosOffset"); LitJson.JsonData _data = LitJson.JsonMapper.ToObject(func.Numerical1); foreach (var _key in _data.Keys) { int _npcID = int.Parse(_key); double[] _pos = new double[2]; _pos[0] = (double)_data[_key][0]; _pos[1] = (double)_data[_key][1]; NpcPosOffset.Add(_npcID, new Vector3((float)_pos[0], 0, (float)_pos[1])); } FuncConfigConfig nxxdImg = Config.Instance.Get<FuncConfigConfig>("NXXDPicture"); LitJson.JsonData nxxdData = LitJson.JsonMapper.ToObject(nxxdImg.Numerical1); multipleRealmImgDict = new Dictionary<int, string>(); if (nxxdData.IsArray) { for (i = 0; i < nxxdData.Count; i++) { if (nxxdData[i].IsArray) { multipleRealmImgDict.Add(int.Parse(nxxdData[i][0].ToString()), nxxdData[i][1].ToString()); } } } bossShuntMaps = new List<int>(GetIntArray("BossShunt")); bossShuntDays = GetInt("BossShunt", 3); itemDropEffect.Clear(); func = Config.Instance.Get<FuncConfigConfig>("ItemEquipmentEffect"); _data = LitJson.JsonMapper.ToObject(func.Numerical1); List<string> _keys = new List<string>(_data.Keys); for (i = 0; i < _keys.Count; ++i) { int[] _props = new int[3]; for (int j = 0; j < 3; ++j) { _props[j] = (int)_data[_keys[i]][j]; } itemDropEffect[int.Parse(_keys[i])] = _props; } xllyDropEffect.Clear(); _data = LitJson.JsonMapper.ToObject(func.Numerical2); _keys.Clear(); _keys.AddRange(_data.Keys); for (i = 0; i < _keys.Count; ++i) { int[] _props = new int[3]; for (int j = 0; j < 3; ++j) { _props[j] = (int)_data[_keys[i]][j]; } xllyDropEffect[int.Parse(_keys[i])] = _props; } xqryDropEffect.Clear(); _data = LitJson.JsonMapper.ToObject(func.Numerical3); _keys.Clear(); _keys.AddRange(_data.Keys); for (i = 0; i < _keys.Count; ++i) { int[] _props = new int[3]; for (int j = 0; j < 3; ++j) { _props[j] = (int)_data[_keys[i]][j]; } xqryDropEffect[int.Parse(_keys[i])] = _props; } dropEffectQuality.Clear(); func = Config.Instance.Get<FuncConfigConfig>("IeemEquipmentEffectQuality"); _data = LitJson.JsonMapper.ToObject(func.Numerical1); _keys.Clear(); _keys.AddRange(_data.Keys); for (i = 0; i < _keys.Count; ++i) { dropEffectQuality[int.Parse(_keys[i])] = (int)_data[_keys[i]]; } customDropEffect.Clear(); func = Config.Instance.Get<FuncConfigConfig>("ItemEquipmentEffectItem"); _data = LitJson.JsonMapper.ToObject(func.Numerical1); _keys.Clear(); _keys.AddRange(_data.Keys); int[] _tmp = null; List<int[]> _content = null; for (i = 0; i < _keys.Count; ++i) { _content = new List<int[]>(); foreach (LitJson.JsonData _values in _data[_keys[i]]) { if (_values.IsArray) { _tmp = new int[2]; _tmp[0] = (int)_values[0]; _tmp[1] = (int)_values[1]; } else { _tmp = new int[1]; _tmp[0] = (int)_values; } _content.Add(_tmp); } customDropEffect.Add(int.Parse(_keys[i]), _content); } BuffToHitEffect.Clear(); func = Config.Instance.Get<FuncConfigConfig>("BuffToHitEffect"); if (!string.IsNullOrEmpty(func.Numerical1) && !string.IsNullOrEmpty(func.Numerical2)) { string[] _buffs = func.Numerical1.Split('|'); string[] _effects = func.Numerical2.Split('|'); for (i = 0; i < _buffs.Length; ++i) { BuffToHitEffect[int.Parse(_buffs[i])] = int.Parse(_effects[i]); } } demonJarHintLevelLimit = GetInt("DemonJarFirstRemin"); demonJarHintLineId = GetInt("DemonJarFirstRemin", 2); skillPanelUnLock = GetInt("SkillPanelUnlock"); dailyQuestRedpointLevelLimit = GetInt("DailyQuestRedPoint"); lowHpRemind = GetInt("LowHpRemind"); autoBuyItemIds = GetIntArray("BuyItemPrice", 1); autoBuyItemPrices = GetIntArray("BuyItemPrice", 2); neutralMaps.AddRange(GetIntArray("MapLine", 4)); neutralBossMaps.AddRange(GetIntArray("BossListMapID")); var _propertyIconCfg = Config.Instance.Get<FuncConfigConfig>("PropertyIcon"); var _propertyIconJson = LitJson.JsonMapper.ToObject(_propertyIconCfg.Numerical1); foreach (var _key in _propertyIconJson.Keys) { var _property = int.Parse(_key); propertyIconDict.Add(_property, _propertyIconJson[_key].ToString()); } munekadolockLimit = GetInt("MunekadoLockLimit"); demonJarRedPoint = GetInt("DemonJarRedPoint"); LoadLV = GetInputString("LoadLV"); mainWinSkillResetTime = GetFloat("AutomaticSwitch"); OffLineTimeLackRemendLevelLimit = GetInt("TJGLevelLimit"); heroDialogueOffset = GetInputString("NpcHalfLength", 1).Vector3Parse(); heroDialogueRotation = GetInputString("NpcHalfLength", 2).Vector3Parse(); heroDialogueScale = GetFloat("NpcHalfLength", 3); var ancientConfig = Config.Instance.Get<FuncConfigConfig>("ElderBattleTarget"); ancientGrandTotalAchievements = new List<int>(); ancientGrandTotalAchievements.AddRange(ConfigParse.GetMultipleStr<int>(ancientConfig.Numerical1)); ancientContinueKillAchievements = new List<int>(); ancientContinueKillAchievements.AddRange(ConfigParse.GetMultipleStr<int>(ancientConfig.Numerical2)); trialDungeonGroupChallengeTipLv = GetInt("SingleIntoFB"); prayerRedpointLimitLv = GetInt("PrayRedPoint"); demonJarLevelLimit = GetInt("DemonJarLevelLimit"); maxItemDropEffectCount = GetInt("ItemMaskEffect"); specialGuide41Mission = GetInt("SpecialGuide41", 1); specialGuide41Achievement = GetInt("SpecialGuide41", 2); supremeRechargeVipLv = GetInt("SupremeCTGVipLimit", 1); rechargeRedpointLv = GetInt("FirstPayRedPoint", 1); rechargeRedpointMinLv = GetInt("FirstPayRedPoint", 2); runeTowerSweepBuyTimes = GetInt("RuneTowerSweepBuy"); runeTowerSweepBuyPrice = GetInt("RuneTowerSweepBuy", 2); teamMatchingTimeOut = GetInt("TeamMatchingTimeOut"); inGameDownLoadLevelCheckPoints = new List<int>(GetIntArray("InGameDownLoad")); inGameDownLoadTaskCheckPoints = new List<int>(GetIntArray("InGameDownLoad", 2)); inGameDownLoadHighLevel = GetInt("InGameDownLoad", 3); worldBossNoRebornRemindMaps = new List<int>(GetIntArray("NoRebornRemindMap", 1)); bossHomeNoRebornRemindMaps = new List<int>(GetIntArray("NoRebornRemindMap", 2)); elderGodNoRebornRemindMaps = new List<int>(GetIntArray("NoRebornRemindMap", 3)); demonJarNoRebornRemindMaps = new List<int>(GetIntArray("NoRebornRemindMap", 4)); dogzNoRebornRemindMaps = new List<int>(GetIntArray("NoRebornRemindMap", 5)); if (ModeDefaultConfig == null) { func = Config.Instance.Get<FuncConfigConfig>("ModeDefault"); string[] _funcNpc = func.Numerical1.Split('|'); string[] _fightNpc = func.Numerical2.Split('|'); string[] _pet = func.Numerical3.Split('|'); string[] _horse = func.Numerical4.Split('|'); ModeDefaultConfig = new string[4][]; ModeDefaultConfig[0] = _funcNpc; ModeDefaultConfig[1] = _fightNpc; ModeDefaultConfig[2] = _pet; ModeDefaultConfig[3] = _horse; } if (RealmGroup == null) { func = Config.Instance.Get<FuncConfigConfig>("RealmGroup"); string[] _group = func.Numerical1.Split('|'); RealmGroup = new int[_group.Length]; for (int j = 0; j < _group.Length; ++j) { int.TryParse(_group[j], out RealmGroup[j]); } } func = Config.Instance.Get<FuncConfigConfig>("PrefightAtkRange"); PrefightAtkRange = float.Parse(func.Numerical1); inGameDownLoadHighestLevelPoint = GetInt("DownReward", 2); dungeonCanUseMoneyIds = new List<int>(GetIntArray("FBEnterTickeyAuto", 1)); dungeonRebornClientTimes = ConfigParse.GetDic<int, int>(GetInputString("DuplicatesRebornTime", 2)); dogzBoxLimit = GetInt("DogzBoxLimit"); fairyGrabBossMapLines = ConfigParse.GetDic<int, int>(GetInputString("MapLine", 2)); var grabBossMaps = fairyGrabBossMapLines.Keys.ToList(); foreach (var _key in grabBossMaps) { fairyGrabBossMapLines[_key] = fairyGrabBossMapLines[_key] - 1; } if (DropItemEffectMapID == null) { DropItemEffectMapID = new Dictionary<int, List<int>>(); } DropItemEffectMapID.Clear(); func = Config.Instance.Get<FuncConfigConfig>("DropItemEffectMapID"); _data = LitJson.JsonMapper.ToObject(func.Numerical1); int _itemID; _keys.Clear(); _keys.AddRange(_data.Keys); for (int j = 0; j < _keys.Count; ++j) { if (int.TryParse(_keys[j].ToString(), out _itemID)) { if (!DropItemEffectMapID.ContainsKey(_itemID)) { DropItemEffectMapID.Add(_itemID, new List<int>()); } var _jsonMapIDs = _data[_keys[j]]; foreach (var _jsonMapID in _jsonMapIDs) { var _mapID = ((LitJson.IJsonWrapper)_jsonMapID).GetInt(); if (!DropItemEffectMapID[_itemID].Contains(_mapID)) { DropItemEffectMapID[_itemID].Add(_mapID); } } } } int[] mapIDs = GetIntArray("RebornAutoFightDungeon"); RebornAutoFightMapID = new List<int>(mapIDs); teamWorldCall = GetInputString("TeamWorldCall"); teamWorldCallInviteCount = GetInt("TeamWorldCall", 2); var ancientKingAwradConfig = Config.Instance.Get<FuncConfigConfig>("ElderBattlefieldTopAward"); if (ancientKingAwradConfig != null) { var itemArray = LitJson.JsonMapper.ToObject<int[][]>(ancientKingAwradConfig.Numerical1); for (int k = 0; k < itemArray.Length; k++) { ancientKingAwards.Add(new Item() { id = itemArray[k][0], count = itemArray[k][1], bind = itemArray[k][2] == 1, }); } } func = Config.Instance.Get<FuncConfigConfig>("QualityEffectConfig"); lowQualityCount = int.Parse(func.Numerical1); medQualityCount = int.Parse(func.Numerical2); highQualityCount = int.Parse(func.Numerical3); } catch (Exception ex) { Debug.LogError(ex); } } public string GetJobHeadPortrait(int _job, int _ReincarnationLv) { if (jobHeadPortrait.ContainsKey(_job) && jobHeadPortrait[_job].ContainsKey(_ReincarnationLv)) { return jobHeadPortrait[_job][_ReincarnationLv]; } else { return string.Empty; } } public string GetOtherJobHeadPortrait(int _job, int _ReincarnationLv) { if (otherjobHeadPortrait.ContainsKey(_job) && otherjobHeadPortrait[_job].ContainsKey(_ReincarnationLv)) { return otherjobHeadPortrait[_job][_ReincarnationLv]; } else { return string.Empty; } } private int GetInt(string _key, int _index = 1) { var result = 0; int.TryParse(GetInputString(_key, _index), out result); return result; } private float GetFloat(string _key, int _index = 1) { var result = 0f; float.TryParse(GetInputString(_key, _index), out result); return result; } private bool GetBool(string _key, int _index = 1) { var result = false; bool.TryParse(GetInputString(_key, _index), out result); return result; } private int[] GetIntArray(string _key, int _index = 1) { var inputString = GetInputString(_key, _index); var stringArray = inputString.Split(StringUtility.splitSeparator, StringSplitOptions.RemoveEmptyEntries); if (stringArray.Length == 0) { return null; } var result = new int[stringArray.Length]; for (int i = 0; i < stringArray.Length; i++) { int.TryParse(stringArray[i], out result[i]); } return result; } private string[] GetStringArray(string _key, int _index = 1) { var inputString = GetInputString(_key, _index); var stringArray = inputString.Split(StringUtility.splitSeparator, StringSplitOptions.RemoveEmptyEntries); if (stringArray.Length == 0) { return null; } var result = new string[stringArray.Length]; for (int i = 0; i < stringArray.Length; i++) { result[i] = stringArray[i]; } return result; } private float[] GetFloatArray(string _key, int _index = 1) { var inputString = GetInputString(_key, _index); var stringArray = inputString.Split(StringUtility.splitSeparator, StringSplitOptions.RemoveEmptyEntries); if (stringArray.Length == 0) { return null; } var result = new float[stringArray.Length]; for (int i = 0; i < stringArray.Length; i++) { float.TryParse(stringArray[i], out result[i]); } return result; } private bool[] GetBoolArray(string _key, int _index = 1) { var inputString = GetInputString(_key, _index); var stringArray = inputString.Split(StringUtility.splitSeparator, StringSplitOptions.RemoveEmptyEntries); if (stringArray.Length == 0) { return null; } var result = new bool[stringArray.Length]; for (int i = 0; i < stringArray.Length; i++) { bool.TryParse(stringArray[i], out result[i]); } return result; } private List<int> GetTimeArray(string _key, int _index = 1) { var configContent = GetInputString(_key, _index); var stringArray = configContent.Split(StringUtility.splitSeparator, StringSplitOptions.RemoveEmptyEntries); var timeList = new List<int>(); for (int i = 0; i < stringArray.Length; i++) { var input = stringArray[i]; var matches = Regex.Matches(input, "[0-9]{1,2}"); var hour = matches.Count > 0 ? int.Parse(matches[0].Value) : 0; var minute = matches.Count > 1 ? int.Parse(matches[1].Value) : 0; timeList.Add(hour * 60 + minute); } return timeList; } private string GetInputString(string _key, int _index = 1) { var config = Config.Instance.Get<FuncConfigConfig>(_key); var inputString = string.Empty; switch (_index) { case 1: inputString = config.Numerical1; break; case 2: inputString = config.Numerical2; break; case 3: inputString = config.Numerical3; break; case 4: inputString = config.Numerical4; break; case 5: inputString = config.Numerical5; break; } return inputString; } } using System.Collections; using System.Collections.Generic; using UnityEngine; using TableConfig; using System; using System.Text.RegularExpressions; using System.Linq; using Snxxz.UI; public class GeneralDefine { public static int greatMasterStartLV { get; private set; } public static int playerMaxLevel { get; private set; } public static float potentialUpSuccessRecommend { get; private set; } public static int[] kylinHomeCollectItems; public static List<int> dailyQuestOpenTime; public static int flyBootItemId { get; private set; } public static int teamReadyTime { get; private set; } public static int elderGodAreaAngerTotal { get; private set; } public static float petRandomSpeak { get; private set; } public static int[] openJobs { get; private set; } public static int playerNameLength { get; private set; } public static int guardDungeonCageNPCID { get; private set; } public static float guardBubbleInterval { get; private set; } public static List<int> autoOnHookMap { get; private set; } public static float autoRideHorse { get; private set; } public static Dictionary<int, string> equipPlaceNameDict { get; private set; } public static Dictionary<int, int> moneyDisplayIds { get; private set; } public static int expDisplayId { get; private set; } public static float xpGuideDelay { get; private set; } public static float xpGuideDuration { get; private set; } public static Dictionary<int, string> trailBossHeadIcons { get; private set; } public static Dictionary<int, string> godWeaponMobs { get; private set; } public static float ResetComAtkTime { get; private set; } public static int RotateSpeed { get; private set; } public static float CloseNpcDist { get; private set; } public static float FarawayNpcDist { get; private set; } public static List<int> SpecialNpcIDs { get; private set; } public static Dictionary<int, int> wingEquipLimits { get; private set; } public static float PetDanceInterval { get; private set; } public static float FuncNpcDanceInterval { get; private set; } public static float audioScaleWhenFullScreenOn { get; private set; } public static int ruinsTranscriptMapId { get; private set; } public static List<int> GuardianPickUpID { get; private set; } public static List<int> EarlierGetTreasure { get; private set; } public static int BossSound { get; private set; } public static Dictionary<int, int> iceCrystalMonsterScores { get; private set; } public static float PlayBossHurtInterval { get; private set; } public static List<int> NoXpDungeons { get; private set; } public static List<int> RandomJobs { get; private set; } public static int elderGodTalkingTime { get; private set; } public static int elderGodBigBoss { get; private set; } public static List<int> PassiveSkillShow { get; private set; } public static List<int> bossShuntMaps { get; private set; } public static int bossShuntDays { get; private set; } public static Dictionary<int, int[]> itemDropEffect = new Dictionary<int, int[]>(); public static Dictionary<int, int[]> xllyDropEffect = new Dictionary<int, int[]>(); public static Dictionary<int, int[]> xqryDropEffect = new Dictionary<int, int[]>(); public static Dictionary<int, List<int[]>> customDropEffect = new Dictionary<int, List<int[]>>(); public static Dictionary<int, int> dropEffectQuality = new Dictionary<int, int>(); public static Dictionary<int, int> BuffToHitEffect = new Dictionary<int, int>(); //参数int，int ，string 分别表示职业，转生等级，icon static Dictionary<int, Dictionary<int, string>> jobHeadPortrait = new Dictionary<int, Dictionary<int, string>>(); static Dictionary<int, Dictionary<int, string>> otherjobHeadPortrait = new Dictionary<int, Dictionary<int, string>>(); public static Dictionary<int, int> bossWearyValues = new Dictionary<int, int>(); public static Dictionary<int, Vector3> NpcPosOffset = new Dictionary<int, Vector3>(); public static Dictionary<int, string> propertyIconDict = new Dictionary<int, string>(); public static int demonJarHintLevelLimit { get; private set; } public static int demonJarHintLineId { get; private set; } public static int skillPanelUnLock { get; private set; } public static int dailyQuestRedpointLevelLimit { get; private set; } public static int lowHpRemind { get; private set; } public static int munekadolockLimit { get; private set; } public static int maxItemDropEffectCount { get; private set; } public static int[] autoBuyItemIds; public static int[] autoBuyItemPrices; public static List<int> neutralMaps = new List<int>(); public static List<int> neutralBossMaps = new List<int>(); public static int demonJarRedPoint { get; private set; } public static string LoadLV { get; private set; } public static float mainWinSkillResetTime { get; private set; } public static int OffLineTimeLackRemendLevelLimit { get; private set; } public static Vector3 heroDialogueOffset { get; private set; } public static Vector3 heroDialogueRotation { get; private set; } public static float heroDialogueScale { get; private set; } public static List<int> ancientGrandTotalAchievements { get; private set; } public static List<int> ancientContinueKillAchievements { get; private set; } public static int trialDungeonGroupChallengeTipLv { get; private set; } public static int prayerRedpointLimitLv { get; private set; } public static int demonJarLevelLimit { get; private set; } public static int fairyLandGuideId = 82; public static int specialGuide41Mission { get; private set; } public static int specialGuide41Achievement { get; private set; } public static int supremeRechargeVipLv { get; private set; } public static int rechargeRedpointLv { get; private set; } public static int rechargeRedpointMinLv { get; private set; } public static int runeTowerSweepBuyTimes { get; private set; } public static int runeTowerSweepBuyPrice { get; private set; } public static int teamMatchingTimeOut { get; private set; } public static List<int> inGameDownLoadLevelCheckPoints = null; public static List<int> inGameDownLoadTaskCheckPoints = null; public static int inGameDownLoadHighLevel { get; private set; } public static List<int> worldBossNoRebornRemindMaps = null; public static List<int> bossHomeNoRebornRemindMaps = null; public static List<int> elderGodNoRebornRemindMaps = null; public static List<int> demonJarNoRebornRemindMaps = null; public static List<int> dogzNoRebornRemindMaps = null; public static string[][] ModeDefaultConfig { get; private set; } public static int[] RealmGroup { get; private set; } public static float PrefightAtkRange { get; private set; } public static Dictionary<int, string> multipleRealmImgDict { get; private set; } public static int inGameDownLoadHighestLevelPoint { get; private set; } public static List<int> dungeonCanUseMoneyIds { get; private set; } public static int dogzBoxLimit { get; private set; } public static Dictionary<int, int> dungeonRebornClientTimes { get; private set; } public static int[] CompareEquipPlaces { get; private set; } public static Dictionary<int, int> fairyGrabBossMapLines { get; private set; } public static Dictionary<int, List<int>> DropItemEffectMapID { get; private set; } public static List<int> RebornAutoFightMapID { get; private set; } public static string teamWorldCall; public static int teamWorldCallInviteCount; public static List<Item> ancientKingAwards = new List<Item>(); public static int lowQualityCount { get; private set; } public static int medQualityCount { get; private set; } public static int highQualityCount { get; private set; } public static void Init() { try { CompareEquipPlaces = GetIntArray("EquipUpType"); greatMasterStartLV = GetInt("GreatMasterStartLV"); playerMaxLevel = GetInt("PlayerMaxLV"); potentialUpSuccessRecommend = GetFloat("SPSkillType", 2) * 0.0001f; kylinHomeCollectItems = GetIntArray("KirinNpc", 2); dailyQuestOpenTime = GetTimeArray("ActionTime", 1); flyBootItemId = GetInt("TransportPay"); teamReadyTime = GetInt("TeamReadyTime"); playerNameLength = GetInt("RoleNameLength"); elderGodAreaAngerTotal = GetInt("AngryAdd", 4); petRandomSpeak = GetFloat("PetRandomSpeak"); guardDungeonCageNPCID = GetInt("GuardFBCageNPCID"); guardBubbleInterval = GetFloat("GuardFBCageNPCID", 3); autoRideHorse = GetFloat("AutoRideHorseTime") * Constants.F_DELTA; moneyDisplayIds = ConfigParse.GetDic<int, int>(GetInputString("MoneyDisplayModel", 1)); expDisplayId = GetInt("MoneyDisplayModel", 2); openJobs = GetIntArray("OpenJob"); xpGuideDelay = GetFloat("GuideConfig"); xpGuideDuration = GetFloat("GuideConfig", 2); ResetComAtkTime = GetFloat("AtkWaitingTime"); autoOnHookMap = new List<int>(GetIntArray("AutoOnHookMap")); GuardianPickUpID = new List<int>(GetIntArray("GuardianPickUpID")); RotateSpeed = GetInt("RoleTurnedAngle"); CloseNpcDist = GetFloat("ConversationDistanc", 2); FarawayNpcDist = GetFloat("ConversationDistanc"); SpecialNpcIDs = new List<int>(GetIntArray("SpecialCollectNpcs", 1)); PetDanceInterval = GetInt("PetDanceInterval") * Constants.F_GAMMA; FuncNpcDanceInterval = GetInt("PetDanceInterval", 2) * Constants.F_GAMMA; ruinsTranscriptMapId = GetInt("SpRewardMapID"); EarlierGetTreasure = new List<int>(GetIntArray("EarlierGetTreasure")); BossSound = GetInt("BossSound"); PlayBossHurtInterval = GetFloat("BossSound", 2); var jobHeadPortraitConfig1 = Config.Instance.Get<FuncConfigConfig>("Job1Head"); jobHeadPortrait[1] = ConfigParse.GetDic<int, string>(jobHeadPortraitConfig1.Numerical1); otherjobHeadPortrait[1] = ConfigParse.GetDic<int, string>(jobHeadPortraitConfig1.Numerical2); var jobHeadPortraitConfig2 = Config.Instance.Get<FuncConfigConfig>("Job2Head"); jobHeadPortrait[2] = ConfigParse.GetDic<int, string>(jobHeadPortraitConfig2.Numerical1); otherjobHeadPortrait[2] = ConfigParse.GetDic<int, string>(jobHeadPortraitConfig2.Numerical2); var jobHeadPortraitConfig3 = Config.Instance.Get<FuncConfigConfig>("Job3Head"); jobHeadPortrait[3] = ConfigParse.GetDic<int, string>(jobHeadPortraitConfig3.Numerical1); otherjobHeadPortrait[3] = ConfigParse.GetDic<int, string>(jobHeadPortraitConfig3.Numerical2); bossWearyValues = ConfigParse.GetDic<int, int>(GetInputString("KillBossCntLimit", 2)); wingEquipLimits = ConfigParse.GetDic<int, int>(GetInputString("WingRealmLimit", 1)); int i = 0; int[] equipPlaces = GetIntArray("EquipArea", 1); string[] equipPlacesNames = GetStringArray("EquipArea", 2); equipPlaceNameDict = new Dictionary<int, string>(); for (i = 0; i < equipPlaces.Length; i++) { if (!equipPlaceNameDict.ContainsKey(equipPlaces[i])) { equipPlaceNameDict.Add(equipPlaces[i], equipPlacesNames[i]); } else { DebugEx.LogError("EquipArea : 装备位置重复"); } } var _trailBossJson = LitJson.JsonMapper.ToObject(GetInputString("MuneKadoTrialBossHead", 1)); trailBossHeadIcons = new Dictionary<int, string>(); foreach (var _key in _trailBossJson.Keys) { var _npcId = int.Parse(_key); if (!trailBossHeadIcons.ContainsKey(_npcId)) { trailBossHeadIcons.Add(_npcId, _trailBossJson[_key].ToString()); } } var _godWeaponJson = LitJson.JsonMapper.ToObject(GetInputString("GodModel", 1)); godWeaponMobs = new Dictionary<int, string>(); foreach (var _key in _godWeaponJson.Keys) { var _godWeaponType = int.Parse(_key); if (!godWeaponMobs.ContainsKey(_godWeaponType)) { godWeaponMobs.Add(_godWeaponType, _godWeaponJson[_key].ToString()); } } audioScaleWhenFullScreenOn = GetFloat("AudioSound"); iceCrystalMonsterScores = ConfigParse.GetDic<int, int>(GetInputString("IceLodeNeedPoint", 2)); NoXpDungeons = new List<int>(GetIntArray("XpNoUseDungeon")); RandomJobs = new List<int>(GetIntArray("RandomJob")); elderGodTalkingTime = GetInt("ElderGodTalkingTime"); elderGodBigBoss = GetInt("ElderGodBigBoss"); PassiveSkillShow = new List<int>(GetIntArray("PassiveSkillShow")); FuncConfigConfig func = Config.Instance.Get<FuncConfigConfig>("NpcPosOffset"); LitJson.JsonData _data = LitJson.JsonMapper.ToObject(func.Numerical1); foreach (var _key in _data.Keys) { int _npcID = int.Parse(_key); double[] _pos = new double[2]; _pos[0] = (double)_data[_key][0]; _pos[1] = (double)_data[_key][1]; NpcPosOffset.Add(_npcID, new Vector3((float)_pos[0], 0, (float)_pos[1])); } FuncConfigConfig nxxdImg = Config.Instance.Get<FuncConfigConfig>("NXXDPicture"); LitJson.JsonData nxxdData = LitJson.JsonMapper.ToObject(nxxdImg.Numerical1); multipleRealmImgDict = new Dictionary<int, string>(); if (nxxdData.IsArray) { for (i = 0; i < nxxdData.Count; i++) { if (nxxdData[i].IsArray) { multipleRealmImgDict.Add(int.Parse(nxxdData[i][0].ToString()), nxxdData[i][1].ToString()); } } } bossShuntMaps = new List<int>(GetIntArray("BossShunt")); bossShuntDays = GetInt("BossShunt", 3); itemDropEffect.Clear(); func = Config.Instance.Get<FuncConfigConfig>("ItemEquipmentEffect"); _data = LitJson.JsonMapper.ToObject(func.Numerical1); List<string> _keys = new List<string>(_data.Keys); for (i = 0; i < _keys.Count; ++i) { int[] _props = new int[3]; for (int j = 0; j < 3; ++j) { _props[j] = (int)_data[_keys[i]][j]; } itemDropEffect[int.Parse(_keys[i])] = _props; } xllyDropEffect.Clear(); _data = LitJson.JsonMapper.ToObject(func.Numerical2); _keys.Clear(); _keys.AddRange(_data.Keys); for (i = 0; i < _keys.Count; ++i) { int[] _props = new int[3]; for (int j = 0; j < 3; ++j) { _props[j] = (int)_data[_keys[i]][j]; } xllyDropEffect[int.Parse(_keys[i])] = _props; } xqryDropEffect.Clear(); _data = LitJson.JsonMapper.ToObject(func.Numerical3); _keys.Clear(); _keys.AddRange(_data.Keys); for (i = 0; i < _keys.Count; ++i) { int[] _props = new int[3]; for (int j = 0; j < 3; ++j) { _props[j] = (int)_data[_keys[i]][j]; } xqryDropEffect[int.Parse(_keys[i])] = _props; } dropEffectQuality.Clear(); func = Config.Instance.Get<FuncConfigConfig>("IeemEquipmentEffectQuality"); _data = LitJson.JsonMapper.ToObject(func.Numerical1); _keys.Clear(); _keys.AddRange(_data.Keys); for (i = 0; i < _keys.Count; ++i) { dropEffectQuality[int.Parse(_keys[i])] = (int)_data[_keys[i]]; } customDropEffect.Clear(); func = Config.Instance.Get<FuncConfigConfig>("ItemEquipmentEffectItem"); _data = LitJson.JsonMapper.ToObject(func.Numerical1); _keys.Clear(); _keys.AddRange(_data.Keys); int[] _tmp = null; List<int[]> _content = null; for (i = 0; i < _keys.Count; ++i) { _content = new List<int[]>(); foreach (LitJson.JsonData _values in _data[_keys[i]]) { if (_values.IsArray) { _tmp = new int[2]; _tmp[0] = (int)_values[0]; _tmp[1] = (int)_values[1]; } else { _tmp = new int[1]; _tmp[0] = (int)_values; } _content.Add(_tmp); } customDropEffect.Add(int.Parse(_keys[i]), _content); } BuffToHitEffect.Clear(); func = Config.Instance.Get<FuncConfigConfig>("BuffToHitEffect"); if (!string.IsNullOrEmpty(func.Numerical1) && !string.IsNullOrEmpty(func.Numerical2)) { string[] _buffs = func.Numerical1.Split('|'); string[] _effects = func.Numerical2.Split('|'); for (i = 0; i < _buffs.Length; ++i) { BuffToHitEffect[int.Parse(_buffs[i])] = int.Parse(_effects[i]); } } demonJarHintLevelLimit = GetInt("DemonJarFirstRemin"); demonJarHintLineId = GetInt("DemonJarFirstRemin", 2); skillPanelUnLock = GetInt("SkillPanelUnlock"); dailyQuestRedpointLevelLimit = GetInt("DailyQuestRedPoint"); lowHpRemind = GetInt("LowHpRemind"); autoBuyItemIds = GetIntArray("BuyItemPrice", 1); autoBuyItemPrices = GetIntArray("BuyItemPrice", 2); neutralMaps.AddRange(GetIntArray("MapLine", 4)); neutralBossMaps.AddRange(GetIntArray("BossListMapID")); var _propertyIconCfg = Config.Instance.Get<FuncConfigConfig>("PropertyIcon"); var _propertyIconJson = LitJson.JsonMapper.ToObject(_propertyIconCfg.Numerical1); foreach (var _key in _propertyIconJson.Keys) { var _property = int.Parse(_key); propertyIconDict.Add(_property, _propertyIconJson[_key].ToString()); } munekadolockLimit = GetInt("MunekadoLockLimit"); demonJarRedPoint = GetInt("DemonJarRedPoint"); LoadLV = GetInputString("LoadLV"); mainWinSkillResetTime = GetFloat("AutomaticSwitch"); OffLineTimeLackRemendLevelLimit = GetInt("TJGLevelLimit"); heroDialogueOffset = GetInputString("NpcHalfLength", 1).Vector3Parse(); heroDialogueRotation = GetInputString("NpcHalfLength", 2).Vector3Parse(); heroDialogueScale = GetFloat("NpcHalfLength", 3); var ancientConfig = Config.Instance.Get<FuncConfigConfig>("ElderBattleTarget"); ancientGrandTotalAchievements = new List<int>(); ancientGrandTotalAchievements.AddRange(ConfigParse.GetMultipleStr<int>(ancientConfig.Numerical1)); ancientContinueKillAchievements = new List<int>(); ancientContinueKillAchievements.AddRange(ConfigParse.GetMultipleStr<int>(ancientConfig.Numerical2)); trialDungeonGroupChallengeTipLv = GetInt("SingleIntoFB"); prayerRedpointLimitLv = GetInt("PrayRedPoint"); demonJarLevelLimit = GetInt("DemonJarLevelLimit"); maxItemDropEffectCount = GetInt("ItemMaskEffect"); specialGuide41Mission = GetInt("SpecialGuide41", 1); specialGuide41Achievement = GetInt("SpecialGuide41", 2); supremeRechargeVipLv = GetInt("SupremeCTGVipLimit", 1); rechargeRedpointLv = GetInt("FirstPayRedPoint", 1); rechargeRedpointMinLv = GetInt("FirstPayRedPoint", 2); runeTowerSweepBuyTimes = GetInt("RuneTowerSweepBuy"); runeTowerSweepBuyPrice = GetInt("RuneTowerSweepBuy", 2); teamMatchingTimeOut = GetInt("TeamMatchingTimeOut"); inGameDownLoadLevelCheckPoints = new List<int>(GetIntArray("InGameDownLoad")); inGameDownLoadTaskCheckPoints = new List<int>(GetIntArray("InGameDownLoad", 2)); inGameDownLoadHighLevel = GetInt("InGameDownLoad", 3); worldBossNoRebornRemindMaps = new List<int>(GetIntArray("NoRebornRemindMap", 1)); bossHomeNoRebornRemindMaps = new List<int>(GetIntArray("NoRebornRemindMap", 2)); elderGodNoRebornRemindMaps = new List<int>(GetIntArray("NoRebornRemindMap", 3)); demonJarNoRebornRemindMaps = new List<int>(GetIntArray("NoRebornRemindMap", 4)); dogzNoRebornRemindMaps = new List<int>(GetIntArray("NoRebornRemindMap", 5)); if (ModeDefaultConfig == null) { func = Config.Instance.Get<FuncConfigConfig>("ModeDefault"); string[] _funcNpc = func.Numerical1.Split('|'); string[] _fightNpc = func.Numerical2.Split('|'); string[] _pet = func.Numerical3.Split('|'); string[] _horse = func.Numerical4.Split('|'); ModeDefaultConfig = new string[4][]; ModeDefaultConfig[0] = _funcNpc; ModeDefaultConfig[1] = _fightNpc; ModeDefaultConfig[2] = _pet; ModeDefaultConfig[3] = _horse; } if (RealmGroup == null) { func = Config.Instance.Get<FuncConfigConfig>("RealmGroup"); string[] _group = func.Numerical1.Split('|'); RealmGroup = new int[_group.Length]; for (int j = 0; j < _group.Length; ++j) { int.TryParse(_group[j], out RealmGroup[j]); } } func = Config.Instance.Get<FuncConfigConfig>("PrefightAtkRange"); PrefightAtkRange = float.Parse(func.Numerical1); inGameDownLoadHighestLevelPoint = GetInt("DownReward", 2); dungeonCanUseMoneyIds = new List<int>(GetIntArray("FBEnterTickeyAuto", 1)); dungeonRebornClientTimes = ConfigParse.GetDic<int, int>(GetInputString("DuplicatesRebornTime", 2)); dogzBoxLimit = GetInt("DogzBoxLimit"); fairyGrabBossMapLines = ConfigParse.GetDic<int, int>(GetInputString("MapLine", 2)); var grabBossMaps = fairyGrabBossMapLines.Keys.ToList(); foreach (var _key in grabBossMaps) { fairyGrabBossMapLines[_key] = fairyGrabBossMapLines[_key] - 1; } if (DropItemEffectMapID == null) { DropItemEffectMapID = new Dictionary<int, List<int>>(); } DropItemEffectMapID.Clear(); func = Config.Instance.Get<FuncConfigConfig>("DropItemEffectMapID"); _data = LitJson.JsonMapper.ToObject(func.Numerical1); int _itemID; _keys.Clear(); _keys.AddRange(_data.Keys); for (int j = 0; j < _keys.Count; ++j) { if (int.TryParse(_keys[j].ToString(), out _itemID)) { if (!DropItemEffectMapID.ContainsKey(_itemID)) { DropItemEffectMapID.Add(_itemID, new List<int>()); } var _jsonMapIDs = _data[_keys[j]]; foreach (var _jsonMapID in _jsonMapIDs) { var _mapID = ((LitJson.IJsonWrapper)_jsonMapID).GetInt(); if (!DropItemEffectMapID[_itemID].Contains(_mapID)) { DropItemEffectMapID[_itemID].Add(_mapID); } } } } int[] mapIDs = GetIntArray("RebornAutoFightDungeon"); RebornAutoFightMapID = new List<int>(mapIDs); teamWorldCall = GetInputString("TeamWorldCall"); teamWorldCallInviteCount = GetInt("TeamWorldCall", 2); var ancientKingAwradConfig = Config.Instance.Get<FuncConfigConfig>("ElderBattlefieldTopAward"); if (ancientKingAwradConfig != null) { var itemArray = LitJson.JsonMapper.ToObject<int[][]>(ancientKingAwradConfig.Numerical1); for (int k = 0; k < itemArray.Length; k++) { ancientKingAwards.Add(new Item() { id = itemArray[k][0], count = itemArray[k][1], bind = itemArray[k][2] == 1, }); } } func = Config.Instance.Get<FuncConfigConfig>("QualityEffectConfig"); lowQualityCount = int.Parse(func.Numerical1); medQualityCount = int.Parse(func.Numerical2); highQualityCount = int.Parse(func.Numerical3); } catch (Exception ex) { Debug.LogError(ex); } } public static string GetJobHeadPortrait(int _job, int _ReincarnationLv) { if (jobHeadPortrait.ContainsKey(_job) && jobHeadPortrait[_job].ContainsKey(_ReincarnationLv)) { return jobHeadPortrait[_job][_ReincarnationLv]; } else { return string.Empty; } } public static string GetOtherJobHeadPortrait(int _job, int _ReincarnationLv) { if (otherjobHeadPortrait.ContainsKey(_job) && otherjobHeadPortrait[_job].ContainsKey(_ReincarnationLv)) { return otherjobHeadPortrait[_job][_ReincarnationLv]; } else { return string.Empty; } } private static int GetInt(string _key, int _index = 1) { var result = 0; int.TryParse(GetInputString(_key, _index), out result); return result; } private static float GetFloat(string _key, int _index = 1) { var result = 0f; float.TryParse(GetInputString(_key, _index), out result); return result; } private static bool GetBool(string _key, int _index = 1) { var result = false; bool.TryParse(GetInputString(_key, _index), out result); return result; } private static int[] GetIntArray(string _key, int _index = 1) { var inputString = GetInputString(_key, _index); var stringArray = inputString.Split(StringUtility.splitSeparator, StringSplitOptions.RemoveEmptyEntries); if (stringArray.Length == 0) { return null; } var result = new int[stringArray.Length]; for (int i = 0; i < stringArray.Length; i++) { int.TryParse(stringArray[i], out result[i]); } return result; } private static string[] GetStringArray(string _key, int _index = 1) { var inputString = GetInputString(_key, _index); var stringArray = inputString.Split(StringUtility.splitSeparator, StringSplitOptions.RemoveEmptyEntries); if (stringArray.Length == 0) { return null; } var result = new string[stringArray.Length]; for (int i = 0; i < stringArray.Length; i++) { result[i] = stringArray[i]; } return result; } private static float[] GetFloatArray(string _key, int _index = 1) { var inputString = GetInputString(_key, _index); var stringArray = inputString.Split(StringUtility.splitSeparator, StringSplitOptions.RemoveEmptyEntries); if (stringArray.Length == 0) { return null; } var result = new float[stringArray.Length]; for (int i = 0; i < stringArray.Length; i++) { float.TryParse(stringArray[i], out result[i]); } return result; } private static bool[] GetBoolArray(string _key, int _index = 1) { var inputString = GetInputString(_key, _index); var stringArray = inputString.Split(StringUtility.splitSeparator, StringSplitOptions.RemoveEmptyEntries); if (stringArray.Length == 0) { return null; } var result = new bool[stringArray.Length]; for (int i = 0; i < stringArray.Length; i++) { bool.TryParse(stringArray[i], out result[i]); } return result; } private static List<int> GetTimeArray(string _key, int _index = 1) { var configContent = GetInputString(_key, _index); var stringArray = configContent.Split(StringUtility.splitSeparator, StringSplitOptions.RemoveEmptyEntries); var timeList = new List<int>(); for (int i = 0; i < stringArray.Length; i++) { var input = stringArray[i]; var matches = Regex.Matches(input, "[0-9]{1,2}"); var hour = matches.Count > 0 ? int.Parse(matches[0].Value) : 0; var minute = matches.Count > 1 ? int.Parse(matches[1].Value) : 0; timeList.Add(hour * 60 + minute); } return timeList; } private static string GetInputString(string _key, int _index = 1) { var config = Config.Instance.Get<FuncConfigConfig>(_key); var inputString = string.Empty; switch (_index) { case 1: inputString = config.Numerical1; break; case 2: inputString = config.Numerical2; break; case 3: inputString = config.Numerical3; break; case 4: inputString = config.Numerical4; break; case 5: inputString = config.Numerical5; break; } return inputString; } } System/GeneralConfig/GeneralDefine.cs.meta
System/ItemDrop/DropItem.cs
@@ -155,15 +155,15 @@ SFXController _itemDropEffect = null; private void CheckPlayEffect(int id) { if (GeneralConfig.Instance.DropItemEffectMapID.ContainsKey(id)) if (GeneralDefine.DropItemEffectMapID.ContainsKey(id)) { if (!GeneralConfig.Instance.DropItemEffectMapID[id].Contains(PlayerDatas.Instance.baseData.MapID)) if (!GeneralDefine.DropItemEffectMapID[id].Contains(PlayerDatas.Instance.baseData.MapID)) { return; } } if (hasAppearCount < GeneralConfig.Instance.maxItemDropEffectCount) if (hasAppearCount < GeneralDefine.maxItemDropEffectCount) { var _itemConfig = Config.Instance.Get<ItemConfig>(id); @@ -179,13 +179,13 @@ if (_itemConfig.Type == 108) { foreach (var _level in GeneralConfig.Instance.xllyDropEffect.Keys) foreach (var _level in GeneralDefine.xllyDropEffect.Keys) { if (_playerlevel < _level) { if (_itemConfig.LV >= GeneralConfig.Instance.xllyDropEffect[_level][0] && _itemConfig.ItemColor >= GeneralConfig.Instance.xllyDropEffect[_level][1] && _itemConfig.StarLevel >= GeneralConfig.Instance.xllyDropEffect[_level][2]) if (_itemConfig.LV >= GeneralDefine.xllyDropEffect[_level][0] && _itemConfig.ItemColor >= GeneralDefine.xllyDropEffect[_level][1] && _itemConfig.StarLevel >= GeneralDefine.xllyDropEffect[_level][2]) { _doPlay = true; break; @@ -195,13 +195,13 @@ } else if (_itemConfig.Type == 109) { foreach (var _level in GeneralConfig.Instance.xqryDropEffect.Keys) foreach (var _level in GeneralDefine.xqryDropEffect.Keys) { if (_playerlevel < _level) { if (_itemConfig.LV >= GeneralConfig.Instance.xqryDropEffect[_level][0] && _itemConfig.ItemColor >= GeneralConfig.Instance.xqryDropEffect[_level][1] && _itemConfig.StarLevel >= GeneralConfig.Instance.xqryDropEffect[_level][2]) if (_itemConfig.LV >= GeneralDefine.xqryDropEffect[_level][0] && _itemConfig.ItemColor >= GeneralDefine.xqryDropEffect[_level][1] && _itemConfig.StarLevel >= GeneralDefine.xqryDropEffect[_level][2]) { _doPlay = true; break; @@ -211,13 +211,13 @@ } else { foreach (var _level in GeneralConfig.Instance.itemDropEffect.Keys) foreach (var _level in GeneralDefine.itemDropEffect.Keys) { if (_playerlevel < _level) { if (_itemConfig.LV >= GeneralConfig.Instance.itemDropEffect[_level][0] && _itemConfig.ItemColor >= GeneralConfig.Instance.itemDropEffect[_level][1] && _itemConfig.StarLevel >= GeneralConfig.Instance.itemDropEffect[_level][2]) if (_itemConfig.LV >= GeneralDefine.itemDropEffect[_level][0] && _itemConfig.ItemColor >= GeneralDefine.itemDropEffect[_level][1] && _itemConfig.StarLevel >= GeneralDefine.itemDropEffect[_level][2]) { _doPlay = true; break; @@ -225,11 +225,11 @@ } } foreach (var _level in GeneralConfig.Instance.customDropEffect.Keys) foreach (var _level in GeneralDefine.customDropEffect.Keys) { if (_playerlevel < _level) { foreach (var _ids in GeneralConfig.Instance.customDropEffect[_level]) foreach (var _ids in GeneralDefine.customDropEffect[_level]) { if (_ids.Length == 1) { @@ -254,7 +254,7 @@ if (_doPlay) { int _effectID = 0; if (GeneralConfig.Instance.dropEffectQuality.TryGetValue(_itemConfig.ItemColor, out _effectID)) if (GeneralDefine.dropEffectQuality.TryGetValue(_itemConfig.ItemColor, out _effectID)) { _itemDropEffect = SFXPlayUtility.Instance.PlayBattleEffect(_effectID, transform); hasAppearCount += 1; System/KnapSack/Logic/PackModelInterface.cs
@@ -290,7 +290,7 @@ private int GetEquipScore(PackType type,int itemId, Dictionary<AttrEnum, int> specAttrDict) { tagChinModel = Config.Instance.Get<ItemConfig>(itemId); if (tagChinModel == null || !GeneralConfig.Instance.CompareEquipPlaces.Contains(tagChinModel.EquipPlace)) return 0; if (tagChinModel == null || !GeneralDefine.CompareEquipPlaces.Contains(tagChinModel.EquipPlace)) return 0; Equation.Instance.Clear(); _tagGsProValueDict = EquipGSParamConfig.GetTagGsProValueDict(tagChinModel.LV, tagChinModel.ItemColor,tagChinModel.StarLevel); @@ -1490,7 +1490,7 @@ else { var _realmLv = 1; GeneralConfig.Instance.wingEquipLimits.TryGetValue(itemId, out _realmLv); GeneralDefine.wingEquipLimits.TryGetValue(itemId, out _realmLv); var needRealmConfig = Config.Instance.Get<RealmConfig>(_realmLv); var curRealmConfig = Config.Instance.Get<RealmConfig>(PlayerDatas.Instance.baseData.realmLevel);
@@ -47,7 +47,7 @@ var randomIndex = UnityEngine.Random.Range(0, mapResConfig.LoadingBG.Length > 1 ? mapResConfig.LoadingBG.Length + 1 : 1); if (randomIndex == mapResConfig.LoadingBG.Length) { m_BackGround.SetSprite(GeneralConfig.Instance.LoadLV); m_BackGround.SetSprite(GeneralDefine.LoadLV); m_ContainerFunctions.gameObject.SetActive(true); var functions = GetShowFunctions(PlayerDatas.Instance.baseData.LV == 0 ? PlayerDatas.Instance.loginInfo.LV : PlayerDatas.Instance.baseData.LV); for (int i = 0; i < m_FunctionShows.Length; i++) System/Login/CreateRoleWin.cs
@@ -70,9 +70,9 @@ { userJob = 1; int _rand = UnityEngine.Random.Range(0, 100); for (int i = 0; i < GeneralConfig.Instance.RandomJobs.Count; i++) for (int i = 0; i < GeneralDefine.RandomJobs.Count; i++) { var _value = GeneralConfig.Instance.RandomJobs[i]; var _value = GeneralDefine.RandomJobs[i]; if (_value != 0 && _rand < _value) { userJob = i + 1; System/Login/ServerBehaviour.cs
@@ -58,7 +58,7 @@ if (job != 0) { m_RoleHead.gameObject.SetActive(true); m_RoleHead.SetSprite(GeneralConfig.Instance.GetJobHeadPortrait(job, 0)); m_RoleHead.SetSprite(GeneralDefine.GetJobHeadPortrait(job, 0)); } else { System/MainInterfacePanel/ChatFrame.cs
@@ -342,7 +342,7 @@ var dataMapId = modelD.GetDataMapIdByMapId(PlayerDatas.Instance.baseData.MapID); var config = Config.Instance.Get<DungeonOpenTimeConfig>(dataMapId); string language = string.Empty; if (dataMapId == GeneralConfig.Instance.ruinsTranscriptMapId) if (dataMapId == GeneralDefine.ruinsTranscriptMapId) { language = Language.Get(modelD.mission.lineID > main.LayerNumberNow ? "WHMJ_Quit2" : "WHMJ_Quit1"); } @@ -390,7 +390,7 @@ var point = mapModel.GetRecommendHangPoint(); var config = Config.Instance.Get<MapEventPointConfig>(point); var flyBootOwn = ModelCenter.Instance.GetModel<PlayerPackModel>().GetItemCountByID(PackType.rptItem, GeneralConfig.Instance.flyBootItemId); var flyBootOwn = ModelCenter.Instance.GetModel<PlayerPackModel>().GetItemCountByID(PackType.rptItem, GeneralDefine.flyBootItemId); var isVipFreeTransfer = ModelCenter.Instance.GetModel<VipModel>().GetVipPrivilegeCnt(VipPrivilegeType.FreeTransfer) > 0; if (isVipFreeTransfer || flyBootOwn > 0) { System/MainInterfacePanel/DefaultDialogueBoxWin.cs
@@ -86,7 +86,7 @@ } float _chkDistSqrt = MathUtility.DistanceSqrtXZ(_hero.Pos, _hero.LockTarget.Pos); if (_chkDistSqrt > Mathf.Pow(GeneralConfig.Instance.FarawayNpcDist, 2)) if (_chkDistSqrt > Mathf.Pow(GeneralDefine.FarawayNpcDist, 2)) { WindowCenter.Instance.Close<DefaultDialogueBoxWin>(); WindowCenter.Instance.Open<MainInterfaceWin>(); System/MainInterfacePanel/DialogueDuidanceWin.cs
@@ -193,7 +193,7 @@ } float _chkDistSqrt = MathUtility.DistanceSqrtXZ(_hero.Pos, _hero.LockTarget.Pos); if (_chkDistSqrt > Mathf.Pow(GeneralConfig.Instance.FarawayNpcDist, 2)) if (_chkDistSqrt > Mathf.Pow(GeneralDefine.FarawayNpcDist, 2)) { WindowCenter.Instance.Close<DialogueDuidanceWin>(); System/MainInterfacePanel/HeadPortraitTip.cs
@@ -406,7 +406,7 @@ void HeadImage(int _jobID, int _ReincarnationLv)//关于人物头像的赋值 { _Head.SetSprite(GeneralConfig.Instance.GetJobHeadPortrait(_jobID, _ReincarnationLv)); _Head.SetSprite(GeneralDefine.GetJobHeadPortrait(_jobID, _ReincarnationLv)); }
@@ -96,7 +96,7 @@ { FairyLandButton.gameObject.SetActive(false); } if (FuncOpen.Instance.IsFuncOpen(21) && GeneralConfig.Instance.bossWearyValues[0] + Worldmodel.extraBossWearyValue > Worldmodel.wearyValue) if (FuncOpen.Instance.IsFuncOpen(21) && GeneralDefine.bossWearyValues[0] + Worldmodel.extraBossWearyValue > Worldmodel.wearyValue) { WorldBossButton.gameObject.SetActive(true); } System/MainInterfacePanel/InGamePushContainer.cs
@@ -220,28 +220,28 @@ switch (findPreciousType) { case FindPreciousType.WorldBoss: killable = worldBossModel.wearyValue < GeneralConfig.Instance.bossWearyValues[0] + worldBossModel.extraBossWearyValue; show = !GeneralConfig.Instance.worldBossNoRebornRemindMaps.Contains(mapId); killable = worldBossModel.wearyValue < GeneralDefine.bossWearyValues[0] + worldBossModel.extraBossWearyValue; show = !GeneralDefine.worldBossNoRebornRemindMaps.Contains(mapId); break; case FindPreciousType.BossHome: killable = bossHomeModel.wearyValue < vipModel.GetVipPrivilegeCnt(VipPrivilegeType.BossHomeAwardLimit); show = !GeneralConfig.Instance.bossHomeNoRebornRemindMaps.Contains(mapId); show = !GeneralDefine.bossHomeNoRebornRemindMaps.Contains(mapId); break; case FindPreciousType.ElderGodArea: var elderGodEnterTimes = dungeonModel.GetEnterTimes(ElderGodAreaModel.ELDERGODAREA_MAPID); var elderGodTotalTimes = dungeonModel.GetTotalTimes(ElderGodAreaModel.ELDERGODAREA_MAPID); killable = elderGodTotalTimes > elderGodEnterTimes; show = !GeneralConfig.Instance.elderGodNoRebornRemindMaps.Contains(mapId); show = !GeneralDefine.elderGodNoRebornRemindMaps.Contains(mapId); break; case FindPreciousType.DemonJar: var totalTimes = dungeonModel.GetTotalTimes(DemonJarModel.DEMONJAR_MAPID); var enterTimes = dungeonModel.GetEnterTimes(DemonJarModel.DEMONJAR_MAPID); killable = totalTimes > enterTimes; show = !GeneralConfig.Instance.demonJarNoRebornRemindMaps.Contains(mapId); show = !GeneralDefine.demonJarNoRebornRemindMaps.Contains(mapId); break; case FindPreciousType.DogzDungeon: killable = dogzDungeonModel.wearyValue < GeneralConfig.Instance.bossWearyValues[2]; show = !GeneralConfig.Instance.dogzNoRebornRemindMaps.Contains(mapId); killable = dogzDungeonModel.wearyValue < GeneralDefine.bossWearyValues[2]; show = !GeneralDefine.dogzNoRebornRemindMaps.Contains(mapId); break; } @@ -267,7 +267,7 @@ private void CheckOffLineLack() { if (PlayerDatas.Instance.baseData.LV >= GeneralConfig.Instance.OffLineTimeLackRemendLevelLimit if (PlayerDatas.Instance.baseData.LV >= GeneralDefine.OffLineTimeLackRemendLevelLimit && !offLineTimeLackModel.hasRemindOffLineTimeLack && PlayerDatas.Instance.baseData.HappyPoint < 5 * 3600) { System/MainInterfacePanel/MainInterfaceWin.cs
@@ -292,7 +292,7 @@ } else { var isNeutralMap = GeneralConfig.Instance.neutralBossMaps.Contains(PlayerDatas.Instance.baseData.MapID); var isNeutralMap = GeneralDefine.neutralBossMaps.Contains(PlayerDatas.Instance.baseData.MapID); if (isNeutralMap) { @@ -529,7 +529,7 @@ } } var inDungeon = IsDungeon(); var isNeutralMap = GeneralConfig.Instance.neutralBossMaps.Contains(PlayerDatas.Instance.baseData.MapID); var isNeutralMap = GeneralDefine.neutralBossMaps.Contains(PlayerDatas.Instance.baseData.MapID); if (_areaType == MapArea.E_Type.Boss && !_enter) { @@ -673,7 +673,7 @@ var inDungeon = IsDungeon(); bool IsBossBool = PlayerDatas.Instance.hero == null ? false : MapArea.IsInMapArea(PlayerDatas.Instance.hero.CurMapArea, MapArea.E_Type.Boss);//是否在Boss区域 var isNeutralMap = GeneralConfig.Instance.neutralBossMaps.Contains(PlayerDatas.Instance.baseData.MapID); var isNeutralMap = GeneralDefine.neutralBossMaps.Contains(PlayerDatas.Instance.baseData.MapID); if (!recordPositionBool) { @@ -761,7 +761,7 @@ { var inDungeon = IsDungeon(); bool IsBossBool = MapArea.IsInMapArea(PlayerDatas.Instance.hero.CurMapArea, MapArea.E_Type.Boss); var isNeutralMap = GeneralConfig.Instance.neutralBossMaps.Contains(PlayerDatas.Instance.baseData.MapID); var isNeutralMap = GeneralDefine.neutralBossMaps.Contains(PlayerDatas.Instance.baseData.MapID); if (recordPositionBool)//显示功能入口 { System/MainInterfacePanel/PlayerTaskDatas.cs
@@ -1256,7 +1256,7 @@ var _singleModel = PlayerBackModel.GetSinglePackModel(PackType.rptEquip); // 如果有守护, 则不拾取 var _itemModel = _singleModel.GetItemModelByIndex((int)RoleEquipType.retSpiritAnimal); if (_itemModel == null || !GeneralConfig.Instance.GuardianPickUpID.Contains(_itemModel.itemId)) if (_itemModel == null || !GeneralDefine.GuardianPickUpID.Contains(_itemModel.itemId)) { float _chkDistanceSqrt; DropItemManager.DropObject _obj = null; System/MainInterfacePanel/SkillContainerResetTimer.cs
@@ -27,7 +27,7 @@ } timer += Time.deltaTime; if (timer > GeneralConfig.Instance.mainWinSkillResetTime) if (timer > GeneralDefine.mainWinSkillResetTime) { WindowCenter.Instance.Get<MainInterfaceWin>().MarkRayButton(); this.gameObject.SetActive(false); System/MainInterfacePanel/TaskBoxBGMWin.cs
@@ -343,7 +343,7 @@ return; } float _chkDistSqrt = MathUtility.DistanceSqrtXZ(_hero.Pos, _hero.LockTarget.Pos); if (_chkDistSqrt > Mathf.Pow(GeneralConfig.Instance.FarawayNpcDist, 2)) if (_chkDistSqrt > Mathf.Pow(GeneralDefine.FarawayNpcDist, 2)) { WindowCenter.Instance.Close<TaskBoxBGMWin>(); WindowCenter.Instance.Open<MainInterfaceWin>(); System/MainWin/SkillTurnplate.cs
@@ -77,7 +77,7 @@ } else { var config = Config.Instance.Get<TreasureConfig>(GeneralConfig.Instance.skillPanelUnLock); var config = Config.Instance.Get<TreasureConfig>(GeneralDefine.skillPanelUnLock); SysNotifyMgr.Instance.ShowTip("SkillPanel_Unlock", config.Name); } } @@ -139,7 +139,7 @@ bool IsSecondPanelAllow() { Treasure treasure; return treasureModel.TryGetTreasure(GeneralConfig.Instance.skillPanelUnLock, out treasure) && treasure.state == TreasureState.Collected; return treasureModel.TryGetTreasure(GeneralDefine.skillPanelUnLock, out treasure) && treasure.state == TreasureState.Collected; } bool IsValidGesture() System/Message/RichMoveEvent.cs
@@ -95,7 +95,7 @@ { byte.TryParse(href.mSplits["line"], out line); } //var _itemCount = playerPack.GetItemCountByID(PackType.rptItem, GeneralConfig.Instance.flyBootItemId); //var _itemCount = playerPack.GetItemCountByID(PackType.rptItem, GeneralDefine.flyBootItemId); GA_Hero hero = PlayerDatas.Instance.hero; if (hero == null) { System/Mount/MountPanelAssignment.cs
@@ -103,7 +103,7 @@ private void LateUpdate() { timePlay += Time.deltaTime; if (timePlay >= GeneralConfig.Instance.PetDanceInterval) if (timePlay >= GeneralDefine.PetDanceInterval) { timePlay = 0;
@@ -20,7 +20,7 @@ public void OnPlayerLoginOk() { if (PlayerDatas.Instance.baseData.LV < GeneralConfig.Instance.OffLineTimeLackRemendLevelLimit) if (PlayerDatas.Instance.baseData.LV < GeneralDefine.OffLineTimeLackRemendLevelLimit) { hasRemindOffLineTimeLack = true; } System/OpenServerActivity/RedPackBehaviour.cs
@@ -45,7 +45,7 @@ if (model.TryGetEnvelope(envelopeId, out _envelope)) { m_PlayerName.text = _envelope.playerName; m_PlayerIcon.SetSprite(GeneralConfig.Instance.GetJobHeadPortrait(_envelope.job % 10, 0)); m_PlayerIcon.SetSprite(GeneralDefine.GetJobHeadPortrait(_envelope.job % 10, 0)); m_OpenBtn.gameObject.SetActive(_envelope.state == 1); m_ContainerUnOpen.gameObject.SetActive(_envelope.state == 2 || _envelope.state == 3); m_GetedLabel.gameObject.SetActive(_envelope.state == 2); System/Pet/PetAttributeMethods.cs
@@ -141,7 +141,7 @@ private void LateUpdate() { timePlay += Time.deltaTime; if (timePlay >= GeneralConfig.Instance.PetDanceInterval) if (timePlay >= GeneralDefine.PetDanceInterval) { timePlay = 0; if (UI3DModelExhibition.Instance.NpcModelPet != null) System/Realm/RealmUpHoldWin.cs
@@ -127,7 +127,7 @@ { m_HoldBtnTxt.text = Language.Get("RealmWin_Bewrite_6"); } m_PlayerIcon.SetSprite(GeneralConfig.Instance.GetJobHeadPortrait(data.Job, data.JobRank)); m_PlayerIcon.SetSprite(GeneralDefine.GetJobHeadPortrait(data.Job, data.JobRank)); } } System/Rune/RuneComposeWin.cs
@@ -300,7 +300,7 @@ private void OnMagicEssenceBtn() { var _itemPath = ModelCenter.Instance.GetModel<GetItemPathModel>(); var _displayId = GeneralConfig.Instance.moneyDisplayIds.ContainsKey(14) ? GeneralConfig.Instance.moneyDisplayIds[14] : 0; var _displayId = GeneralDefine.moneyDisplayIds.ContainsKey(14) ? GeneralDefine.moneyDisplayIds[14] : 0; if (_displayId != 0) { _itemPath.SetChinItemModel(_displayId); System/RuneTower/RuneTowerSweepBuyWin.cs
@@ -63,9 +63,9 @@ m_HighestFloor.text = Language.Get("RuneTower17", StringUtility.Contact(towerConfig.TowerName, floorConfig.FloorName)); var completedTime = dailyQuestModel.GetDailyQuestCompletedTimes((int)DailyQuestType.RuneTowerSweep); var surplusTime = GeneralConfig.Instance.runeTowerSweepBuyTimes - Mathf.Clamp(completedTime - 1, 0, int.MaxValue); var surplusTime = GeneralDefine.runeTowerSweepBuyTimes - Mathf.Clamp(completedTime - 1, 0, int.MaxValue); m_SurplusTimes.text = Language.Get("RuneTower18", surplusTime); m_MoneyTip.text = Language.Get("RuneTower19", GeneralConfig.Instance.runeTowerSweepBuyPrice); m_MoneyTip.text = Language.Get("RuneTower19", GeneralDefine.runeTowerSweepBuyPrice); } private void BuyTime() @@ -85,7 +85,7 @@ private bool TestBuyTime(out int _error) { //1.绑玉和仙玉之和不足；2.仙玉不足；3.次数不足 var moneyNeed = GeneralConfig.Instance.runeTowerSweepBuyPrice; var moneyNeed = GeneralDefine.runeTowerSweepBuyPrice; var moneyOwn = PlayerDatas.Instance.baseData.Gold + PlayerDatas.Instance.baseData.GoldPaper; if (moneyOwn < moneyNeed) { @@ -112,7 +112,7 @@ WindowCenter.Instance.Open<RechargeTipWin>(); break; case 2: var moneyNeed = GeneralConfig.Instance.runeTowerSweepBuyPrice; var moneyNeed = GeneralDefine.runeTowerSweepBuyPrice; var moneyOwn = PlayerDatas.Instance.baseData.GoldPaper; var moneyLack = moneyNeed - moneyOwn; ConfirmCancel.ShowPopConfirm( System/Sound/SoundPlayer.cs
@@ -209,7 +209,7 @@ if (clip != null) { _source.volume = SystemSetting.Instance.GetSoundEffect() * (WindowCenter.Instance.ExitAnyFullScreenOrMaskWin() ? GeneralConfig.Instance.audioScaleWhenFullScreenOn : 1f); (WindowCenter.Instance.ExitAnyFullScreenOrMaskWin() ? GeneralDefine.audioScaleWhenFullScreenOn : 1f); _source.PlayOneShot(clip); } System/Store/UnionStoreWin.cs
@@ -323,7 +323,7 @@ } private void ClickGetPathBtn() { int itemId = GeneralConfig.Instance.moneyDisplayIds[15]; int itemId = GeneralDefine.moneyDisplayIds[15]; ModelCenter.Instance.GetModel<GetItemPathModel>().SetChinItemModel(itemId); } private void CloseWin() System/Team/GroupDungeonChallengeProcessor.cs
@@ -18,7 +18,7 @@ mapId = _mapId; lineId = _lineId; if (GeneralConfig.Instance.ruinsTranscriptMapId == _mapId)//zxw if (GeneralDefine.ruinsTranscriptMapId == _mapId)//zxw { bool iamCaptainer = ModelCenter.Instance.GetModel<TeamModel>().myTeam.iamCaptainer; if (iamCaptainer) @@ -98,7 +98,7 @@ { if (_isAutoMatch) { var dungeon = new Dungeon(GeneralConfig.Instance.ruinsTranscriptMapId, main.LayerNumberNow); var dungeon = new Dungeon(GeneralDefine.ruinsTranscriptMapId, main.LayerNumberNow); dungeonModel.GroupChallenge(dungeon); } else System/Team/MyTeamWin.cs
@@ -375,12 +375,12 @@ var minLevel = model.myTeam.inTeam ? model.myTeam.levelMin : model.levelMinBuf; var maxLevel = model.myTeam.inTeam ? model.myTeam.levelMax : model.levelMaxBuf; var isMinPickLevel = minLevel >= GeneralConfig.Instance.greatMasterStartLV; var isMinPickLevel = minLevel >= GeneralDefine.greatMasterStartLV; m_LevelMinSign.gameObject.SetActive(isMinPickLevel); m_LevelMin.text = (isMinPickLevel ? (minLevel - GeneralConfig.Instance.greatMasterStartLV) : minLevel).ToString(); var isMaxPickLevel = maxLevel >= GeneralConfig.Instance.greatMasterStartLV; m_LevelMin.text = (isMinPickLevel ? (minLevel - GeneralDefine.greatMasterStartLV) : minLevel).ToString(); var isMaxPickLevel = maxLevel >= GeneralDefine.greatMasterStartLV; m_LevelMaxSign.gameObject.SetActive(isMaxPickLevel); m_LevelMax.text = (isMaxPickLevel ? (maxLevel - GeneralConfig.Instance.greatMasterStartLV) : maxLevel).ToString(); m_LevelMax.text = (isMaxPickLevel ? (maxLevel - GeneralDefine.greatMasterStartLV) : maxLevel).ToString(); }
@@ -137,9 +137,9 @@ } var level = teammate.id == PlayerDatas.Instance.baseData.PlayerID ? PlayerDatas.Instance.baseData.LV : teammate.level; var isNirvanaLevel = level > GeneralConfig.Instance.greatMasterStartLV; var isNirvanaLevel = level > GeneralDefine.greatMasterStartLV; m_LevelSign.gameObject.SetActive(isNirvanaLevel); m_Level.text = isNirvanaLevel ? (level - GeneralConfig.Instance.greatMasterStartLV).ToString() : level.ToString(); m_Level.text = isNirvanaLevel ? (level - GeneralDefine.greatMasterStartLV).ToString() : level.ToString(); } private void OnMatchMember() @@ -193,7 +193,7 @@ private void DisplayTeammate(Teammate _mate) { m_TeammateInfo.gameObject.SetActive(true); m_Icon.SetSprite(GeneralConfig.Instance.GetOtherJobHeadPortrait(_mate.job, 0)); m_Icon.SetSprite(GeneralDefine.GetOtherJobHeadPortrait(_mate.job, 0)); m_Icon.gray = !_mate.online; m_PlayerName.text = _mate.mateName; @@ -210,9 +210,9 @@ m_Job.text = OccupationNameConfig.GetOccupationName(_mate.job, _mate.jobLevel); var level = _mate.id == PlayerDatas.Instance.baseData.PlayerID ? PlayerDatas.Instance.baseData.LV : _mate.level; var isNirvanaLevel = level > GeneralConfig.Instance.greatMasterStartLV; var isNirvanaLevel = level > GeneralDefine.greatMasterStartLV; m_LevelSign.gameObject.SetActive(isNirvanaLevel); m_Level.text = isNirvanaLevel ? (level - GeneralConfig.Instance.greatMasterStartLV).ToString() : level.ToString(); m_Level.text = isNirvanaLevel ? (level - GeneralDefine.greatMasterStartLV).ToString() : level.ToString(); var isNearBy = _mate.mapId == PlayerDatas.Instance.baseData.MapID; m_Position.text = _mate.id == PlayerDatas.Instance.baseData.PlayerID ? "" : isNearBy ? Language.Get("TeamMemberNearby") : Language.Get("TeamMemberFaraway"); System/Team/TeamApplicationBehaviour.cs
@@ -41,7 +41,7 @@ base.Display(_data); application = (TeamApplication)_data; m_Icon.SetSprite(GeneralConfig.Instance.GetOtherJobHeadPortrait(application.job, 0)); m_Icon.SetSprite(GeneralDefine.GetOtherJobHeadPortrait(application.job, 0)); m_PlayerName.text = application.playerName; m_Realm.gameObject.SetActive(application.realm > 0); @@ -54,9 +54,9 @@ } } m_Job.text = OccupationNameConfig.GetOccupationName(application.job, application.jobLevel); var isNirvanaLevel = application.playerLevel > GeneralConfig.Instance.greatMasterStartLV; var isNirvanaLevel = application.playerLevel > GeneralDefine.greatMasterStartLV; m_LevelSign.gameObject.SetActive(isNirvanaLevel); m_Level.text = isNirvanaLevel ? (application.playerLevel - GeneralConfig.Instance.greatMasterStartLV).ToString() : application.playerLevel.ToString(); m_Level.text = isNirvanaLevel ? (application.playerLevel - GeneralDefine.greatMasterStartLV).ToString() : application.playerLevel.ToString(); } public override void Dispose() System/Team/TeamBriefInfoBehaviour.cs
@@ -58,12 +58,12 @@ m_ApplyFor.gameObject.SetActive(!(model.myTeam.inTeam && model.myTeam.GetIndexOfMember(teamInfo.captainer) != -1)); var isMinPickLevel = teamInfo.levelMin >= GeneralConfig.Instance.greatMasterStartLV; var isMinPickLevel = teamInfo.levelMin >= GeneralDefine.greatMasterStartLV; m_LevelMinSign.gameObject.SetActive(isMinPickLevel); m_LevelMin.text = (isMinPickLevel ? (teamInfo.levelMin - GeneralConfig.Instance.greatMasterStartLV) : teamInfo.levelMin).ToString(); var isMaxPickLevel = teamInfo.levelMax >= GeneralConfig.Instance.greatMasterStartLV; m_LevelMin.text = (isMinPickLevel ? (teamInfo.levelMin - GeneralDefine.greatMasterStartLV) : teamInfo.levelMin).ToString(); var isMaxPickLevel = teamInfo.levelMax >= GeneralDefine.greatMasterStartLV; m_LevelMaxSign.gameObject.SetActive(isMaxPickLevel); m_LevelMax.text = (isMaxPickLevel ? (teamInfo.levelMax - GeneralConfig.Instance.greatMasterStartLV) : teamInfo.levelMax).ToString(); m_LevelMax.text = (isMaxPickLevel ? (teamInfo.levelMax - GeneralDefine.greatMasterStartLV) : teamInfo.levelMax).ToString(); } public override void Dispose() System/Team/TeamData.cs
@@ -149,7 +149,7 @@ public MyTeam() { levelMax = GeneralConfig.Instance.playerMaxLevel; levelMax = GeneralDefine.playerMaxLevel; } public bool TryGetMember(int _index, out Teammate _mate) System/Team/TeamInvitationBehaviour.cs
@@ -39,9 +39,9 @@ m_PlayerName.text = invitation.playerName; m_Job.text = OccupationNameConfig.GetOccupationName(invitation.job, invitation.jobLevel); var isNirvanaLevel = invitation.level > GeneralConfig.Instance.greatMasterStartLV; var isNirvanaLevel = invitation.level > GeneralDefine.greatMasterStartLV; m_LevelSign.gameObject.SetActive(isNirvanaLevel); m_Level.text = isNirvanaLevel ? (invitation.level - GeneralConfig.Instance.greatMasterStartLV).ToString() : invitation.level.ToString(); m_Level.text = isNirvanaLevel ? (invitation.level - GeneralDefine.greatMasterStartLV).ToString() : invitation.level.ToString(); var mission = invitation.mission; var targetConfig = Config.Instance.Get<TeamTargetConfig>(mission.mapId); System/Team/TeamInviteBehaviour.cs
@@ -40,7 +40,7 @@ invite = (TeamInvite)_data; m_Icon.SetSprite(GeneralConfig.Instance.GetOtherJobHeadPortrait(invite.job, 0)); m_Icon.SetSprite(GeneralDefine.GetOtherJobHeadPortrait(invite.job, 0)); m_PlayerName.text = invite.playerName; m_Job.text = OccupationNameConfig.GetOccupationName(invite.job, invite.jobLevel); @@ -54,9 +54,9 @@ } } var isNirvanaLevel = invite.playerLevel > GeneralConfig.Instance.greatMasterStartLV; var isNirvanaLevel = invite.playerLevel > GeneralDefine.greatMasterStartLV; m_LevelSign.gameObject.SetActive(isNirvanaLevel); m_Level.text = isNirvanaLevel ? (invite.playerLevel - GeneralConfig.Instance.greatMasterStartLV).ToString() : invite.playerLevel.ToString(); m_Level.text = isNirvanaLevel ? (invite.playerLevel - GeneralDefine.greatMasterStartLV).ToString() : invite.playerLevel.ToString(); } public override void Dispose() System/Team/TeamModel.cs
@@ -140,7 +140,7 @@ if (m_IsMatching) { matchingEndTime = DateTime.Now + new TimeSpan(TimeSpan.TicksPerSecond * GeneralConfig.Instance.teamMatchingTimeOut); matchingEndTime = DateTime.Now + new TimeSpan(TimeSpan.TicksPerSecond * GeneralDefine.teamMatchingTimeOut); m_MatchingClock = Clock.Create(matchingEndTime, OnMatchingCoolDownEnd); } @@ -191,7 +191,7 @@ public override void Init() { levelMaxBuf = GeneralConfig.Instance.playerMaxLevel; levelMaxBuf = GeneralDefine.playerMaxLevel; ParseTeamMission(); DTCB309_tagGCAnswerPlayerShortInfo.OnPlayerShortInfoEvent += OnGetPlayerShortInfo; PlayerDatas.Instance.fairyData.OnRefreshFairyInfo += OnUpdateFairyInfo; @@ -271,7 +271,7 @@ else { limitLevelMin = 1; limitLevelMax = GeneralConfig.Instance.playerMaxLevel; limitLevelMax = GeneralDefine.playerMaxLevel; } var createTeam = new CB901_tagCGCreateTeam(); @@ -366,14 +366,14 @@ } var levelRequirement = string.Empty; var levelMax = StringUtility.GetLevelString(myTeam.levelMax, GeneralConfig.Instance.greatMasterStartLV); var levelMax = StringUtility.GetLevelString(myTeam.levelMax, GeneralDefine.greatMasterStartLV); if (myTeam.levelMin == myTeam.levelMax) { levelRequirement = StringUtility.Contact(levelMax); } else { var levelMin = StringUtility.GetLevelString(myTeam.levelMin, GeneralConfig.Instance.greatMasterStartLV); var levelMin = StringUtility.GetLevelString(myTeam.levelMin, GeneralDefine.greatMasterStartLV); levelRequirement = StringUtility.Contact(levelMin, "--", levelMax); } @@ -381,12 +381,12 @@ { try { var json = JsonMapper.ToObject(GeneralConfig.Instance.teamWorldCall); var json = JsonMapper.ToObject(GeneralDefine.teamWorldCall); if (json.Keys.Contains(dungeonId.ToString())) { var invite = false; var level = 1; var count = GeneralConfig.Instance.teamWorldCallInviteCount; var count = GeneralDefine.teamWorldCallInviteCount; switch (dungeonId) { @@ -563,7 +563,7 @@ } var minLevel = 1; var maxLevel = GeneralConfig.Instance.playerMaxLevel; var maxLevel = GeneralDefine.playerMaxLevel; if (_mission != myTeam.mission) { @@ -573,7 +573,7 @@ if (mapConfig.MapFBType == (int)MapType.OpenCountry) { minLevel = 1; maxLevel = GeneralConfig.Instance.playerMaxLevel; maxLevel = GeneralDefine.playerMaxLevel; } } else System/Team/TeamPrepareBehaviour.cs
@@ -58,10 +58,10 @@ m_Realm.SetSprite(realmConfig != null ? realmConfig.Img : ""); } m_Icon.SetSprite(GeneralConfig.Instance.GetOtherJobHeadPortrait(teammate.job, teammate.jobLevel)); var isPickLevel = teammate.level > GeneralConfig.Instance.greatMasterStartLV; m_Icon.SetSprite(GeneralDefine.GetOtherJobHeadPortrait(teammate.job, teammate.jobLevel)); var isPickLevel = teammate.level > GeneralDefine.greatMasterStartLV; m_LevelSign.gameObject.SetActive(isPickLevel); m_Level.text = isPickLevel ? (teammate.level - GeneralConfig.Instance.greatMasterStartLV).ToString() : teammate.level.ToString(); m_Level.text = isPickLevel ? (teammate.level - GeneralDefine.greatMasterStartLV).ToString() : teammate.level.ToString(); m_PlayerName.text = teammate.mateName; } else System/Team/TeamPrepareWin.cs
@@ -53,7 +53,7 @@ NewBieCenter.Instance.FinishNewBieGuide(NewBieCenter.Instance.currentGuide); } timeOut = Time.time + GeneralConfig.Instance.teamReadyTime + 10f; timeOut = Time.time + GeneralDefine.teamReadyTime + 10f; rejectManual = false; if (!model.myTeam.iamCaptainer) @@ -185,7 +185,7 @@ { base.LateUpdate(); var endTime = model.prepareBeginTime + new TimeSpan(GeneralConfig.Instance.teamReadyTime * TimeSpan.TicksPerSecond); var endTime = model.prepareBeginTime + new TimeSpan(GeneralDefine.teamReadyTime * TimeSpan.TicksPerSecond); timer += Time.deltaTime; if (timer > 1f) { @@ -194,7 +194,7 @@ m_SurplusTime.text = StringUtility.Contact((int)surplusSecond, Language.Get("RealmWin_Bewrite_35")); } m_TimeSlider.value = (float)(DateTime.Now - model.prepareBeginTime).TotalSeconds / GeneralConfig.Instance.teamReadyTime; m_TimeSlider.value = (float)(DateTime.Now - model.prepareBeginTime).TotalSeconds / GeneralDefine.teamReadyTime; if (DateTime.Now > endTime && !alreadyAutoPrepare) { System/Team/TeamTargetJoinLimitWin.cs
@@ -95,9 +95,9 @@ if (mapId == 0) { minLevelBuf = 1; maxLevelBuf = GeneralConfig.Instance.playerMaxLevel; maxLevelBuf = GeneralDefine.playerMaxLevel; minLevelLimit = 1; maxLevelLimit = GeneralConfig.Instance.playerMaxLevel; maxLevelLimit = GeneralDefine.playerMaxLevel; } else if (dungeonId != 0) { @@ -129,11 +129,11 @@ else { minLevelBuf = 1; maxLevelBuf = GeneralConfig.Instance.playerMaxLevel; maxLevelBuf = GeneralDefine.playerMaxLevel; } minLevelLimit = 1; maxLevelLimit = GeneralConfig.Instance.playerMaxLevel; maxLevelLimit = GeneralDefine.playerMaxLevel; } UpdateMinLevelContent(); @@ -228,9 +228,9 @@ m_MinLevel.gameObject.SetActive(minLevelBuf != 0); if (minLevelBuf != 0) { var isMinPickLevel = minLevelBuf >= GeneralConfig.Instance.greatMasterStartLV; var isMinPickLevel = minLevelBuf >= GeneralDefine.greatMasterStartLV; m_MinLevelSign.gameObject.SetActive(isMinPickLevel); m_MinLevel.text = (isMinPickLevel ? (minLevelBuf - GeneralConfig.Instance.greatMasterStartLV) : minLevelBuf).ToString(); m_MinLevel.text = (isMinPickLevel ? (minLevelBuf - GeneralDefine.greatMasterStartLV) : minLevelBuf).ToString(); } } @@ -241,9 +241,9 @@ if (maxLevelBuf != 0) { var isMaxPickLevel = maxLevelBuf >= GeneralConfig.Instance.greatMasterStartLV; var isMaxPickLevel = maxLevelBuf >= GeneralDefine.greatMasterStartLV; m_MaxLevelSign.gameObject.SetActive(isMaxPickLevel); m_MaxLevel.text = (isMaxPickLevel ? (maxLevelBuf - GeneralConfig.Instance.greatMasterStartLV) : maxLevelBuf).ToString(); m_MaxLevel.text = (isMaxPickLevel ? (maxLevelBuf - GeneralDefine.greatMasterStartLV) : maxLevelBuf).ToString(); } } @@ -258,7 +258,7 @@ UpdateMinLevelContent(); break; case AmendLevelType.Max: maxLevelBuf = Mathf.Clamp(int.Parse(m_NumKeyBoard.Value), minLevelBuf, GeneralConfig.Instance.playerMaxLevel); maxLevelBuf = Mathf.Clamp(int.Parse(m_NumKeyBoard.Value), minLevelBuf, GeneralDefine.playerMaxLevel); UpdateMaxLevelContent(); break; } System/Team/TeammateBriefInfoBehaviour.cs
@@ -33,11 +33,11 @@ m_Level.gameObject.SetActive(true); m_Matching.gameObject.SetActive(false); m_Icon.SetSprite(GeneralConfig.Instance.GetOtherJobHeadPortrait(teammate.job, 0)); m_Icon.SetSprite(GeneralDefine.GetOtherJobHeadPortrait(teammate.job, 0)); m_Icon.gray = !teammate.online; var isPickLevel = teammate.level > GeneralConfig.Instance.greatMasterStartLV; var isPickLevel = teammate.level > GeneralDefine.greatMasterStartLV; m_LevelBG.SetSprite(isPickLevel ? "keyNirvana" : "UnNirvana"); m_Level.text = isPickLevel ? (GeneralConfig.Instance.greatMasterStartLV).ToString() : teammate.level.ToString(); m_Level.text = isPickLevel ? (GeneralDefine.greatMasterStartLV).ToString() : teammate.level.ToString(); m_Level.colorType = teammate.id == (int)PlayerDatas.Instance.baseData.PlayerID ? TextColType.Green : TextColType.White; model.teammateLevelUpEvent += OnTeammateLevelUp; @@ -69,9 +69,9 @@ return; } var isPickLevel = teammate.level > GeneralConfig.Instance.greatMasterStartLV; var isPickLevel = teammate.level > GeneralDefine.greatMasterStartLV; m_LevelBG.SetSprite(isPickLevel ? "keyNirvana" : "UnNirvana"); m_Level.text = isPickLevel ? (GeneralConfig.Instance.greatMasterStartLV).ToString() : teammate.level.ToString(); m_Level.text = isPickLevel ? (GeneralDefine.greatMasterStartLV).ToString() : teammate.level.ToString(); m_Level.colorType = teammate.id == (int)PlayerDatas.Instance.baseData.PlayerID ? TextColType.Green : TextColType.White; }
@@ -30,7 +30,7 @@ case PlayerDataRefresh.HP: case PlayerDataRefresh.MaxHP: var percent = PlayerDatas.Instance.extersion.MaxHP <= 0 ? 1 : PlayerDatas.Instance.baseData.HP / (float)PlayerDatas.Instance.extersion.MaxHP; if (percent <= GeneralConfig.Instance.lowHpRemind * 0.01f) if (percent <= GeneralDefine.lowHpRemind * 0.01f) { WindowCenter.Instance.Open<NearDeathWin>(true); } @@ -80,7 +80,7 @@ base.LateUpdate(); var percent = PlayerDatas.Instance.extersion.MaxHP <= 0 ? 1 : PlayerDatas.Instance.baseData.HP / (float)PlayerDatas.Instance.extersion.MaxHP; m_AudioSource.enabled = m_Effect.enabled = PlayerDatas.Instance.baseData.HP > 0 && percent <= GeneralConfig.Instance.lowHpRemind * 0.01f; m_AudioSource.enabled = m_Effect.enabled = PlayerDatas.Instance.baseData.HP > 0 && percent <= GeneralDefine.lowHpRemind * 0.01f; m_AudioSource.volume = SystemSetting.Instance.GetSoundEffect(); }
@@ -95,10 +95,10 @@ { m_ContainerDetail.localPosition = PlayerDetails.targetPos; m_PlayerTxt.text = UIHelper.ServerStringTrim(PlayerDetails.PlayerName); if (PlayerDetails.LV > GeneralConfig.Instance.greatMasterStartLV) if (PlayerDetails.LV > GeneralDefine.greatMasterStartLV) { m_LevelSign.gameObject.SetActive(true); m_PlayerLevelTxt.text = (PlayerDetails.LV - GeneralConfig.Instance.greatMasterStartLV).ToString(); m_PlayerLevelTxt.text = (PlayerDetails.LV - GeneralDefine.greatMasterStartLV).ToString(); } else { System/Treasure/TreasureAchievement.cs
@@ -133,8 +133,8 @@ var guid = model.GetBetterEquipByPlace(); if (achievement.id == GeneralConfig.Instance.specialGuide41Achievement && task.GetTaskStatus(GeneralConfig.Instance.specialGuide41Mission) if (achievement.id == GeneralDefine.specialGuide41Achievement && task.GetTaskStatus(GeneralDefine.specialGuide41Mission) == PlayerTaskDatas.TaskStatus.TreasureCardLevel && !NewBieCenter.Instance.completeGuidesBuf.Contains(41) && string.IsNullOrEmpty(guid)) System/Treasure/TreasureData.cs
@@ -157,9 +157,9 @@ continue; } for (int j = 0; j < GeneralConfig.Instance.openJobs.Length; j++) for (int j = 0; j < GeneralDefine.openJobs.Length; j++) { var job = GeneralConfig.Instance.openJobs[j]; var job = GeneralDefine.openJobs[j]; List<TreasurePotential> tempPotentials; if (jobToPotentials.ContainsKey(job)) { System/Treasure/TreasureLevelUpWin.cs
@@ -1132,9 +1132,9 @@ var _propertyCfg = Config.Instance.Get<PlayerPropertyConfig>(_key); m_TreasureStageDesc.text = StringUtility.Contact(_propertyCfg.Name, " +", UIHelper.ReplaceLargeNum(_nextStage.propertyDict[_key])); if (GeneralConfig.Instance.propertyIconDict.ContainsKey(_key)) if (GeneralDefine.propertyIconDict.ContainsKey(_key)) { m_CurrentStageIcon.SetSprite(GeneralConfig.Instance.propertyIconDict[_key]); m_CurrentStageIcon.SetSprite(GeneralDefine.propertyIconDict[_key]); } break; } System/Treasure/TreasureMeridianBehaviour.cs
@@ -148,9 +148,9 @@ m_Descs[_index].text = StringUtility.Contact(_propertyCfg.Name, " +" , UIHelper.ReplaceLargeNum(m_TreasureStage.propertyDict[_key])); _index++; if (GeneralConfig.Instance.propertyIconDict.ContainsKey(_key)) if (GeneralDefine.propertyIconDict.ContainsKey(_key)) { m_Icon.SetSprite(GeneralConfig.Instance.propertyIconDict[_key]); m_Icon.SetSprite(GeneralDefine.propertyIconDict[_key]); } } m_Icon.SetNativeSize(); System/Treasure/TreasurePotentialPanel.cs
@@ -755,7 +755,7 @@ return; } var successRequirement = GeneralConfig.Instance.potentialUpSuccessRecommend; var successRequirement = GeneralDefine.potentialUpSuccessRecommend; var levelUpConfig = GetPotentialLevelUpConfig(); DisplaySuccessRatio(); System/TreasureFindHost/ReciveConditionCell.cs
@@ -142,7 +142,7 @@ { int rewardMoneyCnt = value[1]; rewardCntTex.text = UIHelper.ReplaceLargeNum(rewardMoneyCnt); int itemId = GeneralConfig.Instance.moneyDisplayIds[value[0]]; int itemId = GeneralDefine.moneyDisplayIds[value[0]]; ItemConfig itemConfig = Config.Instance.Get<ItemConfig>(itemId); if(itemConfig != null) { System/Vip/RechargeWin.cs
@@ -91,7 +91,7 @@ var config = Config.Instance.Get<CTGConfig>(x); return config != null && config.PayType == 3; }); m_SpecialRechargeBtn.gameObject.SetActive(_specialIndex != -1 && PlayerDatas.Instance.baseData.VIPLv >= GeneralConfig.Instance.supremeRechargeVipLv); m_SpecialRechargeBtn.gameObject.SetActive(_specialIndex != -1 && PlayerDatas.Instance.baseData.VIPLv >= GeneralDefine.supremeRechargeVipLv); } private void SpecialRecharge() System/Vip/VipModel.cs
@@ -872,8 +872,8 @@ firstRechargeRedpoint.state = RedPointState.None; if (PlayerDatas.Instance.baseData.coinPointTotal == 0) { if (PlayerDatas.Instance.baseData.LV <= GeneralConfig.Instance.rechargeRedpointLv && PlayerDatas.Instance.baseData.LV >= GeneralConfig.Instance.rechargeRedpointMinLv) if (PlayerDatas.Instance.baseData.LV <= GeneralDefine.rechargeRedpointLv && PlayerDatas.Instance.baseData.LV >= GeneralDefine.rechargeRedpointMinLv) { firstRechargeRedpoint.state = RedPointState.Quantity; } System/Welfare/NPracticePointWin.cs
@@ -53,10 +53,10 @@ if(operation != null) { int multipleRealm = (operation as OperationMultipleRealmPoint).multiplePractice; if (GeneralConfig.Instance.multipleRealmImgDict.ContainsKey(multipleRealm)) if (GeneralDefine.multipleRealmImgDict.ContainsKey(multipleRealm)) { multipleRealmImg.SetSprite(GeneralConfig.Instance.multipleRealmImgDict[multipleRealm]); multipleRealmImg2.SetSprite(GeneralConfig.Instance.multipleRealmImgDict[multipleRealm]); multipleRealmImg.SetSprite(GeneralDefine.multipleRealmImgDict[multipleRealm]); multipleRealmImg2.SetSprite(GeneralDefine.multipleRealmImgDict[multipleRealm]); } activeRuleText.text = Language.Get("MultipleXXDRemind", Language.Get(StringUtility.Contact("Num_CHS_",multipleRealm))); } System/Welfare/PrayerModel.cs
@@ -316,7 +316,7 @@ public void UpdateRedPoint() { redpoint.state = RedPointState.None; if (PlayerDatas.Instance.baseData.LV < GeneralConfig.Instance.prayerRedpointLimitLv) if (PlayerDatas.Instance.baseData.LV < GeneralDefine.prayerRedpointLimitLv) { return; } System/WorldMap/LocalMapEventPointToggle.cs
@@ -73,7 +73,7 @@ private void FlyToEventPoint() { var flyBootOwn = playerPack.GetItemCountByID(PackType.rptItem, GeneralConfig.Instance.flyBootItemId); var flyBootOwn = playerPack.GetItemCountByID(PackType.rptItem, GeneralDefine.flyBootItemId); var isVipFreeTransfer = ModelCenter.Instance.GetModel<VipModel>().GetVipPrivilegeCnt(VipPrivilegeType.FreeTransfer) > 0; if (isVipFreeTransfer || flyBootOwn > 0) { System/WorldMap/LocalMapFindPath.cs
@@ -38,7 +38,7 @@ } var job = PlayerDatas.Instance.baseData.Job; m_HeroHead.SetSprite(GeneralConfig.Instance.GetJobHeadPortrait(job, 0)); m_HeroHead.SetSprite(GeneralDefine.GetJobHeadPortrait(job, 0)); mapId = _mapId; var tagChinMap = Config.Instance.Get<MapConfig>(mapId); System/WorldMap/MapModel.cs
@@ -571,7 +571,7 @@ eventPointIds.Add(config.Key); if (config.IsShowInfo == 1 && GeneralConfig.Instance.autoOnHookMap.Contains(config.MapID)) if (config.IsShowInfo == 1 && GeneralDefine.autoOnHookMap.Contains(config.MapID)) { sortedMapEventPoints.Add(config.Key); } @@ -589,7 +589,7 @@ { var eventPoint = sortedMapEventPoints[i]; var config = Config.Instance.Get<MapEventPointConfig>(eventPoint); if (GeneralConfig.Instance.autoOnHookMap.Contains(config.MapID)) if (GeneralDefine.autoOnHookMap.Contains(config.MapID)) { sortedHangUpPoints.Add(eventPoint); } System/WorldMap/WorldMapWin.cs
@@ -88,7 +88,7 @@ } var job = PlayerDatas.Instance.baseData.Job; m_PlayerHead.SetSprite(GeneralConfig.Instance.GetJobHeadPortrait(job, 0)); m_PlayerHead.SetSprite(GeneralDefine.GetJobHeadPortrait(job, 0)); WorldMapAreaBehaviour playerAtBehaviour = null; var currentMapId = PlayerDatas.Instance.baseData.MapID; UI/Common/PlayerLifeBar.cs
@@ -58,7 +58,7 @@ { playerId = _playerId; m_Icon.SetSprite(GeneralConfig.Instance.GetJobHeadPortrait(_job, _jobRank)); m_Icon.SetSprite(GeneralDefine.GetJobHeadPortrait(_job, _jobRank)); m_PlayerName.text = _name; m_PlayerLevel.text = _level.ToString();
@@ -259,9 +259,9 @@ if (isDialogue) { instance.transform.localPosition = GeneralConfig.Instance.heroDialogueOffset; instance.transform.localEulerAngles = GeneralConfig.Instance.heroDialogueRotation; instance.transform.localScale = GeneralConfig.Instance.heroDialogueScale * Vector3.one; instance.transform.localPosition = GeneralDefine.heroDialogueOffset; instance.transform.localEulerAngles = GeneralDefine.heroDialogueRotation; instance.transform.localScale = GeneralDefine.heroDialogueScale * Vector3.one; } m_ShowCamera.enabled = true; UI/Common/UI3DModelFactory.cs
@@ -284,7 +284,7 @@ public static GameObject LoadUIGodWeapon(int _type) { var prefab = UILoader.LoadPrefab(GeneralConfig.Instance.godWeaponMobs[_type]); var prefab = UILoader.LoadPrefab(GeneralDefine.godWeaponMobs[_type]); var pool = GameObjectPoolManager.Instance.RequestPool(prefab); var model = pool.Request(); @@ -304,11 +304,11 @@ { return; } if (!GeneralConfig.Instance.godWeaponMobs.ContainsKey(_type)) if (!GeneralDefine.godWeaponMobs.ContainsKey(_type)) { return; } var prefab = UILoader.LoadPrefab(GeneralConfig.Instance.godWeaponMobs[_type]); var prefab = UILoader.LoadPrefab(GeneralDefine.godWeaponMobs[_type]); var pool = GameObjectPoolManager.Instance.RequestPool(prefab); var animator = _model.GetComponent<Animator>(); Utility/UIHelper.cs
@@ -711,9 +711,9 @@ #region 得到装备位对应的部位名称 public static string GetEquipAreaName(int place) { if(GeneralConfig.Instance.equipPlaceNameDict.ContainsKey(place)) if(GeneralDefine.equipPlaceNameDict.ContainsKey(place)) { return GeneralConfig.Instance.equipPlaceNameDict[place]; return GeneralDefine.equipPlaceNameDict[place]; } return ""; }
